diff options
344 files changed, 6447 insertions, 4869 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9da7544cf944..892f671d3b0d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -736,6 +736,12 @@ githubId = 1771266; name = "Vo Anh Duy"; }; + anirrudh = { + email = "anik597@gmail.com"; + github = "anirrudh"; + githubId = 6091755; + name = "Anirrudh Krishnan"; + }; ankhers = { email = "me@ankhers.dev"; github = "ankhers"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index ed35cbedf663..0f768fbe7a89 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -57,6 +57,16 @@ </listitem> <listitem> <para> + bash now defaults to major version 5. + </para> + </listitem> + <listitem> + <para> + Systemd was updated to version 249 (from 247). + </para> + </listitem> + <listitem> + <para> Pantheon desktop has been updated to version 6. Due to changes of screen locker, if locking doesn’t work for you, please try <literal>gsettings set org.gnome.desktop.lockdown disable-lock-screen false</literal>. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 450503259e58..e169c0a5b8d2 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -20,6 +20,10 @@ In addition to numerous new and upgraded packages, this release has the followin This allows activation scripts to output what they would change if the activation was really run. The users/modules activation script supports this and outputs some of is actions. +- bash now defaults to major version 5. + +- Systemd was updated to version 249 (from 247). + - Pantheon desktop has been updated to version 6. Due to changes of screen locker, if locking doesn't work for you, please try `gsettings set org.gnome.desktop.lockdown disable-lock-screen false`. - `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details. @@ -29,7 +33,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). - [clipcat](https://github.com/xrelkd/clipcat/), an X11 clipboard manager written in Rust. Available at [services.clipcat](options.html#o -pt-services.clipcat.enable). + pt-services.clipcat.enable). - [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). @@ -67,7 +71,7 @@ pt-services.clipcat.enable). Available as [isso](#opt-services.isso.enable) - [navidrome](https://www.navidrome.org/), a personal music streaming server with -subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). + subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). - [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable). @@ -103,46 +107,49 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable and advises all users to use `paperless-ng` instead. Users can use the `services.paperless-ng` module as a replacement while noting the following incompatibilities: - - `services.paperless.ocrLanguages` has no replacement. Users should migrate to [`services.paperless-ng.extraConfig`](options.html#opt-services.paperless-ng.extraConfig) instead: - ```nix - { - services.paperless-ng.extraConfig = { - # Provide languages as ISO 639-2 codes - # separated by a plus (+) sign. - # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes - PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse - }; - } - ``` - - - If you previously specified `PAPERLESS_CONSUME_MAIL_*` settings in - `services.paperless.extraConfig` you should remove those options now. You - now *must* define those settings in the admin interface of paperless-ng. - - - Option `services.paperless.manage` no longer exists. - Use the script at `${services.paperless-ng.dataDir}/paperless-ng-manage` instead. - Note that this script only exists after the `paperless-ng` service has been - started at least once. - - - After switching to the new system configuration you should run the Django - management command to reindex your documents and optionally create a user, - if you don't have one already. - - To do so, enter the data directory (the value of - `services.paperless-ng.dataDir`, `/var/lib/paperless` by default), switch - to the paperless user and execute the management command like below: - ``` - $ cd /var/lib/paperless - $ su paperless -s /bin/sh - $ ./paperless-ng-manage document_index reindex - # if not already done create a user account, paperless-ng requires a login - $ ./paperless-ng-manage createsuperuser - Username (leave blank to use 'paperless'): my-user-name - Email address: me@example.com - Password: ********** - Password (again): ********** - Superuser created successfully. - ``` + + - `services.paperless.ocrLanguages` has no replacement. Users should migrate to [`services.paperless-ng.extraConfig`](options.html#opt-services.paperless-ng.extraConfig) instead: + + ```nix + { + services.paperless-ng.extraConfig = { + # Provide languages as ISO 639-2 codes + # separated by a plus (+) sign. + # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes + PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse + }; + } + ``` + + - If you previously specified `PAPERLESS_CONSUME_MAIL_*` settings in + `services.paperless.extraConfig` you should remove those options now. You + now _must_ define those settings in the admin interface of paperless-ng. + + - Option `services.paperless.manage` no longer exists. + Use the script at `${services.paperless-ng.dataDir}/paperless-ng-manage` instead. + Note that this script only exists after the `paperless-ng` service has been + started at least once. + + - After switching to the new system configuration you should run the Django + management command to reindex your documents and optionally create a user, + if you don't have one already. + + To do so, enter the data directory (the value of + `services.paperless-ng.dataDir`, `/var/lib/paperless` by default), switch + to the paperless user and execute the management command like below: + + ``` + $ cd /var/lib/paperless + $ su paperless -s /bin/sh + $ ./paperless-ng-manage document_index reindex + # if not already done create a user account, paperless-ng requires a login + $ ./paperless-ng-manage createsuperuser + Username (leave blank to use 'paperless'): my-user-name + Email address: me@example.com + Password: ********** + Password (again): ********** + Superuser created successfully. + ``` - The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 @@ -239,28 +246,32 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable * The `bitwarden_rs` packages and modules were renamed to `vaultwarden` [following upstream](https://github.com/dani-garcia/vaultwarden/discussions/1642). More specifically, - * `pkgs.bitwarden_rs`, `pkgs.bitwarden_rs-sqlite`, `pkgs.bitwarden_rs-mysql` and + - `pkgs.bitwarden_rs`, `pkgs.bitwarden_rs-sqlite`, `pkgs.bitwarden_rs-mysql` and `pkgs.bitwarden_rs-postgresql` were renamed to `pkgs.vaultwarden`, `pkgs.vaultwarden-sqlite`, `pkgs.vaultwarden-mysql` and `pkgs.vaultwarden-postgresql`, respectively. - * Old names are preserved as aliases for backwards compatibility, but may be removed in the future. - * The `bitwarden_rs` executable was also renamed to `vaultwarden` in all packages. - * `pkgs.bitwarden_rs-vault` was renamed to `pkgs.vaultwarden-vault`. - * `pkgs.bitwarden_rs-vault` is preserved as an alias for backwards compatibility, but may be removed in the future. - * The static files were moved from `/usr/share/bitwarden_rs` to `/usr/share/vaultwarden`. + - Old names are preserved as aliases for backwards compatibility, but may be removed in the future. + - The `bitwarden_rs` executable was also renamed to `vaultwarden` in all packages. + + - `pkgs.bitwarden_rs-vault` was renamed to `pkgs.vaultwarden-vault`. + + - `pkgs.bitwarden_rs-vault` is preserved as an alias for backwards compatibility, but may be removed in the future. + - The static files were moved from `/usr/share/bitwarden_rs` to `/usr/share/vaultwarden`. - * The `services.bitwarden_rs` config module was renamed to `services.vaultwarden`. - * `services.bitwarden_rs` is preserved as an alias for backwards compatibility, but may be removed in the future. + - The `services.bitwarden_rs` config module was renamed to `services.vaultwarden`. - * `systemd.services.bitwarden_rs`, `systemd.services.backup-bitwarden_rs` and `systemd.timers.backup-bitwarden_rs` + - `services.bitwarden_rs` is preserved as an alias for backwards compatibility, but may be removed in the future. + + - `systemd.services.bitwarden_rs`, `systemd.services.backup-bitwarden_rs` and `systemd.timers.backup-bitwarden_rs` were renamed to `systemd.services.vaultwarden`, `systemd.services.backup-vaultwarden` and `systemd.timers.backup-vaultwarden`, respectively. - * Old names are preserved as aliases for backwards compatibility, but may be removed in the future. - * `users.users.bitwarden_rs` and `users.groups.bitwarden_rs` were renamed to `users.users.vaultwarden` and + - Old names are preserved as aliases for backwards compatibility, but may be removed in the future. + + - `users.users.bitwarden_rs` and `users.groups.bitwarden_rs` were renamed to `users.users.vaultwarden` and `users.groups.vaultwarden`, respectively. - * The data directory remains located at `/var/lib/bitwarden_rs`, for backwards compatibility. + - The data directory remains located at `/var/lib/bitwarden_rs`, for backwards compatibility. - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). @@ -273,6 +284,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details. - The following Visual Studio Code extensions were renamed to keep the naming convention uniform. + - `bbenoist.Nix` -> `bbenoist.nix` - `CoenraadS.bracket-pair-colorizer` -> `coenraads.bracket-pair-colorizer` - `golang.Go` -> `golang.go` @@ -292,12 +304,12 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. - The `services.minio` module gained an additional option `consoleAddress`, that -configures the address and port the web UI is listening, it defaults to `:9001`. -To be able to access the web UI this port needs to be opened in the firewall. + configures the address and port the web UI is listening, it defaults to `:9001`. + To be able to access the web UI this port needs to be opened in the firewall. - The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. -- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. +- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. - The attribute `linuxPackages_latest_hardened` was dropped because the hardened patches lag behind the upstream kernel which made version bumps harder. If you want to use diff --git a/nixos/modules/services/search/meilisearch.md b/nixos/modules/services/search/meilisearch.md new file mode 100644 index 000000000000..98e7c542cb9a --- /dev/null +++ b/nixos/modules/services/search/meilisearch.md @@ -0,0 +1,39 @@ +# Meilisearch {#module-services-meilisearch} + +Meilisearch is a lightweight, fast and powerful search engine. Think elastic search with a much smaller footprint. + +## Quickstart + +the minimum to start meilisearch is + +```nix +services.meilisearch.enable = true; +``` + +this will start the http server included with meilisearch on port 7700. + +test with `curl -X GET 'http://localhost:7700/health'` + +## Usage + +you first need to add documents to an index before you can search for documents. + +### Add a documents to the `movies` index + +`curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]'` + +### Search documents in the `movies` index + +`curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }'` (note the typo is intentional and there to demonstrate the typo tolerant capabilities) + +## Defaults + +- The default nixos package doesn't come with the [dashboard](https://docs.meilisearch.com/learn/getting_started/quick_start.html#search), since the dashboard features makes some assets downloads at compile time. + +- Anonimized Analytics sent to meilisearch are disabled by default. + +- Default deployment is development mode. It doesn't require a secret master key. All routes are not protected and accessible. + +## Missing + +- the snapshot feature is not yet configurable from the module, it's just a matter of adding the relevant environment variables. diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 9ed1a0e9053e..f6210f6f16e1 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -8,7 +8,10 @@ let in { - meta.maintainers = with maintainers; [ Br1ght0ne ]; + meta.maintainers = with maintainers; [ Br1ght0ne happysalada ]; + # Don't edit the docbook xml directly, edit the md and generate it: + # `pandoc meilisearch.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > meilisearch.xml` + meta.doc = ./meilisearch.xml; ###### interface diff --git a/nixos/modules/services/search/meilisearch.xml b/nixos/modules/services/search/meilisearch.xml new file mode 100644 index 000000000000..c1a73f358c28 --- /dev/null +++ b/nixos/modules/services/search/meilisearch.xml @@ -0,0 +1,85 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-meilisearch"> + <title>Meilisearch</title> + <para> + Meilisearch is a lightweight, fast and powerful search engine. Think + elastic search with a much smaller footprint. + </para> + <section xml:id="quickstart"> + <title>Quickstart</title> + <para> + the minimum to start meilisearch is + </para> + <programlisting language="bash"> +services.meilisearch.enable = true; +</programlisting> + <para> + this will start the http server included with meilisearch on port + 7700. + </para> + <para> + test with + <literal>curl -X GET 'http://localhost:7700/health'</literal> + </para> + </section> + <section xml:id="usage"> + <title>Usage</title> + <para> + you first need to add documents to an index before you can search + for documents. + </para> + <section xml:id="add-a-documents-to-the-movies-index"> + <title>Add a documents to the <literal>movies</literal> + index</title> + <para> + <literal>curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]'</literal> + </para> + </section> + <section xml:id="search-documents-in-the-movies-index"> + <title>Search documents in the <literal>movies</literal> + index</title> + <para> + <literal>curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }'</literal> + (note the typo is intentional and there to demonstrate the typo + tolerant capabilities) + </para> + </section> + </section> + <section xml:id="defaults"> + <title>Defaults</title> + <itemizedlist> + <listitem> + <para> + The default nixos package doesn’t come with the + <link xlink:href="https://docs.meilisearch.com/learn/getting_started/quick_start.html#search">dashboard</link>, + since the dashboard features makes some assets downloads at + compile time. + </para> + </listitem> + <listitem> + <para> + Anonimized Analytics sent to meilisearch are disabled by + default. + </para> + </listitem> + <listitem> + <para> + Default deployment is development mode. It doesn’t require a + secret master key. All routes are not protected and + accessible. + </para> + </listitem> + </itemizedlist> + </section> + <section xml:id="missing"> + <title>Missing</title> + <itemizedlist spacing="compact"> + <listitem> + <para> + the snapshot feature is not yet configurable from the module, + it’s just a matter of adding the relevant environment + variables. + </para> + </listitem> + </itemizedlist> + </section> +</chapter> diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 7cf2ff87da26..eb966c37ce7f 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -131,6 +131,14 @@ in restartIfChanged = false; }; + systemd.services."autovt@" = + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear %I $TERM") + ]; + restartIfChanged = false; + }; + systemd.services."container-getty@" = { serviceConfig.ExecStart = [ "" # override upstream default with an empty ExecStart diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 93298af2e3ea..b28e3cf0deb2 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -746,6 +746,8 @@ in umask u=rwx,g=rx,o= + rm -rf /var/lib/discourse/tmp/* + cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/ cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/ ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads @@ -767,7 +769,7 @@ in ) discourse-rake db:migrate >>/var/log/discourse/db_migration.log - chmod -R u+w /run/discourse/tmp/ + chmod -R u+w /var/lib/discourse/tmp/ ${lib.optionalString (!cfg.admin.skipCreate) mkAdmin} @@ -782,7 +784,6 @@ in RuntimeDirectory = map (p: "discourse/" + p) [ "config" "home" - "tmp" "assets/javascripts/plugins" "public" "sockets" @@ -791,6 +792,7 @@ in StateDirectory = map (p: "discourse/" + p) [ "uploads" "backups" + "tmp" ]; StateDirectoryMode = 0750; LogsDirectory = "discourse"; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 4bc42525906c..9bb671adbecf 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -476,6 +476,8 @@ in (mkIf serviceCfg.experimental-features.realtime-scheduling { security.wrappers.".gnome-shell-wrapped" = { source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped"; + owner = "root"; + group = "root"; capabilities = "cap_sys_nice=ep"; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 1de58b3d2c4a..bf254be1341b 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -384,6 +384,7 @@ let "AllMulticast" "Unmanaged" "RequiredForOnline" + "ActivationPolicy" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") @@ -402,6 +403,14 @@ let "enslaved" "routable" ])) + (assertValueOneOf "ActivationPolicy" ([ + "up" + "always-up" + "manual" + "always-down" + "down" + "bound" + ])) ]; sectionNetwork = checkUnitConfig "Network" [ diff --git a/nixos/tests/herbstluftwm.nix b/nixos/tests/herbstluftwm.nix index 2c98cceee6a2..7d079f4bfb69 100644 --- a/nixos/tests/herbstluftwm.nix +++ b/nixos/tests/herbstluftwm.nix @@ -3,7 +3,6 @@ import ./make-test-python.nix ({ lib, ...} : { meta = { maintainers = with lib.maintainers; [ thibautmarty ]; - timeout = 30; }; machine = { pkgs, lib, ... }: { diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index b1a44798555d..38b93c4087c0 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -280,6 +280,7 @@ let }; exporterTest = '' wait_for_unit("prometheus-influxdb-exporter.service") + wait_for_open_port(9122) succeed( "curl -XPOST http://localhost:9122/write --data-binary 'influxdb_exporter,distro=nixos,added_in=21.09 value=1'" ) diff --git a/nixos/tests/systemd-confinement.nix b/nixos/tests/systemd-confinement.nix index e6a308f46d27..8fafb11e1e8c 100644 --- a/nixos/tests/systemd-confinement.nix +++ b/nixos/tests/systemd-confinement.nix @@ -44,30 +44,26 @@ import ./make-test-python.nix { { config.confinement.mode = "chroot-only"; testScript = '' with subtest("chroot-only confinement"): - machine.succeed( - 'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix', - 'test "$(chroot-exec id -u)" = 0', - "chroot-exec chown 65534 /bin", - ) + paths = machine.succeed('chroot-exec ls -1 / | paste -sd,').strip() + assert_eq(paths, "bin,nix,run") + uid = machine.succeed('chroot-exec id -u').strip() + assert_eq(uid, "0") + machine.succeed("chroot-exec chown 65534 /bin") ''; } { testScript = '' with subtest("full confinement with APIVFS"): - machine.fail( - "chroot-exec ls -l /etc", - "chroot-exec ls -l /run", - "chroot-exec chown 65534 /bin", - ) - machine.succeed( - 'test "$(chroot-exec id -u)" = 0', - "chroot-exec chown 0 /bin", - ) + machine.fail("chroot-exec ls -l /etc") + machine.fail("chroot-exec chown 65534 /bin") + assert_eq(machine.succeed('chroot-exec id -u').strip(), "0") + machine.succeed("chroot-exec chown 0 /bin") ''; } { config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; testScript = '' with subtest("check existence of bind-mounted /etc"): - machine.succeed('test -n "$(chroot-exec cat /etc/passwd)"') + passwd = machine.succeed('chroot-exec cat /etc/passwd').strip() + assert len(passwd) > 0, "/etc/passwd must not be empty" ''; } { config.serviceConfig.User = "chroot-testuser"; @@ -75,7 +71,8 @@ import ./make-test-python.nix { testScript = '' with subtest("check if User/Group really runs as non-root"): machine.succeed("chroot-exec ls -l /dev") - machine.succeed('test "$(chroot-exec id -u)" != 0') + uid = machine.succeed('chroot-exec id -u').strip() + assert uid != "0", "UID of chroot-testuser shouldn't be 0" machine.fail("chroot-exec touch /bin/test") ''; } @@ -88,10 +85,8 @@ import ./make-test-python.nix { testScript = '' with subtest("check if symlinks are properly bind-mounted"): machine.fail("chroot-exec test -e /etc") - machine.succeed( - "chroot-exec cat ${symlink} >&2", - 'test "$(chroot-exec cat ${symlink})" = "got me"', - ) + text = machine.succeed('chroot-exec cat ${symlink}').strip() + assert_eq(text, "got me") ''; }) { config.serviceConfig.User = "chroot-testuser"; @@ -158,6 +153,9 @@ import ./make-test-python.nix { }; testScript = { nodes, ... }: '' + def assert_eq(a, b): + assert a == b, f"{a} != {b}" + machine.wait_for_unit("multi-user.target") '' + nodes.machine.config.__testSteps; } diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 76d9c2e594b2..da7047b90254 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -135,7 +135,7 @@ mkDerivation rec { { description = "Set of integrated tools for the R language"; homepage = "https://www.rstudio.com/"; license = licenses.agpl3; - maintainers = with maintainers; [ ehmry changlinli ciil ]; + maintainers = with maintainers; [ changlinli ciil ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 028bd77809f9..a9a9fcdf7b4c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "10iai5k0hvyvishp4gbamvsn9ff8dfm6kvql08h3plr8zrvmaian"; - x86_64-darwin = "1cspla4cxw0l5cg44qywv3jgwyk2g7sx5lk1s4xhbrqz76knzcr7"; - aarch64-linux = "1dc4gfaxlrsd637d8w2c5h4l8c96phv14pmkhmyc1jp1a0q6d5ja"; - aarch64-darwin = "06d8ng6k62mh1qhba0c6nj2lag4vi7i50d2sx3nk8r2v8azwyrmk"; - armv7l-linux = "030c8az831n73w35xfbjpympwvfprf1h4lxy8j5sysm4fbpzi03m"; + x86_64-linux = "0ma8pysww4r3p73rf94wddxk2ar091yw8mk1gi9jawiqvb9ksx0m"; + x86_64-darwin = "008v7hxv71bvfp52wfx3sg97s54bn2klvy5xfjh48wcaka10vsj0"; + aarch64-linux = "1wi5bmjdjfy1la3lwb3c389cjbn4q12j1214vna9214d8if37dyv"; + aarch64-darwin = "14v0gq4kj0lxa6pwi7nbdpw0l25yfcqydigfzhmwrp8ipbnma62k"; + armv7l-linux = "0h94gzwxknlvfy9gcd0zq4qsjmr9zr22adbfrqm1gvv1aksmgm4b"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.60.1"; + version = "1.60.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 316110633891..a8af2dfba655 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-4"; + version = "7.1.0-6"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM="; + sha256 = "sha256-rwaMAkbSBTdrJ+OVZfAOBIp1tmC7/TC34w5gBIe+J94="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index ed2434fa5d07..8f5404cf3ae9 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -62,6 +62,7 @@ mkDerivation rec { ninja pkg-config pyside2-tools + gfortran wrapQtAppsHook ]; @@ -70,7 +71,6 @@ mkDerivation rec { boost coin3d eigen - gfortran gts hdf5 libGLU diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index c5d09f61277b..cc6c4f42e640 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.0.01"; + version = "1.0.02"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-UnTZcZjR8edHGflThkiu6OeWJU9x/bH/Ml/CRwWYgFU="; + sha256 = "sha256-JaKThw6ubutpOCsO1pVAPVxhhUTKpfYRHjBSu02nlN4="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index 9ac853c896e8..a113136c248a 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.24"; + version = "2.26"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-JgpYGzD2FsqcCWnOKBiVCxUKqLfT4S++uUBZekhGWmA="; + sha256 = "sha256-RKpg7LBsrBFOlFozoDcALwGeZ9whPiCpFMZF5ljsp7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 73da15cc3c05..9c7c1975eac8 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.0/src -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.1/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 7ef67e7b0362..4f4ab4464a39 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1811 +4,1811 @@ { akonadi = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-21.08.0.tar.xz"; - sha256 = "0qjg8q11ir3dnhxgd068pniy4rwl8p2g0wwaf4cyzz4qw4kp8sbs"; - name = "akonadi-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-21.08.1.tar.xz"; + sha256 = "02abs3mxwna30rgidlndj4jq0swy3id236ckw726vp3r8m9qimd6"; + name = "akonadi-21.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-calendar-21.08.0.tar.xz"; - sha256 = "0f3psag09vc7k29z6p091qpb4b8464k6mjc5qf3mcnrfy2s6viw6"; - name = "akonadi-calendar-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-21.08.1.tar.xz"; + sha256 = "1p8myayr6kfgp805wdpy39f9bjxw1fafv6kn35h1zsl1fgyc4812"; + name = "akonadi-calendar-21.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-calendar-tools-21.08.0.tar.xz"; - sha256 = "1pzs9bdh7lm7kqyrg6qhjj70rkdycfy4ys35ibrgwjv7r6zdgvfx"; - name = "akonadi-calendar-tools-21.08.0.tar.xz"; - }; - }; - akonadiconsole = { - version = "21.08.0"; - src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadiconsole-21.08.0.tar.xz"; - sha256 = "0sq03jrv9i86qw7217s77hfz6105dc7s51fzdhxw15zzv07qd1hb"; - name = "akonadiconsole-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-tools-21.08.1.tar.xz"; + sha256 = "0j8cc0x2bx64crgvprksnmng4yi7fk71s5pfyjrnw8d9xnj7vvvg"; + name = "akonadi-calendar-tools-21.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-contacts-21.08.0.tar.xz"; - sha256 = "0ay0fsb5rrv88w4azlcvmrhsdf4hx6nw8ahz0ik54j8x7ciabyq1"; - name = "akonadi-contacts-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-contacts-21.08.1.tar.xz"; + sha256 = "13sjy2jg4bbg7dm182apppmcpkhmiwhkpnkjhh13dhz8v7488vnc"; + name = "akonadi-contacts-21.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-import-wizard-21.08.0.tar.xz"; - sha256 = "1pcnasgl6f8z4hwgp5nnk4c5hvw210f0b89zjw7v18il2s09vr58"; - name = "akonadi-import-wizard-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-import-wizard-21.08.1.tar.xz"; + sha256 = "1v0nzaijy6nahjx4j1wsvi8s6s3zk79b8h01n3r6gwilbxklqnqs"; + name = "akonadi-import-wizard-21.08.1.tar.xz"; }; }; akonadi-mime = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-mime-21.08.0.tar.xz"; - sha256 = "08c1gn28p3lna8kh33s7ckj37yk5fz26d5n9msrr5497xlf3zyik"; - name = "akonadi-mime-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-mime-21.08.1.tar.xz"; + sha256 = "15lm1248diqhnv1qldcyyfi1v7w8h13jvwhp80py93hijq07iwz5"; + name = "akonadi-mime-21.08.1.tar.xz"; }; }; akonadi-notes = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-notes-21.08.0.tar.xz"; - sha256 = "14d18h3jx761d3zh4m90fmw9fgn4yk22dvgif8ibm3xz8rwjc2v9"; - name = "akonadi-notes-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-notes-21.08.1.tar.xz"; + sha256 = "1r43pvxpk3f183qaiydxg83xc1y5zss7xgxq5p1vnwgqyifibh3h"; + name = "akonadi-notes-21.08.1.tar.xz"; }; }; akonadi-search = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-search-21.08.0.tar.xz"; - sha256 = "0sknzn0ks8az27a212mdfymrlybscl5irars3axb3f7r7lg4iw9s"; - name = "akonadi-search-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-search-21.08.1.tar.xz"; + sha256 = "1w5vps398kadl6p2jhsj18jqfn4lyysx09jzj6q9cvkvzmq4im6i"; + name = "akonadi-search-21.08.1.tar.xz"; + }; + }; + akonadiconsole = { + version = "21.08.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.08.1/src/akonadiconsole-21.08.1.tar.xz"; + sha256 = "1dplpb6z3glps82bzlqhnx29k13m6b7q2wvdlcw9hfqrp2xgzyfk"; + name = "akonadiconsole-21.08.1.tar.xz"; }; }; akregator = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/akregator-21.08.0.tar.xz"; - sha256 = "067dmvnssgcs5410xwnpr38lcxvqms4h70vxnqwzivj2yidymybd"; - name = "akregator-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akregator-21.08.1.tar.xz"; + sha256 = "03rv9m3f7vrn80jfdmnbzxsl226s82liyfam1cysxl2skkmvpimm"; + name = "akregator-21.08.1.tar.xz"; }; }; analitza = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/analitza-21.08.0.tar.xz"; - sha256 = "1nrja7d5kpn1jywld737rx298ykvypb66mi1rxamscr59x2msq4l"; - name = "analitza-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/analitza-21.08.1.tar.xz"; + sha256 = "0aagcj2dvm5aq24m6r5z79qsq2ra8xwzj7b1f64kcq8sabw7dbn4"; + name = "analitza-21.08.1.tar.xz"; }; }; ark = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ark-21.08.0.tar.xz"; - sha256 = "08pm60963fp77wklv3as2c4mg3qrhm7k8hdy7fqdq7l2y64syzfx"; - name = "ark-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ark-21.08.1.tar.xz"; + sha256 = "1ss33qizhg325k4hhf8339xg52iv4s32qjm048zhi2jaz54pdnv0"; + name = "ark-21.08.1.tar.xz"; }; }; artikulate = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/artikulate-21.08.0.tar.xz"; - sha256 = "0w7f8yrfx57bg765iflpb3wjclncrpbfk0q0kych1pvynbxxam03"; - name = "artikulate-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/artikulate-21.08.1.tar.xz"; + sha256 = "0x71m715iw1hv6xy36sd2gzd0cnsbn09wipp02nx2dc161lavnxk"; + name = "artikulate-21.08.1.tar.xz"; }; }; audiocd-kio = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/audiocd-kio-21.08.0.tar.xz"; - sha256 = "12yp1k2z1sp785g5zzhq0v72qpc5gkw0cl7bbm9xn36jy4phi99s"; - name = "audiocd-kio-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/audiocd-kio-21.08.1.tar.xz"; + sha256 = "1aqzgmpypzska5lgjwjpnbl6q2cbyiirph6h8ph5wnnb992lx8li"; + name = "audiocd-kio-21.08.1.tar.xz"; }; }; baloo-widgets = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/baloo-widgets-21.08.0.tar.xz"; - sha256 = "0hf7lrr502xk5154k7889yxxqdnz6k6v70pkwz1s9qq0d58xrwcy"; - name = "baloo-widgets-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/baloo-widgets-21.08.1.tar.xz"; + sha256 = "01f0hpgvlwxn3yms6yyi0ykryb78c9plp0q2z0ywk1p4lx4iywhd"; + name = "baloo-widgets-21.08.1.tar.xz"; }; }; blinken = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/blinken-21.08.0.tar.xz"; - sha256 = "0i4qs4bbk3kpi0hg98mbrdrndj687gdnyxnx3riay0vs9myqsa25"; - name = "blinken-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/blinken-21.08.1.tar.xz"; + sha256 = "1bfkiwg2cwn4dizwcjb0ynzvvdxndf5172a8z0ch9b2wxlaljh87"; + name = "blinken-21.08.1.tar.xz"; }; }; bomber = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/bomber-21.08.0.tar.xz"; - sha256 = "1rkyxzdcjvzf6m6idjjx4xhqrj7j7cybnjmzyy9i81jnraql58gg"; - name = "bomber-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/bomber-21.08.1.tar.xz"; + sha256 = "1ppsnnbwsf1y9pavnpxr64k845gx1yn5p1mqswpcqgp9zd58f338"; + name = "bomber-21.08.1.tar.xz"; }; }; bovo = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/bovo-21.08.0.tar.xz"; - sha256 = "09gqf0cw23ia10sbqa4szlycihdjmiccvf024vgz8yyy8hi9n2hr"; - name = "bovo-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/bovo-21.08.1.tar.xz"; + sha256 = "0qs96ds0clbvf7q487h9bq7l4haymdcyxzq8rlfd74qpki9cb9aa"; + name = "bovo-21.08.1.tar.xz"; }; }; calendarsupport = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/calendarsupport-21.08.0.tar.xz"; - sha256 = "18dy6dhv0z8acvzr47q93rn027pm6dy5r49gagq975jkjw77wncp"; - name = "calendarsupport-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/calendarsupport-21.08.1.tar.xz"; + sha256 = "0n9mbwdgyc4530g1rn9b393qq8pgpcclcpip9p72q8qc630jsvbw"; + name = "calendarsupport-21.08.1.tar.xz"; }; }; cantor = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/cantor-21.08.0.tar.xz"; - sha256 = "0q7l3x5m0s3j9qlhjjvflzfi613638yzi38kcp1ldas1sw48jh7i"; - name = "cantor-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/cantor-21.08.1.tar.xz"; + sha256 = "18gl6bw8mnn9sp4jws5b57k9w9scqg53ynw6yrabx2796k0hwfiw"; + name = "cantor-21.08.1.tar.xz"; }; }; cervisia = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/cervisia-21.08.0.tar.xz"; - sha256 = "108wm6r0h2lz29z7g47m0vhg0rmsqrlwgx0is6ymbbaf7kdy8ynm"; - name = "cervisia-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/cervisia-21.08.1.tar.xz"; + sha256 = "0dah0lgzpdzxyvccqk2k2qbl5x4dl53qp23d0rxb5cg1ba5h7n2l"; + name = "cervisia-21.08.1.tar.xz"; }; }; dolphin = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/dolphin-21.08.0.tar.xz"; - sha256 = "18b751bmq1mlq8zw6wkk2jw8qqn8n2n84vb9ga4jl6bi2gjdqrjn"; - name = "dolphin-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/dolphin-21.08.1.tar.xz"; + sha256 = "1vmk9iaylw427x203ccdjhlbah3dr5fz7l3lc113nczq54kcwpbf"; + name = "dolphin-21.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/dolphin-plugins-21.08.0.tar.xz"; - sha256 = "1d10sbxpgz5fvw7ym8804qkqmrv1w4css5sn96xhd7kb7n23jbh8"; - name = "dolphin-plugins-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/dolphin-plugins-21.08.1.tar.xz"; + sha256 = "0gnmr73ly0djngp3imdi4zm72icj3gilqcshb4ks3rq3lwk408rr"; + name = "dolphin-plugins-21.08.1.tar.xz"; }; }; dragon = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/dragon-21.08.0.tar.xz"; - sha256 = "0d6kradbq010gmknzi4xf7x7b3cl2lmadhdngijmqw0k66g0gi6m"; - name = "dragon-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/dragon-21.08.1.tar.xz"; + sha256 = "050jrizyip362fanrbx3fwp4n69sr7d4y2w6n70aqv8hhi90xqjy"; + name = "dragon-21.08.1.tar.xz"; }; }; elisa = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/elisa-21.08.0.tar.xz"; - sha256 = "14zlwx97ia7hlzylc0anj57gd2b300hclpjwhzr512sis704cyym"; - name = "elisa-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/elisa-21.08.1.tar.xz"; + sha256 = "12kr5aixw5gdmy2vj6id0wmznkwg6p1ysxcqayk8bwvv2qz2pygr"; + name = "elisa-21.08.1.tar.xz"; }; }; eventviews = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/eventviews-21.08.0.tar.xz"; - sha256 = "06ryds5yc5rb3smdhyc1w94idg0apadfjrv65z7ikh85rw82h62s"; - name = "eventviews-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/eventviews-21.08.1.tar.xz"; + sha256 = "04z5cb4vhxcwxp8dwv7w4400zmj090gr7dm4d4h4x39312d25rhh"; + name = "eventviews-21.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ffmpegthumbs-21.08.0.tar.xz"; - sha256 = "0cbinfvfxibpigcv2pwa95yiyd0nll7qrhcb7gcaa21vsq6ggf5m"; - name = "ffmpegthumbs-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ffmpegthumbs-21.08.1.tar.xz"; + sha256 = "13v5y99fvj0p9f9hqafw652qzb7z267fjfsqykv7wb3pv274f11w"; + name = "ffmpegthumbs-21.08.1.tar.xz"; }; }; filelight = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/filelight-21.08.0.tar.xz"; - sha256 = "1x287k36grk3hn7gl7n7sc89a0ibcciz93bym0znl241fd2ncl3q"; - name = "filelight-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/filelight-21.08.1.tar.xz"; + sha256 = "0smvvh7g9p0vh4s3xd0pk6whszk8vmqv9ww1jp0y3dy6ai2cwixi"; + name = "filelight-21.08.1.tar.xz"; }; }; granatier = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/granatier-21.08.0.tar.xz"; - sha256 = "119nfjcmi6fw47700cj4lxczgmc1dv3nxg2mjvzmp9gbr0cfmybb"; - name = "granatier-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/granatier-21.08.1.tar.xz"; + sha256 = "1n7bvkh118530hi0aka9wwz7kycljwawb5d0wxzjb74kqp5rp0lv"; + name = "granatier-21.08.1.tar.xz"; }; }; grantlee-editor = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/grantlee-editor-21.08.0.tar.xz"; - sha256 = "1jf3bzbg9k4xxhq1r22s5r31f5876gihwgipfdpmk7r7hckz2dzr"; - name = "grantlee-editor-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/grantlee-editor-21.08.1.tar.xz"; + sha256 = "1nfqylrnkvhjiygah527i9q16987n99ry69nwd1000xvf7r1k2yd"; + name = "grantlee-editor-21.08.1.tar.xz"; }; }; grantleetheme = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/grantleetheme-21.08.0.tar.xz"; - sha256 = "14sl4wnas4xcx0dpdp6bqi0fk6ylmm6k0cwiyhxp3n2mam1v9ia5"; - name = "grantleetheme-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/grantleetheme-21.08.1.tar.xz"; + sha256 = "0zscb0wb85g1r0zcqb50ylg1r0640mjk985ifffnjzxlx4ayqglm"; + name = "grantleetheme-21.08.1.tar.xz"; }; }; gwenview = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/gwenview-21.08.0.tar.xz"; - sha256 = "06bgq01zw5vybp78x543fv0j7yaz75wds0f7s1sbddrjyn8ifqwd"; - name = "gwenview-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/gwenview-21.08.1.tar.xz"; + sha256 = "187br8271z00v02vllpxqwk8x6y38gg43xixczd8x4j0p6rgv8a0"; + name = "gwenview-21.08.1.tar.xz"; }; }; incidenceeditor = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/incidenceeditor-21.08.0.tar.xz"; - sha256 = "0z1kbwmrwr430ayawcgc9vjnag11gjj3ydbgybs8x0y64cj5v7c0"; - name = "incidenceeditor-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/incidenceeditor-21.08.1.tar.xz"; + sha256 = "1xyb106ck64qq4z083g0qx9n3rax5ma41jsfwl8am8w5q4szxw31"; + name = "incidenceeditor-21.08.1.tar.xz"; }; }; itinerary = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/itinerary-21.08.0.tar.xz"; - sha256 = "1zcf6wz263an6lanl0q81f676zzbnznrrx8lsadbxacm7dvz47a8"; - name = "itinerary-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/itinerary-21.08.1.tar.xz"; + sha256 = "018871y48yd2z2qsrnjhymb72nn4by2l8lrz38gcd9fq2dwlh5fs"; + name = "itinerary-21.08.1.tar.xz"; }; }; juk = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/juk-21.08.0.tar.xz"; - sha256 = "13q9agy9sc7r3cpfc1ip0697jys5v665ih745l2kv6b7sm77w0f5"; - name = "juk-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/juk-21.08.1.tar.xz"; + sha256 = "0q2q31r72d28hhabrnwglhcz6h3ay70i4fg7gyn658njvx8gl26b"; + name = "juk-21.08.1.tar.xz"; }; }; k3b = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/k3b-21.08.0.tar.xz"; - sha256 = "0289g6dk03k7qab8wrj19kv4gz4b9d25ni9kii48ny5169whnk40"; - name = "k3b-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/k3b-21.08.1.tar.xz"; + sha256 = "1gs4api78ngyb03sgknhc1cil6rx7rd1y66674lmi3sssyhi6bkz"; + name = "k3b-21.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kaccounts-integration-21.08.0.tar.xz"; - sha256 = "0kq3pi3lr4bwz0dv8nzdrf8q0dl9mqyj697x2dcmlhydg6vkcyp6"; - name = "kaccounts-integration-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-integration-21.08.1.tar.xz"; + sha256 = "1860njydckpdz34y7g94pa4xz0229j1szj8ihvql05kgysdm11qp"; + name = "kaccounts-integration-21.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kaccounts-providers-21.08.0.tar.xz"; - sha256 = "0xflvms3y02z52yh9grl4304g8m302k7qw07mlcvfvsma44db1mg"; - name = "kaccounts-providers-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-providers-21.08.1.tar.xz"; + sha256 = "1w5k7y8xakp1lf4ca3wip7af3f9avd04i6zixv7kq9w3fh1mndp0"; + name = "kaccounts-providers-21.08.1.tar.xz"; }; }; kaddressbook = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kaddressbook-21.08.0.tar.xz"; - sha256 = "1yhilvq14cx1g6wa21zccm9cfjm7nkfwg297b3iaympwnjb9bny2"; - name = "kaddressbook-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kaddressbook-21.08.1.tar.xz"; + sha256 = "05lrxban904szlqhri71qqfykyygsxwgsx9w406s213vwkakirxb"; + name = "kaddressbook-21.08.1.tar.xz"; }; }; kajongg = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kajongg-21.08.0.tar.xz"; - sha256 = "12l3ls1v4ldmmdmrky7d4ihymyr75jvm89zrz7mi44nkh5p1s7c2"; - name = "kajongg-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kajongg-21.08.1.tar.xz"; + sha256 = "1izm0n2nsvxh9zvws53q4hkpzjihjwwccspas7k10ryasgp4nwsb"; + name = "kajongg-21.08.1.tar.xz"; }; }; kalarm = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kalarm-21.08.0.tar.xz"; - sha256 = "1mmjj3dyza9xq8c5aqivhryvd1vj4z74zw8nmdfscwnzb72gn9xh"; - name = "kalarm-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalarm-21.08.1.tar.xz"; + sha256 = "088461j6piwas0g4chpj579r3bhyncmyajsfh2hz4679ir5lf6yh"; + name = "kalarm-21.08.1.tar.xz"; }; }; kalarmcal = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kalarmcal-21.08.0.tar.xz"; - sha256 = "1v4aqgs2387jnjj5lf7jb03if1p2clxk433jrsyzi2zici7qcd07"; - name = "kalarmcal-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalarmcal-21.08.1.tar.xz"; + sha256 = "1s0yrh0y54rjp4d6y8vcixxrlsdra1xr8j3lxswl2h866p87v7fa"; + name = "kalarmcal-21.08.1.tar.xz"; }; }; kalgebra = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kalgebra-21.08.0.tar.xz"; - sha256 = "0dl1yjh572mcnr71p2ivm2g5w785nq2frqskpydnng1bglrjcf4w"; - name = "kalgebra-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalgebra-21.08.1.tar.xz"; + sha256 = "0a8hmzdslr92v9a8pjf7rnmpf040l9cizzlx8xrxqk2bdb7qls5w"; + name = "kalgebra-21.08.1.tar.xz"; }; }; kalzium = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kalzium-21.08.0.tar.xz"; - sha256 = "130xcqa5kmwg369s22bp9nvzdz3gb553n5awj5rg5gm1fs1xkwnr"; - name = "kalzium-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalzium-21.08.1.tar.xz"; + sha256 = "0ijxyzryry1j9gfdmk56dlzyb4iz0v4vmjzjnqkv6sq2lm47lhyp"; + name = "kalzium-21.08.1.tar.xz"; }; }; kamera = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kamera-21.08.0.tar.xz"; - sha256 = "1zwwc1kaky7cnb4xmwh05w6n3yhqwz2blc1x7s427ismfxsjvsys"; - name = "kamera-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kamera-21.08.1.tar.xz"; + sha256 = "0cmppa8bc9iqbdk0pbnzrj1qqryqmrdgs7hliay3hsl7gjlz9zgy"; + name = "kamera-21.08.1.tar.xz"; }; }; kamoso = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kamoso-21.08.0.tar.xz"; - sha256 = "00l655hx15h1axxad4bk3v5smfv7zvg45w08hign6n30wb3jhz7f"; - name = "kamoso-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kamoso-21.08.1.tar.xz"; + sha256 = "15nqy97m913f0sdjs15bjivs7hvxghlhlw5579fsnfahg5iz5qp6"; + name = "kamoso-21.08.1.tar.xz"; }; }; kanagram = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kanagram-21.08.0.tar.xz"; - sha256 = "1ak7r1rsq1bxb9696a50dim5kicy4pi8rg199pwh0f7gy0b14wiz"; - name = "kanagram-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kanagram-21.08.1.tar.xz"; + sha256 = "1jqrmgyd2ijqb1sq17r7mijvcix6syys02kyasyilwgibbnlzjz1"; + name = "kanagram-21.08.1.tar.xz"; }; }; kapman = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kapman-21.08.0.tar.xz"; - sha256 = "11r4q66ii48g5mr9sa2c0ilas5441sdxlrd0053psksl3f0j8lv5"; - name = "kapman-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kapman-21.08.1.tar.xz"; + sha256 = "072376xqm4a8fwvslf9grsklvzb50d9f098z4qba1lh3y3ivp7wm"; + name = "kapman-21.08.1.tar.xz"; }; }; kapptemplate = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kapptemplate-21.08.0.tar.xz"; - sha256 = "09pi0s09jiqmmp0gv017m18w0y8y06gqcp60j6gawlcsl4kppykx"; - name = "kapptemplate-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kapptemplate-21.08.1.tar.xz"; + sha256 = "1crll3dr299qpigh2w9psvpi0r4jmb8y0b0facfcfcs6j9ldfbw5"; + name = "kapptemplate-21.08.1.tar.xz"; }; }; kate = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kate-21.08.0.tar.xz"; - sha256 = "1s37smn2pk3lglwm8xh0fmq81jd7j6w10pmxb32lm734igdjw9s9"; - name = "kate-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kate-21.08.1.tar.xz"; + sha256 = "0k9kf8x5gbj5vbnr6lfhizi8122p76xixw480a3zsqi57i4bxk0z"; + name = "kate-21.08.1.tar.xz"; }; }; katomic = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/katomic-21.08.0.tar.xz"; - sha256 = "0z5w4zibczkdr8qv45l094lq1xh398rmhhdbs5k7pglj8pkywyww"; - name = "katomic-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/katomic-21.08.1.tar.xz"; + sha256 = "1595swszpw2ia9dh5c6wgrz04qlcvw84l474imkms4gv1cz583pb"; + name = "katomic-21.08.1.tar.xz"; }; }; kbackup = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kbackup-21.08.0.tar.xz"; - sha256 = "1x8l0fw6p6ynsgp7fyzb1klmm2g78fyd06zn5b7jizm4wb7y47m0"; - name = "kbackup-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbackup-21.08.1.tar.xz"; + sha256 = "04795m0r4icfpv6166ingb82mfai0g6q48f9qvcqn029z0f347ya"; + name = "kbackup-21.08.1.tar.xz"; }; }; kblackbox = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kblackbox-21.08.0.tar.xz"; - sha256 = "0qrhc8zp6pggk103p19kkijz206l99dkdw5whrqa5awl9vi2661y"; - name = "kblackbox-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kblackbox-21.08.1.tar.xz"; + sha256 = "019nd86wmm1m8yz0lsayx37mqyzhx1pa5kbddajf5032dscncymd"; + name = "kblackbox-21.08.1.tar.xz"; }; }; kblocks = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kblocks-21.08.0.tar.xz"; - sha256 = "1if3s2dgfd083ql5sgcijccxbdnab5gn6pqcdc8swwgpvvs98f08"; - name = "kblocks-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kblocks-21.08.1.tar.xz"; + sha256 = "1grgkikl7zcs58y86kaw6slq7wvqa51g85kvwrysniv6l3yzhvxj"; + name = "kblocks-21.08.1.tar.xz"; }; }; kbounce = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kbounce-21.08.0.tar.xz"; - sha256 = "0b8242kf0z9b6bi2k07rvyhyh2r5pqpykxn8gchrklg1a39i2748"; - name = "kbounce-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbounce-21.08.1.tar.xz"; + sha256 = "18sd3yzz0mj9j666pnkm49ngfzh7aw125a5zyf1k947z6ayv5zix"; + name = "kbounce-21.08.1.tar.xz"; }; }; kbreakout = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kbreakout-21.08.0.tar.xz"; - sha256 = "1ps8jdyjv5l7iifps0h8v9mfssqrq2wzk9l6ic5l2lri4i941svn"; - name = "kbreakout-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbreakout-21.08.1.tar.xz"; + sha256 = "0264w926ldfhdx22z1iqk41w5a9gnycff4vdjf0i6rzyws2qsb0g"; + name = "kbreakout-21.08.1.tar.xz"; }; }; kbruch = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kbruch-21.08.0.tar.xz"; - sha256 = "08mafsyr0d2qrpv213rssz9h9qk58miyvlmjbk9p4ryf81qhcbxs"; - name = "kbruch-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbruch-21.08.1.tar.xz"; + sha256 = "1rbkwzca3m93p3z294cwkiyycg0w87r6j37v0zyiq802pwkkpm34"; + name = "kbruch-21.08.1.tar.xz"; }; }; kcachegrind = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kcachegrind-21.08.0.tar.xz"; - sha256 = "1br5f54ym1b2ra20lk2giqijir9q35al0vwm8m7fa7z9s9z002bx"; - name = "kcachegrind-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcachegrind-21.08.1.tar.xz"; + sha256 = "09zgilcya7asj2si747snli6h0s7wzgjzkns9f53rwvq06xbp2zv"; + name = "kcachegrind-21.08.1.tar.xz"; }; }; kcalc = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kcalc-21.08.0.tar.xz"; - sha256 = "14f3p10sg41az5qiccdmdavqi62m9i7ijv27hibi6z162ly15nh3"; - name = "kcalc-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcalc-21.08.1.tar.xz"; + sha256 = "0si3mp1xbk6gps5fhc9fv1vskx37pgwx72i2x1kcm7azif26nzsk"; + name = "kcalc-21.08.1.tar.xz"; }; }; kcalutils = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kcalutils-21.08.0.tar.xz"; - sha256 = "1yg8vdlcl79f42k2j100ikm8r1bhrrwmqdrzin7qnvsqyx8dhw1i"; - name = "kcalutils-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcalutils-21.08.1.tar.xz"; + sha256 = "1xrggb8vv8lrjyhdb9yf2fzs36q766if78hlymgfndj1z37s0m6m"; + name = "kcalutils-21.08.1.tar.xz"; }; }; kcharselect = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kcharselect-21.08.0.tar.xz"; - sha256 = "16z657is57yrag7ydc2cxzsb438kl7bxdnbn68qq2x14n011fzah"; - name = "kcharselect-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcharselect-21.08.1.tar.xz"; + sha256 = "0qbhmyczc13kmbls06732i91s8n6w396dfj1z50z28wrkyqls8zr"; + name = "kcharselect-21.08.1.tar.xz"; }; }; kcolorchooser = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kcolorchooser-21.08.0.tar.xz"; - sha256 = "1lpskfa6nfw6ymbw8rqqi6gr1f4grdsgmxh2s5w4r2n9i9limb17"; - name = "kcolorchooser-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcolorchooser-21.08.1.tar.xz"; + sha256 = "13zdyksijxflvjb3zaszl6q7wzwz0pxsq8hyi5pb2gb7gryz65h7"; + name = "kcolorchooser-21.08.1.tar.xz"; }; }; kcron = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kcron-21.08.0.tar.xz"; - sha256 = "1972l12291mzrcdndr5385qh8sx2alsxjfqpsk9lj1gkcqh13yyk"; - name = "kcron-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcron-21.08.1.tar.xz"; + sha256 = "0c9d3rlml2adk11bp541l1zpbgp3q6mfhb7bpq4alrwlrbd4fxan"; + name = "kcron-21.08.1.tar.xz"; }; }; - kdebugsettings = { - version = "21.08.0"; + kde-dev-scripts = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdebugsettings-21.08.0.tar.xz"; - sha256 = "0a1wp3hnxvzpa6mhf0p6yj144sv3pvhl1dffck9avaz543zrxy36"; - name = "kdebugsettings-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-scripts-21.08.1.tar.xz"; + sha256 = "1pv0qj7xpvxqgcrjbr9989cax0aan64cbipia4kmlg7kriz5wz6c"; + name = "kde-dev-scripts-21.08.1.tar.xz"; }; }; - kdeconnect-kde = { - version = "21.08.0"; + kde-dev-utils = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdeconnect-kde-21.08.0.tar.xz"; - sha256 = "1qmic0016ybldsfagbqj3yrvfhja3zhygkq6pgnkb1zq3bfk22ls"; - name = "kdeconnect-kde-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-utils-21.08.1.tar.xz"; + sha256 = "02ksa35xh8vw08pqik7q8v3wax1fcvx2inicm1b2z2c4gq5k766l"; + name = "kde-dev-utils-21.08.1.tar.xz"; }; }; - kde-dev-scripts = { - version = "21.08.0"; + kdebugsettings = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kde-dev-scripts-21.08.0.tar.xz"; - sha256 = "1v8h3fp8lv6d0qdwbwwwcz9ncj5r8b3l3dbc56r9x07i1pkxxmrr"; - name = "kde-dev-scripts-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdebugsettings-21.08.1.tar.xz"; + sha256 = "1fmnmvyzlhczbsxdpnm3bi50pdh2659raizaqbal2yjxcp6rlb90"; + name = "kdebugsettings-21.08.1.tar.xz"; }; }; - kde-dev-utils = { - version = "21.08.0"; + kdeconnect-kde = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kde-dev-utils-21.08.0.tar.xz"; - sha256 = "17ccgwifx7sq3dzhicclaxa9xlnxc4qic37kf5f391y99d7kj9cm"; - name = "kde-dev-utils-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdeconnect-kde-21.08.1.tar.xz"; + sha256 = "01nwzsryxg7kkxb6g4h0lwn6g5zx4k64vizqk4gsvkif8d5zfc33"; + name = "kdeconnect-kde-21.08.1.tar.xz"; }; }; kdeedu-data = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdeedu-data-21.08.0.tar.xz"; - sha256 = "1szkqcn64z4qrfrbfwnlzp4prv84nl361dnr6m0nr72nk0421w4g"; - name = "kdeedu-data-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdeedu-data-21.08.1.tar.xz"; + sha256 = "19hc9mykw8q0krcxmrjq4mhn5dljfrv9pzv38dm80w3yfflj8y65"; + name = "kdeedu-data-21.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdegraphics-mobipocket-21.08.0.tar.xz"; - sha256 = "0lg92zz122b0ia3qyg7c00ymqlh9pvpja9fyjqa0rvqy1ampb848"; - name = "kdegraphics-mobipocket-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-mobipocket-21.08.1.tar.xz"; + sha256 = "06zpm5d58q10dalm2lm7v7lcjmainn3lmagra6a1f007yshm3i32"; + name = "kdegraphics-mobipocket-21.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdegraphics-thumbnailers-21.08.0.tar.xz"; - sha256 = "1asgh1zag5pv56zhbgjax6pba5vpywhxsd3lmpa2fd6yqvrnqflw"; - name = "kdegraphics-thumbnailers-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-thumbnailers-21.08.1.tar.xz"; + sha256 = "0hqdxsnv6xgvy2knnhq733hbfgzhr6f4fi63l80saysqvpjyrxly"; + name = "kdegraphics-thumbnailers-21.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdenetwork-filesharing-21.08.0.tar.xz"; - sha256 = "1pnn27cfkn209vp6mapfv8p2lbbyjrkha41qfza5cgbsmnbw8vag"; - name = "kdenetwork-filesharing-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdenetwork-filesharing-21.08.1.tar.xz"; + sha256 = "1q5wisy6gz94lbf3dnmxp3rq0c5b1laajph8lnlm9dhfxxmrkacf"; + name = "kdenetwork-filesharing-21.08.1.tar.xz"; }; }; kdenlive = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdenlive-21.08.0.tar.xz"; - sha256 = "08nfjslkm0xdfkq15nma9c6rajgi2d1qf6sb5wscnr5bvqkxyhg4"; - name = "kdenlive-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdenlive-21.08.1.tar.xz"; + sha256 = "0gjv1fm07f1qckpmlvia58myg9si9z46nwxiz1lcca5mx5k7rpcz"; + name = "kdenlive-21.08.1.tar.xz"; }; }; kdepim-addons = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdepim-addons-21.08.0.tar.xz"; - sha256 = "0fbf11zxn6zf6g9l1m3faiprbkppvi4ha1q8v6khxq92nkidq962"; - name = "kdepim-addons-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdepim-addons-21.08.1.tar.xz"; + sha256 = "08vpjcqnjh99bbmwp3h64anp53zafifblqy2f7bqkvwifmlrqvz8"; + name = "kdepim-addons-21.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdepim-runtime-21.08.0.tar.xz"; - sha256 = "1nzc8av8yai8pjbjwz0kx6jm9kl847ddx6v913xx4y58y9w2d3xs"; - name = "kdepim-runtime-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdepim-runtime-21.08.1.tar.xz"; + sha256 = "0ai6v5sysh5pzwpvbhjzi1fvfp608abpndh9nhnm7b87hca73vm9"; + name = "kdepim-runtime-21.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdesdk-kioslaves-21.08.0.tar.xz"; - sha256 = "08vvkcyzlaq4l4v8rwlxxpdqdmxv5ylkrf10cbg8bjkgrwqyalrc"; - name = "kdesdk-kioslaves-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-kioslaves-21.08.1.tar.xz"; + sha256 = "0cz2cmcgksfkgl2nh0nnyz38q3rp1dfwhnajgcif5q0ka528v33w"; + name = "kdesdk-kioslaves-21.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdesdk-thumbnailers-21.08.0.tar.xz"; - sha256 = "0n5nmixnw92mkx8vwzyixgvnjk941q6p43i6j5h272j3w98p10lg"; - name = "kdesdk-thumbnailers-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-thumbnailers-21.08.1.tar.xz"; + sha256 = "1cvh2p3vfzbqbr9cfa1bchgflmp9mi12qx1j6j1jdaqqwhz43kj6"; + name = "kdesdk-thumbnailers-21.08.1.tar.xz"; }; }; kdf = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdf-21.08.0.tar.xz"; - sha256 = "0s3a4chj1hx3s4nw56ddcl8nvk1rannj14zzfq31r2yg3pahy1hm"; - name = "kdf-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdf-21.08.1.tar.xz"; + sha256 = "1xmn7dhbnj9bhaw545ry0qwayxh3jhpgx9xa2fjcc0dhn8yx1spv"; + name = "kdf-21.08.1.tar.xz"; }; }; kdialog = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdialog-21.08.0.tar.xz"; - sha256 = "1pki0hdwxrjlcfzyvhk2ag77050zg7wkhcpj7qzxr91l3ga3rbyl"; - name = "kdialog-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdialog-21.08.1.tar.xz"; + sha256 = "1mxmj5cm5h1dhqkblcqdc7ba9x04sqj6gp0b12gii7jsz3g0pa94"; + name = "kdialog-21.08.1.tar.xz"; }; }; kdiamond = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kdiamond-21.08.0.tar.xz"; - sha256 = "054kjwscdw8ap2123lrrhpaw2mvd1ly1cwf22zjz41k4hq533kmm"; - name = "kdiamond-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdiamond-21.08.1.tar.xz"; + sha256 = "0l8z71k0a300yp03mkpabi3a9xydky6x19sk7xhq727canrb3nwz"; + name = "kdiamond-21.08.1.tar.xz"; }; }; keditbookmarks = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/keditbookmarks-21.08.0.tar.xz"; - sha256 = "1z0n0d0wgvr4v97lkvkx7lkj3d1ncp2vi7chvvq9ja0kxyd67r8f"; - name = "keditbookmarks-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/keditbookmarks-21.08.1.tar.xz"; + sha256 = "0j9m5l3llb969ras4bvsswahqqpwrv1zscjpdscchk72vxi2ky4w"; + name = "keditbookmarks-21.08.1.tar.xz"; }; }; kfind = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kfind-21.08.0.tar.xz"; - sha256 = "0qa462fsfdzk1m8jasm5zcyhx2851r42gi5jkki35gnny84ic2lg"; - name = "kfind-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kfind-21.08.1.tar.xz"; + sha256 = "0d3milbrznwls197a5bjrdwarpdly4pyask7j97ia7nx0z91k35f"; + name = "kfind-21.08.1.tar.xz"; }; }; kfloppy = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kfloppy-21.08.0.tar.xz"; - sha256 = "03kgypngvalzzraf58g7l266naal0v7781lyh9ibi78frf6j7qw3"; - name = "kfloppy-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kfloppy-21.08.1.tar.xz"; + sha256 = "1nxkjaarvr7fq494hb4pk6nf9731f74zsxhfia3lzb2qf3rnxhvg"; + name = "kfloppy-21.08.1.tar.xz"; }; }; kfourinline = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kfourinline-21.08.0.tar.xz"; - sha256 = "1g663kkjhpfi0f6q23rmfqgwi976i46fs8qr4nqw55v7l09qrkwq"; - name = "kfourinline-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kfourinline-21.08.1.tar.xz"; + sha256 = "0niwvc1fxvxk5xi90n753y7gjhljrnm3jjzxgjxs9ca5y1c7jcac"; + name = "kfourinline-21.08.1.tar.xz"; }; }; kgeography = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kgeography-21.08.0.tar.xz"; - sha256 = "01y0phdfymn8k14riiy15f58b0148rl2jidxnbl9if1jpn90dkai"; - name = "kgeography-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kgeography-21.08.1.tar.xz"; + sha256 = "0wqblfs4h8pr0c3m9qv5xpz1sq1zxxbbgv42d0m12fhlbmhx0l64"; + name = "kgeography-21.08.1.tar.xz"; }; }; kget = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kget-21.08.0.tar.xz"; - sha256 = "0k406isgg3lgnbl4c6l9wqgwjiv0hp5pg07na94vm03j0qg015q5"; - name = "kget-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kget-21.08.1.tar.xz"; + sha256 = "06lng1sr1l5a7qcbld7xn97vlaxnq4f98sai2llmjkyna3awzi6r"; + name = "kget-21.08.1.tar.xz"; }; }; kgoldrunner = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kgoldrunner-21.08.0.tar.xz"; - sha256 = "1d2z76xv3v7sg9bad6gwc5p9dbb00ljkhd9jq8bn3lrqiya5vn1l"; - name = "kgoldrunner-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kgoldrunner-21.08.1.tar.xz"; + sha256 = "1dggs4fbfqc7q97j8fpi2v6q52165yikaps15mracn319c8mbx85"; + name = "kgoldrunner-21.08.1.tar.xz"; }; }; kgpg = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kgpg-21.08.0.tar.xz"; - sha256 = "0hkhnf1n72w4ccnh3mrvzg22nfv6vpjkh8i9a5496yrzkch862g8"; - name = "kgpg-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kgpg-21.08.1.tar.xz"; + sha256 = "0q4k7ahh1qr4fnkw4na5kyp4kq922a45hjgz9qzh7whn6zqrhsxs"; + name = "kgpg-21.08.1.tar.xz"; }; }; khangman = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/khangman-21.08.0.tar.xz"; - sha256 = "03bazg4bd23q90pi8z5gab91j4md7ya9ahvyla5523r671pcfwhh"; - name = "khangman-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/khangman-21.08.1.tar.xz"; + sha256 = "1jv7vbk4za17l73b10xx1ckv56qhsvlf2irlys917bk39jhxmwpp"; + name = "khangman-21.08.1.tar.xz"; }; }; khelpcenter = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/khelpcenter-21.08.0.tar.xz"; - sha256 = "15if3awpx514prhsaznvw7acxy4zihgf36pxjgd1rzsg6f0gcj5i"; - name = "khelpcenter-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/khelpcenter-21.08.1.tar.xz"; + sha256 = "09ayg8kb4b4v30xjm8ca5csw1axipn1336mq2sfqra5qwkj8d93y"; + name = "khelpcenter-21.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kidentitymanagement-21.08.0.tar.xz"; - sha256 = "1jqn973dccdynqinyi698wkm92nqvhyy8z6nihh82rcfzkj16xcf"; - name = "kidentitymanagement-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kidentitymanagement-21.08.1.tar.xz"; + sha256 = "0xhkz33w0z9jlxlqb06w5fiyj1qz2mjssrbba2kdm55q67lj1b76"; + name = "kidentitymanagement-21.08.1.tar.xz"; }; }; kig = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kig-21.08.0.tar.xz"; - sha256 = "1m2wx1cpv5821438hlzhpis88r8dspsrh8snr1a1sgnmpgpjjla9"; - name = "kig-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kig-21.08.1.tar.xz"; + sha256 = "0gvp07mnkpfamdq78bv2r1m84l4xp23qh2i6iscdhjdh05dzyl6s"; + name = "kig-21.08.1.tar.xz"; }; }; kigo = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kigo-21.08.0.tar.xz"; - sha256 = "1kym2bl0xh8mih13ykxw3g6xkl1lyh7vpyvyn2zprgnqjhs4699v"; - name = "kigo-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kigo-21.08.1.tar.xz"; + sha256 = "1y7fh9acng4a135bz7skg7hgmyisaxgwli4ddv7y5h3r1rlhfd47"; + name = "kigo-21.08.1.tar.xz"; }; }; killbots = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/killbots-21.08.0.tar.xz"; - sha256 = "0agqd8ww6l5i1absv6wxzraavdjlwvdp831xk18vr7gfdqq5rqzw"; - name = "killbots-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/killbots-21.08.1.tar.xz"; + sha256 = "02rh60ww43r3zqv3v7zs42j7nl8b5373mykbql80amxnbj5965mn"; + name = "killbots-21.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kimagemapeditor-21.08.0.tar.xz"; - sha256 = "0lpzf2wcn6ifbh3jin7z55bryb2gzq1yki2yl6v5fgabq0kg0pb9"; - name = "kimagemapeditor-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kimagemapeditor-21.08.1.tar.xz"; + sha256 = "1mrf0k923gwy4cfh7g5yv0nnm4kx0j0yk9sz051sbvvbm4hbxqjg"; + name = "kimagemapeditor-21.08.1.tar.xz"; }; }; kimap = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kimap-21.08.0.tar.xz"; - sha256 = "0qyixdxy0d56a9r8gw2asm4230bcmwmj88wlhcgzd6n5q198xh49"; - name = "kimap-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kimap-21.08.1.tar.xz"; + sha256 = "19b8awcbrn61dwqli10v883i8s18sjz8w335c2sxlhzqgdijgxhl"; + name = "kimap-21.08.1.tar.xz"; }; }; kio-extras = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kio-extras-21.08.0.tar.xz"; - sha256 = "0va8ankd2hp1c5c0fdmhnx6p8rhar6xicdalck6z8gw8q94dg4xx"; - name = "kio-extras-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kio-extras-21.08.1.tar.xz"; + sha256 = "0wlgd0cc56gzicgi16nx4592i6f6594d1mvz7d0266xrwmm8n688"; + name = "kio-extras-21.08.1.tar.xz"; }; }; kio-gdrive = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kio-gdrive-21.08.0.tar.xz"; - sha256 = "1akjmd9l4ydvrjh4r2rxrhfzngvbv487wmdgq2fvy9y926vzvvlz"; - name = "kio-gdrive-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kio-gdrive-21.08.1.tar.xz"; + sha256 = "1vqm8b819hg1yfjlz1x3yis9qkbclahp7l00cpqbxnra0ph9b1vw"; + name = "kio-gdrive-21.08.1.tar.xz"; }; }; kipi-plugins = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kipi-plugins-21.08.0.tar.xz"; - sha256 = "0xfn0sx9xxl2fasj89iyyhqn6b7czkmrqxssmahi67dfnazqdnvg"; - name = "kipi-plugins-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kipi-plugins-21.08.1.tar.xz"; + sha256 = "1w6sw3wn0nj15jv6qp0yg7psg1m87b3izgn303z74vzkhqw04pid"; + name = "kipi-plugins-21.08.1.tar.xz"; }; }; kirigami-gallery = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kirigami-gallery-21.08.0.tar.xz"; - sha256 = "1q64blarbm82pwpch9r16my3zidvifmbzx2hj1wm6nan57k56xs8"; - name = "kirigami-gallery-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kirigami-gallery-21.08.1.tar.xz"; + sha256 = "0db1a5czq0xg0dhhmphds5vrz2lq771zwmps7gq6ahpfj01vyavd"; + name = "kirigami-gallery-21.08.1.tar.xz"; }; }; kiriki = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kiriki-21.08.0.tar.xz"; - sha256 = "0cvhc14syhzkgf7k04m1wpb9l8lrph2lk0mb47xyj2qlw4vyn31a"; - name = "kiriki-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kiriki-21.08.1.tar.xz"; + sha256 = "0x7iq3y2jc4wykgcyrgm8gmrkvlhs8gsxdl0495n1x1invsnmj00"; + name = "kiriki-21.08.1.tar.xz"; }; }; kiten = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kiten-21.08.0.tar.xz"; - sha256 = "1n961yhiiw6vsfqnfb9k1w8rdfdcrzawimvk4z6990bli6caj432"; - name = "kiten-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kiten-21.08.1.tar.xz"; + sha256 = "1skyfw5bshy6z8xvhs5q9f3c8nwqbm4mc74jcs6yhzc3i4mp82n3"; + name = "kiten-21.08.1.tar.xz"; }; }; kitinerary = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kitinerary-21.08.0.tar.xz"; - sha256 = "0hd28l6a2p3q6rrdn80l46fznswwy645krfcfpyasaf917710kkm"; - name = "kitinerary-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kitinerary-21.08.1.tar.xz"; + sha256 = "0r7mrcs7gh9ffscksvkh5v78dr2y1nh26p8r8ginafachg32p0mi"; + name = "kitinerary-21.08.1.tar.xz"; }; }; kjumpingcube = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kjumpingcube-21.08.0.tar.xz"; - sha256 = "0wvfn1a2wa6bwpsgk3b4i6jfza106f4j0mpqvqcck2bdyjpcqrc6"; - name = "kjumpingcube-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kjumpingcube-21.08.1.tar.xz"; + sha256 = "1kh3jqp3m96lal6salcrqhgzg1pbacx20xn41c1jy272ch57r2jj"; + name = "kjumpingcube-21.08.1.tar.xz"; }; }; kldap = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kldap-21.08.0.tar.xz"; - sha256 = "0ng64lrcp0av31i2rp0jpag4kvikfmmxap4z1wzb21br3wr6zfcr"; - name = "kldap-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kldap-21.08.1.tar.xz"; + sha256 = "1m92kd6mrz3dxap6rzw0r85wij030a60n10hkgkjkxb8npgvl14g"; + name = "kldap-21.08.1.tar.xz"; }; }; kleopatra = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kleopatra-21.08.0.tar.xz"; - sha256 = "0l83x3cpfi9b1pbf00fbbynk5g9ffryasmapxdr1qqsavk2wlybr"; - name = "kleopatra-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kleopatra-21.08.1.tar.xz"; + sha256 = "1j1jd8ivcw2r2nlzzhr24kxcvfp5q1206gpkchd5mvsl6q34fmzx"; + name = "kleopatra-21.08.1.tar.xz"; }; }; klettres = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/klettres-21.08.0.tar.xz"; - sha256 = "16fc71s9nksd47xhphqw4zdw8inb47m5zn5m6xpmvvf98bs42ia1"; - name = "klettres-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/klettres-21.08.1.tar.xz"; + sha256 = "0scgccwsma1hc1zp52h4rqddwizsqzwsh6gql5lf4qxhr8ihgj4m"; + name = "klettres-21.08.1.tar.xz"; }; }; klickety = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/klickety-21.08.0.tar.xz"; - sha256 = "172ajlmnw6hwg8lr7kdiixd43iv2ldg5bwnh1jaddrpn29zfdj9g"; - name = "klickety-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/klickety-21.08.1.tar.xz"; + sha256 = "0r8dr4blwv1l6b8585qw7q258qr9pgk97pmrfmpssb90yxni2c1c"; + name = "klickety-21.08.1.tar.xz"; }; }; klines = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/klines-21.08.0.tar.xz"; - sha256 = "0f4281cynn1zacfpq5i6n5vwps9d1k7i6mqpzwx8jrxmwka39r1y"; - name = "klines-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/klines-21.08.1.tar.xz"; + sha256 = "1iyk91spsnfrkbjyf6jng6rgximcav2zf2xqkq1q2vvyhwwpchn6"; + name = "klines-21.08.1.tar.xz"; }; }; kmag = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmag-21.08.0.tar.xz"; - sha256 = "148frh2qq1yxixcpr0s8kvcviz8qh7vjvyp2w0v30m9lr01asm0s"; - name = "kmag-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmag-21.08.1.tar.xz"; + sha256 = "1hdjcya1jv6adz0d9hp1sq7y8f6fvzpw30fchmjkdm9y2kf8il6c"; + name = "kmag-21.08.1.tar.xz"; }; }; kmahjongg = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmahjongg-21.08.0.tar.xz"; - sha256 = "04mr9i0dwy1rypr22wlv3lcg73zz1yy373pb1vv914b3spps9pip"; - name = "kmahjongg-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmahjongg-21.08.1.tar.xz"; + sha256 = "1wrzyiv07cffn5xiachqa8k9spcsi3iwvdj6prgbgdndbffw2gim"; + name = "kmahjongg-21.08.1.tar.xz"; }; }; kmail = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmail-21.08.0.tar.xz"; - sha256 = "1jnlgl5hdw4dx36wd5642x484dka1094d9xq0wn7iqpzlyh8d519"; - name = "kmail-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmail-21.08.1.tar.xz"; + sha256 = "08q7c8l2nfrvw5xgc2dzcmidcpsjfya3jjnssziy3hpznmf8jpjr"; + name = "kmail-21.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmail-account-wizard-21.08.0.tar.xz"; - sha256 = "14sxx25xijp9r53001kywbbaidsni1sslk4mi1pi71rwi4mvmm2w"; - name = "kmail-account-wizard-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmail-account-wizard-21.08.1.tar.xz"; + sha256 = "1xqm4737p5l5cwqlnn7xladz4yna7aghl84hlbvzrfcc72v5xkal"; + name = "kmail-account-wizard-21.08.1.tar.xz"; }; }; kmailtransport = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmailtransport-21.08.0.tar.xz"; - sha256 = "1xijhf37djscjm86r3m1f64w97q24plpv06h55mqq4pgxkm6v0a9"; - name = "kmailtransport-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmailtransport-21.08.1.tar.xz"; + sha256 = "0zd03s4848n3g1w8fm0q3kq5sy91zhjw3hc2w6ncv6cgbb9s50dv"; + name = "kmailtransport-21.08.1.tar.xz"; }; }; kmbox = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmbox-21.08.0.tar.xz"; - sha256 = "1xa4g2cj5chmmhsw6larbmwr0k0n07mj7953w1qm5wi1jfr2ivca"; - name = "kmbox-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmbox-21.08.1.tar.xz"; + sha256 = "027x76lrjssrhqpr651fyqqkdv6jmiad901cssv7w54r2dpzs6w3"; + name = "kmbox-21.08.1.tar.xz"; }; }; kmime = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmime-21.08.0.tar.xz"; - sha256 = "19g9l5bl6gm4rx133nlsv6p4kpa1pifk24rqx7f2rv5j7by8jmxh"; - name = "kmime-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmime-21.08.1.tar.xz"; + sha256 = "0prsmiv0g6icclhv7mkha66pddmdqz2mi69njz0xwz6m3ax068jw"; + name = "kmime-21.08.1.tar.xz"; }; }; kmines = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmines-21.08.0.tar.xz"; - sha256 = "1v4hl4kqwgrdkjj1lsa5z6bvlq8xhldp2pwldzvg05c1r7lbvnw1"; - name = "kmines-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmines-21.08.1.tar.xz"; + sha256 = "0nx07cghq20rja8rncrayx87v357s036whdfyzc6qkhdmlmkh6qj"; + name = "kmines-21.08.1.tar.xz"; }; }; kmix = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmix-21.08.0.tar.xz"; - sha256 = "1bdp2vasbw2qrsajqlpd5w1403n291w43dfms46fgw8vw5wpi5qq"; - name = "kmix-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmix-21.08.1.tar.xz"; + sha256 = "0jc0b1j32gg7az0z7m1cvfdjrwss4q91hm1cfhrk5fq12620vivf"; + name = "kmix-21.08.1.tar.xz"; }; }; kmousetool = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmousetool-21.08.0.tar.xz"; - sha256 = "1rz44gwjikckpjms4v4hsakll2dy0imrsgdvk2zsr9nr00lgbn0v"; - name = "kmousetool-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmousetool-21.08.1.tar.xz"; + sha256 = "04a5zrxg48svrvdf8gf3qc7cj7cayzhw0q4l1v8nzs2ykc330xq1"; + name = "kmousetool-21.08.1.tar.xz"; }; }; kmouth = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmouth-21.08.0.tar.xz"; - sha256 = "0i8bg49y4x9bwacmq0hk8az88r2q54bgnzxbd1rscd5nkqs21fr1"; - name = "kmouth-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmouth-21.08.1.tar.xz"; + sha256 = "1rmqppmjjcrc7xp63csdgp440f003nia6hcnixxlya8pwn90bpwr"; + name = "kmouth-21.08.1.tar.xz"; }; }; kmplot = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kmplot-21.08.0.tar.xz"; - sha256 = "1szskpbql3s10b64na55rnys2gz05gssvydbsiqxkwyj4igs91yv"; - name = "kmplot-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmplot-21.08.1.tar.xz"; + sha256 = "0mkcrdg0v98hdy5lgkyfv4x019w4sm7yiyfpryhx1wiqcpibxwl1"; + name = "kmplot-21.08.1.tar.xz"; }; }; knavalbattle = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/knavalbattle-21.08.0.tar.xz"; - sha256 = "1f8byp909306ksvbdjs662k7ahyf5sjg3gsv3qay0d36kzlp8274"; - name = "knavalbattle-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knavalbattle-21.08.1.tar.xz"; + sha256 = "1lvq223jspc5y0z6qaf648m85a58yp88b0jm8510p77ymxhyvgm7"; + name = "knavalbattle-21.08.1.tar.xz"; }; }; knetwalk = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/knetwalk-21.08.0.tar.xz"; - sha256 = "0djdshqq35mpbdqn10acaxn3irwagh3q6zvc6sfsc2cs7nihaff2"; - name = "knetwalk-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knetwalk-21.08.1.tar.xz"; + sha256 = "1akv78yaym474b57d9qxqp3vivs405m1zm6x0plf2g1adp93myz2"; + name = "knetwalk-21.08.1.tar.xz"; }; }; knights = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/knights-21.08.0.tar.xz"; - sha256 = "1hq9vm67cgdjqmy41hk2hf6x0z4gqmrzyz8sfd1ja5j03yisjv4h"; - name = "knights-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knights-21.08.1.tar.xz"; + sha256 = "1m00nryw69k4dyb0vvnjz3fwasf67ghkq78l7k8ck9vvzrihmwd1"; + name = "knights-21.08.1.tar.xz"; }; }; knotes = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/knotes-21.08.0.tar.xz"; - sha256 = "0p2jvvm2i66aib0ajlr2jynsyf7gzqhn18rxpp4mg95lqzsmvdlf"; - name = "knotes-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knotes-21.08.1.tar.xz"; + sha256 = "1av537f02zsz72mqkzlcrv977kf96nrdwsj4fx7kmdbhf5x9rvgv"; + name = "knotes-21.08.1.tar.xz"; }; }; kolf = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kolf-21.08.0.tar.xz"; - sha256 = "1p2sgfkrlcm125y461kdf5rf5i6x89z3i3kad375agl6wnlnkvr7"; - name = "kolf-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kolf-21.08.1.tar.xz"; + sha256 = "15wk2c2pzpg39hv6s1b80mf5l7gkbxlprahjq6wh6f6a5hm3wkxb"; + name = "kolf-21.08.1.tar.xz"; }; }; kollision = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kollision-21.08.0.tar.xz"; - sha256 = "1vs298nigl6rnp14xrlsp50gmca77bah149k94mxqq86f0gfin7s"; - name = "kollision-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kollision-21.08.1.tar.xz"; + sha256 = "15ddxccj29094lxrihchc17x2a2xnjk790dqhfja9d235vkg3lpb"; + name = "kollision-21.08.1.tar.xz"; }; }; kolourpaint = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kolourpaint-21.08.0.tar.xz"; - sha256 = "0n6fid327m864sp8sa7ms0l559fhxj7ikp5yn6pfm86xl6ks8bfz"; - name = "kolourpaint-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kolourpaint-21.08.1.tar.xz"; + sha256 = "0vjssni7c8dx1617gsnkp8dip92agys8n1ydzdly6jpwhvlr382a"; + name = "kolourpaint-21.08.1.tar.xz"; }; }; kompare = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kompare-21.08.0.tar.xz"; - sha256 = "1m079gqqzfsawixsq0spi7lyg0ad9vm3mhddzbmnbg2mn250nbkb"; - name = "kompare-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kompare-21.08.1.tar.xz"; + sha256 = "0sigh2c91ff7r6yclx18lcwqbwh4gbj55n5fjpd1fw9rb7xf9j3n"; + name = "kompare-21.08.1.tar.xz"; }; }; konqueror = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/konqueror-21.08.0.tar.xz"; - sha256 = "0jlnw7j6p1svx3af95drdfrczqvikz4krq3gmmq3r62gp5bk3yyf"; - name = "konqueror-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konqueror-21.08.1.tar.xz"; + sha256 = "155dc8nd3kgr25wpjisnp9z2jr1f31vcnm8ywa98p4i59kaaxh7h"; + name = "konqueror-21.08.1.tar.xz"; }; }; konquest = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/konquest-21.08.0.tar.xz"; - sha256 = "0l128pr04qq6jdja6p0bbzc6y1233gd2h3wvbwh7hml4vxl8fsbh"; - name = "konquest-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konquest-21.08.1.tar.xz"; + sha256 = "0i0pm5zq2ipm1ipsam19c771v16bxlhilidny336rzwfa1vik0zl"; + name = "konquest-21.08.1.tar.xz"; }; }; konsole = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/konsole-21.08.0.tar.xz"; - sha256 = "1gxy98wg2qfylqslg3ga3prk54knrik1rhzs7lsmmr73vym1dpav"; - name = "konsole-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konsole-21.08.1.tar.xz"; + sha256 = "0v74yrblwakbmy0p4x5j9lhmqyavgsffahr51bh5r5qcgx0cafjv"; + name = "konsole-21.08.1.tar.xz"; }; }; kontact = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kontact-21.08.0.tar.xz"; - sha256 = "1bdvji09nimgpdlz6nk7dbr22agnsrpra7r8jz81a0cjqspcmmsi"; - name = "kontact-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kontact-21.08.1.tar.xz"; + sha256 = "1aqyrkmc7hnzja1spm75ybrb9c3yg37rklcgdr7myyyhjxmvnrzg"; + name = "kontact-21.08.1.tar.xz"; }; }; kontactinterface = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kontactinterface-21.08.0.tar.xz"; - sha256 = "1gl99624yhafwc1nw5if0a2k2v25s3rl4ak35c8af8mba54niy5z"; - name = "kontactinterface-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kontactinterface-21.08.1.tar.xz"; + sha256 = "1l251rw80c329sgrv25r8cn242v0kl7pvcfv9xkakql7dw707xs9"; + name = "kontactinterface-21.08.1.tar.xz"; }; }; kontrast = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kontrast-21.08.0.tar.xz"; - sha256 = "000bmbgp43znmqxxb33ik11lri1x44jcdyzd8cxlh8frwv96hd9x"; - name = "kontrast-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kontrast-21.08.1.tar.xz"; + sha256 = "05nw7z05maxpcr37andv60fn9s8kprz474bkza980ah05xzvkkvb"; + name = "kontrast-21.08.1.tar.xz"; }; }; konversation = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/konversation-21.08.0.tar.xz"; - sha256 = "162rdh9cz417b6zc5217gp53vwsny3i7r0s14cpvrmfl141isrg8"; - name = "konversation-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konversation-21.08.1.tar.xz"; + sha256 = "0v3nvyjc13jav8x9krg9sd9p533j7ndan0fqb5p0virwk1dznvfy"; + name = "konversation-21.08.1.tar.xz"; }; }; kopeninghours = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kopeninghours-21.08.0.tar.xz"; - sha256 = "1abyq50pa8qzsvgawbas4mn64g3p8jz7cbz5fb6mzy8546sm11yv"; - name = "kopeninghours-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kopeninghours-21.08.1.tar.xz"; + sha256 = "09yskjfkr190vkp8xgj2hicfyg1mx9mqm7pgn4133qfn08xh52vd"; + name = "kopeninghours-21.08.1.tar.xz"; }; }; kopete = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kopete-21.08.0.tar.xz"; - sha256 = "11zngca7wyfzbv0bw1f3qw1gvi5234m2ybkh5sznhrd3w1jadqgl"; - name = "kopete-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kopete-21.08.1.tar.xz"; + sha256 = "131nic6w1bzc0l94b8jkzac2dckaz64y2fgplyiqjidicm0cyrd1"; + name = "kopete-21.08.1.tar.xz"; }; }; korganizer = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/korganizer-21.08.0.tar.xz"; - sha256 = "1d5zilr1qsgfwvzc61pmbn8w8gv4a6i5i1slbdaps6wkr4bb0z7m"; - name = "korganizer-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/korganizer-21.08.1.tar.xz"; + sha256 = "0x05i3c0nj46bnnd7msz1rpghbr2p6sywfsa15d6l1j72i2ay0vr"; + name = "korganizer-21.08.1.tar.xz"; }; }; kosmindoormap = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kosmindoormap-21.08.0.tar.xz"; - sha256 = "1lbywi76mwvljxp7n6gyhgfl4772cdfa5sphxhbf1klyvhryl797"; - name = "kosmindoormap-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kosmindoormap-21.08.1.tar.xz"; + sha256 = "1v31cik859b994xka37z0l86nd0crykbsnafyxpmqdzf942ixixb"; + name = "kosmindoormap-21.08.1.tar.xz"; }; }; kpat = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kpat-21.08.0.tar.xz"; - sha256 = "1wpsxz2fwjl92yl4a0npksdbhd9b3gfvh9giyr2p0gwfxrwwdq3z"; - name = "kpat-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpat-21.08.1.tar.xz"; + sha256 = "1dxihma5mad2kbg7wzfbnaq3gmgwav70rqrj5fpji42pvlqx4vyn"; + name = "kpat-21.08.1.tar.xz"; }; }; kpimtextedit = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kpimtextedit-21.08.0.tar.xz"; - sha256 = "1s20s5njmrbn5sa4vx74aivrphnypzd133j6n58xqbjza7zm0sgj"; - name = "kpimtextedit-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpimtextedit-21.08.1.tar.xz"; + sha256 = "1zaavf0gpaibk22fz8ij0fqrlp18lj07hgdg6ynhdmhamw59sfr5"; + name = "kpimtextedit-21.08.1.tar.xz"; }; }; kpkpass = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kpkpass-21.08.0.tar.xz"; - sha256 = "058kk3rfklfmw949wix0rv10q8094xq30vxyrglll96pxk2rj22h"; - name = "kpkpass-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpkpass-21.08.1.tar.xz"; + sha256 = "0z8dk548awy37iq8zz41x2wm2i9bhpfa2g0ghlwvhj7sy97ap1vk"; + name = "kpkpass-21.08.1.tar.xz"; }; }; kpmcore = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kpmcore-21.08.0.tar.xz"; - sha256 = "0l9aqm07203r2q74g6pnzhgwqhccr38qn89zb80p683bqi3chdd1"; - name = "kpmcore-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpmcore-21.08.1.tar.xz"; + sha256 = "1aw21x70kgm1dmhqr384k6rbsd1fx70zd94i0slq5zyf37zx6b9l"; + name = "kpmcore-21.08.1.tar.xz"; }; }; kpublictransport = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kpublictransport-21.08.0.tar.xz"; - sha256 = "1bfyr509z27gz59ykar0png1gghbna6minl987hxyiys76pchrd2"; - name = "kpublictransport-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpublictransport-21.08.1.tar.xz"; + sha256 = "1dbbsdrzhqaiz6d4hlyy1f50m6hi0arafxrxr65gh9h4zs2ym4qs"; + name = "kpublictransport-21.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kqtquickcharts-21.08.0.tar.xz"; - sha256 = "1x4bxqpnmyq6cvg7j6dbk0y7nbhjkrrldw9spxa72lx914bpd6np"; - name = "kqtquickcharts-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kqtquickcharts-21.08.1.tar.xz"; + sha256 = "0ghmxzy3jqzy3zdpp5zhjv3mcq6micnnk1jhnlq03v4z981rrs6h"; + name = "kqtquickcharts-21.08.1.tar.xz"; }; }; krdc = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/krdc-21.08.0.tar.xz"; - sha256 = "0ja1x3i91wiw0v8qfd6fig56bqhpbfg2hhhl1bh8bqxm77q3qq9h"; - name = "krdc-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/krdc-21.08.1.tar.xz"; + sha256 = "038m7wgpg33sqqqq7iy4rvficsi7x2012rimxb1gn2azg5kcwk6v"; + name = "krdc-21.08.1.tar.xz"; }; }; kreversi = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kreversi-21.08.0.tar.xz"; - sha256 = "1122ybggnmkhb0lx934a2dka24gbfif0dmcg5qgzsbhvmc3am0cp"; - name = "kreversi-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kreversi-21.08.1.tar.xz"; + sha256 = "1gh7zhqzyh2m34v3gyb902c6cvw33rbib5g8p3dwsmm5v2bfgggj"; + name = "kreversi-21.08.1.tar.xz"; }; }; krfb = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/krfb-21.08.0.tar.xz"; - sha256 = "14l5h04g3k51jsphzl4yq4kd8d2s3wfh7dq4i099gw6r04divipb"; - name = "krfb-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/krfb-21.08.1.tar.xz"; + sha256 = "0l28l9wmfxf6vihxr86pwxj027fkz0k0pwkif8had0s4swc9jfnx"; + name = "krfb-21.08.1.tar.xz"; }; }; kross-interpreters = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kross-interpreters-21.08.0.tar.xz"; - sha256 = "1vnfd96sjb20jifh5pvnd752ycq3m8p8kl7rmwv5s9lvmdiw14s2"; - name = "kross-interpreters-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kross-interpreters-21.08.1.tar.xz"; + sha256 = "1fznrng6mz9s8ynzr48p05n6akkmzn3fifbgpxs98nhzlz2ay574"; + name = "kross-interpreters-21.08.1.tar.xz"; }; }; kruler = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kruler-21.08.0.tar.xz"; - sha256 = "1bz7b3m46mlibf2gai6is68119w8gphal7idz4wi3rlwl2lfbmm4"; - name = "kruler-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kruler-21.08.1.tar.xz"; + sha256 = "0l78hk7zjwjxba094gjvajh32v4avdc80h5r0rv94k2r3gckfjv4"; + name = "kruler-21.08.1.tar.xz"; }; }; kshisen = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kshisen-21.08.0.tar.xz"; - sha256 = "1m9fhd2hk9pi5297hj1a36m1sl8c959a3mx1fc36va7yi0m8vxly"; - name = "kshisen-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kshisen-21.08.1.tar.xz"; + sha256 = "107y828nkdzza5hi68pxxk5gp017dy2yxdmmhmg6ylppk5gfp6dp"; + name = "kshisen-21.08.1.tar.xz"; }; }; ksirk = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ksirk-21.08.0.tar.xz"; - sha256 = "0vqg4gz67p00p3rrrv7mw2aiy9lcahkzrhz69xki96vfzcbpxw4r"; - name = "ksirk-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksirk-21.08.1.tar.xz"; + sha256 = "0l6bfpima9whgfdkbghhfh36p6kjs8j26gz5zc7r8fcswv66ya21"; + name = "ksirk-21.08.1.tar.xz"; }; }; ksmtp = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ksmtp-21.08.0.tar.xz"; - sha256 = "1imm692nkgxa5bhhxqvd4mc6n8ajigjbmm6crpsciwi1gm84fx0b"; - name = "ksmtp-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksmtp-21.08.1.tar.xz"; + sha256 = "0pl167gjhpmdvhsjm6hcygxwjs8v1z4xfc7x0c69bac8rdrzrlb6"; + name = "ksmtp-21.08.1.tar.xz"; }; }; ksnakeduel = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ksnakeduel-21.08.0.tar.xz"; - sha256 = "14hp1vqw9bk3lavv02y9xxmpgv1g9cvz113900j924c5xsjkp4mi"; - name = "ksnakeduel-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksnakeduel-21.08.1.tar.xz"; + sha256 = "1jk4mdxg2b1aa1686rimhjqh91ijaf8n7fahvswwbl473zfjf748"; + name = "ksnakeduel-21.08.1.tar.xz"; }; }; kspaceduel = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kspaceduel-21.08.0.tar.xz"; - sha256 = "1aa2cx06x5kq3ni5ikgjvar0rmz4csi231hvhgjhsnj18ilk0bxh"; - name = "kspaceduel-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kspaceduel-21.08.1.tar.xz"; + sha256 = "0q2mpidkhgjz3nm88j3m8wdb06y3m8ixr0540q0s9i9d997jdkch"; + name = "kspaceduel-21.08.1.tar.xz"; }; }; ksquares = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ksquares-21.08.0.tar.xz"; - sha256 = "1715l0j79n6nrjgg0fib17yv8rhjbnivmcgs8fg4iw49c3k5s7nc"; - name = "ksquares-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksquares-21.08.1.tar.xz"; + sha256 = "0z7h5vig5zablvdlv7lanmsjjbqq931pqjyynm75mygrrbavgcfq"; + name = "ksquares-21.08.1.tar.xz"; }; }; ksudoku = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ksudoku-21.08.0.tar.xz"; - sha256 = "1p878yglczah0fdmmmcys46x07r2d78fx5f54z1yd8vhaf8bxmxj"; - name = "ksudoku-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksudoku-21.08.1.tar.xz"; + sha256 = "0aax14xwg42wr8g563nbpn7m55gs4k50kwk0zn79pf62i78g10lp"; + name = "ksudoku-21.08.1.tar.xz"; }; }; ksystemlog = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ksystemlog-21.08.0.tar.xz"; - sha256 = "18jlwmk9aynhcnkgflky20b6mphzaxxvcicmpv58sp4q92fgwgab"; - name = "ksystemlog-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksystemlog-21.08.1.tar.xz"; + sha256 = "1vv0wbb3npbq8r0mq8y5lc36qx1hxdjxygfcnw2h9hm4dwl8mc5v"; + name = "ksystemlog-21.08.1.tar.xz"; }; }; kteatime = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kteatime-21.08.0.tar.xz"; - sha256 = "0imm902b19g2miyhwliryjyiyygsdsilk2b3biyvjlqp037sfrr4"; - name = "kteatime-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kteatime-21.08.1.tar.xz"; + sha256 = "0gjnvcvrnb3049ln64chnjgr7xm722ighjscxxhqz61i872dgb72"; + name = "kteatime-21.08.1.tar.xz"; }; }; ktimer = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktimer-21.08.0.tar.xz"; - sha256 = "05pka16za7dbpbhsss0mcm2h6rxzd7sp7wlly2ds9azdkwqzdjkh"; - name = "ktimer-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktimer-21.08.1.tar.xz"; + sha256 = "1l79yrg6g78gf8av1h6yr4mxyd1n63g4r38qp4csvpnjpx7y8ijd"; + name = "ktimer-21.08.1.tar.xz"; }; }; ktnef = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktnef-21.08.0.tar.xz"; - sha256 = "0zp03pbry6qkcanbjj5qscja9i97f7gsssmn40swnfbd45ja2z6l"; - name = "ktnef-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktnef-21.08.1.tar.xz"; + sha256 = "08wk4ssasqqixwnp59smv64c8m4jf89vpcwc3zvz4h92sfk0pk33"; + name = "ktnef-21.08.1.tar.xz"; }; }; ktorrent = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktorrent-21.08.0.tar.xz"; - sha256 = "1wqf6vvl1wyw8b6xzl91pry1mzjj9lpflnp4rinr9jsxfrf88c4x"; - name = "ktorrent-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktorrent-21.08.1.tar.xz"; + sha256 = "1r7w43ns4zy94y82dbghrjgqv1sbdj01rni0iijirzjjikr5av9m"; + name = "ktorrent-21.08.1.tar.xz"; }; }; ktouch = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktouch-21.08.0.tar.xz"; - sha256 = "0zwf5q5h9qacygp9gzyj0s2y2sd3j2y5sm2rc6z3bn4jcv03bjxf"; - name = "ktouch-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktouch-21.08.1.tar.xz"; + sha256 = "00pyrp00dqbanb2w0cxmxh8aahih714q85prjij6iy5sv0917zr7"; + name = "ktouch-21.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-accounts-kcm-21.08.0.tar.xz"; - sha256 = "0qs3izsffkjyafxxq7mrhcw487zrl9vvdv75gdahc8bq6hni60q9"; - name = "ktp-accounts-kcm-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-accounts-kcm-21.08.1.tar.xz"; + sha256 = "0pn8g5w4p2synwfskw9m805nj2wk9g7yff423243qc3fxl572sv8"; + name = "ktp-accounts-kcm-21.08.1.tar.xz"; }; }; ktp-approver = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-approver-21.08.0.tar.xz"; - sha256 = "177hz0fwpqxg65cw5d51hzqsb5ipp3vm513zdc6ac1bxjb6pd725"; - name = "ktp-approver-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-approver-21.08.1.tar.xz"; + sha256 = "1q2rsg9520ra7ap3ipvv0sdyc2mzbzap2ygzkwbm80fpspl6b973"; + name = "ktp-approver-21.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-auth-handler-21.08.0.tar.xz"; - sha256 = "1wg4vcix56ws1mq7611h1kqcxk8dfb5fw57m9wn2q0ikzs9ymav7"; - name = "ktp-auth-handler-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-auth-handler-21.08.1.tar.xz"; + sha256 = "0yzh2sqsyic3d979mj3m8d9m42y37w3h2s7gsyifw08gf5sna48p"; + name = "ktp-auth-handler-21.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-call-ui-21.08.0.tar.xz"; - sha256 = "1mgbhkd9ph411h95xyajx6cqsjjf1m52frxw88agv5q6cymx2iz1"; - name = "ktp-call-ui-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-call-ui-21.08.1.tar.xz"; + sha256 = "0m8x3mfhy5rnv9wp15zrl5fiwdkm66pc8szkncqnjxw2nv721s3m"; + name = "ktp-call-ui-21.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-common-internals-21.08.0.tar.xz"; - sha256 = "16ivfv65q06gxf01zzswy77f8aqdnjm7jycz812xa07h5xqxj4az"; - name = "ktp-common-internals-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-common-internals-21.08.1.tar.xz"; + sha256 = "12jcfr3cvyhzn62jnlnfmp39wyxa06bih4qz8gxzv56nl434qzv0"; + name = "ktp-common-internals-21.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-contact-list-21.08.0.tar.xz"; - sha256 = "1pwql0g5bz5h59wc4nay85c74vic3yk0vc7wx8z6namjcw5sl6n8"; - name = "ktp-contact-list-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-list-21.08.1.tar.xz"; + sha256 = "1d4d0bvi9c813c3gyws3gc8zca1az2f3ych2r1cgpdhhbqjrf3wl"; + name = "ktp-contact-list-21.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-contact-runner-21.08.0.tar.xz"; - sha256 = "1wv21ybzk0nvabjrbnvc6yg4mfdxw368x5zxhrffirv58lyqclxs"; - name = "ktp-contact-runner-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-runner-21.08.1.tar.xz"; + sha256 = "0l2qimrpfnpmhvspgv62y8a7hsbw4abz92n1xry040qmkfqzv2l7"; + name = "ktp-contact-runner-21.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-desktop-applets-21.08.0.tar.xz"; - sha256 = "1wzjxd4xndpcixlhv636m9gis1clqhf9cksapxgk6sn31mamqxia"; - name = "ktp-desktop-applets-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-desktop-applets-21.08.1.tar.xz"; + sha256 = "03si91agdjascs6ri0g5zrhicjzx24p6kh2ni1d96k5sc7alwxnl"; + name = "ktp-desktop-applets-21.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-filetransfer-handler-21.08.0.tar.xz"; - sha256 = "0zvfhwa70jiiv9xf405263h9mr2zap1fpplgyfrz5r2lsidga5r8"; - name = "ktp-filetransfer-handler-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-filetransfer-handler-21.08.1.tar.xz"; + sha256 = "08dklgklc31fvcdi3917lh77gr58y75f1di0xhjf6jq8vxplqjd8"; + name = "ktp-filetransfer-handler-21.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-kded-module-21.08.0.tar.xz"; - sha256 = "17k94bwmv547xks6206x89h014r4gxkd2gj3wry3xm3g1z27w7bn"; - name = "ktp-kded-module-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-kded-module-21.08.1.tar.xz"; + sha256 = "1135hh82ivvbpks9k39baisrq053570yq2x851j4vb2qrxg000yg"; + name = "ktp-kded-module-21.08.1.tar.xz"; }; }; ktp-send-file = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-send-file-21.08.0.tar.xz"; - sha256 = "0hk85ydzhlqfinj3ggy5kxvs242kkwbvlh5jz0hh3bi88rdw13px"; - name = "ktp-send-file-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-send-file-21.08.1.tar.xz"; + sha256 = "1fnn5m9spa0x8nw1rx94x85hy06qwkb1fl5l498rmhyzikhxmhqp"; + name = "ktp-send-file-21.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktp-text-ui-21.08.0.tar.xz"; - sha256 = "0zv736zrz5mkvbzgbkm9hq8sp6qnqkg58nyd76xfqq54svgcpi71"; - name = "ktp-text-ui-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-text-ui-21.08.1.tar.xz"; + sha256 = "0cfnf688jz5953x7jxjrdlfs96rxjcfzvasrc881y1aprav1dmjq"; + name = "ktp-text-ui-21.08.1.tar.xz"; }; }; ktuberling = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/ktuberling-21.08.0.tar.xz"; - sha256 = "15sjqskzni5jhvr77b794mia3v00rmzgxvzqaqbwkhy6ax1gihda"; - name = "ktuberling-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktuberling-21.08.1.tar.xz"; + sha256 = "1f3a74nfh4fhxibcfxgjdj6phy185iz6y9nfg3pag3jvqsn8nx49"; + name = "ktuberling-21.08.1.tar.xz"; }; }; kturtle = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kturtle-21.08.0.tar.xz"; - sha256 = "07japzwhfhb5gbm8ac4acvq4k2xqhlz6sl11qjb9j9scmz77y66f"; - name = "kturtle-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kturtle-21.08.1.tar.xz"; + sha256 = "15ng6k6xfaj37dvycm29pj2pk73yfr66pp0wgj719c0kq7c9avdp"; + name = "kturtle-21.08.1.tar.xz"; }; }; kubrick = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kubrick-21.08.0.tar.xz"; - sha256 = "0lk4qfg0fzfhs796csqvniinlyljd4iz9x1l884b1pz2savrfq05"; - name = "kubrick-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kubrick-21.08.1.tar.xz"; + sha256 = "03i0b24mmq3jqf7812a9sjr8lr82mq9mrq75z2a9h62jinvxvigj"; + name = "kubrick-21.08.1.tar.xz"; }; }; kwalletmanager = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kwalletmanager-21.08.0.tar.xz"; - sha256 = "0qwrlm0ay04gn9k752pixykiz2dvqaxybfgahahlqf2j2l5w18kh"; - name = "kwalletmanager-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kwalletmanager-21.08.1.tar.xz"; + sha256 = "1a4aiajq04rlm566jwqwjq2b6sfamnabfrjfa80pld3qcmq0l1mz"; + name = "kwalletmanager-21.08.1.tar.xz"; }; }; kwave = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kwave-21.08.0.tar.xz"; - sha256 = "0pi7ycxnl5dacw5qmig1v3xy69a6c0x3hdk4bpw19avx9asgfjq7"; - name = "kwave-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kwave-21.08.1.tar.xz"; + sha256 = "1dl7kn67hp9y39xlnq989kg743295a23kbpjpvbjashgdqy3hqwl"; + name = "kwave-21.08.1.tar.xz"; }; }; kwordquiz = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/kwordquiz-21.08.0.tar.xz"; - sha256 = "1ms8scxg14s4s35xcgacryfwyadvfyzsv1alkipv87x75qsbjzjm"; - name = "kwordquiz-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kwordquiz-21.08.1.tar.xz"; + sha256 = "1mzdmgls07bb6k2x6qb1xzp04jpfifdrka2k6kzwy9bq071gs7q5"; + name = "kwordquiz-21.08.1.tar.xz"; }; }; libgravatar = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libgravatar-21.08.0.tar.xz"; - sha256 = "10nqv5f3hanhljld8rpkxaqvr892sj1v2vfx43i52xhg6pbxdd5n"; - name = "libgravatar-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libgravatar-21.08.1.tar.xz"; + sha256 = "08xl8nb0bn6zf9sh7sn4v7aa86ffqb16hixci4ymixyxy5c4gwbv"; + name = "libgravatar-21.08.1.tar.xz"; }; }; libkcddb = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkcddb-21.08.0.tar.xz"; - sha256 = "006z9m4lwgk0ick5blx00mndw5m04l6ayb9nmd7fswd4ql3qqcpv"; - name = "libkcddb-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkcddb-21.08.1.tar.xz"; + sha256 = "08841rssxcg9vi490qih8jxnalnbjd2wqsgcq22gkm1ahfj5dizq"; + name = "libkcddb-21.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkcompactdisc-21.08.0.tar.xz"; - sha256 = "0fgcr6gr4di5spw9dm6yz90s16jv2zmdpgpvhxbscirn7mf1b4is"; - name = "libkcompactdisc-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkcompactdisc-21.08.1.tar.xz"; + sha256 = "1q838md6kqvjmc61sy943lqgv5isll2px1s0izyvvxkf747hcpin"; + name = "libkcompactdisc-21.08.1.tar.xz"; }; }; libkdcraw = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkdcraw-21.08.0.tar.xz"; - sha256 = "176wp24ij2kciggjnffcamgk4y6h59cwabwwxvli32i3l3ll8wlc"; - name = "libkdcraw-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkdcraw-21.08.1.tar.xz"; + sha256 = "17ijpgljhrm851mdnd1znjpa7hidmv1d5d05q68r6lp1aclcgmwm"; + name = "libkdcraw-21.08.1.tar.xz"; }; }; libkdegames = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkdegames-21.08.0.tar.xz"; - sha256 = "0nbimjv8sanwn3is9d357ic8zy0dpdr3g3qsipzapzlchpigjm9b"; - name = "libkdegames-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkdegames-21.08.1.tar.xz"; + sha256 = "0vfx3ksy6z5h4hjx0dl3fr3phfz3q590h86ksbp5q20lyylmdpji"; + name = "libkdegames-21.08.1.tar.xz"; }; }; libkdepim = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkdepim-21.08.0.tar.xz"; - sha256 = "1gxyzq7lgswfrkxsfqf5y4vwx2ji3wz7vyzkg5gpygr1an6c2sp3"; - name = "libkdepim-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkdepim-21.08.1.tar.xz"; + sha256 = "10zb97zf1jidh9q6dkn8cjs9f4gqz2xn6yqylsbq0bjlycv991fh"; + name = "libkdepim-21.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkeduvocdocument-21.08.0.tar.xz"; - sha256 = "1nm07fdaas7jn3yfds7k22n6xl9c8wdi6bjrf8blbycj6fflciwd"; - name = "libkeduvocdocument-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkeduvocdocument-21.08.1.tar.xz"; + sha256 = "0wnyx7h284g6wssnfdfz4m0hcb0rc6fnlryav8vnjcyzz7p5ni6l"; + name = "libkeduvocdocument-21.08.1.tar.xz"; }; }; libkexiv2 = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkexiv2-21.08.0.tar.xz"; - sha256 = "0mb5qj4n2fcwak36an4yslffvlhj6f2qfv5vdl2cid8c34ikvqll"; - name = "libkexiv2-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkexiv2-21.08.1.tar.xz"; + sha256 = "0wnpkzivb5f5z3d1dn5952cx07q8nw421xrs21r57cmbsss344xa"; + name = "libkexiv2-21.08.1.tar.xz"; }; }; libkgapi = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkgapi-21.08.0.tar.xz"; - sha256 = "0f2yk75a0gr7hah32fmn35lk0illviswfhlh0nw6ignfx56q7f3r"; - name = "libkgapi-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkgapi-21.08.1.tar.xz"; + sha256 = "14wzl40j5baw20628dqcpkg8vi6jsq5f9gw0sc1my8qhw91mj3vy"; + name = "libkgapi-21.08.1.tar.xz"; }; }; libkipi = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkipi-21.08.0.tar.xz"; - sha256 = "0831x76w413azciabm6l83nrwpiivq5pjqxcl3yzhs2hq1i1wd06"; - name = "libkipi-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkipi-21.08.1.tar.xz"; + sha256 = "13579gqxyj8dwmrmxylnw6mf56vr73vlbbv07rpi661kfrbjk2ms"; + name = "libkipi-21.08.1.tar.xz"; }; }; libkleo = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkleo-21.08.0.tar.xz"; - sha256 = "14i65vh0c39z0d65kgqn2apcfi5x3vxrxp2ybc4ccc4sxh033akp"; - name = "libkleo-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkleo-21.08.1.tar.xz"; + sha256 = "1n1nacr1q0nw2jq8px6b3cmda6ff9mygggfrl3xh6qz042bg77xz"; + name = "libkleo-21.08.1.tar.xz"; }; }; libkmahjongg = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkmahjongg-21.08.0.tar.xz"; - sha256 = "18syxfszfvq1h0l5fbgy599ak2pgp4mj4i949kyv4v6qdwwv9mhi"; - name = "libkmahjongg-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkmahjongg-21.08.1.tar.xz"; + sha256 = "0ry6wz0i9dccjn5w2qy2nin0rhbg30vlbcr4zrlx8bxsw0la2k94"; + name = "libkmahjongg-21.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libkomparediff2-21.08.0.tar.xz"; - sha256 = "0b5yhhvnipbwzn2sylh45ispslrw3w68y9xnrxrjwb0ydmq5zqyb"; - name = "libkomparediff2-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkomparediff2-21.08.1.tar.xz"; + sha256 = "0n6xxam33k8j6c9wqdf0lhfpk6nyf9brhvdkivdamp0idhi3rcpx"; + name = "libkomparediff2-21.08.1.tar.xz"; }; }; libksane = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libksane-21.08.0.tar.xz"; - sha256 = "0i2vr95hi776rqljjjh14d3p5zhcbnjx0b3n94x7m4jq5k2wqpqs"; - name = "libksane-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libksane-21.08.1.tar.xz"; + sha256 = "1x4wsdfczqnasr6ps8677m0ix1fqqd2316f6k2k3awn9qfgsqy3x"; + name = "libksane-21.08.1.tar.xz"; }; }; libksieve = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libksieve-21.08.0.tar.xz"; - sha256 = "0r35153l0kgmw5gvspvqlna6ramggz7p055rbpz60xz9hxfkz3d7"; - name = "libksieve-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libksieve-21.08.1.tar.xz"; + sha256 = "1569xcjz575f8007z91zs9xn5wjklzkiy6l0cl7yzpzn880wc03p"; + name = "libksieve-21.08.1.tar.xz"; }; }; libktorrent = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/libktorrent-21.08.0.tar.xz"; - sha256 = "12x7h0wrxdcpyd4mblbv64swxlcc8vc5k4nlzmag4nzdmgrb7c3x"; - name = "libktorrent-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libktorrent-21.08.1.tar.xz"; + sha256 = "0y5881v0g49rr8dspzaq4l1c62rchgfq4mjx64sn0ng2jjpnhv1x"; + name = "libktorrent-21.08.1.tar.xz"; }; }; lokalize = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/lokalize-21.08.0.tar.xz"; - sha256 = "0mwyvfam5ybrhd67vq6dgw74106l7p0q16xvddxa9gi0sdxb9883"; - name = "lokalize-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/lokalize-21.08.1.tar.xz"; + sha256 = "0ih7a1rkwn9jpgk3qld8anavr0g4wlf8figwikhvbc2dw79lxs7k"; + name = "lokalize-21.08.1.tar.xz"; }; }; lskat = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/lskat-21.08.0.tar.xz"; - sha256 = "14ii7pcq6p0k1626x63nc49pvjb4lvc4d5sdsi47rp0ll0f03sa8"; - name = "lskat-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/lskat-21.08.1.tar.xz"; + sha256 = "1d89yqfsc703pnvxljcsn33wpsv64s4nr2wlmlbl609m9x8b9g9b"; + name = "lskat-21.08.1.tar.xz"; }; }; mailcommon = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/mailcommon-21.08.0.tar.xz"; - sha256 = "0braayvcpbyvmcxx82ic7fhmzfwf6dyanvikwcmb0p9y7bkr1vk1"; - name = "mailcommon-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/mailcommon-21.08.1.tar.xz"; + sha256 = "1r0qyqasah4z8vx836fhvv1f4zm20az9qrw8122l3a986lazh1zw"; + name = "mailcommon-21.08.1.tar.xz"; }; }; mailimporter = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/mailimporter-21.08.0.tar.xz"; - sha256 = "139akl53hfq3kc91qnca5f6i5vimr8djbxnw94xibpiwj22xq7rz"; - name = "mailimporter-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/mailimporter-21.08.1.tar.xz"; + sha256 = "05kiizbdnsl15ry2zb5sg94lcdwq9w4lnznd6zcq8n09s0zpz8nf"; + name = "mailimporter-21.08.1.tar.xz"; }; }; marble = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/marble-21.08.0.tar.xz"; - sha256 = "17sn26grpph8iw2kw498krvryyxy0qp6ala55bvh6a2hyn3562zl"; - name = "marble-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/marble-21.08.1.tar.xz"; + sha256 = "01hf3wwz9zflkpgx1pbkxbnl1vs2yyafrwmldnil66nkxsxx7izw"; + name = "marble-21.08.1.tar.xz"; }; }; markdownpart = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/markdownpart-21.08.0.tar.xz"; - sha256 = "138pi82653mwxn18s541b95i1zj5nij08cm7zykpm7kpkr2ri167"; - name = "markdownpart-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/markdownpart-21.08.1.tar.xz"; + sha256 = "0xgs2kxnbrn70mrzza2d4f7xpx9ks3dbl3yj1y1kds7bnidsf3f9"; + name = "markdownpart-21.08.1.tar.xz"; }; }; mbox-importer = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/mbox-importer-21.08.0.tar.xz"; - sha256 = "0whpz4vv27cibvb4q98dxkdrn3jpiywvbqdn5adzfmjvw9sdb4ym"; - name = "mbox-importer-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/mbox-importer-21.08.1.tar.xz"; + sha256 = "06mgz10ma8r0vi7ln9zxz2kipdp9rd0zw0sgm69h43rq9zyjnjkk"; + name = "mbox-importer-21.08.1.tar.xz"; }; }; messagelib = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/messagelib-21.08.0.tar.xz"; - sha256 = "1l5af4bwgcgj2askfsvx11bzqsp4bl5jc84fnswxpzidrir4x8ig"; - name = "messagelib-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/messagelib-21.08.1.tar.xz"; + sha256 = "1r3lqacixy5vy36jgy6glz08gp8k4559h1bdqyh7svmmflhs927i"; + name = "messagelib-21.08.1.tar.xz"; }; }; minuet = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/minuet-21.08.0.tar.xz"; - sha256 = "06dk90qb2lvl01bc6d9wmjqm3xv4hqi092ljn1dh6h2711c7czca"; - name = "minuet-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/minuet-21.08.1.tar.xz"; + sha256 = "0law0ram3xdf5ayc7j8as1xwj83k37mf7w6qkkp3hy3kj2r2dahx"; + name = "minuet-21.08.1.tar.xz"; }; }; okular = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/okular-21.08.0.tar.xz"; - sha256 = "0sbaq7cqzardmdvbl8y7jqb8pi605kg8jq2daizrp2m73w8p7vfx"; - name = "okular-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/okular-21.08.1.tar.xz"; + sha256 = "1vk1mn40i80b5vkxq47i1qf2i734n5nfa1wgx3748jwc1fws631p"; + name = "okular-21.08.1.tar.xz"; }; }; palapeli = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/palapeli-21.08.0.tar.xz"; - sha256 = "11mgsyk3mg9ic76grr1x0m8qihzrs8da40qxbx2v0syy5dgn7ssw"; - name = "palapeli-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/palapeli-21.08.1.tar.xz"; + sha256 = "09mswv446s6vqlllhz727qpd7mdszdkgivfn9sazgmydmmmzrw53"; + name = "palapeli-21.08.1.tar.xz"; }; }; parley = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/parley-21.08.0.tar.xz"; - sha256 = "1qn9pqvha52ha80lpqcvsi34yssvgnnyhl50is9wgk7qfnj02g9b"; - name = "parley-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/parley-21.08.1.tar.xz"; + sha256 = "02v9gfjdryf48m5iinsc9qg2qfmj1s96xga5b3ndd63g66b6gp9b"; + name = "parley-21.08.1.tar.xz"; }; }; partitionmanager = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/partitionmanager-21.08.0.tar.xz"; - sha256 = "1r5vis8dnpyl8jvv3r22jmlfwsscnqvfdkvpabkrfw6l7l33p3cj"; - name = "partitionmanager-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/partitionmanager-21.08.1.tar.xz"; + sha256 = "16vc0g08rs6dz87zv4b1ygs198c6mbjwcp2j4994z6cf16bxfgz8"; + name = "partitionmanager-21.08.1.tar.xz"; }; }; picmi = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/picmi-21.08.0.tar.xz"; - sha256 = "02jwsibpclp1a3nrzlkkq4qzm3y595cdf2pfd5933z8q3lk0zj85"; - name = "picmi-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/picmi-21.08.1.tar.xz"; + sha256 = "1yshwfl8baw0cw8hnvzkb3y72r0bycyr19rwwns9sjc3fk9gnk6a"; + name = "picmi-21.08.1.tar.xz"; }; }; - pimcommon = { - version = "21.08.0"; + pim-data-exporter = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/pimcommon-21.08.0.tar.xz"; - sha256 = "12ffffv149ggpycdpk3sxh152y67dnm460d5d7sdfx8ip78xl0lv"; - name = "pimcommon-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/pim-data-exporter-21.08.1.tar.xz"; + sha256 = "1vx7h7900wq8icx7q4khkx9g5gm6j5c8dl38q08pwda4vl0pmxmd"; + name = "pim-data-exporter-21.08.1.tar.xz"; }; }; - pim-data-exporter = { - version = "21.08.0"; + pim-sieve-editor = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/pim-data-exporter-21.08.0.tar.xz"; - sha256 = "0zdcldazg5dsi3npl63hsz8v99h8k0pvnfh9rnhf0lg0mpcl8psn"; - name = "pim-data-exporter-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/pim-sieve-editor-21.08.1.tar.xz"; + sha256 = "0ph62khl2k2gpfjf05p9sklihib0hbxgl3n1bv59l58awj9brs0r"; + name = "pim-sieve-editor-21.08.1.tar.xz"; }; }; - pim-sieve-editor = { - version = "21.08.0"; + pimcommon = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/pim-sieve-editor-21.08.0.tar.xz"; - sha256 = "008a8wq7n68fgh63gaz64q4qsxlk11zlg9v4mmln8238zgvwif1q"; - name = "pim-sieve-editor-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/pimcommon-21.08.1.tar.xz"; + sha256 = "1379lhvin2vkikd3fzanhwfjszb4cc9f3h9bxf3md3h4gx1i6hb6"; + name = "pimcommon-21.08.1.tar.xz"; }; }; poxml = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/poxml-21.08.0.tar.xz"; - sha256 = "0wb3nq09ki2nkcpl6nfl483cm919hx6qxd39g6d76ksa7q2q46m9"; - name = "poxml-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/poxml-21.08.1.tar.xz"; + sha256 = "10wwrbmhwbjk71m4ya1shb7mviil33fciykrzyqvvdnvx668aawm"; + name = "poxml-21.08.1.tar.xz"; }; }; print-manager = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/print-manager-21.08.0.tar.xz"; - sha256 = "01pcrjfp40a9h466jsm3ymjqzavrzxvn74gcrvxasi68wwq8aqrf"; - name = "print-manager-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/print-manager-21.08.1.tar.xz"; + sha256 = "1hzykjnymr0knh67h6s5214bjp5lk1klm6znh8q2asf49c6x2zgw"; + name = "print-manager-21.08.1.tar.xz"; }; }; rocs = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/rocs-21.08.0.tar.xz"; - sha256 = "1jqiaxxdbv1cc75awl5gfq1kv76qmgiw872s4g5bny27ki8dlk7w"; - name = "rocs-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/rocs-21.08.1.tar.xz"; + sha256 = "1b527n0csk43sxafynqijiwf0bzj89viznpxnk2ayb9lik4q3djm"; + name = "rocs-21.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/signon-kwallet-extension-21.08.0.tar.xz"; - sha256 = "0wig4p13qjpmn3imjiz4l14haad8qkr4qccv1kdgkkijy2dr66dy"; - name = "signon-kwallet-extension-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/signon-kwallet-extension-21.08.1.tar.xz"; + sha256 = "1x1q1vmqm9nq7sjhxc495x612jh39scxba0nbr8a4rval144268m"; + name = "signon-kwallet-extension-21.08.1.tar.xz"; }; }; skanlite = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/skanlite-21.08.0.tar.xz"; - sha256 = "1kkxxcaibxfvsaf9548vxspz6iyfhdl9xmmcdxrp85w9ymcr3mi5"; - name = "skanlite-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/skanlite-21.08.1.tar.xz"; + sha256 = "17lnazx1h4lk78037gvzscnm3p2yl6dhc4970bdq982ahwp63gg8"; + name = "skanlite-21.08.1.tar.xz"; }; }; spectacle = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/spectacle-21.08.0.tar.xz"; - sha256 = "18rhb92m102hdkirdcigbd5ixma3s86022af1h133h3fy33xciwc"; - name = "spectacle-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/spectacle-21.08.1.tar.xz"; + sha256 = "0bs93gylw90wj3b9kw71xhqy60smggh38s5g4jcras1n6iqmb06x"; + name = "spectacle-21.08.1.tar.xz"; }; }; step = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/step-21.08.0.tar.xz"; - sha256 = "0dayfkfh68ldg3ivh2nki78w07rscqphq04xazvqss8j296xjzgz"; - name = "step-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/step-21.08.1.tar.xz"; + sha256 = "0rg69j8r479vzyrajbdjgh5l2506w8f2dnlh1di545gzjk2ww448"; + name = "step-21.08.1.tar.xz"; }; }; svgpart = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/svgpart-21.08.0.tar.xz"; - sha256 = "00pigyf0bicgclbb1imz2w1ksp10zzdf385kdx9zphh2h438kagf"; - name = "svgpart-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/svgpart-21.08.1.tar.xz"; + sha256 = "1silp6k0l9xb363h8whiv4dry6gf1mj4w53mksl1i2slhqn9q96v"; + name = "svgpart-21.08.1.tar.xz"; }; }; sweeper = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/sweeper-21.08.0.tar.xz"; - sha256 = "1g6s7nvcxs93i8mwplwd6a42jjid73n4rywwar9z2y1293afzaci"; - name = "sweeper-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/sweeper-21.08.1.tar.xz"; + sha256 = "0p25bkczxmx93igicyiasvjd4v9rc3sg7gm7b9ddgzz8rrnr0d9p"; + name = "sweeper-21.08.1.tar.xz"; }; }; umbrello = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/umbrello-21.08.0.tar.xz"; - sha256 = "0nly325zb51n5l2hbc6m199vhqx3jsscbvp4bqhgplklwhd6c1c0"; - name = "umbrello-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/umbrello-21.08.1.tar.xz"; + sha256 = "0x4f3hiydyprhzd56i8lijwfhzca041bmbbxp7x1dckv3shdangc"; + name = "umbrello-21.08.1.tar.xz"; }; }; yakuake = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/yakuake-21.08.0.tar.xz"; - sha256 = "0gm2djqjf807h657br1hz9ds5w09lszyi8iy2n3my4h78cs9lw72"; - name = "yakuake-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/yakuake-21.08.1.tar.xz"; + sha256 = "1x41jrkvlff8x5qcd12lcrv6zqzw7jqw02ikpmqv1v4gw7lz94w9"; + name = "yakuake-21.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.08.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.0/src/zeroconf-ioslave-21.08.0.tar.xz"; - sha256 = "13nxmghb8h0p5qp69w095xwgdl6b7kv8c1zs1n63l0m028wa37bg"; - name = "zeroconf-ioslave-21.08.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/zeroconf-ioslave-21.08.1.tar.xz"; + sha256 = "113sp3lqzyxx7icww4sznc23kxarmxz0158kzl6nazxj4m6cnm4r"; + name = "zeroconf-ioslave-21.08.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 21e63b8b29bb..52f4e8def20e 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -3,18 +3,18 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 -, steam-run-native +, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages }: python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2021.7.14-treviso"; + version = "2021.7.28-treviso-2"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix"; + sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; }; postPatch = '' @@ -52,7 +52,14 @@ python3Packages.buildPythonApplication rec { dbus-python gst-python liblarch - ] ++ [ steam-run-native ]; + patool + ] ++ [ + steam-run + xdg-utils + pciutils + cabextract + wineWowPackages.minimal + ]; format = "other"; strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 @@ -62,8 +69,10 @@ python3Packages.buildPythonApplication rec { substituteInPlace build-aux/meson/postinstall.py \ --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" substituteInPlace src/runner.py \ - --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ - --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ + --replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" + substituteInPlace src/runner_utilities.py \ + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ ''; preFixup = '' diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix new file mode 100644 index 000000000000..cb33aa595a46 --- /dev/null +++ b/pkgs/applications/misc/cloak/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cloak"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "evansmurithi"; + repo = pname; + rev = "v${version}"; + sha256 = "139z2ga0q7a0vwfnn5hpzsz5yrrrr7rgyd32yvfj5sxiywkmczs7"; + }; + + cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj"; + + meta = with lib; { + homepage = "https://github.com/evansmurithi/cloak"; + description = "Command-line OTP authenticator application"; + license = licenses.mit; + maintainers = with maintainers; [ mvs ]; + }; +} diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/applications/misc/psi-notify/default.nix new file mode 100644 index 000000000000..5a4b6f385df2 --- /dev/null +++ b/pkgs/applications/misc/psi-notify/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, systemd, libnotify, pkg-config }: + +stdenv.mkDerivation rec { + pname = "psi-notify"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = pname; + rev = version; + sha256 = "0hn37plim1smmlrjjmz8kybyms8pz3wxcgf8vmqjrsqi6bfcym7g"; + }; + + buildInputs = [ systemd libnotify ]; + nativeBuildInputs = [ pkg-config ]; + + installPhase = '' + runHook preInstall + + install -D psi-notify $out/bin/psi-notify + substituteInPlace psi-notify.service --replace psi-notify $out/bin/psi-notify + install -D psi-notify.service $out/share/systemd/user/psi-notify.service + + runHook postInstall + ''; + + meta = with lib; { + description = "Alert on system resource saturation"; + longDescription = '' + psi-notify can alert you when resources on your machine are becoming + oversaturated, and allow you to take action before your system slows to a + crawl. + ''; + license = licenses.mit; + homepage = "https://github.com/cdown/psi-notify"; + platforms = platforms.linux; + maintainers = with maintainers; [ eduarrrd ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 8b80f8f8a6ef..96729f1dcda6 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -19,8 +19,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - ${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} - ${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} + cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index fac1537a7c7e..4b7fbc38bbcc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,21 +160,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "91" "94") [ - # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): - ./patches/fix-missing-atspi2-dependency.patch - # Required as dependency for the next patch: - (githubPatch { - # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat"" - commit = "4b438323d68840453b5ef826c3997568e2e0e8c7"; - sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82"; - }) - # To fix the text rendering, see #131074: - (githubPatch { - # Linux sandbox: fix fstatat() crash - commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; - sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; - }) ]; postPatch = '' @@ -196,7 +181,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/deno + chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -253,6 +238,7 @@ let # e.g. unsafe developer builds have developer-friendly features that may # weaken or disable security measures like sandboxing or ASLR): is_official_build = true; + disable_fieldtrial_testing_config = true; # Build Chromium using the system toolchain (for Linux distributions): custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; @@ -289,10 +275,6 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; - } // optionalAttrs (!chromiumVersionAtLeast "94") { - fieldtrial_testing_like_official_build = true; - } // optionalAttrs (chromiumVersionAtLeast "94") { - disable_fieldtrial_testing_config = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch deleted file mode 100644 index 9417b30159d7..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001 -From: Michael Weiss <dev.primeos@gmail.com> -Date: Sat, 10 Apr 2021 13:53:50 +0200 -Subject: [PATCH] Fix a missing atspi2 dependency - -See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for -more details. ---- - content/public/browser/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn -index 7e7c436d90c7..20ef832f1d8c 100644 ---- a/content/public/browser/BUILD.gn -+++ b/content/public/browser/BUILD.gn -@@ -535,6 +535,7 @@ source_set("browser_sources") { - - if (use_atk) { - sources += [ "ax_inspect_factory_auralinux.cc" ] -+ configs += [ "//build/config/linux/atspi2" ] - } - - if (is_linux || is_chromeos) { --- -2.20.1 - diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bbd205bac7ab..d7f29c4fefa2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "94.0.4606.54", - "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83", - "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3", + "version": "94.0.4606.61", + "sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4", + "sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz", "deps": { "gn": { "version": "2021-08-11", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "94.0.4606.54", - "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83", - "sha256bin64": "1c2i9830r0fldigv16ggmj6r74l6d85abbhka0a5wpbbn6ay08jx", + "version": "95.0.4638.17", + "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", + "sha256bin64": "0h88gd8y4i2jmvhiwadbq6hzqygddym8jy1fhzp8qnwfhc30qm4m", "deps": { "gn": { "version": "2021-08-11", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4638.17", - "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", - "sha256bin64": "1azn9216jhcdg4yjr6frz8vp98qbcnnhifp9jn9bwvyg69lr0dwb", + "version": "96.0.4651.0", + "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6", + "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9", "deps": { "gn": { "version": "2021-08-11", @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "93.0.4577.82", - "sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx", - "sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify", + "version": "94.0.4606.54", + "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83", + "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3", "deps": { "gn": { - "version": "2021-07-08", + "version": "2021-08-11", "url": "https://gn.googlesource.com/gn", - "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", - "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" + "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", + "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "93.0.4577.82-1", - "sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66" + "rev": "94.0.4606.54-1", + "sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index d14d5b3215b9..5b7e6ad4233b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,985 @@ { - version = "90.0b6"; + version = "93.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "07c06ddfe0b2d3f4acc89a8bd5de963ae8fb90aedb7710272adbccac178af867"; + sha256 = "d0e5726093a17a6a399f3051812679311cb512e68bc840bf4f428ac3854c3796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b01b6f591d815e2dd3c0bb129952a4a5dbfc7f93d9eed2d61b8c387135768462"; + sha256 = "b511966a34c754e130644b04bd7af12d7171045ba711eaccc4f37d20c565a208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "aebbf9e5edce5aa4a01b3dea5342d2335dadca261124f9557d727a2f03c5a123"; + sha256 = "c792bfaba7b3d180574a234d6b5f8130b4f5c86b7013ed389a61093b29b8163c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "842c29a5aa563d1f386ed74820ba2cce763e86f8d86a943295b959a51bd8bf27"; + sha256 = "ffe5349e09c6ac5a269b47b11b0a45d668046b1782c9952d344f47e7014edb5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8fe01d2193b4d60ce2134ebc5848abf6621cc49bc76d08890ce7588ac2d81311"; + sha256 = "d0dc0d132efbc3801eb44507dfaee73f293fe322a2b33061e04a8258dd8a6d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e5a929e0eb95a09ec408aa831853b1a5859bb0b1f3b133677568f18bc7ba5a31"; + sha256 = "dbaa43c932c85a91f0c2febdfe79f7635be49e1ef044f4aa822934a5f6c4d001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "32533dc55222e7e407b386f46d55ae78dc61581ec7653bbe9f8e9859b4d191ce"; + sha256 = "a7849eae891297d23559c0b9df2510207f4645b1084e9c38999dcc9d3477f844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2d561a690d625cfff4fe163dda26eac5424e89b74bd6385543238c9e85abf39b"; + sha256 = "f73997a3428ccfbbff1afae009bb6b468ea8abe64d5d628abef49a06c04103ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "3cec173b9c23137d935221d715bfeb87353bc87bd316a219c8063b5977422bc8"; + sha256 = "824032ba36651e7cc2e21bb8a0c5a0045d95f9e896dcb2a5f2708a33a9bca178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ab9bd15850209de8d7ad1ef33f50c132babc2c6e70b4ceddee84081f2707b6ab"; + sha256 = "67d55e943eb3c38ca05dc544a41d977b6e4c91c47ea4de22e51e706b9585140c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9f9c87c0bf0a08c23dc30b29bcfb79634a52dccfa945a4593451f6230e373686"; + sha256 = "c834af150e15fe82d48b80a3d3ea272ef0aabbfb2481499787db5c7f12193c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "21900bc7c61ebbf34f45da1b4740a722e00d6c0d27042a89e006fd99485e7b60"; + sha256 = "afc49c06a0eee92e8349723bde36c641b208d2b5e5edc258773e96d35eff6a47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6ccec2ac83ab36fb72a8db9293622d7b1c6fe55d1fb8ec6421a64e1210e7e0a1"; + sha256 = "33a30568d25de6388c61b08bb1f04afa92ff58e8359e21229d72b6b069a9e464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7610d94fa66da37689abd3fa79e0703d77f68457c77287e5e61e66169baf7473"; + sha256 = "d862b1620a5221fbaccc638e91b4b5f5ecb8408763318551385d638c91a22e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6241b68e5618b474b86529222f5a646f426983eb9e39b2a4d7c3d261cd26f4e2"; + sha256 = "114a740beba1b3f934a05ceadbb54e3b663432ea5fd9d62fabc566cb00119e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b981946aec3128a3e7da3ca76f7815373dc8963ed01d495ee02941954ca42fca"; + sha256 = "ecfdebdd9b235d0eecfaaeb02897d01c429bbe8b16da7e7b6db3092bb0cf3221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c59f28aef1af64d1cf83e0e5e9ba4bd15be593da27e88e6ea7edaed80a3a64b5"; + sha256 = "6d7533de8a3b1898ca8129f78ab963bfc3579d80022085aa2ac1db4e1ad734b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b9cd59a9b7ca024f6931d8e25962349346d8c279d3c7983f1a76681784c38efc"; + sha256 = "7b2214651e7326aa6966dc7ff16b4cc7a3c15a5011a00dba21df4ddb9fc206d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e185f4b874beeacca38bfde59958eb277ce83fcf47eee4cc16065e350707e52d"; + sha256 = "ea4a0ed8e603e3271a271cf047aba1c7b7fa5f411c4c9e338d4729e84a049350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ed323fc4a677afa40b1073640dc3fe9e5f49906842684677694a1c85d042c988"; + sha256 = "7dabe495e8e3e601fda6bbdfcd17e36a600251bc3ad08879c2eac9003ed1ab9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3c495c341ab226b13cca26fb4d1e79ba8a763c2944374f417b0d1d1e3afb6e64"; + sha256 = "231615a5aa24152383f993f1e5a592b1a22088b6bb90fcdd90b6e024e06c23f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "00d888cf643780473aa480c0a0ded49ad22b76ee0b902062cf014f140ddd2530"; + sha256 = "fbaa80f5f3aedcf1d7f56b54b6f2b477ef2fc28878fd00279753137f95319a51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4421542a7a8d968b4e705852ca76ec4bed857c57df0d10afab17f27b701712e8"; + sha256 = "bd7272d70a62dd1927b2f79d3895d4f09028a77f33800fcbf0192386b6ec7ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "db89780192cd14f0fb43ac2974c7c8a72e1896ddcf2db7ff3f6eea9f2788051a"; + sha256 = "394ad6b0f718fc3bb6bc2114e5a019f6c96b3e7bbe308a98824f23bed35a0c5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "60cd22340342b689e12cabf13ae33a2af3a5ecc6dad5b5e15851fcec0405652b"; + sha256 = "36ff6fd2687f394f792d0920138b97175e2e88b8bd8e9f7d3c57372a81aa7ec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "7524fa67ed3246fac49622fb360ddb9ca5b91cc0bdb7eb64d881bf9851dd9128"; + sha256 = "9436e754d9c5a79ac600c5172426bb27275b14ef28398207e49019a731d502ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "641c8f48694184ff77db1b7825317f623deae42acafccce35cf7b8b95d38d45e"; + sha256 = "e633c6ce44f330e0779a5c1ea0d24038915832337c374a41e1159f36d1457cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e0c808695678e844efe04926bab17168fef0a97f8b125e724c4ebc606a5fc513"; + sha256 = "af04af6a2a4d2698d8fb00890e51871f4fd179ee93c81ca151796cc32c46edbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "64fc3ac8c3614cb128f7174802dc101b5c36a92fee5cd6dbd826f505e85c149d"; + sha256 = "284d63fc7623f493bfd7b937c76303fdeb7de88f0545f28e9d9029497eec47b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e7bb62c4f6d4a00b0837fb720c08923f057610267ef97b0090ae8767c26e6867"; + sha256 = "738c96dd120342e48c8aff7a38756e6cf4da9f5d83cdafb2e489960febfd1504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "038a1f723017141ae12ec15a6fec3fc6a49cbdd6244d237c18cd36c70ea6e6d9"; + sha256 = "0da024e521465cdeec5eecbafea0a9319f83e263edb9541b45ff76f3477e33ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e2c1d68ee029e3f1064277dc6c3844bdbbe3eb28b0492c1299ed6f8a9351ab56"; + sha256 = "26c68ebed471ef45d61d3464938039d5da7c3860b5c9ba976ad27edbc95305af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c5e4dff35094ff645272bf402e4c56908b6df7b5c7d6b6925e86528d3ced89af"; + sha256 = "cc33430049420448835ae5f23bedce0648cdcf8769933bfcd20e714b68956fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "502f35f69f5f04477678f183e40f8958aa095724e65254cbbdaa9c72c1a40ed7"; + sha256 = "ba3fc410a6bc2876e437a34a75970571093602f011e0eaf61b206113816a0186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e353afc86a7b6c452870587b13fa093883e7680f2e44a14c94563d12d50de622"; + sha256 = "feb88e31052d2107f62d81950698f89f071136d136932a68fefa029e01eaf09f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "10cb0a4ee3c42035a06e509a74e632dc269c407efb8dbad40bc4dfc2b2d6b9d4"; + sha256 = "c6f56623965e7efe843350a4df004a5c08cfd73e3766278ff077d6d470e325be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8cc1603bd589fb910df22b47a8d7e3611cff371deea4eb634127b68a523221df"; + sha256 = "07e4cc718d12ff33a23839e628a5202a8d0589064b32770cdc892066fb6acaea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b4867bf6406854f80dd402ab3f1ad1e20b7acae7e93587831913144e690cc84f"; + sha256 = "7ea901227a96a505c63a90a0897e2030215f93ed5bc24be8c7a1f8eec0e3eb17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "555a76d9915a471f134d8f3986e7afca341d201bcad73d90d5751d8ec86c17c3"; + sha256 = "7aaa7ec4520583755a042f15a03276d4f1610edbc9c76f20909888d123f06f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c72f1b40d5a9fbe689b76b3a0010ee1838b8b7fd7126dccb2a7c8907a87db0a4"; + sha256 = "9a9071437e106857364fdd9c36650a7a1cad657ac745a394701defe0aed974a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e63f1e83785b777dbf9c69982c314684937dc22456b19eb1e8e83c87af511938"; + sha256 = "380ce47961f8ea6756430f51ffc9506f25efaa7e9deb1643c8ade47ecbecf2ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "41e02c58459a2b2e4dfee5ba4d8dce6fda51fd85ddcf7a4d18426d25b9049aa7"; + sha256 = "df0866c595d887d0bb9071af3686b7f0c95cbc528137bf1c10468956efa0d9f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5b4122ac4367a88de9d8551498633d396630ac4fbaa7012408382e8e7dbfd27f"; + sha256 = "01b83410c8e3aeecc058005083608d48ce49ef617c164a129b11fb0a9455a5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ec1d030b1980e747c415d6238cc5868c24ff6393cce6489f4775926e00fe55e6"; + sha256 = "c7d7f2f31dee9939bb8eda83783dfd164f8857a453dfd81dc497a157f4a83a8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "214f1dc79bd09d1f5e4dbba1311ebfbfd47ac4a418da2f6adb6c8c6285bfc4b4"; + sha256 = "64d89540a8eb8d07529ce858259a4d37f4e5bad17d32f40be0efbd3479d9ca8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "fddc2c4c13595e480696924cea10e5caeea81fb775d01a91e7b13a6701a1cd2a"; + sha256 = "1da16ec37e7efbf88d5b41aaeb2cb92020d84d12f6355b2a0ef0470ae91a29d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "39402ff53caddb69cb6248afbcc37814536fc0cd4767a2096923089168f48a46"; + sha256 = "2c2d36cb858615f55c8e7562eb86597c990fe703cf653946baff71d5b73ef618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d2143e50a0f6bb19ce038e5fcc83530bbd5c781bb104da3a29d870f00acd2001"; + sha256 = "0c64736719aded00ce140151bf2f36c54222390c5357835c00ca9b23522a52c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e2b035ece9d2911d131fb40eee6bd8f9c40506cc812978bce0bcf317ea9c8ef1"; + sha256 = "564fc9da8d9e5518ceb27b5db96da0165b6e05eaaf348d106f26735c16a3ba5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a2c3ddfeba658b8c58b77e6abd6aaf2c4141c73b0ee6363e391f08f5a94e8ec4"; + sha256 = "2a7590c5f5a3f033b268656e7672b3d2cb2c0a8588cf857d5351ff621e31672c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ea7c40e0d00a1d8d72d7cd397bbe7533959e1e715a2a7df8a205ce6e98d26fca"; + sha256 = "547adad237c4e53ffdd18ae610631dba56ce80f198b8957fc670abfa21c5f2b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24c62141ec5bddfc431690bd21428bbf8ad07d7fecc9acdc242565a2dfe5fe91"; + sha256 = "908af546da517476700b8004d62e2cb9511f3b18f7cb21cfed95db91938ac937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "de40edc25528e7cff904d14feac97dd282067e27793a4d2a85311c260be4262c"; + sha256 = "42195e5dfb1183eb8c9664d60b868bbeb163aee2e487a54c1c7fbc6dc849ffde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a4daf7b8c77661f2dc211c6e4a4432de8c57e34be48556b707f167f7333f0a25"; + sha256 = "8a804224897cfbfacc6457b4d263f1530a85014c4d847fa261323947e891802f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6d4a3eb396871b35e4d880c98e48dd5dfd92e66b09a80066c20543f95ab3cfbb"; + sha256 = "e97e0a5c5f60ffd59cb846f4adc9c0a3bd395921640954164c35b6740ea6ce6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ff5e9d651cb9224dde03d207042c5ee4312359d9b111839269eaadff49d2efb5"; + sha256 = "752e095be2856836578bada2b4cf5a8eebb6aea2e1d585641dd90ed163681957"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3433149001e07215dcce9f3b934edf5f188b8e88725a01372fb1e831f0dc00f7"; + sha256 = "26a310c92a9a1918a114c10e3d5ea5f8ff0e4c1c50d209835b8e434464df0440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "79434cc64d0acbed593f3c859ef15623333239d2868d0b797e6e51252778466c"; + sha256 = "785eeee3bce686f95d84403a5dd3c19e155491c103fd7883ea9fad16555861d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "efb3302005785dc6fd7aa464c591978f11637e89aca3a6f41d4d855970fe68d9"; + sha256 = "0d8ce47835c0bce9dac357b6d6fe68ead731900b5ac27faa2ab6ba65edfc937f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7940ac6685d94144e758f703511946aa422f7a9303f6e8461d29b65178068d3d"; + sha256 = "c797d782f17d3ba29f6e27ed487b36dd171a3e5400c3de8e51e467baf1e331af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "adfc49b40832942760d996da4e659c672def298159de535b03daf5064ebbb049"; + sha256 = "cfd1b94eab0563ca999832c2f60e3ec63dfc085d9cf9edb01d39aaf953467962"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "1212c04fb5b1a114b49562534e65c4983bfade7ae9290290e1b51f999476fdbe"; + sha256 = "5c55491069da30171a6c697e6abfb4a3e77551e66672bcf411a731fc340b713c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4172e9dd98806535b22162c2a4b50b1912936ac6d94ee99fc2315fc8e93e7fba"; + sha256 = "68ce7a3b7f7b5e054119779f73e6fb41486490db6090a7b72c3571a259e54b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4c65a755594a5e03611c0add1b506760853efcfc057b9c04c0237968d972960e"; + sha256 = "abb13539f92f2ef3222d16642dcb287dba92803d5cc78ae1cf503488f01062ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7b82b581badc7d5ddcc02e008bb1b968a1ddccd42e4acc3f75863114ef00459b"; + sha256 = "c0acf71a7d5c8881f55dc8b9434ffdd331907dc53370fb2932d8d6f5dcfb98c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "db25e60614b1f31049886d17b5d9f7aa45f51a1230e5829d513d449752d4cad4"; + sha256 = "66b8103a114689b24aa1f619d9175aa91fdfe9b7a85e0345dc4e390201a9d8c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d0208622ac503716edd14383f9b3391064b0e5167ebeb6e349819253ab12cadd"; + sha256 = "f9062dd30186390b0bbc131eac7f8d0023436a823400290e99dcae4ba30eb700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3e9eb15f215120151572feb8ae621cd9e07617962fd1797edbecd79f7176f950"; + sha256 = "3a3d429a5729c0eb59affdc1c1207ab3789313167619107724fd58e27a7f7e7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "db49b53e15f96dd4668e0224019f4413c3e41c5e696de137faa44ac547ad2560"; + sha256 = "06ad36d6271aa223fe72d97de0eca5f74d630c0d9be3638f5c12fc8b30abe3ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9b05c58c61c25b584dd32cd9973d42aed887b22e07feb8a64f20e8288a1ccbcf"; + sha256 = "c7e43cb3028f0b095497dd2e9eb83b562c6f31ce34c93f8dea045e23a7309619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "bdcd745a9270d9fa34b070cd260285381f41481a2735bcde9cb73ffd038c924c"; + sha256 = "f57b656b43d8aeb3084c9a457c44abcab598e3240506db7b5c413161929549ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "05ce159ae923326132d656b94b7ed78590109b14ce5436d65f262c00f7b70235"; + sha256 = "ff9b034781120ad951626684392b62e2b2e969d7593a8410024d6981a7e7be52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1829442b517f425fa85feab5691ec63e2375473655d00a25618f21f4c3ff6797"; + sha256 = "a5a4a2dc7be12f53993f420b4daca288350dee15f5741a920e70c6315244fea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5ea7bfa88a46b4d3409ab953537fcc87a5a8a95dfc314a9f7b4b991886be10dd"; + sha256 = "d0921c67b4428cbb12cbf6abf5ffc3a8a8495139485e66459f7844df07da59bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "896c0a79ccebd764d4718342bd142d1cfdc172a666b2db2beafc3f1883b69edc"; + sha256 = "c9253ee6c0897eff1e7fdd2457bd34ab5848aacd42700cfb4b085413faf6f9c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6c4f2da35945c331de90f292e35314ffd51c693f01ad69268062bbcad0e2a617"; + sha256 = "ed4e04002e4bc59521ee78f884f657ac5be69c53ed6cdf934fc68b645dbbbcfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-x86_64"; + sha256 = "80f71db11ab64c26f8fd6ba1725e37bfdbd1751914fc89daa1d381c11fd59e1e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "095abb133991ec166dd0d6bc86de71f6367bd338a21480577f2fc2210f42d69f"; + sha256 = "bcd8249b4f6b0e7559fd78cf55b2f693a27d1be24760bb3b3a9d16658f2a93a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "549d6fe7bb33d99a2e4a22438defeb5d5b090069f67d58063efdcc458edcaf9c"; + sha256 = "541a8f327edd16c5e169bbd4d04ae9e6676e0adfc8ad8824d6608a39a27f2174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5c7138c3ccefcfea898c00e428fb166b0c8883ebaa4980eb9f75507acd15f01b"; + sha256 = "d860fb445e7295a054241473350304e0530be4a22f8f1c838a0ee8464ae7ebfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a4cdf6b8a865b818301fa23a2ed3626f4e220b02cdc46475d1e39bc9e5245735"; + sha256 = "708e932ccd10487480f7d3fa165918aecd57e0486b408fc13bef27425bfe53e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "69d42b943be2a848b5a28aadf240540f9cb7e527ea312d83e1ac559a361ccfdc"; + sha256 = "9415edaffb318ecd800edb9ea68231d4b3f3c3ecf6927d30be6782748cc5d0be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8b14c6a508f0c5676de085050cac2732a6852047356d28d6257dcf80691df0b1"; + sha256 = "a78fb7f010d88c2c3b4da8e7dd7918b7b403b1eb2509ac2445a0455c4c420cb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b145606546bac77e3e45b98a23bdeebd23b752b5a1045a72312e1cb6c6927fc9"; + sha256 = "3598d62e445fcd512638c6dcc976d02053c4c034ddd7852751291891dffb8a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "212ff7d8d8addec767ce38d81a4a92103d9ee905f01387df9975bbf557795a8d"; + sha256 = "4305e07b18641027c3f8d8ef7370f0f613a32b8945eae50f1bda6bf8b621e3c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "334684039f1350871356e58e0c467b2d93c6d56b00973601e24728a65ebf45fa"; + sha256 = "1deaf959c0bf15119cabe5b869d18a727b02ad581854b769f17a6fcc715e6ce2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "96a9a309a869fa11effce362fd6f781e9c0067639a49b372170e0bc85eb11706"; + sha256 = "ce6decf89059650d8da398bd1b26b15135b1e183dff69bfa56c723e2926d130a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3bce10cbab2b6e913af910160c4935e814d2fe862428be78448b6c3b872df53f"; + sha256 = "174bd366c565283c912c567babd6e304f758ae7e379cd192343be527178c2284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "96879338880bc4c632d31d2b096966a957c85de649a047a9ecd5f8e0eaaa43e5"; + sha256 = "f02202793a78feed19ff8436a852cacee6c5cfba12e38c3bb2565436a040a156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ab592b0b45491be0c573e604344a74291df2d7aa41604ae7961dd78e64987f49"; + sha256 = "83dddbf773f775366a709a7095847217b65426c1eec6ecf733be7e3a7db3fe30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d75e1569466425349d64c57836517a20be7f6e036bfa837815f6e60c9b1f4f85"; + sha256 = "13b4b38c90bfd97065c1bec7d906fa03adf79906c6584165ebdd656c5be974bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5a35497e2e07cd5552f05a130c4ca161929e0643cf106e3bd6fd46fca71e2309"; + sha256 = "e7872bfa3c73bc9eb8ea69dc42f2ad386d5a8f947757eb6371e33fd3b2bb51c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "504a498350b1399662a68ef1b5371e3d5bd9313c844a9389e862ebc74b28f073"; + sha256 = "d6996fb216388aa54438ae2a4eb73e6ab3b8511e987ef3d650cc88a1ed7f7e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "46c4b1f8403f0fb645878b5cf2867871bfd74382d33963ddc3240ebd0222971f"; + sha256 = "e163143913bd90e5390495238229db83a293ddb6ff65c36c353c063af595f4a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "909f7fbdd6d669f46bb3fdd7fdc929c4fccae59f3b6fcbce4fb6668e26661dc9"; + sha256 = "d16684e0ae4841bf682dbc3d3461128129f2715e180eef51038ac9566056e24a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "98114043b1b79dd9a151de04b2654fdc12885649e06a45c05818c1d66229a818"; + sha256 = "21102105b0ce8e77246a8e0f28c908a4f5b046ecc85a8413a932d93a93c095df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b2a0f7e1a18f77cbc33183a48a70f6459adde67329b7c2522d95622ac474f2f0"; + sha256 = "59e681831835b0b3c1a3da85e0e18ee070857079c8204aec9eb45e6a391d54e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "3999a0a4f297acfa0e5e8e464df86774676c07f7df9cdf3a9ade243b17d91424"; + sha256 = "89624b05a42c6a3c45f150ef24dcdbe51269b8d1cfd6bfa05ceaab954b77ec24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1557576b37ef31b8ac98f2663afab1e589acc071a489c415594b2b7880ae15b6"; + sha256 = "bdf4f17f4a7dd56811ede354c389d598c01270f1007de9d19e513da7a39439be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1ee162319eb90015d06165d4e6fb4ba6071cfddc54dbb17e3b84ee6c5f9bb72c"; + sha256 = "6f86397033fc2ad582b7d1b01e6e09c87f86f0a0dc1b857c72e40e04c4ec16ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "bb117ca51ff004a4320f58593f5aa45042e1ad9336989fee60810aa13b051ec7"; + sha256 = "3c70474ddc293f11818b323a827c73a076f76a3f512dc4e1ee9ffc68d516b579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d204482d09bb66f08562dc57a7151230d02994ed7515443c2a8ae1cdb35e1533"; + sha256 = "caef97a5d2aae3796a0370585bfbb3f5f1a96f83975971e024d0c76f7c8aa197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "412812c1b9df963039f72652d24785f4401f414d4953c8a249c9bb8bb94e2f2a"; + sha256 = "326e9ae3193d093f72e9e58b8f991eb4128cff6597202dcf2c77ebffa070ed34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3e2fe0a600137fdda9ed538dbc9292c8da03654d071c44651fae7a0917fd1428"; + sha256 = "8d4f54a224af9cb08e48e1281c72b4375916ef967698bc30d230e56fec10796f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5d845562839f60c2c7b6b142411bb43764b67dbab604ea27852f2b61bf77bf22"; + sha256 = "be07f2011a2e5cfbbee5d4cdb0ed098aa17bb4c6b44896325fe451bceff5f887"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "642f79d32cb8ffa869527dc394b316a95caa3b3c30b1e61303d49ef4becc7ce1"; + sha256 = "c20b7a7b544397b8c6638042a6310646e4365bb51cc86bb2e65f3256d93f9b3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "aef7ab7858de026b357f9af8d00c32759031e77aef42d6ce9338cdffb1b120dc"; + sha256 = "0deca1edff9fe4826ee3abe61dfcf9c657a32c86ca8b926e298030db195e5c99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "856d428fc9cd62369b1b6834fbf577c94807ce4f958eb3c70accb45d4f86445e"; + sha256 = "59f358027d82b5d4a452d87cc3e7f6c752cf0bfb4e261af3a37d1de377ef966d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "8557c44af4b52dc6c72279b1b3b31a41c87c5cd9b1c23284e2e503362ba81ff7"; + sha256 = "c1eda916f44a8b25b3b0769a2da35663c57d112df83867f9c1e687be07b19560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0fc37342f7539431522dd60f1eb319ade594efa494810416843a58a1291fbe40"; + sha256 = "12ba89bd23f8c1fd20762af26172b2a5c8e23b28a228f211d863bae5d795b96d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e5577a0cfec17c2dc83c46570a1351363ec7bffc3bbca59390d3866459bcd33c"; + sha256 = "23f8f0fc938caa8430fc26fec32c1b13b6a4220134ad20fbb79238a45f1ca71e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e4ea2fa2c4d15152d21fa1843a5d14d76c12aaaa0ea8326c8db29f219f877f88"; + sha256 = "c432541d196e9aef73233ca32535d64b044d9119cdaa880e76116834b4e61dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "43d9d42a10ad996f8a447f932068a0366557d542c1f2a3be626703b2f09735d0"; + sha256 = "c23d0e158f65c64f2a1010bbc886f801721104d4a5ffd8f5eec18608e7f3d949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0c79fc024f1714d4267d3483c33e5ef75a0415fc487b0689d600ac5a9a8b8c9b"; + sha256 = "9c8331496a92b0d79bbd1615661e0bc6ce74075b00d195f5ddd3060f42186026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "df9e037da8af21c5a22c26f326389d8c171fdc3218e2df2b37795a2ea0af4987"; + sha256 = "885ee2d2a04aed0c76748a4959cd313a3f1a14a0eea6f6420ceae79fd2a6d15c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1e85bb05709e2efdbb48d5b788a0210a5ed83b52c709be06d4cae6d7a94ea9a1"; + sha256 = "fa554536207916a67ea90cf405e2e2afd33f7fc84f062f3592751ec696b247c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1074ee2af33d208875197e7f6434596b9d9bcbe6aa5ae911e11adb3606a8f06d"; + sha256 = "8576d990801c2ad851b793e745abc90d774289ae38ae75f97b4c62298f7a8277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c2378d2924f99e3c8600d6d23023cb524ada34884645917e1adfd810583fa1b4"; + sha256 = "92d905beb97cb1ff711ea6de17d6c0a68d387a502cc82736a99064e3d0ee7fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8f3f4c41c324d7b8b6e518f370899cef2aa58d311e2edea50be22991e0f0c865"; + sha256 = "6d11a75285e5e6387ce1da4b93d2e132a0025ec9c7009691f6ca32b94ff92938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a702f5cc3d5cc80b189ab4e50579a4a0dd5a3b969497c0f17f22296ccd6aaeac"; + sha256 = "640da3c339be2b78da31060dda3f21c9898b0652cb1a69131e6f573e6603c962"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "628dce1cf52e132019eb538d260c692e360d33ba18067c5696b665118f1756c1"; + sha256 = "55f16fe714887e043f3cb72feb286f6481f828f1f91c85f62a3d96278670c389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "bea0b89ddeaf47d79d40ffd152c14846e7ece9d5cd62c3e11b3d8a47db26018e"; + sha256 = "29a004a7ecaef1ad46fba73c23f74d36d7c2e4757bc5649c1cb5a23f3fdccff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "79703843c31b39f48198e7477c1047c246c2bbf6ae23736483a1a3c68a3acee2"; + sha256 = "e38224e8a952779c191a5ebab85c1069fab1c4ebd989d0647962dbc3cb9a0e39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a1defb47b1e0deca525e474790fbb75ab48825b59a996f8e2af6d8bb3fd04da3"; + sha256 = "4348196295d9b224788d1d71486e8a68642a325017b14d219c06f642a70021df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "cc0b63ac061cc573a16ef419a856417242cb52f4f39525eaf4a03fe084659e87"; + sha256 = "4535f52c4e9ac754abc6e9f1093394b2b0610c8268612035fb644e06e7a4502f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9f0ccc88d783b2b5dcefa19c0761517ec4aa29ebd45e09d36f3b52d4c0d4841e"; + sha256 = "c39f4bcf863f3e196f57bbbf5696f8db9de865fe9b64bcf5afe806579bcf7fec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f08eb49146b4ff68ad82c92accf80956c9b5e203d384021475cbc51abd1be67e"; + sha256 = "165c2efb87a82c7b217be3184588eb9ee53635caccc6535ecadbe79d601a985b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "982cce3566baf096f37a3d9b4ab09324c0b0edd8bd1b31e711a269e2284fe5d2"; + sha256 = "e7084ade6270a90a744ec28f5c24e84e54042f0409816768fb2724b7323f541e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "8fcc7329ca0fd874e6b36d830bc6195d43387332b28bd2fdfbe09fad0a17c65f"; + sha256 = "92b83ff98c7e3e3e757c0b22438589dff0822c2b8340c7be968171cf58889c3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "efb096d2e43e54f9ed0e18ed898db646839287f55996c86610a463c1d6b92cd5"; + sha256 = "04a89dce83c600fc4af2bde6adc0e02dad151d3f8e22aad9f41088d1c266e272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8c3715c8063cbe7d7df698fa4e4380be1fd06d4e5c7976578f46fa3d40539417"; + sha256 = "9335d8a619fc9e387d71cf1051a8112735f74fc5ec1a082ba918d50ce318befc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "57077171b350b88ccfaceb8c0eb3ad1990748d80b2f40dbc3d761c1d0a73d6eb"; + sha256 = "73f895669700a88e615d42dcc247bcad25d91081183a9c26ef2f85499aa54cda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "14f24328d0e33a18ce6e3d67fbc95cecc61554d07035884181806a25391ab6b6"; + sha256 = "694656f308e44a432e0bc618eebed744cbcd537170214385923683525f3c0f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "27a8b7fdb93b98f36aee3a5442564421436df91f17a68d58961238108992542a"; + sha256 = "1f897211bbeeab3c8fccd5267761251d382977925dcf28123adbcbff7c63ed47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2319b00f9b2bb0073045b08d170af666d217b2e4667611fbd8b9628c52680200"; + sha256 = "4e610963fe90250c9f906aa9f3902e788e33b51cae9cc622142b0ef14421eb41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "65782353f01ad909dec1b473a6642b0a0e6733070df5c98f0a262b28aa536e36"; + sha256 = "988e1216882068a823ee4cb5c0e8d496472906cdc33087168d1a1f64d555953c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e6cea933b4b1948f0eb84918df5b401968f6e449caae9a5a57ab765a8726eb89"; + sha256 = "b61b00d9ec818d5d8551dcd9759a25d250ac5a82c65ae209e0357dfd6c44950d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5702b1f19f7b99781447290abf32bbcf97c4ab889549ae5b9d73b20d49b0ecb6"; + sha256 = "7850917f25af596cf3fa38ce9390b75b6f26f662cd3db031b40017be5f2547b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "599e8f6d6972a7d9c33ebd92527eb30abe7ea5098c0dc0ad91171818d2ea1ca0"; + sha256 = "a8b992459399696ca9c30eab37488de89a45fe628a96159e6b74812d15ae05d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d8303c9148c008e556dbe754eba46f2c056a93167e90088ce06fb1bcf425c27e"; + sha256 = "250347865e62af7e78a7ad3ff80856d4420165c89576e28872b4a8fa09b6a074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "da8034b67d159a267b5a1e0d1d816c2030e52d1828fea29e46b8241486854e0f"; + sha256 = "ae830c670267f80982895bdc4787b9e56952e5d51daf7069a2570324b08fb758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7b7fa736a29a08108f6e3b5bb47aa768e3ee6c9dc58dae866dd70ab3ec6b04bb"; + sha256 = "eab6afa1409dd54eb476e6e66a8dbce5465cf58ed86f3c64019c141443c14200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7152458a1742f65ca69341d3762c0adec354acd7402c35213ac07ea2264107d8"; + sha256 = "dbc23804ef22b355b5bdd3901c831bdb7e81c660a7c7a0f1ec31f95dccf14814"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "362b5c4c2764f69c3cc175025cf3b0de054cc39e5a47bced76a67e8578d17a2a"; + sha256 = "d4394b8b398c84c6ee1ce5d46ded950a794af2932209957317823c98f3e0bcbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a19ec522293833dbb48a20e0da510d67825f2dc7892c6c7c9e66d844f74a62f6"; + sha256 = "277c4fc2aa3473ef627f7df4ed14acd446adfb2d2d701c791d891eafbbb57fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cc0819e2c416b2473ef52eb1ee91dec88b38af97c420723562d90dab16f30952"; + sha256 = "e61b2a405a42adb4fc92e64265b0567e4b562de02d2c352ade5195d1dfa44638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f24905a22e4a664af3cfffc859ce6ec453a1b40309c2756b45a74b999e056769"; + sha256 = "03a55e33077ad11b8319ee655849279c15131e0686fea435896d9a35d5dbd703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e9813624c07dac6b9615f18baed1d24cbb1e34a2347e3d31034ba4718dba90b7"; + sha256 = "20faecbe37820be2935e6942a2e96865898f78da93ceef769f04c59e64739d8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e8670c1edbff38ee9400bcfc9bc9893ff036af337fcfcceb8d8f76c854474b61"; + sha256 = "51ad50c6cdadf90d11056545bf308f121e78681b1d0a4ad649059fef081bc693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bb9243d36cf8c4e62258be1b692366243056d51164a183c7e10fcb3206e22902"; + sha256 = "bc1b0f3b95bd9d505a6776ccfe9ee194cbd96af337212ecaa7c6a45bff098750"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7e57fa6e4da39014b4c7c53bf8b7e5b4f7868ba7e5c80726a3e03bf2d283baca"; + sha256 = "47105ccb2feb77ea05f2eacb771bf790b80f53bed3b5ddc622f738a20b4f2447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "acf4d5d11aa323659ef6c6ea0754104d642501cdc68e734d75bde77b662e207b"; + sha256 = "e6030b349dde6189fd2602c673830f1ef0b98afcb5918af55eaf1a4647ab6808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "ab268fc166a3cf2b27df64472835d2ea487bf4860662db807a0700ac21ccfa0c"; + sha256 = "c1b2419acd6154fa05bfa94548835143c4d37738bc7f5e7087d121d0de8f83ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "478ea687157dc0922712a61652ad6884972551ed8ce4d01127a80c1efc106e32"; + sha256 = "25149dc40cc00cc2d7f1a52e85a7ba66ffcb2ef722afc699045f79bf66d79b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "111876d47dd316c11e77439e076df41af384d3daed166f6f5d30b68bd0be4d52"; + sha256 = "e1a724ce75dda12054f9ac25b3a2895f491a1e24352c17e7e8ab4065fa4c91e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "0810c419383c606ff14d2bbac487368d2122599ee3a5684a288416069b52fac9"; + sha256 = "88505bdc9fc55503794a401d08e8f4a7cae47077a469819d0e085f8acdd7ac55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "79ab57756a0d232407752eecd621f13567e43592f84ce2995b13bf73513022b6"; + sha256 = "0bee40593c31e28c8e1ba84cee367fe1497abb4596fc8953c146a2465a118c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "856608639af7990122fa2fce426ef126d35dbc3525fc7515b5f26c93203aadb8"; + sha256 = "cb7e1c15c830e2d79e31c761625d9e87dd2c1f3cc9d0e426eb85208bcbc31656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ddd8dfa8a85754d96b83ef24ae5f0b3748b084cc1fbc87670dfe576d7c65c012"; + sha256 = "3a215b110a1b15453cf6acd5c18baa7400a821ba852cbbf010709fabae965eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "52f5327fe808e4273830ae5b71077d6419dff4c763c9e4fd9e64ac8c49b67f14"; + sha256 = "88c0ae127b8c03cbfe37bb14d7467e39f42905f82db521837eb023edeb1c1a15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0242eedfe6b5259738175f83686db3bfdd6d42db66173f7632c6ad9b064cdd51"; + sha256 = "990efa377c86737edd76fa88d68b60d56869e31f3689edef94bd78572018db50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "706c6525e5f6859b5d19a5c49ad787577064b1c12ad5088cff3e923d4fb3304d"; + sha256 = "c9d46a5f6eb097dca199435ab66f0bf3a15c31273711b1958cb1b9dcaccf57e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6a3aca1232dbf5a018be45fc5411ca82a45f4be7ecb91fc052a429b9716ec8d6"; + sha256 = "b133f54d14263dccc14cf7e4ccffa28c1b115ab4f2b45b62365dc37a5ff88d30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ee10040074f9eb053a83308b104f84deabb2183bf7b1b9dbf349adfd3e25f523"; + sha256 = "dcdad00c5b7deb0897c4a6ad9679a74046372f710f34bf307f8e16fc0ce9b472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3bbd3358f8a6d84ae3183f8f67941f3653d70595feb4d74f9c3d287caa698932"; + sha256 = "a10efbe195186f06e90601e21c50e7062c3b610deeb7f75761d8a1653c3345ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "61f21fef0fb76e40099f2264aae4969d1cd798f58dbf75db81c6366ddfe48335"; + sha256 = "35dbb3f4e2d4084413f3471f21dcf97a4c094063f54d1e232fa952cbea09518c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0edac08c5d0f400df2f2c7d26c410b2eb3b2a467a167d17fd57b50352b9ff079"; + sha256 = "1e155efd7ff874cef65f6be0eddb4fa6ea2f161a82574de6c5d995243ac48a57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c036f77e862df5454e3be5f913448e1732585f19b3f4cd968824c139f82d8790"; + sha256 = "4c91d84911383326b3cdd3ff86be27903696b4c4b7060fea2fbac06778e604d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "927a08479433999af0808538ea3df289d3595ff0c88dc311c71d061875ada19d"; + sha256 = "2aabe66a15ec18ffb1a2c28a984351447092de8257e260b4b63511d4a290cd56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fd7ec7834104629773481d47cf3c36deb1147326661788403c5ad676e18dc1a5"; + sha256 = "a389ab0baef9576d549191e7928cdd07ac333cdb157a0dd8422a878811e0f092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b5125d265997ed75a68a9b9c8348efb1127da8c7e07233ee403bbc1c1c1d551a"; + sha256 = "b5d3ad3f589ff0831c438518dc4e5a8a5e8b0678aaa65ef1688207eb2e177d80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "9a77df59be3a58f7ba75951f38461ac366afeb22a936c01562a01d509792ecbb"; + sha256 = "406f3260b468b8f5adfdf86fe511ac534d62d3bf28f1be387150a92cc3e362d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "baf15728a07ba2ce73213edbc486cd060a95e9722867e129b4dcaa5b7dbdc20e"; + sha256 = "a8eae453a8e25e33dcbc2b4322167d9720b1e90728118d9d1ae249833248b7b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "201bfd1905918fde0134abff649e4153639d42beefca8e5cf695db13305c4869"; + sha256 = "c05e1c24e0cd94ba0df7608968b46a73227e7cf08de7b7b888c4f56682ae6cd8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-i686"; + sha256 = "c1e3dd28aeb714102f105473c998b18c2715c6aa9fef8e96adf4ad79489154ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "9a8b35abf95cedd5bd8c777e45dc412df76c5ab135fdffce1136f4d5400c4b5f"; + sha256 = "520ba30da9407af4df173af1734ce5bd8f67de290133f71082bc69b51708c28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "371fc35135170674b3560a7472b479473c5f989d041c87cd030f8798861f1c2e"; + sha256 = "eab55c6d232f9c6eb9f6db8f8cb886cb560dffaa5b105c18a7808c6531f06c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "77df5a99a9577a3a07bb0f034a99f96afa85cb4b05200f56c41a3da2283a93f6"; + sha256 = "12dbc45778e917ab6b0d836a4ec0da059a7a2e5aa22580edee5aaef04447e5ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5b72f4757d23c78e2f6ed33ba7afc99b09478d434b6d85b453f980d6a183fabb"; + sha256 = "64643222f7e0cb23259b75c7aa8dd4a61a87ecf21e46da62c1302cac22c6045c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f44f53326face336bebe48657abec77444fbeaf90c82ea57a596465f0fa2e87f"; + sha256 = "ec7269e6e6a69abd48c093399aa40dd57795cffbec7dbb0138aca95b105ee362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5a284e9d3afc91691a2f4cc9454f8f113a2385db8e93cf243717e18755a066ce"; + sha256 = "2561aba7e7a770129989fb780b74fdcd00ab39ea17fb3e27190c16c53c409447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b2abb070d7d89d0fff19b9ba293961d863547da558804c9ee853ba280cab5524"; + sha256 = "6e52362bb333ba3d5e20be7aaec57bc99cfe2edff32e7622863f8228eeeccc39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a6a8233e17ecdc236c6741286272fb79148d30b86876d348097f93733937bfcb"; + sha256 = "443b6bc4e2f163539e1ddc13420ecba7bde4de38cf9595b2d4916eb30b730c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "723d94602a9914c1d572f85635ceb2622960b09bfdc99d4ae010efd1f65e4792"; + sha256 = "09a127420ae54b83c25dfc15f427b4df5f6e6b99eef396a8bda62df4a80907b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "78e0ed7271171c5eaed2831ed56afb98b525f8ae4cd9db78f6e5b2c6830b5c87"; + sha256 = "3ecad182f27b0f1128e899233768702eb8c697ccaf24928f60f0b3fd14f1774d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4d06b6cf8b81e39875f6b749286cc52d89d8c172e8a8af54f920906326404346"; + sha256 = "15299b0799913da435abfb98c7a8d01f026658d59c1af3ab2d2fbf5ce3639a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "9880b5fb724522d823fdbad3aea4c9b1376e9d97543ad47071a7438aef164b1c"; + sha256 = "14c274e705a16afffc832e05fe0539035d20248571ce08c2869b2b37c8c549be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b198c6491a3618c0dc437cfef06c4564a8b70700b399013072201bbf003b2b37"; + sha256 = "dfaf43de7d1a227d72b732f8c424adfc1215d2a0c4201594b1c251aa337aa984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f35c3b4a04742ad4e500fd60a5d6f80147e19b60d6ba1464c7df62707a8dcc19"; + sha256 = "2831e14423d338a64d1db9de0baa2252b715ed24b356ae5d5062d2f801d4ea84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d3c2b7e536438e8d212c66463bb201475c1df143a040617aaeb08cc14e6962eb"; + sha256 = "76c69e012647c8053972a6b0c48df31a9ac74510ebf1ab58b704b1fe9197a128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c708a6886f3a22ec5ef66d9c3d26e051d153fea4ff01fceb65ac41cf090173e8"; + sha256 = "50c8c6858b1bf9994052e634f3d11c2849afcf9ff94757679d43ae5b1dd8bd48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e26ab71962c17774721bc54bb612f963c61b3b5fb83f5c1473a84157c73c28bb"; + sha256 = "bb23e4d726b4f735593593e64b27bce89a3845ac4efdd6f91eb28b2c02ae33ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fc8d824190bec7889618e14cc439f6b96e878acec171ef270e54980000cb60d5"; + sha256 = "be4fdfebf4f107be47a0d929786bb6388433e93ccaa0412fc1e4ce445423744a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ef932683f2b7eb51b043ac7c2b9dc1ffef3e048f3a92a5abc65550743e95440b"; + sha256 = "846feea2feb0ab09ac6e30d3a5af3d97367fa1e83034b0ec142c002659cba58f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9e2695711d611ace940d8f6dcce037646bd96f0d0a533d551b73eb1adaa31b98"; + sha256 = "43df849aebf37e26fe7fb7458db07570df3b8af3a727517bd25cdd1550c1a477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "dbb0f78780deef67bfed9c1a126ec296657f327ce3a72beabcea0bbb9a033be3"; + sha256 = "b17e9f960f3a90b64c6a8a9dbaa01b5921e62d24494806e00953ba24d42ac141"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 551453e9a2eb..54763b801817 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,7 +28,7 @@ , libXt , libcanberra , libnotify -, gnome +, adwaita-icon-theme , libGLU, libGL , nspr , nss @@ -137,7 +137,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ wrapGAppsHook gtk3 adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 619b6186b49c..1972f8c2734c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,985 @@ { - version = "90.0b6"; + version = "93.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "20c33b145287c4477e6516837c7bd763f0895750e40400e82ddb6f196b072b23"; + sha256 = "b4e7438a7d4d5b4899fc752580909278ef92478069d4642c4e60aa413aa537f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "edebcfa2f2c8a7af69d8d98ec4890d6ce8404f93d8e21a7d643458d769056286"; + sha256 = "01ad52ec485881d0c621a95b7a5e6af22a72d704d487c88448ab86a62b4acb30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "59a8423486afdf3860bd03c5ed2df595c5706f2d048f14d27acf50bc659da119"; + sha256 = "f0dc29176b70234356bf145e65a77b1da218cb6f68914f90482278c456477bbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0c2f57d48e42602109bc30574f12843c09f68f84e810e3f7860d3185999bf7cb"; + sha256 = "a58e28425055baa6d94aa337a637ba26da2a74fd6a7a5ee61ceb58c04c146545"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d505465fa32dd6e0a324955ca950cbef5826f3136b5d2deff3e5a42b8063e69a"; + sha256 = "f921078583c19eaa9059e22928f91083d55f98e240cd821822f6bcb73b0ee10b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fd87877ec1d0978b4f83451360d1eb4f2ff7c0e3fec9a9346b38f34545b89418"; + sha256 = "d13bb74cef565d2f13c3925ef358f64b791473d9f6cba2102d61bf91df9bc570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a193474f5b728559acbabbfb5d746930909db38e83c2607c38d48a8b62376bb9"; + sha256 = "49a01b14b3edcf28b2f17953d10cfb7dea75bb3e502aa1c268eba7357708c61f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b0ed4a45bb9ec405b4795d2e73eccd56e89555eaa40c4c72c64c0b5d7731bad0"; + sha256 = "e80f298d74846850f66648141653db30214dfbe66c6dbb6f34c7189d11f1d687"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1d7deb7f6bed82fe73e795677b4e60192dee7bc52e2a870c1ef53dc3a23e7390"; + sha256 = "50619c3343700135d25cee66e127f931f7d4c7b2a52007a1cc493ca3a882e38e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "379304d81c8ca21b41e63802394d30892572dc3a740d5fc701512ca482e2a649"; + sha256 = "382dbb9e1687534d1dabfd9388bfc3d532d36bedd314c33df25f14ae04e968f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8b54063ef6a1c015f2fac84426b6309df89e013dc8e7deeb862ca6ef54512a7f"; + sha256 = "836551df658a7cfbd2374840226aa941ca2ceac0996d2ae98be43e62c5ed4d05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "80ca50a92ff6a46d140609558265efb422759ce320f5e7480a270b16fcaf486d"; + sha256 = "54c4a599103789390d95742c20c873ed478963c3b55ec7188286156647ce5fc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "00c027ca3c56aea456d0187a0a664d34d5ad704af5220d508e7dfe29ef66a4fa"; + sha256 = "884727b1ec14187d84031dece2e537adad1b3f5d6672e22d67e3b8f93076443b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7126556936ac97989719922c4123f48508bf946ea51af05ce30182a8c5c798ca"; + sha256 = "9bc3c37ef3adb69176080c1c69ac541dfd95af9827d3a3e428515045a0227148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3f40d14e92fd79cf695b36c0c6357503bf08ffdf3e2105ea30b38919a0c40442"; + sha256 = "7efb185b5fe43570740585d770f5aed2de7e77f4bc1bc7614a69b97e6f9a37f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "be85ba66f9d92f27fadc5bef7220b794ad1425c09424ff7c1ffea905f1495222"; + sha256 = "cfac99243d6452aa2944c87a6cfd004a11c138cf70524ae6a2936790cafdc9aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a69fb1355b2b0fb710954d2982750d9a11a80be924c4e8ca8664d97a77676f7f"; + sha256 = "3f399b0188aabd4c8e38ab8cf750f6a9660f1fb797407705e2474f53402eded7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9142b0b44f4f375f2b426f3ed7af11646367b2a21db8cc3afb704d847552569b"; + sha256 = "03ae768d7dc3d9741b0c85357fcf9523571c3e53c8bb2c9efec9ed7caf1b63a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "42f04094c7d3eaeff3e8bebb073c140870a94e7de29f367950c47ea963fd8ee5"; + sha256 = "e2c6af4afc5cbd5b0007fb59e03bf9ca0d389df3ae24995a0d08b361ca529ef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "17a234d289679e507f9bfe67d2b65d7a89dcb4b603e0b154b9faebb9044d320b"; + sha256 = "19f14830e19de72ec1933720f43a769e84a164dde8928d1f62d5fe051742159a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5c5e9ef0526aaccf67f6f0bd1bbd5415c2086c0ea8c9d9e614cdd053c5e3e9c8"; + sha256 = "eb0ba67507f4c4c804dab1032a0656733b08ffc162c776291d0f716d5d0b5a6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "61a4dd2a80d54c79436c2f3f62c4b56bb2d6449c0475cd938a4bc5c3c91a41fd"; + sha256 = "1309163a30dfc89b687945665600ab1bd420bcbb3df310984f9219200f4241bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0ab2b7121ff045df76e043e165cffd3a4cf33f4a5d76f80d880e4135b3ac8e87"; + sha256 = "066297d53c67a1be6dee4ddbad3dfab150f62c45bc24080f5790e922c11580a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "20282abb72dc7bbc2db8898d6c18b2d877a6905449a221d4044bb2984594782a"; + sha256 = "8c4f2e4b095f4c275815ee3cd98d2ebc7f0f3cc0013442996fcf911108c81688"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3bfdb83b8ec6ea8c2e95e4a7e50348370617135057053e89ccf9e61ae26710bc"; + sha256 = "65e469a63917b09cca08b75c5448e967348b6a81dab302a41c9b339f20c31065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b78b75d2832c240c764409d0130f7f70081c66ddfc6a4a710acb329325df3f36"; + sha256 = "0bc194ad4e571d72d48c74f62c387c2d836d031a9904fc6cc79f8a591701d515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28821baefc20114bd7785c04ddcf4aec363151f0c1ebb850d364b337a5141fbd"; + sha256 = "12852d4120f7101a889f7ae4e1442f3a03bf0a10dee38aca5315121a3e57ffb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "853620bc46a74bd425554e83a5866bc5bdec79e9f8129c83f0ba147c47ceec35"; + sha256 = "d7fb67fb1bc9c03759e7835c5ccaa740ba0ad625239d7ae8c125e10618c161d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "570cc2cf48702b16384029ee8831e3ba4db39a50b1b02576a0c82d51beb03779"; + sha256 = "51136e86f93f74c79ed3dc852ad16c94e5e4f44db12d395885f39f1c05b38f8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "44f3cb224da4c0df900737ca5d4d80ce41f404f1d3aa36f6f470d6eb13d7c9bb"; + sha256 = "1ce5e28ef66a523b5e82a5c83c90177149659253eb3035141f4fe91b5b32ebac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "24ac71b7d28b286fe026b1cea49777876eff5146bd47463071142524d4f18fb3"; + sha256 = "e2f8026270e6187a592c3b11a1a7a2182b5235616e3fe1b308580329ecc36d32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1a795decfbef4c7689eeb931f07d8b036943856239ffdd550882267a14395dc0"; + sha256 = "81f01d94f933a94de8a0e48d3d30619e6d145e19ec3bc12bd58efb4c377bde48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "807a38d68d0a5010c6309e2e725d210e3254de5c5b7375fbd209b864053ad25b"; + sha256 = "34818f9a370f2f3c255dedb3dea41612988a2da1c57632b1b46b0b8fcc63b280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6be1e617b3dcd59ec82607a8a1f8b5f145ca6c1cea7020ee678021ea5524d902"; + sha256 = "4f3bdc4c6c6000c008a891d0aec85915c8bbc089c963a771fbd058015ff76c58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "48d4de4cc60ebc53acdcc4f8fea5b483b546f06527f24bf90340db141f1a043a"; + sha256 = "cc18317fd5101966f51a717e01a90e83c22a52d7056f7e396fa35ba4a63059af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4924bab4100d18fa65b1309a091f0e6042f34aa342508923dd8c3ca559dc9628"; + sha256 = "6bc1f8875100ddead9ed8b2ea3dfc36d3b13267fc55a06a58d4cb709cb22d6b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b2dcd37bc4c9ed6015321216040cbc27909061c668d8cc053f3385920ad9b18a"; + sha256 = "01937c8f7010ee8b5a573338e1aaeb17a2074738792416142fabcab587894c4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bb50a6514aeed37e4fd96295c0e97ef026bc6fca8c62b7ce6bfdbc227b69b0dd"; + sha256 = "b9daea490c1b6f4fb3e4043322e245a509564b64a237c10cb2cde519e4e81bf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a038dd8daa01675758acb4adf50cb93b204f3573ee204f97cf170a16f300906a"; + sha256 = "813383aa1a9fb4d7e1d9348a8c234341cabe6a536f857a7d0759cdc478afde9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a2b385578b11bc12c3bd7230b3a22d03f08a260d26e8f287efb2756b0fd3f9e0"; + sha256 = "8f82730dfe1656c7d5bc83f6729b4d8f3ef60258f67019eb3f250596131f14f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6025d34743157cc0869d12aa5921d9951cffa660244804b092ce0f79ebe9abae"; + sha256 = "c8ebfe59ae4e64a6ef0e186fcced173a16505dc69d367adab30aed82469f9476"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "0c83746e1212350945277a65e0219e7bd871bf3bd01fd2e91194dd0e44e377c1"; + sha256 = "d03e1385f8ae37cc77a6f8d59145b5f0e79fe309e926ea30f17c01ed7c335cae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "03675af908ee739dbe8f426fe7c4647f4b9073128544e990fd3e167020ba3a88"; + sha256 = "f79607136311cce69955220e63c5421818db8127f12dd8dcddb9db3e9fd3e9d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9cf3dc5faebef0342f2b165189312fb1d76b5882b0767241a8240a440fc33bc8"; + sha256 = "85a924cee68507c1ca439c5b37b5054b01f3bad00109b19f75d668ab20c5ea7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b30deb7e51005523457e7f31428356178c1fd546440df2cb12f9420d89374c08"; + sha256 = "4f09afdc657283b6d983154fb20e036af10bde48d6bb34111a4f689cc0617422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b51db297071b1bcec3416e7904bc1340d1dcf3bc5fea5016e3311911782ae813"; + sha256 = "f7a3bc86f2cb510843959b6be1ba7ff6fd1403ded3472a8074a571d83257d13d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1e946e4c6893583836874e9ed951969a605b5f8de222d152d79ca003904af86b"; + sha256 = "d4fc2c62fe8577ce06caa906f21741cc5a13fc5bfe722d54e3ab2068bca8e19d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6fb1006d097e353401e032090f08bf1911247b4c3923d2490a7f46cae3f69376"; + sha256 = "7bd53608373e570ff4fad8564e60de11ccdf95d2b36ecbe01087a1e86decf724"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a0de49c85a0726fd56038058acb6e1ab31e5100bbb759a6c5cc89191908fe402"; + sha256 = "50cceb8dd09d4b90e2bd88e7b7f9a3389e9181a40f9d98655aa969f4fd865a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "386c1b25b9f78b91b0474e512091b6907a598555a8e146ed61226332e3c04e22"; + sha256 = "b2d72a1fa9e57b3e95e76dcce39e4b48330d51e463495d3cdfc8f5dad2ea4ebe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "185964b4ba62e93ce54004e28a8d6da65c9b5c657f191e4ef924528c92bf5fcb"; + sha256 = "f8daf66c5f57bcde2553e579824c8734cd82444443368bc192a1d305110bf9b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ff14f1d6c4ee8438cc471c151fea840cc81336de06e244b6e2c8ca193d97e490"; + sha256 = "a0be598b8e2f0fc28c1ee8e1180d5fc4708fc272a9e5fd4114645649d95a15a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "36d9058cb4c0bd804f640665bfd05804a787ec59632010d682ea132f12660b18"; + sha256 = "0477f918ee53e1a11d4f37a12ced16d5054d2bc2d63c1f30a0b597f905934e48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "da31f2928efa27843afe07872ecd9b6e286bac90a101c14e1dd1e806e3bdeb65"; + sha256 = "70c6f49e6ea628b6a52196c9593e83f47b26abfe74cd9df5ac78c7f1c76ba93c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7a8a1aaf9d78f7b1373374e70017252004c3d49de9c0b97e705fc5df7790834d"; + sha256 = "1bdd53425ce34db23830ed5ea075b8867b076ff31565f52de58861614d987370"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8641fa391ff8ac3cc25236ee6d19c043c39d651c674cca2badafee685b47eeef"; + sha256 = "da83476278e063e87351b20411f2278c71b31cd4da18add1aefa1e93afa4c675"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7a676b767215a1d5d6537975fbe9e7e16156d21032901365c24b8b0dd1adb21f"; + sha256 = "e1651a1b982e3de1d0256b40605cbe648ae2854d206ab65c5a0b238737833800"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "3d5b3e6f04d7a617870a034a4c1b213246d48408eb4849cfaa8872f1aa8c8f13"; + sha256 = "74544673b4f1873d59ae86a5fc7435daba78c230e6cae037691b4dd78c231385"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6534871a9a4414a59c3b885d7fa7d7637c9e1f220aa82afcb89e629795c61562"; + sha256 = "4ea7b516fc0be437944948d5eceb74aa80cf234182fbfd4d81a3c08c86f42d2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c2b3cb52ea74f0d62b28e54f87662863b801d4f8fc357c088ecb690d042fe8f4"; + sha256 = "3aa2aefb7202c7cbdcc053a3a13c7fce7edf7872b5d82901be05a7bfed6790a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2a30d42025663aad7cf6f3039c0e4b8a1fe642dcf97b9d616e6a70c5f2ff0e82"; + sha256 = "8e91a31085519232ab0a23553f36291f7998fb5ae1c7cbb8b9d37b1ea0609537"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "43f244482732b43c39f206fecbf1080c8a154e78707be98931549e0f6809b56f"; + sha256 = "59d3dc4141b0fd2bac81691ab72d4bab6d1e0265142e4584e9a87eef88d59b4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "46b3273f508889c48d611568f0e927eac7e612c2fdafb3546c47f080ee928db7"; + sha256 = "228e5d2419aaa55e5e98c355ae7dd81871f22661be041bc1a9397be5db2ecb5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ea355f78f80ec11c44a5735838c5b48b6b915951872abfd8a935f8991010840c"; + sha256 = "e7b7a5c9788ce72b68fc0236fc7fc1fecc00f792e03b71e67359e9c93ff9f07f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "acda50b76ec558b2d941d77b4e523edc0fe4cce0f03e0201d881917a820dff9a"; + sha256 = "e71350bc79c186f1f64e28f3c13ffac3e9396674180ad3559b1ebc418078ec4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ac72053ee1992338bf192ec3a10ff975cc973e72c5468de68f8441bc815553b8"; + sha256 = "e90e6e6ab1a49bfb53e244bf58d21bb0e2c6fc17f2899cca4642097d2742adc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7f8c13888b7a24235c48f7c8c03ed66f7e3736247c936ddfcf88c8f3816c066c"; + sha256 = "f9d292f1c1238802a2c90fd5b5bcd77c6fc4d36e2848b81ca3d62c5128443ce6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c0b50c45a6d198f60cd5703889771778bae6493e77e70d07518b6ae9ce9c4f4b"; + sha256 = "50e59a0ac8263b59d63a39e8acc93ddf88f4570755b859f75c29b0f8b5a08a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0b75c4725e1d9f271a5f34781b8479ff6d6a11ef827afca97d52c599fb389d08"; + sha256 = "0fb8406247ac22b55295b4d089aab6ceb4a8b334ea03268591f218ca2ae70930"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "fd4e2d38c3dbbe0ef35799a89fb8cb50435e2a06ed49cec2a380144b3ccd0ec9"; + sha256 = "39caf8f8035591e5180e5336fe2bc92d7468e9c630177a4b6c20aec946f92164"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a329a085eaa20c41105b70b2efdfc31260c2e5f9afaae97416a8c3a77e82f822"; + sha256 = "0c9f88b6c78749d2306aa45edc29a68bcf52cddfe50fd5a61977f51373fb21a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c418d18e275c4ce5641c8b0f7e30da75659137a4a5ef9dc43fbd2c206e1a1bdb"; + sha256 = "687d9fa875030327d376b58127776c10ca880982eb3bfdb3609cb643c80a76b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d5cbb5282477c716966c6b30ca9a8f21771638cfbf2e3fce69663ff7bc58c6b4"; + sha256 = "49b221a77cbb575a627b9cb2503544cec5a7fd2beeb35f51358ae59c7984a11d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "916934135d13a1b8c0a21543c3569f697358e8935cb9f6972c9e80f96fbb775c"; + sha256 = "07f1f9f1c4d81c0ecc11580032cc590007778322db260ea4088c8004095bb5df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "5571914386329eb2b0eddf3e4ddbf98eeebf1ae86172fac533d2397a48c8cb31"; + sha256 = "dd1ec66d82593f461f6277d8707761ae18903da16428cb37f079d83153278489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6b78d8ed2d8df5c00198ccf6fc3221b215623ab4a0b6c21030cde5413f1a1165"; + sha256 = "574f4afb6c4cc4f686c7e21570193708a2ba5f71f9462649e71f8db80c545847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-x86_64"; + sha256 = "dcfe33f0f4ef517d71ccfc1bbd9c57f166c33f2c41e24e64c3699d576dea1581"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ed31203623e85d3cd0ea23c54177542455af4013e2ed8ddf642056a99187f814"; + sha256 = "8a815a0f17a5d9065b40bba172897e7e258fa6462b6c139a8353dd548eb49279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ef8f4020adae61fcd797ed23efc1bf54bd94609105a9bec4ac7f543fe876275b"; + sha256 = "162f1c3eca8245152d200fdf8a928a087d6d86e9493545c173b5aa9b44cbbed4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ca4a679042db1485d0ced1f81be3610493755ceb7a32887110f528029657b499"; + sha256 = "3879192bd83507236a1415007205ffbf20291d4739f2bf289d3f951c0889571a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "aeb7a5e4a15eb836455dacf964826a08905ac822390e2f67230eccd32942e136"; + sha256 = "5d0f0ed50682a74cf7bbdd1cd75050507aa9696c15aeb813de14975a49b16212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "93109db6d38da24dd3999960c866754966945dceebdfee960125039e1939b5d9"; + sha256 = "87a273b3b0d232356364516bcbebe2e68689425e909a3f160ecb296b35954deb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cc1787dca9c673d6ee937d7e0a2801cb345a0b06db3f6e53581e1151716d4170"; + sha256 = "ea036fad2cafb67e0458f3a92b945e4436461e409ed4d89905b1e98fd52f38fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "281397c37d390635e44e1471b318ea9ba98f4b3b8d7670131c3262838ad26e4a"; + sha256 = "a44a9f6ed29ce861573e02bdaa4157a76a10aa1dc5f8cbde29571c1778637a53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "5255724df1ec3d05f33de152885d180dab52796317ec6739838029f20195ce3b"; + sha256 = "3e7da2699de6cc01665632cef6d3de0f8c4abcda128993ce530a24a4a2f2237a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d8c5ae00cc8175e5b6beba8b1c7102a8a1f81860d5945c4e73cd77df5b5f8368"; + sha256 = "000eed6800e7e7148dd283bd13e139ee9b02badfef751cfb76edcfffd13567e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "270e079ef9ce1c7977d8cdcfaed1f34552c3058dd6cdad22f17b53c31d6c1dc6"; + sha256 = "84f3da7dbdd3b82751b2a67f652eebbeddc47f94fd36ce2fced2b2031f0fb225"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "747acadb00c955621ec470870478a63a10c4131c244282bdde2a269a9569d6e6"; + sha256 = "25d87334811930044b8998940fb3bb6a3e4b54cbbbccec3c3456b1cf419600c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9cdc0ccc264d071ee7f9d7208cd1fddb6179e016ad759c4d5e4dbb00f6508360"; + sha256 = "0e2a7660604450ef5b23bfd6846036e20b7644b18396cc56950f14aea47529f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2e20a8e524e0b91832efa759627b0ddab02fac12d009e0b6bc81ba0833c94c2c"; + sha256 = "58efcd056d117d7b7e79054f472eeeac0b81b1362c0a1f663dbe83b2670a16fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "1f4654b6d9d9d33992662288c47e79f8fcfbdf76db5ba0519bfb0de997756afa"; + sha256 = "6cb54768b1932129fc19b5ffde3dbd255584be401d3928c0edea9b8bc34a1c0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e7048a1226c8af17dd95d162b0d88ed9cd8b0ddfb08bc03920ed04e3d2cd2d8b"; + sha256 = "0869ffbd421fcda84cd73ec7bb2887afcce92f9cc97c36e35604f48b750a1bda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5ae8a63c2c3dc8168910c231dcf54aac745327b818d66254a3caada129a83fb0"; + sha256 = "1ed8047553e0888fba18c51cdc683c7a46ffb5b686f6586c33a14d1c7fe21b40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3dc370ffe28c5ed91b8374c2f5ee41a0ae4bd094851a8dfb1d53b546595f558f"; + sha256 = "64602d30e1724206415a9fb42bb09efd2565812ba28e9e8c5d8ac9e9292da218"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a6f39e25aae7ed5b7d7d1e4ec8c67c4bd5f5ab28178d8f1fbbb817713dbecc1a"; + sha256 = "7d27a349cb694bb1cacd504911c20e4ceb3f6dd88acdeb7ee763c510ec0dea1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "10d3c4c3638f0715001b8eb0026a6ca18a5b92d09e8e1d80f6b40246a5c7cafd"; + sha256 = "f5d919ee5e150565ea7f62360f838eeeed6816511c4a76ee3a2502fe9134ca72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2142e803dd183e8f7fdf7949804e3cfef22dee2a0e665eeb60933368f54797c5"; + sha256 = "be32a85851306cd134fb142443c388ed063d5a919f27836c1f531c07f8fd7584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0617ccd22cc00872e5e5462636f150511ef5074052c8ad707bba98ae907f4ad7"; + sha256 = "b4dfa008a320bf25924718c14aa2a340e5a3eec4ab769f52f688c6e7b78e7e5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "eaa38a9976a7ac2e99030559ba27ff56cac4820ab5f9757f5c2cef76db8c4536"; + sha256 = "e9eb2a4532b6136b5889ec66d4b3ca4d19c99f99a66c96f119c2dfd41b4267cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "acc117bc014e08cfef0a26447097bb8df774d6246d569e6408021f0f8799af9d"; + sha256 = "927db81da2ebdfafe7e0ab53bbab88782167d4ee25f6a6651adfe5baf7373dee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1bbab4c2b380edc694480e2f6427ddb539b5fe5fd2489f050998c920975725da"; + sha256 = "ca5309cf1e2b48e311d37c495f823c3b5f6c5fcbf9f50be0bc59b1230111e5ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4d438bef41db963a282b53d13fc54db0d685014e03684fa19e25109f94d7f6bc"; + sha256 = "496bbfc40b050f2d2c49e8cbca690f50d7f1b88bab436bf56d82e92296b7897e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ae0d76246adcf16e4e910a02c54c8227a1ebd930b24bfe32ee54e631310cc42e"; + sha256 = "b1fb5d0634f4f153f59b66603dc8ce55ba0575951db9f59b2ec841c274fff9d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7b262f731afe0ab9a35e604099197e470416a79c80141c672886473cccfe9f49"; + sha256 = "f162ac2af6c4cd596b6d8733ef501555ea53b8dd115cc31e32df3955c2f21279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7a3596146cc81954dc55c4040d3926326d468e447dc8fdffaac7a3fabe423d0e"; + sha256 = "5a0732d66d76eebbfe4bdebc41884b44ac32259a008e47ac3559f1b52eacf5ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8a1cd058dbd39c6c807a7819116f1af4b22ff936a71d67bc54047d72252721f7"; + sha256 = "275bd0bd8498313775939f9b8727c6ff4f4bfdb30e47938ad40ab2ed0f29c927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8e58b03730a2c32f0537537114ec662c7307d1f79c5f1aa3dbe60a8d95526194"; + sha256 = "48c71288deb68a813036f465e4658f4f64c0c7f97e8acef2f165acde6a940a5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "37bb7c1e9c015994ea23b6c069b227367c752a4a2cb968d983fe2b0fd0d35839"; + sha256 = "064a2aefbcd520efd8d9e53d897418542488684780e766cddc3969611d944351"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "fa97d80ac97b9d155c40ca0dcc21bc5d1255b3e6a54153402d965b35700d9f74"; + sha256 = "cd5d9d229c0f2be0a76dece98bf52bb7e74a8709ae1ab843e1e6815d067eaec6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c9bc1be306267b7bb2282c8a543e6af66ccfaaa1f09769cd4c535d744a670b22"; + sha256 = "14818c3d576b0c5e860f9eb406d270d30f930153ee61d9858eaeaaa0987c0d65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8f3d423ea28e80303709b9323576695a674ea20c675bd825ab5431606e284136"; + sha256 = "2adf82a136c78a7bda852e2c9f4918c5279e1c44a3a21b3b7ed828f57917afc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "57d9509c186eee016cc22568d1f90942e689aeb918ed55aef19764b53da46087"; + sha256 = "fc05da877c0693d96619890abf19c1b68672ed6dfc49a5272b07195ea5d8ff43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "af43cab80b6f29346310171c32f8b8ea610f191ae48d6caf7db383826f23945c"; + sha256 = "d83868f0ee45fbdcd9bf12b97b4000dd9470c62dd8731baaf8a66b027ccae2e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "dc8e87e1e15cba292f3c5aadec017d8c0c6f2c5c5518f68b5267c7e707b27c4e"; + sha256 = "dcf063c758462ddb65b48e265047c18f9631a311c380e5660cc9f9a7c188a8e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c30e8c35a2eb997c62530a330fc411bf9f87996a717ea3e12f0747784ce287d5"; + sha256 = "595160a704e76ab74fca0497c01e1085f44e8935415725e1c266eb72537e6b02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ab884b36e16d5401b54c1e75d77d553c9add8bd26ee38e57f11f433a163bc567"; + sha256 = "ee8c11feeb6333ea81df1d5f5fc5d0c8a9cd87fb0401398b12e553d83d471fdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0eb8d2548e8b79211dba6fd477393430ba77c7bfb2fc519eeb5e1a3f484504fd"; + sha256 = "7f25250ebd2cc53d74b4fc8c217fc727149b622db386abd24f2d83e8561fabf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "86522647d5107f3518002d8958af62272f0566e178b732a1243ff84da1b2579a"; + sha256 = "1fe1e5d977d4b0a4f6331efe1b8d53e56fa7c254b6e1985c5d03a7fd02c79808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e9b442a4aebca8f9740f657bd9c032661573890355efc2e418bc2a8ca66c07a4"; + sha256 = "6cf56b811a7e59f3c0db5c04f700a71a333cb8618a4b01b29ded81ff54451a06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d0a850a7d9754bb71ff29985c4a129160ce3e99e30df1ef4e7c7a2e011b59771"; + sha256 = "40e7a0f214cef11ab5c16e9da62cc98f6dcb3287cefdc4ffaa34c99601eb624f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4ba4529f6b391d946e876aa321648790b0ec7a92ea5530981dd2f726e04ce0b6"; + sha256 = "de10ad020df1bf779839acd6a2a0f409d6b35c6361f7a5f80f02b678004064e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "01e4bcc9d4d01ff5ffb67540cdb815710ab12d9bf621ab1febe8237236960680"; + sha256 = "7311cdfb11a7cf8a88b2424916d52423ce84703ab931e096c6d7bb72c148a65b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e3d38a32104b08219d06950d1f63726460ea631a7efe8f0eb594ff8aa4e398f4"; + sha256 = "3fd4508eb613f3001fe81bdb2845c0ef389e966b79ce12c8040901c579bd79c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "20df30c114c27f1242d14139e0a62efde00a6fca686adb54ea9f30ce30a22776"; + sha256 = "fe84e47151d82be0a9d74b377318925bd44ddd9be2e217778c041399e02b9e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "441b5a41d4721cb6a3f99de3820611907e212415c4a398be9177693704d3cd80"; + sha256 = "4de9f1f42f27b2fb36daaa5ba7d212ba91fe3651ad0d326b3b8436b48decdc2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b08fa76644afe19af1203fcf079e4908f1e441bf0db362cead45d13ad5f30a93"; + sha256 = "11b870635a925c571a762e1cbd1a8c53b3327e1031ddd8475591a72bafe01874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "1754d25cf865a5d08c8a267abe0bce05c951644b58e0126f7085152538392028"; + sha256 = "1929a9f8a03fbf6ca8ab32a072e8c54855e1489c7f907d4edfdad8b07f8a91e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "33c3a95df0a369c5feae813bda7f0cc8bbc9b1c63aba5cf4193647f03d86623b"; + sha256 = "ec27021034521061ff5d53d403b082145f1bbd81494dd1dc8c8ea3b56643fa43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ba977267c4ab955665fee6ebae8e5be2ac9a71118b118c2626942f4481e8b8f8"; + sha256 = "50c56acbc126c8c3e984316a00f94a4961ca8fa0eba8c5ec0f281f5fb11c6cd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "52b1cbeae32276158a6e649299229c008f797e05d16af756f8e11ab10b8e5a68"; + sha256 = "39571a5f07088064c9772f376ed30384f5bb2a02b25ade0b1cd7983786fbdffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "45e3e210abb3d0e8647451a52c3ac8e17982d3774e557ffbde36383741b3ea88"; + sha256 = "9872be03a45fbf0cbbfe2da4caea27c34f75b515d8dc0e71e51de42b64cd0c20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0d6b747bc77931771c9cf6ec23085bcc3def89d8586ebe310df6296a4690df74"; + sha256 = "9855d6a2344b8d49da4fbfba9918952b48fd5f227ab98dc65989f4ec31764dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "829019f441a1bdbabe67a367d755499c0fb2a79fe1e62c5fa319f7b786d8f096"; + sha256 = "d7f3daa5e12166b96112393d9c201ae1e7c3b4c52abd14a53caace37dc794dc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2a04c91377b2870c986d434e24626e119a2420028549a51e0dfc0be140ebbd57"; + sha256 = "803ea16ab684720467ec0dd7b4d04bac066a9718423d0c66e6baa1dce1dd017c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "60ac0465a4cdae54b33035469d6897a5905678ebbe36b49a748fd87b0bf8e541"; + sha256 = "fc33b3978073687432daaf6321e9fdb33e24b3103623ccfe8fc0dd8d8f3e1530"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "237a0ef1486b7864bb8cfbccd17d8ae95a1935664acda423a1c4ae543aa4401d"; + sha256 = "6b418d450059c4e7c7d443596d253a5446c1d8fdba62a2198435ed5bdb55800d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "137d3c301c5fb74d69481801eca7e7bd1cd01d10d0a87b68b177bc63382f8559"; + sha256 = "37dd582899cab6a195bd35ad98ac38b0d3db98096b90f192b5efdc3cc8f18000"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6d9e69ca5feb66721369a1c39e76ea3e0b4b4db855ca895137f55d61df129485"; + sha256 = "d45ef9352b50e78454e115ef69adba76adddf2429226ed54787b0844213a4f9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fe88f902475e01b1fb5a26abaf40fef31910eb1c812bce208eb9f55024225e95"; + sha256 = "87a0c3278b25be8d39b2eec94d1e34075075db3abf87c87e1c28d726ce1f2a65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fce917ccb693ac825b387ea78f6a5e4de4816f8fe9d7fe5ad6c2b600a2a68cbc"; + sha256 = "43dd434b6fac377f9710995d4a5c5c74b095308a1d40a68a7367814b01f96b65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "71872966d982032bbafea002c3e7e03162b972ee7f8eb8df00d26bd5d3e8c70e"; + sha256 = "7330335e186ed88837a4c955fec3a53aac36e78764aeb56de37561a67de0b63c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ea8d862701f94cbca2e5f22090cc1434f6f51f8afec5ec929c84c714f11c42ee"; + sha256 = "73fcbc76759400d216c2d08fa54a61548b8f07c449792145446fa76d88485eb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9bd5842125a2432fc997a416987414323f729685b8b0780db1183a8415ad3a94"; + sha256 = "5bd7eea9ddc2c7a9a0aa41e68b2810a400c56f918d81fadf62c8e72d714c2c79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "d094a0d50acfa2d2e28cc6c4bda43c4e4fa999e80ef97bf4090fa19d672515a9"; + sha256 = "da2d3dab995c36a387993aa67655d18706c6c9d9b5e01e70ef23ac080d0ccc97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "077179806415be1461f4cf2dc5676c434b851fe99e62404cafa6736284cb432c"; + sha256 = "9572d0a6b82cd87bf022d29a247f9ac0e30255e784f3c82c7aede9bcfaad70f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "69e9dbb8621fb196d2a59f7f96c3f368abebc7b512ccc492ea45959f9ba75446"; + sha256 = "6d3b711cfbc9993d46510d021198a21d0ed3fdb00085f14eb05e508bf0cc1321"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b5776defe739415915780672d31c35a277f885914ac56c09ac947e317f71ac5a"; + sha256 = "c7cb2639f7e17f41f0d96690f2ad3f82a212a5bcf5023cdebee6fc93aefc67a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "37b347a27bb14ee9a2c6c7f672cf971de1a7826cbeb0588a4847c32b79dc0496"; + sha256 = "8f9f401b3d07d3674fa4fc60b9cebaf81552248807cfefc88a31f16346f6bc90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "979cb88f236160d3091f7cfcb80d317fba4fac6ab2ec26d78a2c92651e856f21"; + sha256 = "dd69192e7d5c8abdedd9a099558d1ed3670e3f2ffe0f549bd95d5d7684d2561b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "744cf7540dc3238442153b0edd50c687957f47531c0569ce32720e2e5160cbd7"; + sha256 = "83f2dd9e75e6260fa4bb4bf04d00616514194a00f370eabe0884bb22036530f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "66efbd08ad245c4629d05de0eec26f987d7d72d66ad097ab197bb31f29345284"; + sha256 = "f58da4330ff0307b17763aa45a52533aa7a4483c0afa66a7456ce61508168831"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9099027e11d674ce49a0945194d724010980deab08360b4bc0240d007c307fbc"; + sha256 = "72674bca530d0c95857fa014e1e0c7435fa1bde0c68638d47d41fc7d4decf836"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "a7e43012fcb7a6b58ad20069452d69cc9624236983872f733239c487e4737fda"; + sha256 = "e8aa8cdd71b7f8977d1242d472c45d4e500766c68ff28a77c852e75405d4b53d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "396bb2a4e2c5385b5f74018d3eccb3db2526fdaf277ca99e74934cb17c738cd2"; + sha256 = "621871771eabfeeb1d65def14ea3550bd8d28c7b08ce0a3311badfa8f2a5c2e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7606eccf3e6ebe3190a1bfbb60bf88d991e0ff48453b9cc1c07a08ecf54e7932"; + sha256 = "0e3c16f9f0450da181f41eda8b55bb89794f35540a4cd206b7d9ad62f182eee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "b5570a8a3ee4445da1b18ee3217976e02923819f4b3d05f58caba65586f91294"; + sha256 = "65c6ad7b2fcf59a0320ede05f7ecdd43fc09143446ac822a566a81ec8763b3ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2e4b6a279d3db48dc8a498ee5d038c6304782083a699a89d958f81bfa87d8916"; + sha256 = "7a2b96ebdc2dfffb7bf331ec28eddfd04ac3b51dbb353208f50d1dcdc840280a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "031c1fa63780985b4576305b2979bb3c7265cfb175b67393c0f0bfc23177711e"; + sha256 = "a5293896e24d53645553af0b76f82dc0caad6a556fa749b2183ad6681b6950ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "797af316793586db1ab0e0cc9fcf75c1fe70a9c89d78ffa43e6ca6b4fce99c44"; + sha256 = "18f078070bddb2f74b60f7d48b5ee60a520e822b5634515c8edba26886136cf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5363901c98627006d490d20f89fbe9a050cc23a018651934b39e0a0b7dde0d5e"; + sha256 = "22d9f5a4eb0319e41cbd7e19421aad78168e5880bdc8557e5ca2d9e925715494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "063ebaa12fa522c218990d01f5b312f019e223fee8efb57a10ff68197b8c529e"; + sha256 = "5c45c94fc63c39ab2168812a9b74de506cb2b9228241fe4c3573d33dca07c6f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "0eac26eb33852f0c0ea79869385010c623769933f5c8cd6c718ab9fde5eae61d"; + sha256 = "4b4859b782cea1810a8186dce1e792d53d63c8c4d262b38ea201e05d3e613267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "15cad2c535889f2cc29021490d6bb28145e0f1df27676e3871d18d17b3db90bc"; + sha256 = "55c6bbd9624951d12249c391c21f2d0e267164bc465b79b27b7dbacc3e116542"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "640b3099d96af524455026de4059a23fe75a54b330a8b4fd0a9efe58e55cf950"; + sha256 = "cef068a354a629983b9cb4ba447fa6d5b14b9a56bf20bba7baa957bced248f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f12f1d587701cc78884fa5ae3d9997aed69ab6b57438e89419bda3330e1787d7"; + sha256 = "ace8c4b715acea848034f45a9e30dcaf2c10085fe2d5bc819c011e1d3bccb4d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7ac1de885da3fd400e03d91adad4eee78736d7776d1b3134b38ecb9bc4d4614c"; + sha256 = "55d95b6d644247239200004f56087bf0631f97a91a925ac271c658c35384037e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bab17427dc0d1af03bf8a28a1ac9f505d71ff2d84a184fa6ac99454d6623a269"; + sha256 = "c3c043ad64908241feeea5f0c26231878bff46a9a26173a9ab1819dc1fca04ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "47a04146475054fcb8d76880f06491e885e12862bd0444e6556ac1030ae8b2b9"; + sha256 = "d9c96deeede18320fc545cbe334cbcbd7ee7e1850de9b8303658dd34b7b83efc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5c4993bcc60f8d116ef36ea6b502078c34c274f91ee455497203714281f3be46"; + sha256 = "f8cb141e864d190352fecc706805f5018eacde93cb19e51320f5707493f0392b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7b5e2f52aa1864a6c1c96387a8f5fe3e788b8472d4852226919db430168b151e"; + sha256 = "a3333a81c8bd6bd0592c909270143c50dffc09e13ed602ce61a61de979bd54e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7717af1088d956ffaaf91f122e5929d3605b60938a40bfa829f791eb7833b620"; + sha256 = "683aa8963adafedf9bf843531829a783a5d51374bad88ca82d9661e6aba93848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "eea1dd966c8f4264616b89183a732f7c551c30c999c7bc95e3a6952c6ed667c1"; + sha256 = "d79a780952024f89b00d3f72e2e048d6d84163e49c638a781a4ab8f6a6ead3d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1f472eab1edacbd4f94e5120a32ecd51b4ec507108b516a244582e0a6f177669"; + sha256 = "8b6497370f76fc56fd9a9098a0c1a86a662b783143ab9dc018ebcb7a2bee0c05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0cc517ed918facc26e76159b744b28397536736db641a45ac5e11bef9cf9b3d9"; + sha256 = "32292a87d2ffc2be2e5026fc7ea7ae24174391d9419809f16521bcfcf68eed6e"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-i686"; + sha256 = "1c8dc3d68cf2d6670b6e262db5cf12f54b572130b4f3d125f8317cb83958c283"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "edb56422879227089c8093397464e24c641d7d76bfd71e2dd6fde7a8b7b2498e"; + sha256 = "d4051b591ff9124c3dee56cb28c267c04a353a875f28d48ba8edabf288079224"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ca64ed30ae3d073b51c3dc82c841eec88a7fa3913e82243dd8f67078f0ec59b0"; + sha256 = "406eb629f1c4b6b139079bffe021fdd07c2e0c5e8e548aefd542a8743b3cbfc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ce5c1df3db5e819f309a757e37c764f75dffc2cbf8737a8953349283f98855c2"; + sha256 = "0ca1a6894f9ca4cf129bb9d3d9105c063a2b07836142004354eac0d49a144376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "d1f5604c5204be5c6c5e323b1ffabb411051de8c31c1568cebb6cecda0c1a371"; + sha256 = "50a9fddee248dbe7e3870616c18ec01215a371c63cce4eef456cc89a9a901a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "805b77a1a561541e714c9ebaf23d0f5d50abb84766033e38056e0c528ac44d13"; + sha256 = "b1a19cceef256312a675b7c7749869031650c8d3894bfa13571da8e42ee7ae57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d9b5ca9b56132936391f0b56b3694dd741a6217f591acc7cecb73e947adac302"; + sha256 = "0996f5494ffc0f60d2b0edd52666989dc952705f56b04cdd5bb0e06a927bd4a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3b5aa0a8d598135a2bee5b9b7db478a106473f7708e24c89f103c8d67e233dec"; + sha256 = "0cc38a93202358508c05a8c65b06a23f46f9fef4d1858ce9a0ab5b6f047007bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "6da4aef36fb8cd014e827a89a9ec9092c9d2005f493b29180048fe70688e8513"; + sha256 = "ac7cb9a6eef936bddf9c43dad2bd4fd92ac773ddba2e182d771c35a7e9d56529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "972706bfdf85c74f7615222fd3dc15315fe9b339f2cf03509ea40461ffa09dc9"; + sha256 = "549a7a0241e3333da7449638e52a9797a72dcc18b6a9066adaf25131d41cf187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5e92dbef162c8553868c321c604315af544fc5a157ad80bbb6cf0dfc1e049ed3"; + sha256 = "c56357ae1ec59fb32f38efb068107a22f0d854cf8486e5e259577752c262755f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2530799eca2427f2294b9020dacdd1360f12c07973627a4f27a1fd09fcee02c3"; + sha256 = "a0653f59b22028f9aba8dd29b8993d650c361bbc19ebf8dbc5604a961e9d011c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ab71a1db5a1a1a77e52819b48322186a7b2425ccea4528aa68c286f76733b0cd"; + sha256 = "ed207c9b471e8d34d9127c87621ba98faf83749f4157aba896ed30e22a5289b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f4816b4dcc0263451bfe4953c80ca9b2c19dcc882cd01523dee0fa95f8196db7"; + sha256 = "4f43cf4f101c37b4ab50842b342063a43e95b855018b9cfcabb3b3297696b349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "6dad8a06f75a64ea647b7eac9b211611048d46f6cb82c339eed09f26554e97e1"; + sha256 = "745802fdb974cde7565fc02f71046231bdc992edc17ae4567daf24f2dab27ba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ea5eb3e482eb51804a935266a91957c5969f0faacf7ea6fc3aaeb39e0b0d3dc4"; + sha256 = "4b85ea750a155f40356c2c7b8aa205ca3b269d0382bbd9200d0fad3141c4caa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "3048627e8fa53fa379f5d1c3ec9ea70733aadee3a8a9ae35c75187f820024a1e"; + sha256 = "968d3a3920e8709f787a12c19c7106322af4aea48889b3a84827b00899fd8b64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9cd8711b5a188e7c3fc954b65bd08b4ecb3b827816652ae859d5e6a57a15ae5f"; + sha256 = "cec4b1fd4a1460ae789ff99c4ee0923a337d5c48ce489dc44ea02291b96acafa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "89b09f5d295512e98fc374ee950a74aac041ecdde3bbad5cf42a07e5b3ae3ece"; + sha256 = "50cea0a2eb38ea294da4cb9298dde867e2fc1ee8d4e93f0c5c6efb8ba1aa1de7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "925c0f9832d235aca22b0b26aef59f750f09d1d3ea2a391aab4087a44f743072"; + sha256 = "913b091a7eaeb2905fa45b56db3125106e0161d944eef8a9f9aded4e8e3f00f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3f8029b6f33a0954ea8d3029a5182b4b016356348d1a793f9f96261a5e7e6e99"; + sha256 = "33fcbece46f5fc08ae0b378b63378aa0b9933302c63ce11ec8e4f310e4f8e7e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8d69eede16322268738bf8d4b75698a825391df1c06caa0ca2931555c832f124"; + sha256 = "cd88a9500b99db3849a1762a3981ecf1f0c2ceb919dbdd1844dbb9aaa7dd72c5"; } ]; } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 34cc5bb9160a..03bdb84f4384 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -6,7 +6,7 @@ , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, mesa -, libxkbcommon, wayland # ozone/wayland +, libxkbcommon, pipewire, wayland # ozone/wayland # Command line programs , coreutils @@ -67,7 +67,7 @@ let flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core libkrb5 libdrm mesa coreutils - libxkbcommon wayland + libxkbcommon pipewire wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva ++ optional vulkanSupport vulkan-loader diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index e70d6c187c2e..20623ac31827 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "165kva8dgf152ahizqdk0g2y466ij2gyxja5fjxlkxcxr5p357pj"; + sha256 = "0wq3kjc3zc5ikzwix7k7gr92v75rg6283kx5fzvc3lcdkaczq2lc"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 0fea57ea9cc7..5f2a094ca36b 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca"; + sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c="; }; - vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx"; + vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch index 0e0d4e28b0a1..dd89c92fd3d4 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch +++ b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch @@ -1,13 +1,15 @@ -diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go -index f93a95f..da6a61d 100644 ---- a/lib/notification/notify_linux.go -+++ b/lib/notification/notify_linux.go -@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error { - if critical { - soundName = "complete" - } -- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() -+ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() - } - return exec.Command("notify-send", args...).Run() - } +diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go +index 7f102b8..996c15f 100644 +--- a/lib/notification/notify_xdg.go ++++ b/lib/notification/notify_xdg.go +@@ -26,8 +26,8 @@ import ( + var notifySendPath string + var audioCommand string + var tryAudioCommands = []string{"ogg123", "paplay"} +-var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga" +-var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga" ++var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga" ++var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga" + + func getSoundPath(env, defaultPath string) string { + if path, ok := os.LookupEnv(env); ok { diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1d015990b996..669e7de99fb8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -60,7 +60,7 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "3.1.0"; + version = "3.1.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -69,7 +69,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0507qdkz8gn0gyyhxsy4mc4rs2r94s1ipqfxrc6ghgj43jkrklx3"; + sha256 = "0h4g8lw9hf9pwmdljavflyn9g9jvjvany7y4vji0qcc1kd99vsnp"; }; postPatch = '' diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ng/default.nix index 0fd33573850a..64ef525cfc84 100644 --- a/pkgs/applications/office/paperless-ng/default.nix +++ b/pkgs/applications/office/paperless-ng/default.nix @@ -26,12 +26,20 @@ let # https://github.com/Koed00/django-q/issues/526 django-q = super.django-q.overridePythonAttrs (oldAttrs: rec { version = "1.3.4"; - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "Uj1U3PG2YVLBtlj5FPAO07UYo0MqnezUiYc4yo274Q8="; }; }); + + # Incompatible with aioredis 2 + aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { + version = "1.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; + }; + }); }; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index ff458cedba10..7584debc20f2 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -30,6 +30,7 @@ in with python.pkgs; buildPythonApplication rec { postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion + installShellCompletion --fish watson.fish ''; checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 8efe537dcacd..3cd991796989 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -27,9 +27,15 @@ in stdenv.mkDerivation { ./openblasPath.patch ]; - nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; - buildInputs = [ + nativeBuildInputs = [ + perl gfortran + cmake + texlive.combined.scheme-minimal + makeWrapper + ]; + + buildInputs = [ openblas hdf5-cpp python diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 6889aec53577..9933d0d8c727 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - buildInputs = [ fftw blas lapack gfortran ] + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ fftw blas lapack ] ++ (lib.optionals useMpi [ mpi ]); configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 02ff4c1ca440..7b3a69ae775b 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation { inherit mpi; }; - buildInputs = [ blas lapack gfortran ] + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ blas lapack ] ++ lib.optionals useMpi [ mpi scalapack ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 2e5986651342..5c0de33a71ae 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -6,7 +6,11 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; - buildInputs = [gfortran blas lapack]; + + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ blas lapack ]; + configureFlags = [ "--with-blas=-lblas" "--with-lapack=-llapack" ]; meta = with lib; { diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 95c6c23fb09a..4ce04340f3a1 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -19,11 +19,12 @@ stdenv.mkDerivation rec { sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; - buildInputs = [gfortran ncurses] - ++ lib.optionals withGtk [gtk2] - ++ lib.optionals withOCaml [ocaml] - ++ lib.optional withX xlibsWrapper - ; + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ ncurses ] + ++ lib.optionals withGtk [ gtk2 ] + ++ lib.optionals withOCaml [ ocaml ] + ++ lib.optional withX xlibsWrapper; /* diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index 16d858b00bed..cf4584979ba2 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation { sha256 = "1r76zvln3bwycxlmqday0sqzv5j260y7mdh66as2aqny6jzd5ld7"; }; - buildInputs = [ mpi gfortran ]; + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ mpi ]; configurePhase = '' cd source diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 5033b28bd3b3..cd9b7430b99f 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = [ gfortran mpi blas liblapack qt4 qwt6_qt4 ]; + nativeBuildInputs = [ cmake gfortran pkg-config git ]; + buildInputs = [ mpi blas liblapack qt4 qwt6_qt4 ]; preConfigure = '' patchShebangs ./ diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index eb718be12e4a..1c1bc22b0ffc 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C ''; - buildInputs = [ gfortran sqlite lhapdf rivet ]; + + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ sqlite lhapdf rivet ]; enableParallelBuilding = true; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1d02adc6397e..9c9fa6032c6c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation { # Fix references to gettext introduced by ./git-sh-i18n.patch substituteInPlace git-sh-i18n.sh \ --subst-var-by gettext ${gettext} + + # ensure we are using the correct shell when executing the test scripts + patchShebangs t/*.sh ''; nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] @@ -318,6 +321,7 @@ stdenv.mkDerivation { # Flaky tests: disable_test t5319-multi-pack-index + disable_test t6421-merge-partial-clone ${lib.optionalString (!perlSupport) '' # request-pull is a Bash script that invokes Perl, so it is not available diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 2fab523f6a94..8917784bc6c3 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id libblas${canonicalExtension} \ + -id $out/lib/libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' @@ -114,7 +114,7 @@ EOF patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libcblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id libcblas${canonicalExtension} \ + -id $out/lib/libcblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libcblas${canonicalExtension} '' else "") + '' diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh index f5af76e8168f..0d8a76558026 100644 --- a/pkgs/build-support/setup-hooks/compress-man-pages.sh +++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh @@ -9,7 +9,7 @@ compressManPages() { echo "gzipping man pages under $dir/share/man/" # Compress all uncompressed manpages. Don't follow symlinks, etc. - find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \ + find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \ | while IFS= read -r -d $'\0' f do if gzip -c -n "$f" > "$f".gz; then @@ -20,7 +20,7 @@ compressManPages() { done # Point symlinks to compressed manpages. - find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \ + find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \ | sort -z \ | while IFS= read -r -d $'\0' f do diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index ef31dcdce274..e4460f98816d 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare) _moveToShare() { forceShare=${forceShare:=man doc info} - if [ -z "$forceShare" -o -z "$out" ]; then return; fi + if [[ -z "$out" ]]; then return; fi for d in $forceShare; do if [ -d "$out/$d" ]; then diff --git a/pkgs/data/fonts/chonburi/default.nix b/pkgs/data/fonts/chonburi/default.nix new file mode 100644 index 000000000000..4a14368f1f5f --- /dev/null +++ b/pkgs/data/fonts/chonburi/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "chonburi"; + version = "unstable-2021-09-15"; + + src = fetchFromGitHub { + owner = "cadsondemak"; + repo = pname; + rev = "daf26bf77d82fba50eaa3aa3fad905cb9f6b5e28"; + sha256 = "sha256-oC7ZCfNOyvGtqT9+Ap/CfCHzdWNzeCuac2dJ9fctgB8="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/doc/chonburi $out/share/fonts/{opentype,truetype} + + cp $src/OFL.txt $src/BRIEF.md $out/share/doc/chonburi + cp $src/fonts/*.otf $out/share/fonts/opentype + cp $src/fonts/*.ttf $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://cadsondemak.github.io/chonburi/"; + description = "A Didonic Thai and Latin display typeface"; + longDescription = '' + The objective of this project is to create a Thai and Latin Display + typeface. Chonburi is a display typeface with high contrast in a Didone + style. This single-weight typeface provides advance typographical support + with features such as discretionary ligature. This font can be extended + the family to other weights including both narrow and extended version. It + is also ready to be matched with other non-Latin script. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.toastal ]; + }; +} diff --git a/pkgs/data/fonts/kanit/default.nix b/pkgs/data/fonts/kanit/default.nix index 9b5be79061c1..8875704ba6b6 100644 --- a/pkgs/data/fonts/kanit/default.nix +++ b/pkgs/data/fonts/kanit/default.nix @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/share/doc/${pname}/css/ $out/share/fonts/{opentype,truetype} + runHook preInstall - cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/${pname} - cp $src/documentation/css/fonts.css $out/share/doc/${pname}/css + mkdir -p $out/share/doc/kanit/css/ $out/share/fonts/{opentype,truetype} + + cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/kanit + cp $src/documentation/css/fonts.css $out/share/doc/kanit/css cp $src/fonts/otf/*.otf $out/share/fonts/opentype cp $src/fonts/ttf/*.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 416bf0095188..4c60895897fe 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; version = "2.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index d1206c9d0ae0..61ec86dec44e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,12 +1,11 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson , ninja , pkg-config -, vala +, vala_0_52 , desktop-file-utils , gtk3 , libaccounts-glib @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.1"; + version = "2.7.2"; repoName = "photos"; @@ -43,18 +42,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p"; + sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/photos/pull/629 - (fetchpatch { - url = "https://github.com/elementary/photos/commit/e5230a4305381734e93f1e3d1177da21a8a4121b.patch"; - sha256 = "1igqq51sj1sx6rl8yrw037jsgnaxfwzfs0m6pqzb9q4jvfdimzfi"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -68,7 +58,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/elementary/photos/issues/638 + vala_0_52 wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 26476d4fe0a6..c3860ba22789 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , nix-update-script , pantheon -, fetchpatch , substituteAll , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index dda4fa8a3a20..0368314e7b4f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pantheon diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index f68898239aad..e85acf39e722 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , linkFarm , substituteAll diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 280a6a07576d..3f674075133e 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , pantheon , pkg-config , meson @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0xp9vviamzdwlcnx4836sxaz2pyfkxswgvjm73ppn7fkdm0zjpzx"; + sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g"; }; passthru = { @@ -75,12 +74,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/gala/pull/1205 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/605aa10ea2a78650e001b2a247c5f7afce478b05.patch"; - sha256 = "0bg67wzrnmx8nlw93i35vhyfx8al0bj0lacgci98vwlp2m1jgbd2"; - }) ./plugins-dir.patch ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index fcaf06de0113..55f27d606467 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -7,7 +7,7 @@ , meson , python3 , ninja -, vala +, vala_0_52 , gtk3 , granite , wingpanel @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/elementary/wingpanel-indicator-sound/issues/219 + vala_0_52 ]; buildInputs = [ diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index db200b4cd1ea..5e9e799e2e7e 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index e6e49a591810..c650f4ef83df 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -40,6 +40,18 @@ mkDerivation { ./0002-xwayland.patch ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch + # Fix build against libglvnd 1.3.4+ + # Remove with release 5.22.90 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/839710201c389b7f4ed248cb3818e755a37ce977.patch"; + sha256 = "09rldhy0sbmqdfpyjzwm20cwnmrmj0w2751vyi5xlr414g0rzyc1"; + }) + # Fixup previous patch for i686 + # Remove with release 5.22.90 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/38e24ecd6416a975db0989c21b70d6a4cc242f35.patch"; + sha256 = "0zsjmzswcnvfd2jm1c8i9aijpbap1141mjv6y4j282bplyqlp966"; + }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 0cd26b6a6cf3..c90bc704237d 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/bluedevil-5.22.4.tar.xz"; - sha256 = "10bqk46ygnf72aqxxaxlx4khv1gwj46la1czsjmlszvkcqxrpwa0"; - name = "bluedevil-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/bluedevil-5.22.5.tar.xz"; + sha256 = "01fc5zk3qh3kx8z3dpikaaidi6vg21s75kmpd9w65rj5akg98452"; + name = "bluedevil-5.22.5.tar.xz"; }; }; breeze = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-5.22.4.tar.xz"; - sha256 = "1b4zrwpaayd6mlwsnwg416ryba32zpg8w2dlh56qbmg6jxzjnybx"; - name = "breeze-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-5.22.5.tar.xz"; + sha256 = "09ll0bddsbbhz7ihqcn0wbd2llbjrblgk90gp556kpy09jh4rz73"; + name = "breeze-5.22.5.tar.xz"; }; }; breeze-grub = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-grub-5.22.4.tar.xz"; - sha256 = "19zlhq3k80id676sxlf8nhk0a11rkrwmbd256aggdwhz1fivxc1c"; - name = "breeze-grub-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-grub-5.22.5.tar.xz"; + sha256 = "1p08pmhkac3s5pccryy5s33594kr0v8z6j1hg94l419nzaqqya1v"; + name = "breeze-grub-5.22.5.tar.xz"; }; }; breeze-gtk = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-gtk-5.22.4.tar.xz"; - sha256 = "1p47vsr2xj00p1r2jhyns2wzchjlhymzzyv2xqy9xd4l8pkv8scb"; - name = "breeze-gtk-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-gtk-5.22.5.tar.xz"; + sha256 = "0lifs97wad9cg5hp1vdd5ag9fkcbqj3h2bkg6x5jd4f41j0x2fy2"; + name = "breeze-gtk-5.22.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-plymouth-5.22.4.tar.xz"; - sha256 = "0b9sjn8lfhgyc2sz1r9rnknkas79526qmwi5j3wbxb0va2rcap9z"; - name = "breeze-plymouth-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-plymouth-5.22.5.tar.xz"; + sha256 = "1735ii7is873yz6rhcsrj81crvmdxj4a368k22rkj8nm374s44g1"; + name = "breeze-plymouth-5.22.5.tar.xz"; }; }; discover = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/discover-5.22.4.tar.xz"; - sha256 = "0ij7b1fyv9rgiw6ywgxzj35c9bd3937w3njzqmkzi2l9zlnrzwvg"; - name = "discover-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/discover-5.22.5.tar.xz"; + sha256 = "1c22910ainm4819xzkri8j2x8lng0g6zgmh1k770jsgjyg49x069"; + name = "discover-5.22.5.tar.xz"; }; }; drkonqi = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/drkonqi-5.22.4.tar.xz"; - sha256 = "1dy5v50icnlwa4pl5z30q5abv2sbznlrpgiy28hh1mf64hx6hl3w"; - name = "drkonqi-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/drkonqi-5.22.5.tar.xz"; + sha256 = "1f23p35wzsk0wx2kz0r7x616in6kizzdvl9j37v2a94hh8z3f7my"; + name = "drkonqi-5.22.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kactivitymanagerd-5.22.4.tar.xz"; - sha256 = "1km0mlqyrvflq45gwffrbwvkrqirb44qn1rp37iif4d82pmx11yv"; - name = "kactivitymanagerd-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kactivitymanagerd-5.22.5.tar.xz"; + sha256 = "069a862myj9b0303qc6j8iv3mdja8qhzx5ax52206pjrglvn9ar2"; + name = "kactivitymanagerd-5.22.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kde-cli-tools-5.22.4.tar.xz"; - sha256 = "1kh8pba9q61qjjpc945nvx42mm63vrj5bny4iv60jgcfxxwy7qj4"; - name = "kde-cli-tools-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kde-cli-tools-5.22.5.tar.xz"; + sha256 = "1jj5vywai9di05wzr81dzvrcsb5h6l300llw3ma49f0jl4z3gjwh"; + name = "kde-cli-tools-5.22.5.tar.xz"; }; }; - kdecoration = { - version = "5.22.4"; + kde-gtk-config = { + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kdecoration-5.22.4.tar.xz"; - sha256 = "0cc0lskm359lbg93bxny84cf1qnk0h53f64bxy3dvbyn5gmvzsch"; - name = "kdecoration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kde-gtk-config-5.22.5.tar.xz"; + sha256 = "0v0yjy6diwby3y71kkipx8h0wxfc49nwr2r3g2j8cf9ybqnwmy6s"; + name = "kde-gtk-config-5.22.5.tar.xz"; }; }; - kde-gtk-config = { - version = "5.22.4"; + kdecoration = { + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kde-gtk-config-5.22.4.tar.xz"; - sha256 = "0d56brzpk5yi7cdyvpqg3jlk5n3l2dvk98npw34fd4i3gw357px8"; - name = "kde-gtk-config-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kdecoration-5.22.5.tar.xz"; + sha256 = "1vqv44ls79x2d71ldkkkzpk4mzpv110y270wf1gbkmxaxwp20xxm"; + name = "kdecoration-5.22.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kdeplasma-addons-5.22.4.tar.xz"; - sha256 = "1flf4mq0zcjh7fnv155hklliidfvflh20d1s84rj8q2ka7phcwk0"; - name = "kdeplasma-addons-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kdeplasma-addons-5.22.5.tar.xz"; + sha256 = "00ricjqxcafhji8b33zqynrlh56z3nr516v5jghp8cz2wclvnh32"; + name = "kdeplasma-addons-5.22.5.tar.xz"; }; }; kgamma5 = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kgamma5-5.22.4.tar.xz"; - sha256 = "0fgx9i031iqrp7w7v7px1vha079cjcdv9w5ah4k1m53g8abriddl"; - name = "kgamma5-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kgamma5-5.22.5.tar.xz"; + sha256 = "0m2h4wwkg3dnkvq31z8mvn4q1r7hwi1q2d7csy350ycrv9x7f402"; + name = "kgamma5-5.22.5.tar.xz"; }; }; khotkeys = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/khotkeys-5.22.4.tar.xz"; - sha256 = "1lm1xrbrpym7nhvnzljdgr5nsas8z3i0hgda53j5k6svzk5r3qg8"; - name = "khotkeys-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/khotkeys-5.22.5.tar.xz"; + sha256 = "1l0p9q7bmljism188mzssryyd31b1x0alivnpsk0jhhjr9hwbqb4"; + name = "khotkeys-5.22.5.tar.xz"; }; }; kinfocenter = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz"; - sha256 = "14vfz5j3fxhfb1fip00fgg9k6dc9ffjf0ss8ij1cx7bga14nmzvw"; - name = "kinfocenter-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kinfocenter-5.22.5.tar.xz"; + sha256 = "1pxr4pihy6asflpij5r4payxnbagzkli3qm5zh4zgap4bhq447lm"; + name = "kinfocenter-5.22.5.tar.xz"; }; }; kmenuedit = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kmenuedit-5.22.4.tar.xz"; - sha256 = "186j8ky5z3l0mmxx327xzahhsyf7wlds1rsmzzmlxficpg43n90b"; - name = "kmenuedit-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kmenuedit-5.22.5.tar.xz"; + sha256 = "1in8q0hd8wgcnwmx0cpv2w5l2w75xhv5j38mc5py322h9gkg1mqs"; + name = "kmenuedit-5.22.5.tar.xz"; }; }; kscreen = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kscreen-5.22.4.tar.xz"; - sha256 = "0hkn7ap55x4rzm6x3qdinjar9qhnb742zgzmvswy1kn3a8mxby17"; - name = "kscreen-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kscreen-5.22.5.tar.xz"; + sha256 = "0q0ykp10nwfzzxjrcra11k4b81di4r37jbhis4b9wn9j0pqv3ykb"; + name = "kscreen-5.22.5.tar.xz"; }; }; kscreenlocker = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kscreenlocker-5.22.4.tar.xz"; - sha256 = "0i7c6a378h7366h7nl5051mwrx7cadzfaryfnhpskhlgy3l7119j"; - name = "kscreenlocker-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kscreenlocker-5.22.5.tar.xz"; + sha256 = "107icbr0cdcpbzi5npgx3fw2m2wp1z91k1iw26n595dp3n2czv98"; + name = "kscreenlocker-5.22.5.tar.xz"; }; }; ksshaskpass = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/ksshaskpass-5.22.4.tar.xz"; - sha256 = "01f2rz1xqb1jy83427f7rmsb3a7ivkgf2qmm04kwjv29zplg796f"; - name = "ksshaskpass-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/ksshaskpass-5.22.5.tar.xz"; + sha256 = "0ig2cx80ba57k9mq7bcnmriymjln7kvr81mgm5rsdi4asal2zpgp"; + name = "ksshaskpass-5.22.5.tar.xz"; }; }; ksystemstats = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/ksystemstats-5.22.4.tar.xz"; - sha256 = "1daz3890v7qbkcsb9m535mfnijdq3rbasxwqs0ixhn2m400yivvg"; - name = "ksystemstats-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/ksystemstats-5.22.5.tar.xz"; + sha256 = "1cb5hbwnj6j9ziin6bflcz9b8jyvjqbqqhqbzvgs8dyji2xz0gb8"; + name = "ksystemstats-5.22.5.tar.xz"; }; }; kwallet-pam = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwallet-pam-5.22.4.tar.xz"; - sha256 = "1ljrrgjvkvs3fsiijgaxj82hzp1fhsiy39r4amwp21v411c80jwq"; - name = "kwallet-pam-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwallet-pam-5.22.5.tar.xz"; + sha256 = "03rj2kgda1as547jjvvigkb4pblh1w9jv8hsrjrs5vwfir0ag8nq"; + name = "kwallet-pam-5.22.5.tar.xz"; }; }; kwayland-integration = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwayland-integration-5.22.4.tar.xz"; - sha256 = "17nl033vl8i9a92bjbgwwwrkf03lg4726lwdbj3y8xajdp8ql1nb"; - name = "kwayland-integration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwayland-integration-5.22.5.tar.xz"; + sha256 = "0kgv6klb32y7ckflsi5xbs8ajn7zg461621fqhmgn1x54w931g2c"; + name = "kwayland-integration-5.22.5.tar.xz"; }; }; kwayland-server = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwayland-server-5.22.4.tar.xz"; - sha256 = "0z3ni5ar2bwpc75ssb3qmkbff85a489sxr7vzqhxa40n48bp85ns"; - name = "kwayland-server-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwayland-server-5.22.5.tar.xz"; + sha256 = "17gkbcam9dpqbw618rvb5ia8inp0yvpyr3bxd0fn4fdj57bbsr6x"; + name = "kwayland-server-5.22.5.tar.xz"; }; }; kwin = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwin-5.22.4.tar.xz"; - sha256 = "1x5338aib7kn1lgpb06b8s06bfj2ybfgyr6k0q91zlc53x61qamh"; - name = "kwin-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwin-5.22.5.tar.xz"; + sha256 = "18zmzhmjr6q5vsfd7lr0ym5ga7l2x8xcxqizmpfnb7hv3kaax38j"; + name = "kwin-5.22.5.tar.xz"; }; }; kwrited = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwrited-5.22.4.tar.xz"; - sha256 = "1rbkbqf5v8wqd2aldpg396ki8a9fsw82jmzmdhsirq33r5yznn4i"; - name = "kwrited-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwrited-5.22.5.tar.xz"; + sha256 = "02cffj88hqs5rfvrkkmk9z23qsdnqhavm98hksx1v5ajjh4rbgb3"; + name = "kwrited-5.22.5.tar.xz"; }; }; layer-shell-qt = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz"; - sha256 = "11iqk4bla0y0w2frmvzxi4a3jxj3cj2m8y473z3nfb0z8i5yca0m"; - name = "layer-shell-qt-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/layer-shell-qt-5.22.5.tar.xz"; + sha256 = "0i9gsckqk9608drxvym6ghcwxqilcf6ilcxq48sbrnpswid71k7z"; + name = "layer-shell-qt-5.22.5.tar.xz"; }; }; libkscreen = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/libkscreen-5.22.4.tar.xz"; - sha256 = "0z2mzha22f2yl7l0ijy4pqpab6n1ivib3grnd583znff02wvj4d2"; - name = "libkscreen-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/libkscreen-5.22.5.tar.xz"; + sha256 = "1qqnra28r698kbps6ywk22ncac4sm3f9d9wrwmicp963mkmwlksv"; + name = "libkscreen-5.22.5.tar.xz"; }; }; libksysguard = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/libksysguard-5.22.4.tar.xz"; - sha256 = "14h66gs7z6gf7wrpdhpd1461431q2plv7kvfsh02fj52l1dzpcc0"; - name = "libksysguard-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/libksysguard-5.22.5.tar.xz"; + sha256 = "1hkjsjfl4hsxbk998hpq4f38rahqfx6nmznbh0dqrymadfbsn8m5"; + name = "libksysguard-5.22.5.tar.xz"; }; }; milou = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/milou-5.22.4.tar.xz"; - sha256 = "11fa9bj3yzriaydfk8q9kc626yv0s0sal5ws13pcd6ksbhslz83s"; - name = "milou-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/milou-5.22.5.tar.xz"; + sha256 = "1d1zg1fbhl6cbxfhgrp9njvpcn052psn96cfyw314255v532phpp"; + name = "milou-5.22.5.tar.xz"; }; }; oxygen = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/oxygen-5.22.4.tar.xz"; - sha256 = "1p5hklryi02xw0byy5zcaxx5zw81vd6vq3s1h8dyhj07vspimpzw"; - name = "oxygen-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/oxygen-5.22.5.tar.xz"; + sha256 = "0fy4dr8kjyh96w482qbf47vkbnb2qqwwp8d0jlf0xc20w6fb4fqc"; + name = "oxygen-5.22.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-browser-integration-5.22.4.tar.xz"; - sha256 = "023qbp77ga0jblhhx3437v9jjxx5va7q58abmnpv2nls1xwyq8hb"; - name = "plasma-browser-integration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-browser-integration-5.22.5.tar.xz"; + sha256 = "1zkz4qd9nk2kw8zx0mj0p5q4yclmfgz5ihfmgqb2iw4j0d2ckw8f"; + name = "plasma-browser-integration-5.22.5.tar.xz"; }; }; plasma-desktop = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-desktop-5.22.4.tar.xz"; - sha256 = "0c225lckhsmhig7xsnv5yfajys3w67g6xj4w1hvz1x3hqs79z3kj"; - name = "plasma-desktop-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-desktop-5.22.5.tar.xz"; + sha256 = "1kmcmpfjgmiazalczjchyrvgy365s1gqdnyv3xav4g4irb62llxl"; + name = "plasma-desktop-5.22.5.tar.xz"; }; }; plasma-disks = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-disks-5.22.4.tar.xz"; - sha256 = "02brm36akqfhjz9fzyzfinjnb954glrrlwpyhiq1sx073v2ibyap"; - name = "plasma-disks-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-disks-5.22.5.tar.xz"; + sha256 = "14ml1vxdp6brms8yqg5x96bad2r9n81cki91fsq6qk0aq098dqbh"; + name = "plasma-disks-5.22.5.tar.xz"; }; }; plasma-firewall = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-firewall-5.22.4.tar.xz"; - sha256 = "1c1mzpd45hd4sb6qsylqgq2x4fay1nskkgmcc1vswmnapcm9gp91"; - name = "plasma-firewall-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-firewall-5.22.5.tar.xz"; + sha256 = "19ii5ha3m9jmfrdg59z9nfx8frmp4f2gc3a7c0krsnajhyrm0npg"; + name = "plasma-firewall-5.22.5.tar.xz"; }; }; plasma-integration = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-integration-5.22.4.tar.xz"; - sha256 = "0rslli0jsyyhm6prac3xgilwf58gjxqhsijgvr25sipg6200r2z0"; - name = "plasma-integration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-integration-5.22.5.tar.xz"; + sha256 = "0w7jnsyz876k6kzppd6lx0i58ywbfhaycsnq3nn2s10im7ql7ir8"; + name = "plasma-integration-5.22.5.tar.xz"; }; }; plasma-nano = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-nano-5.22.4.tar.xz"; - sha256 = "1ag57nphgkj3f17s42d81npk0z2n27623szbiz1hpgp7f6994l90"; - name = "plasma-nano-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-nano-5.22.5.tar.xz"; + sha256 = "0i8r8mxf00c0rfnybxy2nzl2hn2r7vqfzwlbmkykd6b1z333xfjh"; + name = "plasma-nano-5.22.5.tar.xz"; }; }; plasma-nm = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-nm-5.22.4.tar.xz"; - sha256 = "1cvfawsqzk3yzjwnz6gc6l7p3pz9brbh0n6km23i1bis08rks168"; - name = "plasma-nm-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-nm-5.22.5.tar.xz"; + sha256 = "0jgwp41l4h16qyif2bwnsdfd190ykpddv7gi3zrcmc57fnhrzavz"; + name = "plasma-nm-5.22.5.tar.xz"; }; }; plasma-pa = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-pa-5.22.4.tar.xz"; - sha256 = "1p000y08p89wvv73glv9ic0gdbdhc9fpzvphx72y420g5hhmnnwa"; - name = "plasma-pa-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-pa-5.22.5.tar.xz"; + sha256 = "1axm564si8g9j9f9ndvq39x7s6awiwiiyqnvs1wf76miyyjfdba0"; + name = "plasma-pa-5.22.5.tar.xz"; }; }; plasma-phone-components = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-phone-components-5.22.4.tar.xz"; - sha256 = "0mkr7amxvr325y7f98y1368iv4gs6j2x6bkpi20rp8c2vifkvg5b"; - name = "plasma-phone-components-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-phone-components-5.22.5.tar.xz"; + sha256 = "1m2swgkydjrpxsnj87fs8zkyavba6zrfrzvimbhxf15c3199yrj0"; + name = "plasma-phone-components-5.22.5.tar.xz"; }; }; plasma-sdk = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-sdk-5.22.4.tar.xz"; - sha256 = "0nrh3zbff25wr59hbsvrygjix56as8rd95smr5075qwdyamcqnhf"; - name = "plasma-sdk-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-sdk-5.22.5.tar.xz"; + sha256 = "0gvmvdlqjm2kvkb7bw3bhryql4d9mp0max89l9y25kzqadd6byad"; + name = "plasma-sdk-5.22.5.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-systemmonitor-5.22.4.tar.xz"; - sha256 = "1gl6kjk6b8xwcfrk6xf41jf1lh3zxr5b6qvdv7z6i8wb3pll63cb"; - name = "plasma-systemmonitor-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-systemmonitor-5.22.5.tar.xz"; + sha256 = "18s72vdcx4jrjs1hfr7mq8zjng2pmba2x23k11jdk8hxl7msm7nx"; + name = "plasma-systemmonitor-5.22.5.tar.xz"; }; }; plasma-tests = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-tests-5.22.4.tar.xz"; - sha256 = "1wf33c0izm9yyjcysiimcpiwmsa64b4ypklga2rbg7kkk7q0nq82"; - name = "plasma-tests-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-tests-5.22.5.tar.xz"; + sha256 = "1wmwm9mmdy98qrmr0r8h99j0cpmib2vyv66jk99wf43bwddy2hxi"; + name = "plasma-tests-5.22.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-thunderbolt-5.22.4.tar.xz"; - sha256 = "1c5ihvam5hfk7xiy3m707jjhpv2rxgl7d2f6m0d764zynm6zax79"; - name = "plasma-thunderbolt-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-thunderbolt-5.22.5.tar.xz"; + sha256 = "13rjn21sdga5yx9983zx26jdb260lg5815ilfjnkdfp7g6ckjlmc"; + name = "plasma-thunderbolt-5.22.5.tar.xz"; }; }; plasma-vault = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-vault-5.22.4.tar.xz"; - sha256 = "1p6bl8as8rx36nzwx2rymqmx4rg7dg0bfrxr0flx9jqp1adclf39"; - name = "plasma-vault-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-vault-5.22.5.tar.xz"; + sha256 = "1ap9kp9agnqljlszzkd14sivpfz9ihjlhq67lhg2sg570s8ng4a0"; + name = "plasma-vault-5.22.5.tar.xz"; }; }; plasma-workspace = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-5.22.4.tar.xz"; - sha256 = "1fi0c66f2cgqcbshbaxzch75r28l5w4l3flggccil5c73lavf5mg"; - name = "plasma-workspace-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-workspace-5.22.5.tar.xz"; + sha256 = "01inn7jawqn5brcmbglqs3szfzkq637qzf39kya8siq3lgg14bpj"; + name = "plasma-workspace-5.22.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-wallpapers-5.22.4.tar.xz"; - sha256 = "0abz3qic8m7dcbd0m1ci8qspfds3fdsqhgv8m6ks2jkcm7z4vnnr"; - name = "plasma-workspace-wallpapers-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-workspace-wallpapers-5.22.5.tar.xz"; + sha256 = "1h582vqw14zyngfyjppg6lgs17d1nmc7gcr8kw1zzbc0ynbl68dy"; + name = "plasma-workspace-wallpapers-5.22.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plymouth-kcm-5.22.4.tar.xz"; - sha256 = "0vh39lidm0dqah14y7nkzqpanlkxpmylf7wc40giavady3d2i1y1"; - name = "plymouth-kcm-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plymouth-kcm-5.22.5.tar.xz"; + sha256 = "1rn8c0z6ycagmxm72gs9cm6pwv1fy8zg5881brglpxy8x63prb9g"; + name = "plymouth-kcm-5.22.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.22.4"; + version = "1-5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/polkit-kde-agent-1-5.22.4.tar.xz"; - sha256 = "0pxrrn4qs96a5p9cp890vdq2g79ah72p655643ciqdb14936p0z2"; - name = "polkit-kde-agent-1-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/polkit-kde-agent-1-5.22.5.tar.xz"; + sha256 = "1a1b4baszlx01x4n66wikgw8z7wwnycz5rqzjr8r6q1b9dafmqv0"; + name = "polkit-kde-agent-1-5.22.5.tar.xz"; }; }; powerdevil = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/powerdevil-5.22.4.tar.xz"; - sha256 = "17427sv6yh16hmgl94lyb4d7gds0r4hvx8vbbqhzysih2x81xl6m"; - name = "powerdevil-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/powerdevil-5.22.5.tar.xz"; + sha256 = "17qw7w9h60illpzd1zlymdipx0mpwfhn12d9k0f165qcabk02wsr"; + name = "powerdevil-5.22.5.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/qqc2-breeze-style-5.22.4.tar.xz"; - sha256 = "15h9rjc4ry3kw18aw18r8y8av4cn2wckab8gyyi7zx7s54n6zpvc"; - name = "qqc2-breeze-style-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/qqc2-breeze-style-5.22.5.tar.xz"; + sha256 = "0qi8b11f45lnyy09w3b65h0s7qj7d40b7ppwy8mapr92m0zqrkpf"; + name = "qqc2-breeze-style-5.22.5.tar.xz"; }; }; sddm-kcm = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/sddm-kcm-5.22.4.tar.xz"; - sha256 = "08j0qd288a5msagpyaqwrw0w6wymxsgqq3rlk8kv3n6qvrsm7174"; - name = "sddm-kcm-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/sddm-kcm-5.22.5.tar.xz"; + sha256 = "163p426bd9zfval5zz2hmq3na0px3pz016shzzgna3rqwh7s8sa6"; + name = "sddm-kcm-5.22.5.tar.xz"; }; }; systemsettings = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/systemsettings-5.22.4.tar.xz"; - sha256 = "1ap2h1sa6hdakhf6lzy4bhaq5pxc8g7p32iz04894hd7dbb2iv8h"; - name = "systemsettings-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/systemsettings-5.22.5.tar.xz"; + sha256 = "1fvmp6nhmn71hxrf0nfg9m8ifp36kvk5k550hiazgz63l7x7hyfc"; + name = "systemsettings-5.22.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/xdg-desktop-portal-kde-5.22.4.tar.xz"; - sha256 = "1xmlw66bw60cl530hjjab8g4krv6di4wpimjaz0a9mv3dnq9xz7m"; - name = "xdg-desktop-portal-kde-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/xdg-desktop-portal-kde-5.22.5.tar.xz"; + sha256 = "00d6dh9jh15y0ndcrm86wzhmpv81s9pm0x0pbiywdia606yp27c6"; + name = "xdg-desktop-portal-kde-5.22.5.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index da6857f6ab92..1747f16f12d1 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,13 +1,15 @@ -{ lib -, callPackage +{ callPackage , fetchurl , gcc7 , gcc9 +, gcc10 +, lib }: let common = callPackage ./common.nix; -in rec { +in +rec { cudatoolkit_10_0 = common { version = "10.0.130"; url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; @@ -56,5 +58,19 @@ in rec { gcc = gcc9; }; + cudatoolkit_11_3 = common { + version = "11.3.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run"; + sha256 = "0d19pwcqin76scbw1s5kgj8n0z1p4v1hyfldqmamilyfxycfm4xd"; + gcc = gcc9; + }; + + cudatoolkit_11_4 = common { + version = "11.4.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run"; + sha256 = "0180pb1zfajb9l6blr467xkx01yp3snfwm2xix8x52crf6d36v6x"; + gcc = gcc10; # can bump to 11 along with stdenv.cc + }; + cudatoolkit_11 = cudatoolkit_11_2; } diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index ccfb4a18a12a..069c4655ea46 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -370,9 +370,11 @@ in rec { ./009_remove_signedness_verifier.patch ./010_mx_substratevm.py ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang python27withPackages icu ruby bzip2 which - readline bzip2 xz pcre curl ed gfortran + readline bzip2 xz pcre curl ed ] ++ lib.optional stdenv.isDarwin [ CoreFoundation gcc.cc.lib libiconv perl openssl ]; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index fa46bafa295d..4605b87846fd 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -19,7 +19,7 @@ let release_version = "13.0.0"; - candidate = "rc3"; # empty or "rcN" + candidate = "rc4"; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit rev-version = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "1c781jdq0zmhhgdci201yvgl6hlpjqqmmrd6sm91azm3i99n8gw2"; + sha256 = "0cjl0vssi4y2g4nfr710fb6cdhxmn5r0vis15sf088zsc5zydfhw"; }; llvm_meta = { diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index eeaba75c0de4..736a9d3c34c6 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -17,7 +17,15 @@ in clangStdenv.mkDerivation rec { sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll"; }; - cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; + cmakeFlags = [ + "-DUSE_BOOST_WAVE=ON" + "-DENABLERTTI=ON" + + # Build system implies llvm-config and llvm-as are in the same directory. + # Override defaults. + "-DLLVM_DIRECTORY=${llvm}" + "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config" + ]; preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; diff --git a/pkgs/development/compilers/rust/1_54.nix b/pkgs/development/compilers/rust/1_55.nix index b31dbc8bb9a9..715a82de5adf 100644 --- a/pkgs/development/compilers/rust/1_54.nix +++ b/pkgs/development/compilers/rust/1_55.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.54.0"; - rustcSha256 = "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc"; + rustcVersion = "1.55.0"; + rustcSha256 = "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; @@ -34,24 +34,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.53.0"; + bootstrapVersion = "1.54.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "4ebeeba05448b9484bb2845dba2ff4c0e2b7208fa8b08bef2b2ca3b171d0db99"; - x86_64-unknown-linux-gnu = "5e9e556d2ccce27aa8f01a528f1348bf8cdd34496c35ec2abf131660b9792fed"; - x86_64-unknown-linux-musl = "908b6163b62660f289bcd1eda1a0eb6d849b4b29da12546d24a033e5718e93ff"; - arm-unknown-linux-gnueabihf = "6ae3108f4a0b0478c76f5dbaf1827c9e4a983fa78a9f973b24d501e693cfdcab"; - armv7-unknown-linux-gnueabihf = "886e78f7c5bd92e16322ca3af70d1899c064837343cdfeb9a216b76edfd18157"; - aarch64-unknown-linux-gnu = "cba81d5c3d16deee04098ea18af8636bc7415315a44c9e44734fd669aa778040"; - aarch64-unknown-linux-musl = "a0065a6313bf370f2844af6f3b47fe292360e9cca3da31b5f6cb32db311ba686"; - x86_64-apple-darwin = "940a4488f907b871f9fb1be309086509e4a48efb19303f8b5fe115c6f12abf43"; - aarch64-apple-darwin = "c519da905514c05240a8fe39e459de2c4ef5943535e3655502e8fb756070aee1"; - powerpc64le-unknown-linux-gnu = "9f6c17427d1023b10694e4ba60d6d9deec0aeb07d051f99763789ed18e07e2e6"; - riscv64gc-unknown-linux-gnu = "6ae23ac00269df72b0790f10f2d9a98d03acf542c6090f4d30a87365fafd14ed"; + i686-unknown-linux-gnu = "1cd06090463711d50d98374ef52c1a84b9f4e3e35febaaef4890fb10536ceb3a"; + x86_64-unknown-linux-gnu = "350354495b1d4b6dd2ec7cf96aa9bc61d031951cf667a31e8cf401dc508639e6"; + x86_64-unknown-linux-musl = "3571db0018fcd32f3b579a32b2301826dbd1cce44b373aed8e8a31c2a6f52fe8"; + arm-unknown-linux-gnueabihf = "77f4e4c2195f75466c6de0b1d8fd7fb8cef3d12666e3aae777dcfd0d71d080ca"; + armv7-unknown-linux-gnueabihf = "dd01ccb6a53d5e895a6755a78c213ae601a347366688941d5c543b5af5835d6d"; + aarch64-unknown-linux-gnu = "33a50c5366a57aaab43c1c19e4a49ab7d8ffcd99a72925c315fb1f9389139e6f"; + aarch64-unknown-linux-musl = "49d94116a357ea13f5a3231de2472f59210028c3cf81f158b8a367c3155ac544"; + x86_64-apple-darwin = "5eb27a4f5f7a4699bc70cf1848e340ddd74e151488bfcb26853fd584958e3d33"; + aarch64-apple-darwin = "801b3b15b992b0321261de8b8ea2728e9a74822c6cb99bf978b34e217c7825ba"; + powerpc64le-unknown-linux-gnu = "67cadf7ac5bd2e3d5fb4baede69846059f17c4e099f771329b266d08b875ed71"; + riscv64gc-unknown-linux-gnu = "6113a6cce3500033d0dc0d170b54c5f22562ef3025fd58d804c822a2499c74d7"; }; - selectRustPackage = pkgs: pkgs.rust_1_54; + selectRustPackage = pkgs: pkgs.rust_1_55; rustcPatches = [ ]; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 3ada23e74882..ee909e973a35 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib +{ lib, stdenv, pkgsHostHost +, file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, cacert, rustPlatform, rustc , CoreFoundation, Security }: @@ -16,7 +17,10 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ]; + nativeBuildInputs = [ + pkg-config cmake installShellFiles makeWrapper + (lib.getDev pkgsHostHost.curl) + ]; buildInputs = [ cacert file curl python3 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; @@ -54,6 +58,14 @@ rustPlatform.buildRustPackage { # Disable check phase as there are failures (4 tests fail) doCheck = false; + doInstallCheck = !stdenv.hostPlatform.isStatic && + stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf; + installCheckPhase = '' + runHook preInstallCheck + readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so' + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8f93a6746ea2..809e81ae548b 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -116,18 +116,18 @@ in rec { }; vala_0_48 = generic { - version = "0.48.18"; - sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy"; + version = "0.48.19"; + sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; }; vala_0_50 = generic { - version = "0.50.9"; - sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn"; + version = "0.50.10"; + sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; }; vala_0_52 = generic { - version = "0.52.4"; - sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc"; + version = "0.52.5"; + sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; }; vala = vala_0_52; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 2598d4e233eb..1ac76b38c72c 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -7,9 +7,10 @@ with lib; mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.7"; out = "3.3.1"; } + { case = range "8.7" "8.14"; out = "3.4.2"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw"; release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz"; release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; releaseRev = v: "flocq-${v}"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index abfff8009afe..353535ed6823 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -416,6 +416,11 @@ in with passthru; stdenv.mkDerivation { # This allows build Python to import host Python's sysconfigdata mkdir -p "$out/${sitePackages}" ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/" + + # debug info can't be separated from a static library and would otherwise be + # left in place by a separateDebugInfo build. force its removal here to save + # space in output. + $STRIP -S $out/lib/${libPrefix}/config-*/libpython*.a || true '' + optionalString stripConfig '' rm -R $out/bin/python*-config $out/lib/python*/config-* '' + optionalString stripIdlelib '' @@ -445,6 +450,13 @@ in with passthru; stdenv.mkDerivation { find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + '' + '' + # *strip* shebang from libpython gdb script - it should be dual-syntax and + # interpretable by whatever python the gdb in question is using, which may + # not even match the major version of this python. doing this after the + # bytecode compilations for the same reason - we don't want bytecode generated. + mkdir -p $out/share/gdb + sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py ''; preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -470,6 +482,8 @@ in with passthru; stdenv.mkDerivation { pythonForBuild buildPackages.bash ]; + separateDebugInfo = true; + inherit passthru; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 872123338f8c..764ab29e919b 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -94,12 +94,18 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { - # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages - nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { - interpreter = python; - }; - }; + integrationTests = lib.optionalAttrs (!python.isPyPy) ( + lib.optionalAttrs (python.isPy3k && !stdenv.isDarwin) { # darwin has no split-debug + cpython-gdb = callPackage ./tests/test_cpython_gdb { + interpreter = python; + }; + } // lib.optionalAttrs (python.pythonAtLeast "3.7") rec { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + } + ); # Tests to ensure overriding works as expected. overrideTests = let diff --git a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix new file mode 100644 index 000000000000..0254d843a4cf --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix @@ -0,0 +1,22 @@ +{ interpreter, lib, gdb, writeText, runCommand }: + +let + crashme-py = writeText "crashme.py" '' + import ctypes + + def sentinel_foo_bar(): + ctypes.memset(0, 1, 1) + + sentinel_foo_bar() + ''; +in runCommand "python-gdb" {} '' + # test that gdb is able to recover the python stack frame of this segfault + ${gdb}/bin/gdb -batch -ex 'set debug-file-directory ${interpreter.debug}/lib/debug' \ + -ex 'source ${interpreter}/share/gdb/libpython.py' \ + -ex r \ + -ex py-bt \ + --args ${interpreter}/bin/python ${crashme-py} | grep 'in sentinel_foo_bar' > /dev/null + + # success. + touch $out +'' diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index c5b622d2761f..acc42c9d2d3c 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.11.10"; + version = "0.11.11"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-snnvREM2RLssmE55Ea0Imcw12pmyD6+/11ZXmmUY36U="; + sha256 = "sha256-IOConYPH+t84INXaHw8OVp0mLNucSDS2RT2AlZOUoEs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/pkgs/development/interpreters/tcl/8.5.nix index 193ff4f93769..9daf67fe2bd0 100644 --- a/pkgs/development/interpreters/tcl/8.5.nix +++ b/pkgs/development/interpreters/tcl/8.5.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.5"; version = "${release}.18"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3"; diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index 37a7fee8a859..03fcb8317792 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.6"; version = "${release}.11"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c"; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index beb95d51d2c1..6351a08c1c07 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, makeSetupHook, makeWrapper +{ lib, stdenv, callPackage, makeSetupHook # Version specific stuff , release, version, src @@ -51,9 +51,9 @@ let inherit release version; libPrefix = "tcl${release}"; libdir = "lib/${libPrefix}"; - tclPackageHook = callPackage ({}: makeSetupHook { + tclPackageHook = callPackage ({ buildPackages }: makeSetupHook { name = "tcl-package-hook"; - deps = [ makeWrapper ]; + deps = [ buildPackages.makeWrapper ]; } ./tcl-package-hook.sh) {}; }; }; diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix index 4f3ffe6f995f..f3d34f13c688 100644 --- a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix +++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix @@ -39,8 +39,8 @@ let "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck" ]) // { - buildInputs = buildInputs ++ [ makeWrapper tcl.tclPackageHook ]; - nativeBuildInputs = nativeBuildInputs ++ [ tcl ]; + buildInputs = buildInputs ++ [ tcl.tclPackageHook ]; + nativeBuildInputs = nativeBuildInputs ++ [ makeWrapper tcl ]; propagatedBuildInputs = propagatedBuildInputs ++ [ tcl ]; TCLSH = "${getBin tcl}/bin/tclsh"; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 11135b14fd48..720823852b02 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; + configureFlags = [ + # Required for cross-compilation. + # Prevents linking error with 'undefined reference to rpl_malloc'. + # I think it's safe to assume that most libcs will properly handle + # realloc(NULL, size) and treat it like malloc(size). + "ac_cv_func_malloc_0_nonnull=yes" + ]; hardeningDisable = [ "format" ]; meta = { diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index a7420e300ed4..6f59c96d2bc6 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s"; + sha256 = "sha256-B8SFOc1oGgU5AGAbkqe5oz045H08TnymNAbzz2oOKoo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 414194acb830..8f65bd6c5cd7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -59,6 +59,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small + separateDebugInfo = true; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index c85e14257885..b39e09236096 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -10,14 +10,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "15ngaqyjbwkj0rd9mvxaqf3i9vzsnlrqgr50cnxxjqnpf7xdmslj"; + sha256 = "0bkps488h9s15ylvkm4fmfywgrpbw570glawpnv6khpq9n223dzl"; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index ad8ee222f7f9..a528656fe464 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} ''; - nativeBuildInputs = [ cmake perl ]; + nativeBuildInputs = [ cmake gfortran perl ]; buildInputs = [ netcdf openjpeg libpng - gfortran ]; propagatedBuildInputs = lib.optionals enablePython [ diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index c1ef9cee9906..1283ec8cfab0 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "sha256-QQoWOJGwL03zbBfrFNXz0Ff9Agc2dMBW9nW3jdOwEE8="; + sha256 = "sha256-ba8SBtJd0ERunO9KpJZkutkO6ZnZOEGzWn2IjO1Uu28="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index f3758ca53924..14405f40f67d 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -23,6 +23,16 @@ callPackage ./generic.nix (rec { url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch"; sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i"; }) + (fetchpatch { + name = "CVE-2021-38171.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6.patch"; + sha256 = "0b8hsb45izw7w1vb2b94k9f6kvn2shxrap5ip1krdxg6hs7an0x8"; + }) + (fetchpatch { + name = "CVE-2021-38291.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/e01d306c647b5827102260b885faa223b646d2d1.patch"; + sha256 = "0p2p8gcnb5j469xa3czfssm09w3jk08kz8rnl8wi2l9aj9l08my9"; + }) # Fix incorrect segment length in HLS child playlist with fmp4 segment format # FIXME remove in version 4.5 # https://trac.ffmpeg.org/ticket/9193 diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3c8fe4d569fa..edb37d2ddd32 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.3"; + version = "2.68.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; + sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index 95edf3cfedd5..4a287d5c9ca1 100644 --- a/pkgs/development/libraries/glibc/2.33-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.33-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d2d7b6cc064c..fe8fd6d80c6d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.33"; - patchSuffix = "-49"; + patchSuffix = "-50"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-49-g22d37364ae + glibc-2.33-50-gc6cadbf83a $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 8b01f9f68146..a2e983ece83d 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0bky91ncz6vy0011ps9prsnq9f4a5s5xwr23kkmi39xzg0417mnd"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mpi blas gfortran openssh ]; + nativeBuildInputs = [ autoreconfHook gfortran ]; + buildInputs = [ mpi blas openssh ]; preConfigure = '' configureFlagsArray+=( "--enable-i8" \ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 4a12c5bcc225..e94fcc5ece9d 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -32,7 +32,8 @@ let in stdenv.mkDerivation { - name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; + pname = "harfbuzz${optionalString withIcu "-icu"}"; + inherit version; src = fetchFromGitHub { owner = "harfbuzz"; @@ -42,8 +43,7 @@ stdenv.mkDerivation { }; postPatch = '' - patchShebangs src/*.py - patchShebangs test + patchShebangs src/*.py test '' + lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 6be73c8da4b3..b61f4e442bf2 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE="; + sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; }; buildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 93d7cbef74c3..05c89d25ce62 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.84/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.85/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 47b958ea0b32..84957c183ff5 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchpatch, - extra-cmake-modules, kdoctools, qttools, + util-linux, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, @@ -11,7 +11,7 @@ mkDerivation { name = "kio"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications + util-linux karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras kcrash ]; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 34792d254e72..73d4ce478c61 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/attica-5.84.0.tar.xz"; - sha256 = "1q5imda1p26rw3lzz7p6wlg63d2kjl6yx93pxryy129xwyxszf5d"; - name = "attica-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/attica-5.85.0.tar.xz"; + sha256 = "1rwb2jz2chvxa7hdxn5ms1f93ykpk26kmnngwcixqr7gwlcv8prl"; + name = "attica-5.85.0.tar.xz"; }; }; baloo = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/baloo-5.84.0.tar.xz"; - sha256 = "15ldfq9qryw2xna6kr316fqldrfd2r09qj9ig8i2x391x18dzhg4"; - name = "baloo-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/baloo-5.85.0.tar.xz"; + sha256 = "0kcilv41assarhp54i99scpg08m11fjznw4d1lx5rdy7fyd4bd41"; + name = "baloo-5.85.0.tar.xz"; }; }; bluez-qt = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/bluez-qt-5.84.0.tar.xz"; - sha256 = "0pg6zj0b7j9v339g1q5a9dm1l0a7n1c388n26x6k2s1q785vk6lh"; - name = "bluez-qt-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/bluez-qt-5.85.0.tar.xz"; + sha256 = "18h0swvmimfxr9ygg0fs9gg0bm4a016n55hkvqx6n3y505b2lnx8"; + name = "bluez-qt-5.85.0.tar.xz"; }; }; breeze-icons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/breeze-icons-5.84.0.tar.xz"; - sha256 = "1320c84pr39541lb4zk33brxx593dbvvnij5x8as4rp99mcjd6h4"; - name = "breeze-icons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/breeze-icons-5.85.0.tar.xz"; + sha256 = "0g97md30f76x38skqf7xpxxrcpydx4z5adrknq0bcnpqg3baw1s4"; + name = "breeze-icons-5.85.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/extra-cmake-modules-5.84.0.tar.xz"; - sha256 = "0h8w5ahjpbb524qgabzbgd4x2j8qnfv1d1cq8vzq5hbpw7r5w25v"; - name = "extra-cmake-modules-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/extra-cmake-modules-5.85.0.tar.xz"; + sha256 = "0d36dg727d0ilq0ag4mv3vhp065p60nnl61014jm1p0kn71hjhks"; + name = "extra-cmake-modules-5.85.0.tar.xz"; }; }; frameworkintegration = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/frameworkintegration-5.84.0.tar.xz"; - sha256 = "0jzrsw5fkbgk8xpdjfjprqm1vpa61x32zikyj370shcg3qsaiyir"; - name = "frameworkintegration-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/frameworkintegration-5.85.0.tar.xz"; + sha256 = "1j3p1hy5fhy1b83mcy2n25a8rzwv8n79c2jwfxhyd2hw1yvrkmzr"; + name = "frameworkintegration-5.85.0.tar.xz"; }; }; kactivities = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kactivities-5.84.0.tar.xz"; - sha256 = "0lihxr9jvmg2h7k36djdfvsz5slxzzgxpxmv9745ynvc92fr1c46"; - name = "kactivities-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kactivities-5.85.0.tar.xz"; + sha256 = "0c40ripx3k8rccaj699ill4kmdnh1vl9gsxvzvff0y312ya1v2gm"; + name = "kactivities-5.85.0.tar.xz"; }; }; kactivities-stats = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kactivities-stats-5.84.0.tar.xz"; - sha256 = "1mb80jzccvha6rnd9q0xych1k4p0nfdyh7s9ryafv9fqqhzr5fh4"; - name = "kactivities-stats-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kactivities-stats-5.85.0.tar.xz"; + sha256 = "08y5wqalsd3xwczb87n2n5l0rky8lydhyb66xvh2dzl5fmw7k5z1"; + name = "kactivities-stats-5.85.0.tar.xz"; }; }; kapidox = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kapidox-5.84.0.tar.xz"; - sha256 = "0h8isigbgc02df3kb875p7yzy04i41lss2r5awlh5b1np89l5g51"; - name = "kapidox-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kapidox-5.85.0.tar.xz"; + sha256 = "1cmx16gy2s6j2vvs0nn62vczjf6pc8s7dvdz47lrnpmc7p8yzddm"; + name = "kapidox-5.85.0.tar.xz"; }; }; karchive = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/karchive-5.84.0.tar.xz"; - sha256 = "1xjykx94xn0p1926my4f82dn9bsv2b2mv1l4pjpzzfwyn26df34s"; - name = "karchive-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/karchive-5.85.0.tar.xz"; + sha256 = "0bvbmd3phjyk11ylggmzl0kihmg7w623alplwp3j4mj8jn8nw6cc"; + name = "karchive-5.85.0.tar.xz"; }; }; kauth = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kauth-5.84.0.tar.xz"; - sha256 = "1jwynarchwbgdnfzpp3r8ggr8mz2gwgwiv9j2kxmh0m607sqzj04"; - name = "kauth-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kauth-5.85.0.tar.xz"; + sha256 = "1ib1i4mpxdkddn0kd6prx0j8vc55ai6nlx71lakr2cdafp296fhs"; + name = "kauth-5.85.0.tar.xz"; }; }; kbookmarks = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kbookmarks-5.84.0.tar.xz"; - sha256 = "1k3mamhd55j3hvkw7h0gfizy5hg37d57h26xz9hbxrw1lb1p9gyc"; - name = "kbookmarks-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kbookmarks-5.85.0.tar.xz"; + sha256 = "0jraagmjch0pda15k9ywpidl474x4wq60zzffi2n3vmy8y9hs4rn"; + name = "kbookmarks-5.85.0.tar.xz"; }; }; kcalendarcore = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcalendarcore-5.84.0.tar.xz"; - sha256 = "06asygdsk4bnn29cc8khpzy68fiyrqwajl55fixmja7kvzsnq4cb"; - name = "kcalendarcore-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcalendarcore-5.85.0.tar.xz"; + sha256 = "04nrfwd4g5v4lnmlcq0rdmx8xfn9wbzp92izsy7zwwxcmpwivysq"; + name = "kcalendarcore-5.85.0.tar.xz"; }; }; kcmutils = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcmutils-5.84.0.tar.xz"; - sha256 = "1ackicsg2xnjl8gid9v4a72vvqhn7536s0w1g50hss142hp0b9zf"; - name = "kcmutils-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcmutils-5.85.0.tar.xz"; + sha256 = "14yfkrqv77r6hm390ib8g7gcjcw3dlnlqs9bd3y0mg123wps7s10"; + name = "kcmutils-5.85.0.tar.xz"; }; }; kcodecs = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcodecs-5.84.0.tar.xz"; - sha256 = "0fjjz40kchw38p74zvgrcfsgclg54w6b8bl6ly72qmj5n0ip2gr3"; - name = "kcodecs-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcodecs-5.85.0.tar.xz"; + sha256 = "1zgpi177j0j3jzi3n0kjyddy0d7b9vp7kxv6c2jsqx9ppps0l1k5"; + name = "kcodecs-5.85.0.tar.xz"; }; }; kcompletion = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcompletion-5.84.0.tar.xz"; - sha256 = "1kbj1f3c3qpfxn4jyldhzlmgxfxn0af5rbs0irzwd9wqgk9i94vs"; - name = "kcompletion-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcompletion-5.85.0.tar.xz"; + sha256 = "1vy41mavbm8avr9jfspys4mpzc4i5rkg5gpl9hcbjrkldb9ymfj1"; + name = "kcompletion-5.85.0.tar.xz"; }; }; kconfig = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kconfig-5.84.0.tar.xz"; - sha256 = "0wshg4hx4d6m1r17mc7l9ivhx6mw0h1qx8fd46hmydmbjp030jma"; - name = "kconfig-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kconfig-5.85.0.tar.xz"; + sha256 = "0qmrv8ixlg7qrb7fyyvk7a0a7avvpflc05rj46zzip6kjhl4imds"; + name = "kconfig-5.85.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kconfigwidgets-5.84.0.tar.xz"; - sha256 = "17hyf495wlm5jqc0qxxymy1kcjybbihg8093kf59hvvpcci5xsin"; - name = "kconfigwidgets-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kconfigwidgets-5.85.0.tar.xz"; + sha256 = "0hx8f1dcd38wsrifh4j3a5m05xahdqrhsysasbdwxhr5s29d7vvr"; + name = "kconfigwidgets-5.85.0.tar.xz"; }; }; kcontacts = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcontacts-5.84.0.tar.xz"; - sha256 = "0gvskvfwfmrs884fkfl0gvmnic4hhymffs7jhq6yaixbsjl2mznl"; - name = "kcontacts-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcontacts-5.85.0.tar.xz"; + sha256 = "07j2h8fd62j7jbcm5fyv27vy120687k1cmp2rw06sf3xl480nk8k"; + name = "kcontacts-5.85.0.tar.xz"; }; }; kcoreaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcoreaddons-5.84.0.tar.xz"; - sha256 = "1c0z2cn02jqanisq5rr6iry1hx9p5ffm59353mknyyg5xyk3qkbm"; - name = "kcoreaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcoreaddons-5.85.0.tar.xz"; + sha256 = "052l8kvv7k3m43r6arckg4fls0y913gklc8jx09y56g1m51mgbwh"; + name = "kcoreaddons-5.85.0.tar.xz"; }; }; kcrash = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcrash-5.84.0.tar.xz"; - sha256 = "0asr7llkdbr6wzq31vnmga7haxddz1b6xqp3smw7hvgzs0f8vrv5"; - name = "kcrash-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcrash-5.85.0.tar.xz"; + sha256 = "14hknkl4md0qzh44f1zqraljzvlbwzc95mci713a9mhk9rb0957f"; + name = "kcrash-5.85.0.tar.xz"; }; }; kdav = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdav-5.84.0.tar.xz"; - sha256 = "09wly717cp86b3gahj79nfplx71f78zyb5mhpw9xm0dkdf1qf56q"; - name = "kdav-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdav-5.85.0.tar.xz"; + sha256 = "11wwdv19d0fy7b1bzgqaciv4hg99a8pi6g2ymjn3g0l3ps05a0sl"; + name = "kdav-5.85.0.tar.xz"; }; }; kdbusaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdbusaddons-5.84.0.tar.xz"; - sha256 = "0a4v2g86lss1wq359mssg142dp1qccn17yrdhbgy55qi6id6pvl5"; - name = "kdbusaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdbusaddons-5.85.0.tar.xz"; + sha256 = "0f8k2kynbspi86gcvpzn209m1bm6vc65flqlnh8prbkd3gg283d6"; + name = "kdbusaddons-5.85.0.tar.xz"; }; }; kdeclarative = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdeclarative-5.84.0.tar.xz"; - sha256 = "0ygp3jwz0fjixiq7bkjchsxzvg6fn50qw7si9nil5hkkg6lwxir6"; - name = "kdeclarative-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdeclarative-5.85.0.tar.xz"; + sha256 = "1qdbvfx0i09hn9236hnb73fzym529wjsgqmfwzhh5a6dnqdh1rjd"; + name = "kdeclarative-5.85.0.tar.xz"; }; }; kded = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kded-5.84.0.tar.xz"; - sha256 = "0c6klrchbxy57f7hjvsk640bg6s8gp1ilrzvzg7f8m825yg1b5jc"; - name = "kded-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kded-5.85.0.tar.xz"; + sha256 = "1yar9zcrrs0c0hakg8sfisnp32284ljj1axhgmx8hkwfj591jdiw"; + name = "kded-5.85.0.tar.xz"; }; }; kdelibs4support = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kdelibs4support-5.84.0.tar.xz"; - sha256 = "1qkiqv0fq8q6i18mi7gm58qhnqra8xkslzjprap6zjq49g9lcgrp"; - name = "kdelibs4support-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kdelibs4support-5.85.0.tar.xz"; + sha256 = "1c4zd60s7l1qv719nl28j7gh3lpr1cwqq5vcibb9a6di04k27mm0"; + name = "kdelibs4support-5.85.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kdesignerplugin-5.84.0.tar.xz"; - sha256 = "0k51pjkh4dfc8bkw0pbsa260fifvcm0wrbpckvd1xd32b0r1n2ax"; - name = "kdesignerplugin-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kdesignerplugin-5.85.0.tar.xz"; + sha256 = "0pchfvmy7r2mkd412nbzk2pkji2dx5lispwcnk759ffm4wlnxncf"; + name = "kdesignerplugin-5.85.0.tar.xz"; }; }; kdesu = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdesu-5.84.0.tar.xz"; - sha256 = "0b3ljqj86crccyqzlqg0fkjryi654pi5q84c11zywmws72bjjx9d"; - name = "kdesu-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdesu-5.85.0.tar.xz"; + sha256 = "1xqzkyd9flglr3aqabkh54yl7a5a429d24mpqphakc3djmdv5d08"; + name = "kdesu-5.85.0.tar.xz"; }; }; kdewebkit = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kdewebkit-5.84.0.tar.xz"; - sha256 = "0rhjdqr5g4gphszz70nhvv9wgr0g048pnc36w4w2jpzyy75nwjq2"; - name = "kdewebkit-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kdewebkit-5.85.0.tar.xz"; + sha256 = "14w254wfp35sldadff1y62yl6f1kshlfk4vlhlan626vyidypc43"; + name = "kdewebkit-5.85.0.tar.xz"; }; }; kdnssd = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdnssd-5.84.0.tar.xz"; - sha256 = "1ayscd05m20i4nldidxdx83xsa66ybsyrf3f8sm3h99hgwb1yxm9"; - name = "kdnssd-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdnssd-5.85.0.tar.xz"; + sha256 = "0i1qv6qjsdlb08mwiqs3s6v2hwfr77i65hgc0qj9pbhzvm5v6x8m"; + name = "kdnssd-5.85.0.tar.xz"; }; }; kdoctools = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdoctools-5.84.0.tar.xz"; - sha256 = "1x0dimayl1pj6r4cjwsvzvyc5j79308bcdi27bn0lq1769wm7rlp"; - name = "kdoctools-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdoctools-5.85.0.tar.xz"; + sha256 = "01bxzp65ffwr14yrrbw8p15lkwhisv15drwkgcwg48f289f51if1"; + name = "kdoctools-5.85.0.tar.xz"; }; }; kemoticons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kemoticons-5.84.0.tar.xz"; - sha256 = "0h8ilgwd5y8mbmvr89qkq81km216gs2lx7ln4rijamv2380gwcq7"; - name = "kemoticons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kemoticons-5.85.0.tar.xz"; + sha256 = "0zihi00fql8q4jp08n71agmjrpr5177yw24w0vf0lmjhgmxwkrsw"; + name = "kemoticons-5.85.0.tar.xz"; }; }; kfilemetadata = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kfilemetadata-5.84.0.tar.xz"; - sha256 = "19a6lsnh7vxjgvy780bgispgxycj2838gyak6ivd9lxzn6d9jw6i"; - name = "kfilemetadata-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kfilemetadata-5.85.0.tar.xz"; + sha256 = "07i52zi4jmqhm2sazw2jx7g7s3mp8c7kr32z3ikifsc5wfzy8kix"; + name = "kfilemetadata-5.85.0.tar.xz"; }; }; kglobalaccel = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kglobalaccel-5.84.0.tar.xz"; - sha256 = "0v3j4zx6p45lwd7jpbc9y43l5fh247dm6g21w5r56cq6asapx3k5"; - name = "kglobalaccel-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kglobalaccel-5.85.0.tar.xz"; + sha256 = "0f5ly344a06aaj3rcsa45xzg9xx0s2qsgk5r0h2kphkj8n2gpp70"; + name = "kglobalaccel-5.85.0.tar.xz"; }; }; kguiaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kguiaddons-5.84.0.tar.xz"; - sha256 = "0p98xzml58fv2cv8x382bmcrbk39q89mrxy52hkqy759g4ffj919"; - name = "kguiaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kguiaddons-5.85.0.tar.xz"; + sha256 = "1d1724k67chiv4sxbaifnwzwcss3kry3ms9frpxifi2nsn0x9nhc"; + name = "kguiaddons-5.85.0.tar.xz"; }; }; kholidays = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kholidays-5.84.0.tar.xz"; - sha256 = "0fzcdlvai0p3l58wbs8ia7vmd9ll2akzzab12ask8kkaz7iwaqqs"; - name = "kholidays-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kholidays-5.85.0.tar.xz"; + sha256 = "0nrxn8sjzp1lg3va7703d5hxmda33d0f91rgq2s99mxi77a82yi2"; + name = "kholidays-5.85.0.tar.xz"; }; }; khtml = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/khtml-5.84.0.tar.xz"; - sha256 = "13j2plfgx4zx99i3s70424v8b7qj2xf6gndp7hhmdka0vjhm5bv9"; - name = "khtml-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/khtml-5.85.0.tar.xz"; + sha256 = "0ma9sk51pszxqmvzlrfdsnh2f8fm09wd0kaywsrkvbh2q2f6kg8g"; + name = "khtml-5.85.0.tar.xz"; }; }; ki18n = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/ki18n-5.84.0.tar.xz"; - sha256 = "1530jxpbfky3mhr1dv3pr7lrvi96q4ai8fn85h5gnjp7s7h1wgv0"; - name = "ki18n-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/ki18n-5.85.0.tar.xz"; + sha256 = "1h1jcdyc3cphkn56qfn5j6jbbb6wp5z0vp8kxzm1wd023sj83dqn"; + name = "ki18n-5.85.0.tar.xz"; }; }; kiconthemes = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kiconthemes-5.84.0.tar.xz"; - sha256 = "0r90cdxs6x9bnqb6qb7p2szavqw2lfk9khhxhzgp2z9121smxpgn"; - name = "kiconthemes-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kiconthemes-5.85.0.tar.xz"; + sha256 = "0k6ni351b051k8rfncpddf5zplqmg71wf9a5h8k6ix787h1r5dcp"; + name = "kiconthemes-5.85.0.tar.xz"; }; }; kidletime = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kidletime-5.84.0.tar.xz"; - sha256 = "0akkzj05399f72klr8qf5q0w9v8x1jw2961m3h4hcg1zfsmb6pv4"; - name = "kidletime-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kidletime-5.85.0.tar.xz"; + sha256 = "1nclrxipjzasqi8g84lvpsr5rwfs9xfqgj377wfphm4qbml09x2z"; + name = "kidletime-5.85.0.tar.xz"; }; }; kimageformats = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kimageformats-5.84.0.tar.xz"; - sha256 = "1xzddqc6wj188dhwcw1haa2a28r2d8c4aqhmgymwdwhs7k4ibpds"; - name = "kimageformats-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kimageformats-5.85.0.tar.xz"; + sha256 = "1687sh19ph1v1bg4xrdrf0gs2nna0ds8gcqc8x7ydgdc2301m9jh"; + name = "kimageformats-5.85.0.tar.xz"; }; }; kinit = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kinit-5.84.0.tar.xz"; - sha256 = "0a5i2rvamw95y9bqscdg6fk1fjsib7rcis9fbk504qk4n7jdp9gw"; - name = "kinit-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kinit-5.85.0.tar.xz"; + sha256 = "03m6ik7l54q1w615111rqs0m7az7snh6x418s90xnzm81g0dzpwj"; + name = "kinit-5.85.0.tar.xz"; }; }; kio = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kio-5.84.0.tar.xz"; - sha256 = "1lz07745w3549n7lc174p4rz5w12mm4q08y5xn2a95xg5xrjpgln"; - name = "kio-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kio-5.85.0.tar.xz"; + sha256 = "1xhrmpz9xbwipxqvj7l6d1n471isb3jggrvgcx5hqlz659yqmmg4"; + name = "kio-5.85.0.tar.xz"; }; }; kirigami2 = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kirigami2-5.84.0.tar.xz"; - sha256 = "05hpw2ba7g5kzg6z0slngrfz45kih8w1zmahbjhss9i7blj9x32r"; - name = "kirigami2-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kirigami2-5.85.0.tar.xz"; + sha256 = "0axdsxzmr735ci19srmgkgpm4x7h23vk37hhakfc6n30ry0j7lik"; + name = "kirigami2-5.85.0.tar.xz"; }; }; kitemmodels = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kitemmodels-5.84.0.tar.xz"; - sha256 = "1v19vc155jh421z8djhrigc83ajz9qvb6qz9cpscdzrcimhaarns"; - name = "kitemmodels-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kitemmodels-5.85.0.tar.xz"; + sha256 = "0c55lw6r78x41v6fgycr68inviaxlxa6bj8zm8fdia631mhx273s"; + name = "kitemmodels-5.85.0.tar.xz"; }; }; kitemviews = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kitemviews-5.84.0.tar.xz"; - sha256 = "14rammhm5zp8h37a794z3pmgkpnb606izqy1zlk8lwvnw6aj0kwb"; - name = "kitemviews-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kitemviews-5.85.0.tar.xz"; + sha256 = "1fr8ivpvpaxykrgnjjsf8nhnhs60i4xhlkanvhrkkgjabxk0sbl0"; + name = "kitemviews-5.85.0.tar.xz"; }; }; kjobwidgets = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kjobwidgets-5.84.0.tar.xz"; - sha256 = "0gcdd07ma7wg6rqygfhmq2nc3cq78zcxbd7mx0fgirdns5fbp8p5"; - name = "kjobwidgets-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kjobwidgets-5.85.0.tar.xz"; + sha256 = "05gpp2bvirbxs5yk0ysi5gh72axwv253yc2sqmzdsjylq4fjy8rl"; + name = "kjobwidgets-5.85.0.tar.xz"; }; }; kjs = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kjs-5.84.0.tar.xz"; - sha256 = "0qi1xk6pq7nyzkh6jlp4l1v1b5gq9hryq2a81hgfl7q9xgrx00qy"; - name = "kjs-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kjs-5.85.0.tar.xz"; + sha256 = "0inliv97x63174n3mn5jqyy8d440863g3m5pn69cq1i2mr5zyswb"; + name = "kjs-5.85.0.tar.xz"; }; }; kjsembed = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kjsembed-5.84.0.tar.xz"; - sha256 = "1av326byza162ds5vn54nmpd9ndr7yb0cpl8hxmwzfbym1favhvb"; - name = "kjsembed-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kjsembed-5.85.0.tar.xz"; + sha256 = "1j8prfg7hpk0g7manilds27ivrcgxr3hidjzy0yzn13ckvv3ccj1"; + name = "kjsembed-5.85.0.tar.xz"; }; }; kmediaplayer = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kmediaplayer-5.84.0.tar.xz"; - sha256 = "1zzx7d9wcc1qh9zg83c2ihid0c2f5p23gpc475ql056ny71fdvv3"; - name = "kmediaplayer-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kmediaplayer-5.85.0.tar.xz"; + sha256 = "1bmj24d3si937svh8zdi7xs0y4j1ibyj8z8q1y4k2vp8fa9fack6"; + name = "kmediaplayer-5.85.0.tar.xz"; }; }; knewstuff = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/knewstuff-5.84.0.tar.xz"; - sha256 = "1y1b7704xlf7kmw7c41b3ngsmi5304mvdgphcqsinav6bq48ka5f"; - name = "knewstuff-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/knewstuff-5.85.0.tar.xz"; + sha256 = "1j90ysfw1qygaiigizbjik1k7zkl6wkin0r7r9q8r3dibvbqziph"; + name = "knewstuff-5.85.0.tar.xz"; }; }; knotifications = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/knotifications-5.84.0.tar.xz"; - sha256 = "02az98aqk8alq1cqrxym5idnlzvl6i4jvgnv34q6g4x7j5h4v75h"; - name = "knotifications-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/knotifications-5.85.0.tar.xz"; + sha256 = "0qr695sn2di24cal0x6yj4x1a8qk6jny68r4d4xdcy5i1i4yyni5"; + name = "knotifications-5.85.0.tar.xz"; }; }; knotifyconfig = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/knotifyconfig-5.84.0.tar.xz"; - sha256 = "1x7jp2c2a1bawl3nl46zfnp8d5al1z19za58g76wn40jy9ksnpy2"; - name = "knotifyconfig-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/knotifyconfig-5.85.0.tar.xz"; + sha256 = "1aphmi7r4zmzrfk8635a66dnkd6zg2i17nrm0hfqhqhcfn217mfv"; + name = "knotifyconfig-5.85.0.tar.xz"; }; }; kpackage = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kpackage-5.84.0.tar.xz"; - sha256 = "166cc85y49xqk4r8k6003rlwphxxx2rmik24d7yhmq8p1qig4qb7"; - name = "kpackage-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kpackage-5.85.0.tar.xz"; + sha256 = "14rwq5ckns06h0n8h4q2r7ilfr1myxcan1md1zz4cg4vb87ckimj"; + name = "kpackage-5.85.0.tar.xz"; }; }; kparts = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kparts-5.84.0.tar.xz"; - sha256 = "1fbmywx1fvv9hnznpiy8cp27dfn2ysskymyppqi1hsw01gqs7vfy"; - name = "kparts-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kparts-5.85.0.tar.xz"; + sha256 = "07px14xdh7p2kb9kvsma16xifsc65mhpm6xmnz15i5pdmrz1wxc1"; + name = "kparts-5.85.0.tar.xz"; }; }; kpeople = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kpeople-5.84.0.tar.xz"; - sha256 = "0llggx56xb3y10j0avm4vdmjfl4pwqbvpb5w7kk1gb43nxpz7h3p"; - name = "kpeople-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kpeople-5.85.0.tar.xz"; + sha256 = "03ynnbjj939b3cmczlz9piilkgh45fbyal71pab0qfpxr66m9fk5"; + name = "kpeople-5.85.0.tar.xz"; }; }; kplotting = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kplotting-5.84.0.tar.xz"; - sha256 = "007cvy57ck2frnr5dvs80k3n7lv1q2xw1zadmw13wwdqqsl0kzag"; - name = "kplotting-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kplotting-5.85.0.tar.xz"; + sha256 = "0jhkc12fiz50iavz9msj6w29lhqrm6chl1521sx55km9cb3wmzda"; + name = "kplotting-5.85.0.tar.xz"; }; }; kpty = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kpty-5.84.0.tar.xz"; - sha256 = "04q6qz62vwywzaxxmsq0g28k036ljrcyvn5hywdns58zi5d7nab2"; - name = "kpty-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kpty-5.85.0.tar.xz"; + sha256 = "1zmzzlzv1pnx0d7w6v8yiccw1q2g94pfjzh4sm2k1fickgrfrir8"; + name = "kpty-5.85.0.tar.xz"; }; }; kquickcharts = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kquickcharts-5.84.0.tar.xz"; - sha256 = "01q1ncvk8dc9jkm9x6q7wkcnj1z1377824gj7m83pzgy3g51vcdg"; - name = "kquickcharts-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kquickcharts-5.85.0.tar.xz"; + sha256 = "1hnbr3qkjy48pq8hkvl7lcfd8cywkkr77n8qf296rjmrv23jw4xf"; + name = "kquickcharts-5.85.0.tar.xz"; }; }; kross = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kross-5.84.0.tar.xz"; - sha256 = "0fz4q2m16f4zy6pajcrmhm5a9fjrfjfqyns1lm6aimdsrvkwpc93"; - name = "kross-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kross-5.85.0.tar.xz"; + sha256 = "07gnh98avv5zzybh4262jqkjy8kg0cplryv356kvsbarl4ksy4kr"; + name = "kross-5.85.0.tar.xz"; }; }; krunner = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/krunner-5.84.0.tar.xz"; - sha256 = "15ai1x9v5hm5vj7qhh7c4ajiiaf56h3yy3qnb4kamkv146g09a1p"; - name = "krunner-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/krunner-5.85.0.tar.xz"; + sha256 = "1pz466pjrqd3dj2wdqsqxcpmim0ig8i7gvnw96mxlh262cv15h4d"; + name = "krunner-5.85.0.tar.xz"; }; }; kservice = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kservice-5.84.0.tar.xz"; - sha256 = "1lbx51wpsc7qdp480yl08wsp6lb1lww5ix5hpxxmv0x7galcgsf2"; - name = "kservice-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kservice-5.85.0.tar.xz"; + sha256 = "008b56jibgvpg6qqh7wqbg39fyca62w6nj7c9qxsgj1bd91vglg2"; + name = "kservice-5.85.0.tar.xz"; }; }; ktexteditor = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/ktexteditor-5.84.0.tar.xz"; - sha256 = "0znpls5ap33yjcjw1ayl6zja8qnqx5glk2bvig5aajriqbpw8irk"; - name = "ktexteditor-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/ktexteditor-5.85.0.tar.xz"; + sha256 = "1j6xkz8w7mb47ypgcf00m7hl1ayli8r5a3l4fk5xzsz1k0g72l6m"; + name = "ktexteditor-5.85.0.tar.xz"; }; }; ktextwidgets = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/ktextwidgets-5.84.0.tar.xz"; - sha256 = "069qk1frsfa9iqgchpvkq4sgh973fc2fy1hjymc2zv3mahz23qfl"; - name = "ktextwidgets-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/ktextwidgets-5.85.0.tar.xz"; + sha256 = "128jjcay0s2qi0zs32zxwlmh2xq4kzasc0zhy3l9gfv898yaq6zy"; + name = "ktextwidgets-5.85.0.tar.xz"; }; }; kunitconversion = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kunitconversion-5.84.0.tar.xz"; - sha256 = "0a8jc3vw4ydsfff1qis9323vcd7nhigwyjxqa57qzvswrk7wmlxf"; - name = "kunitconversion-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kunitconversion-5.85.0.tar.xz"; + sha256 = "0rcnmdqnm7h8ffxacza2v7y7zicly0yvz07g4857jxpk7h4z62hy"; + name = "kunitconversion-5.85.0.tar.xz"; }; }; kwallet = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwallet-5.84.0.tar.xz"; - sha256 = "1m08q820zl9wrc04i0inb7n0r35p0lzcv3hiwvzxmgdcm9zm2n3c"; - name = "kwallet-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwallet-5.85.0.tar.xz"; + sha256 = "053ddi83a5d1i61r8y6jimd5pafmilja25w5pl09g3fqkp3id677"; + name = "kwallet-5.85.0.tar.xz"; }; }; kwayland = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwayland-5.84.0.tar.xz"; - sha256 = "1lpmbqkfbjq3445lj42zqc90wk437kzyjlpzji0wh4p9nqa4a27s"; - name = "kwayland-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwayland-5.85.0.tar.xz"; + sha256 = "0sfzpqb3v79jrhc49f4v3akc9wrv1976nb7xs9nd6ips237v86v2"; + name = "kwayland-5.85.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwidgetsaddons-5.84.0.tar.xz"; - sha256 = "1xffbmi3a3qp781aay964b30l9y170imxaa05r3xpj77saq673kp"; - name = "kwidgetsaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwidgetsaddons-5.85.0.tar.xz"; + sha256 = "14042vc9jl48fclsfmsincwqj2s6mfm3lbq4yg5vlj931kznyr31"; + name = "kwidgetsaddons-5.85.0.tar.xz"; }; }; kwindowsystem = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwindowsystem-5.84.0.tar.xz"; - sha256 = "19fa8j4paq245rwvnmnz2mnwgh8y6c26wbw25v8kgd7a33ryg0fg"; - name = "kwindowsystem-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwindowsystem-5.85.0.tar.xz"; + sha256 = "07k6d6sgxlfwkjg0r9lgvlkd7j53b986qfv283c313ahy5c3gd3d"; + name = "kwindowsystem-5.85.0.tar.xz"; }; }; kxmlgui = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kxmlgui-5.84.0.tar.xz"; - sha256 = "1ddfvjwww2270zx4f86w0xmd45pyir95llhc4x2ixicx94jvsg1c"; - name = "kxmlgui-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kxmlgui-5.85.0.tar.xz"; + sha256 = "1ciwrm16a5cgmkkm8cv72cyr45q418gsrxc3qrjq3iic9ycf6fi5"; + name = "kxmlgui-5.85.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kxmlrpcclient-5.84.0.tar.xz"; - sha256 = "10jddyak99wd4x3vm9d6xzh45pl1lhhfw9isrdkgzcixip2s4p6i"; - name = "kxmlrpcclient-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kxmlrpcclient-5.85.0.tar.xz"; + sha256 = "117cvdf7iy1139sx0vk906whmkm3ffw0wivqdjdcfwxsdxi6s6d1"; + name = "kxmlrpcclient-5.85.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/modemmanager-qt-5.84.0.tar.xz"; - sha256 = "1k0dbgq3zbg1rhy775vbxwqssbdin4wm7rw4fkcdra4z9hf39xin"; - name = "modemmanager-qt-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/modemmanager-qt-5.85.0.tar.xz"; + sha256 = "1jb27266dc6ry2y3w9bf1sf20xxw2rkb6ac8z9p46r0myhj2zn2j"; + name = "modemmanager-qt-5.85.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/networkmanager-qt-5.84.0.tar.xz"; - sha256 = "1qd58p2hj1rnzjvd6sskmry7gq7gp9fvp115ihc8dkaq8xvwah77"; - name = "networkmanager-qt-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/networkmanager-qt-5.85.0.tar.xz"; + sha256 = "1lg17ibk9mn4jsxh6dl0yzyhy26xifymvrf5saggl28vkkhvnh6r"; + name = "networkmanager-qt-5.85.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/oxygen-icons5-5.84.0.tar.xz"; - sha256 = "06h1c2lvvs41lcibgv5iz31g7j1x7fdyi7lnh21hkgd7747vk42l"; - name = "oxygen-icons5-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/oxygen-icons5-5.85.0.tar.xz"; + sha256 = "0if136n5mkvxhiyvlmwmj3q9y1g1gr9qz4qqdcsn6wy9jippq46g"; + name = "oxygen-icons5-5.85.0.tar.xz"; }; }; plasma-framework = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/plasma-framework-5.84.0.tar.xz"; - sha256 = "0chmmb04m1bq4d1w67bw3ppc2iycw7wzsdpams6c4y9f59iwrd8r"; - name = "plasma-framework-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/plasma-framework-5.85.0.tar.xz"; + sha256 = "1zzqmm7s39bcay3b4f6qzhd5pw3q6p9fas94i88afhqsxjbkm6w7"; + name = "plasma-framework-5.85.0.tar.xz"; }; }; prison = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/prison-5.84.0.tar.xz"; - sha256 = "17bd40fqp88j5dwxixrhf1d4xwri574l4593rdhzg8qgi9jm2ypj"; - name = "prison-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/prison-5.85.0.tar.xz"; + sha256 = "1c6dq4ql3n6s9xwvs6ix8n3fsv96aqdvd0qwc1n4sap9xlg3752n"; + name = "prison-5.85.0.tar.xz"; }; }; purpose = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/purpose-5.84.0.tar.xz"; - sha256 = "01rh85fc4c4gl0lxw2rbcrh001akggnz7aahkc2spsgd64m7vfv7"; - name = "purpose-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/purpose-5.85.0.tar.xz"; + sha256 = "13r47g81qfqdvd0s70r9dwlcdg8c6m5xrnpvypjs6cd51907m0f5"; + name = "purpose-5.85.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/qqc2-desktop-style-5.84.0.tar.xz"; - sha256 = "0vz68nh6iy92whjlkgf1jmmlhr5261rgsy1r7k3bfd91a41qh2qw"; - name = "qqc2-desktop-style-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/qqc2-desktop-style-5.85.0.tar.xz"; + sha256 = "1hkcy3dzaqfkxnmj9k278q0dijiwhjmzw98xxj9fh8mjygwkj1dp"; + name = "qqc2-desktop-style-5.85.0.tar.xz"; }; }; solid = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/solid-5.84.0.tar.xz"; - sha256 = "0lrims7zfr5xr5y25v63d08m6cm27z6mxbdg9j06xsrqf93vyz4s"; - name = "solid-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/solid-5.85.0.tar.xz"; + sha256 = "0gcddgrz07j9dgf4fg9hc810zr8f3az9b0qvxax9ys9x5kg1dr57"; + name = "solid-5.85.0.tar.xz"; }; }; sonnet = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/sonnet-5.84.0.tar.xz"; - sha256 = "0xnbi1rbb2awl5bvyjxjvzq5a8n9xpmiqvlzcgprmqgmsygzlnnq"; - name = "sonnet-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/sonnet-5.85.0.tar.xz"; + sha256 = "1cg2f09c0blk7ymlq7j3a1bci78kv1n0xq3ys4kxgf53khwhdqpw"; + name = "sonnet-5.85.0.tar.xz"; }; }; syndication = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/syndication-5.84.0.tar.xz"; - sha256 = "0m245vp5dkw88rz9kgym4ka729p688wspm8mv6zzsfffggvfkwrc"; - name = "syndication-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/syndication-5.85.0.tar.xz"; + sha256 = "05hvzxzlvdzc2sxapjvqhdycdvn6bnq0hs45c88pb13ncxxljdxh"; + name = "syndication-5.85.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/syntax-highlighting-5.84.0.tar.xz"; - sha256 = "1mb4di9k2rxf6f7n53z94q5awmwzfd516kv757ifd323w9xkmyxa"; - name = "syntax-highlighting-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/syntax-highlighting-5.85.0.tar.xz"; + sha256 = "1qn9n2sv9n22j7bhq4n93i985v244kkg0vi5c33s9zppb4xgd34a"; + name = "syntax-highlighting-5.85.0.tar.xz"; }; }; threadweaver = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/threadweaver-5.84.0.tar.xz"; - sha256 = "0hmxkqwxjvk6m3h3l12bw01xgwqxzja5cismqrwcc3yxf8fyd572"; - name = "threadweaver-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/threadweaver-5.85.0.tar.xz"; + sha256 = "0md5bnkn5bh2jqzj7m444bmn5c7davyhwlffi0pg22r01m44l6s3"; + name = "threadweaver-5.85.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index f53d1b1a12f7..2a1d53e6ee01 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -12,13 +12,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "sha256-RFPhe4PCq8OLwa6c7ir+5u9jBsUxS5M/fcZYAG9W6R0="; + sha256 = "sha256-H00UJ+ON1kBc19BgWBBKmO8f23oAg2mk7o9hhDhn50Q="; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 20e69c4ad664..1c650ad60de0 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,30 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; - version = "0.6.22"; + version = "0.6.23"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release"; - sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; + sha256 = "sha256-Os0yI/IPoe9MuhXgNdDaIg6uohclA2bjeu9t3tbUoNA="; }; - patches = [ - (fetchpatch { - name = "CVE-2020-0198.patch"; - url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch"; - sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k"; - }) - (fetchpatch { - name = "CVE-2020-0452.patch"; - url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch"; - excludes = [ "NEWS" ]; - sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6"; - }) - ]; - nativeBuildInputs = [ autoreconfHook gettext ]; meta = with lib; { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 506b1a5b25fb..6b0f4aad4449 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; + sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 65d0651ed415..b4d8657359f1 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6"; + sha256 = "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk"; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 98aba664c02a..bb4b03515eda 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.2.3"; + version = "1.4.0"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kuxKWB7BtB3Qek6PqvXVKuN8q7fh+n+UTWyvvllrbWE="; + sha256 = "sha256-JnbVH6H6QP3udJfT52P++hiwM4v/zS7jLn9+YzyIVEY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 83555ccab8ce..ba0338ffd934 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libogg-1.3.4"; + pname = "libogg"; + version = "1.3.5"; src = fetchurl { - url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1"; + url = "http://downloads.xiph.org/releases/ogg/${pname}-${version}.tar.xz"; + sha256 = "01b7050bghdvbxvw0gzv588fn4a27zh42ljpwzm4vrf8dziipnf4"; }; outputs = [ "out" "dev" "doc" ]; - patches = lib.optionals stdenv.isDarwin [ - # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64 - (fetchpatch { - url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch"; - sha256 = "1s72g37y87x0a74zjji9vx2hyk86kr4f2l3m4y2fipvlf9348b3f"; - }) - ]; - meta = with lib; { description = "Media container library to manipulate Ogg files"; longDescription = '' diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c613cfab777b..c5cd5c353960 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.8.9"; + version = "0.9.6"; src = fetchurl { - url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; - sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; + url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; }; postPatch = '' diff --git a/pkgs/development/libraries/libssh2/CVE-2019-17498.patch b/pkgs/development/libraries/libssh2/CVE-2019-17498.patch deleted file mode 100644 index 8681c3ef6091..000000000000 --- a/pkgs/development/libraries/libssh2/CVE-2019-17498.patch +++ /dev/null @@ -1,210 +0,0 @@ -From b9aa7c2495694d0527e4e7fd560a3f0f18556c72 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:14:19 -0700 -Subject: [PATCH 1/5] packet.c: improve parsing of packets - -file: packet.c - -notes: -Use _libssh2_get_string API in SSH_MSG_DEBUG, additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST ---- - src/packet.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 38ab62944..ac69768cd 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -537,26 +537,26 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - case SSH_MSG_DEBUG: - if(datalen >= 2) { - int always_display = data[1]; -- -+ - if(datalen >= 6) { -- message_len = _libssh2_ntohu32(data + 2); -- -- if(message_len <= (datalen - 10)) { -- /* 6 = packet_type(1) + display(1) + message_len(4) */ -- message = (char *) data + 6; -- language_len = _libssh2_ntohu32(data + 6 + -- message_len); -- -- if(language_len <= (datalen - 10 - message_len)) -- language = (char *) data + 10 + message_len; -- } -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 2; /* advance past type & always display */ -+ -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - } - - if(session->ssh_msg_debug) { -- LIBSSH2_DEBUG(session, always_display, message, -- message_len, language, language_len); -+ LIBSSH2_DEBUG(session, always_display, -+ (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } - } -+ - /* - * _libssh2_debug will actually truncate this for us so - * that it's not an inordinate about of data -@@ -579,7 +579,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, - -From 8b3cf0b17c1b84a138bed9423a9e0743452b4de9 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:15:33 -0700 -Subject: [PATCH 2/5] stray whitespace - ---- - src/packet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/packet.c b/src/packet.c -index ac69768cd..8908b2c5a 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -537,7 +537,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - case SSH_MSG_DEBUG: - if(datalen >= 2) { - int always_display = data[1]; -- -+ - if(datalen >= 6) { - struct string_buf buf; - buf.data = (unsigned char *)data; - -From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:24:22 -0700 -Subject: [PATCH 3/5] fixed type issue, updated SSH_MSG_DISCONNECT - -SSH_MSG_DISCONNECT now also uses _libssh2_get API. ---- - src/packet.c | 40 +++++++++++++++------------------------- - 1 file changed, 15 insertions(+), 25 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 8908b2c5a..97f0cdd4b 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - size_t datalen, int macstate) - { - int rc = 0; -- char *message = NULL; -- char *language = NULL; -+ unsigned char *message = NULL; -+ unsigned char *language = NULL; - size_t message_len = 0; - size_t language_len = 0; - LIBSSH2_CHANNEL *channelp = NULL; -@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - - case SSH_MSG_DISCONNECT: - if(datalen >= 5) { -- size_t reason = _libssh2_ntohu32(data + 1); -+ uint32_t reason = 0; -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr++; /* advance past type */ - -- if(datalen >= 9) { -- message_len = _libssh2_ntohu32(data + 5); -+ _libssh2_get_u32(&buf, &reason); -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - -- if(message_len < datalen-13) { -- /* 9 = packet_type(1) + reason(4) + message_len(4) */ -- message = (char *) data + 9; -- -- language_len = -- _libssh2_ntohu32(data + 9 + message_len); -- language = (char *) data + 9 + message_len + 4; -- -- if(language_len > (datalen-13-message_len)) { -- /* bad input, clear info */ -- language = message = NULL; -- language_len = message_len = 0; -- } -- } -- else -- /* bad size, clear it */ -- message_len = 0; -- } - if(session->ssh_msg_disconnect) { -- LIBSSH2_DISCONNECT(session, reason, message, -- message_len, language, language_len); -+ LIBSSH2_DISCONNECT(session, reason, (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } -+ - _libssh2_debug(session, LIBSSH2_TRACE_TRANS, - "Disconnect(%d): %s(%s)", reason, - message, language); - -From 77616117cc9dbbdd0fe1157098435bff73a83a0f Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:26:32 -0700 -Subject: [PATCH 4/5] fixed stray ( - -bad paste ---- - src/packet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/packet.c b/src/packet.c -index 97f0cdd4b..bd4c39e46 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { -+ if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, - -From 436c45dc143cadc8c59afac6c4255be332856581 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:29:00 -0700 -Subject: [PATCH 5/5] added additional parentheses for clarity - ---- - src/packet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/packet.c b/src/packet.c -index bd4c39e46..2e01bfc5d 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index ed09e8ba5624..d6817550fe7b 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh2"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"; + url = "https://www.libssh2.org/download/libssh2-${version}.tar.gz"; + sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -14,16 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; - patches = [ - # Not able to use fetchpatch here: infinite recursion - ./CVE-2019-17498.patch - ]; - meta = with lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = platforms.all; license = licenses.bsd3; - maintainers = [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 1eee4b3870bc..2d4186385193 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "libva-${lib.optionalString minimal "minimal-"}${version}"; + pname = "libva" + lib.optionalString minimal "minimal"; version = "2.12.0"; src = fetchFromGitHub { @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { # TODO: share libs between minimal and !minimal - perhaps just symlink them mesonFlags = [ - # Add FHS paths for non-NixOS applications: - "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + # Add FHS and Debian paths for non-NixOS applications + "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 0d7caf8ba5c4..9ebb2c855cba 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen, python3 }: +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, glib +, pkg-config +, udev +, libgudev +, python3 +}: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.11"; + version = "1.12"; outputs = [ "out" "dev" ]; @@ -10,14 +20,25 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-HDBWycdZf/pUL7ZzCuF55tfby3GW0WW6Vq3htPWT1v4="; + sha256 = "sha256-pCO0lB0liveIEZIxY3IJcqlmWy4rYhSBtRPssfzHEow="; }; - nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; - mesonFlags = [ "-Dtests=disabled" ]; + buildInputs = [ + glib + udev + libgudev + ]; - buildInputs = [ glib udev libgudev ]; + mesonFlags = [ + "-Dtests=disabled" + ]; meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index b46bc9626302..3f16f3cc3e2a 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07iljmv737kx24kd33x9ndf5l854mwslg9x2psqm12k07jmq9wjw"; }; - buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl cmake ]; + nativeBuildInputs = [ perl cmake gfortran ]; preConfigure = '' patchShebangs ./ diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 8bec962c0aea..25d2d89add01 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv"; + sha256 = "0d4jzq0zv1xmng0z0q5lb4rz03ikgxdwi68k3r70ac16gb911ixk"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 62e95dc8e993..81d553547c3f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.2.1"; + version = "21.2.2"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "11qpq16xbxymcgiy0wk787dk4yw2pv8fzgj8d92ng6s11dqycr9c"; + sha256 = "1i75k6gh76f49vy6kksbsikf593jmgk6slqwbs1fs5s2jyzz3an4"; }; # TODO: diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 9227cd705430..3aed0d288527 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ perl gfortran openssh hwloc ] + nativeBuildInputs = [ gfortran ]; + buildInputs = [ perl openssh hwloc ] ++ lib.optional (!stdenv.isDarwin) ch4backend; doCheck = true; diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 704a28dbb8cd..c496927ebca5 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -21,13 +21,12 @@ stdenv.mkDerivation rec { sha256 = "0jd28vy9ivl3rcpkxmhw73b6krzm0pd9jps8asw92wa00lm2z9mk"; }; - nativeBuildInputs = [ pkg-config bison makeWrapper ]; + nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; propagatedBuildInputs = [ numactl rdma-core zlib opensm ]; buildInputs = with lib; [ numactl libxml2 perl - gfortran openssh hwloc ] ++ optionals (network == "infiniband") [ rdma-core opensm ] diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 0cdeda238792..503226ddcbb3 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; }; - buildInputs = [ netcdf hdf5 curl gfortran ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ netcdf hdf5 curl ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index fcc6238500f1..dfb67b6a12a7 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -154,6 +155,11 @@ stdenv.mkDerivation { # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch + # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; + sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; + }) ]; # This prevents cmake from using libraries in impure paths (which diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 16ada2609323..c3f46d8e31ef 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , fetchFromGitHub , cmake , pkg-config @@ -217,6 +218,11 @@ stdenv.mkDerivation { # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch + # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; + sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; + }) ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; # This prevents cmake from using libraries in impure paths (which diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 35708c0ac016..d3323b1fa9e0 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -46,14 +46,14 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ zlib ] - ++ lib.optionals fortranSupport [ gfortran ] ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core ++ lib.optional fabricSupport [ libpsm2 libfabric ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + ++ lib.optionals fortranSupport [ gfortran ]; configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" ++ lib.optional (!fortranSupport) "--disable-mpi-fortran" diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 65aa7b8b4703..3ed2f24f45f9 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; + nativeBuildInputs = [ gfortran ]; + # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ gfortran hoppet lhapdf root5 zlib ]; + buildInputs = [ hoppet lhapdf root5 zlib ]; patches = [ ./bad_code.patch diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 0a7e9b4d948e..1c3bfaa2064e 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; }; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool gfortran ]; - buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] + buildInputs = [ boost fastjet gsl thepeg zlib ] # There is a bug that requires for default PDF's to be present during the build ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]); diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 7ad5b9861a1d..af90192878d7 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; }; - buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl gfortran ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index 90cf5ac8b2d1..e48a2f4638bc 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y"; }; - buildInputs = [ gfortran ]; + nativeBuildInputs = [ gfortran ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index a8cea4638069..d8f2e3bd5599 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; + separateDebugInfo = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; diff --git a/pkgs/development/libraries/protobuf/3.18.nix b/pkgs/development/libraries/protobuf/3.18.nix new file mode 100644 index 000000000000..c670b56c7c5a --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.18.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.18.0"; + sha256 = "0nhjw4m4dm6wqwwsi0b18js5wbh3ibrpsq195g6mk9cx54fx097f"; +} diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index ad7e88d4647e..2f119311c1f2 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; - buildInputs = [ gfortran ]; - - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which gfortran ]; meta = with lib; { description = "Library for fast updating of qr and cholesky decompositions"; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 04a89558c3d0..3cb8a3e801cc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -177,6 +177,7 @@ stdenv.mkDerivation { ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' + ++ lib.optional stdenv.isLinux "-DUSE_X11" ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index a26a3bb6d8d9..88336f21ed27 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -22,9 +22,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = assert (blas.isILP64 == lapack.isILP64); [ - gfortran blas lapack eigen diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 85a73ccd5697..cfdc102e0447 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; - buildInputs = [ gfortran ]; + nativeBuildInputs = [ gfortran ]; configurePhase = '' echo >make.inc "SHELL = ${stdenv.shell}" diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 38d1b126ea4e..311ffefcfaad 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; }; - buildInputs = [ suitesparse gfortran blas lapack ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ suitesparse blas lapack ]; makeFlags = [ "BLAS=-lcblas" diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index fcb49d70a3b1..a87d107b3a17 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=OFF" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ - gfortran blas python3 boost diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix index 1b5895b02bb3..b8f4475ce122 100644 --- a/pkgs/development/libraries/science/math/cutensor/default.nix +++ b/pkgs/development/libraries/science/math/cutensor/default.nix @@ -1,6 +1,6 @@ { callPackage , cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 }: rec { @@ -33,5 +33,13 @@ rec { cudatoolkit = cudatoolkit_11_2; }; + cutensor_cudatoolkit_11_3 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_3; + }; + + cutensor_cudatoolkit_11_4 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_4; + }; + cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index d1d7a9b9f342..e0dfef0b7eec 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { "--with-lapack-lib=-llapack" ]; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip gfortran ]; - buildInputs = [ gfortran blas lapack ]; + buildInputs = [ blas lapack ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 3b84a9d99cbe..3b1fb98a42ea 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; }; - nativeBuildInputs = [ cmake openssh ]; - buildInputs = [ mpi gfortran blas lapack ]; + nativeBuildInputs = [ cmake openssh gfortran ]; + buildInputs = [ mpi blas lapack ]; doCheck = true; diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/development/libraries/science/math/spooles/default.nix index 6f4ddb3f787e..6e94d093a2cb 100644 --- a/pkgs/development/libraries/science/math/spooles/default.nix +++ b/pkgs/development/libraries/science/math/spooles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "spooles"; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 240c86534335..406603e66225 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, audiofile, libtiff}: +{ lib, stdenv, fetchurl, audiofile, libtiff, buildPackages }: stdenv.mkDerivation rec { version = "0.0.6"; pname = "spandsp"; @@ -8,7 +8,19 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + configureFlags = [ + # This flag is required to prevent linking error in the cross-compilation case. + # I think it's fair to assume that realloc(NULL, size) will return a valid memory + # block for most libc implementation, so let's just assume that and hope for the best. + "ac_cv_func_malloc_0_nonnull=yes" + ]; + + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; propagatedBuildInputs = [audiofile libtiff]; meta = { description = "A portable and modular SIP User-Agent with audio and video support"; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 7e53222d0a33..96028009e2cb 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.35.5"; + version = "3.36.0"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "9StypcMZw+UW7XqS4SMTmm6Hrwii3EPXdXck9hMubbA="; + sha256 = "sha256-vZDD65a+6ZYga4O+cGXJzhmu84w/T7Uwc62g0LabvOM="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 0dbfef2c6394..b0ab391a89f0 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,40 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, openssl ? null, libpcap ? null +{ lib +, stdenv +, fetchFromGitHub +, libpcap +, meson +, ninja +, openssl +, pkg-config }: -with lib; stdenv.mkDerivation rec { pname = "libsrtp"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "1f7i3jdh1wzdv7zjlz7gs3xw5jqig9zw8z9awsqqcp54f94xdpvd"; + sha256 = "0syl2ywddgqz29h43d6rc7waf3hp2yc14yhnrvdsja2bg8wrv6sb"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; - - # libsrtp.pc references -lcrypto -lpcap without -L - propagatedBuildInputs = [ openssl libpcap ]; - - configureFlags = [ - "--disable-debug" - ] ++ optional (openssl != null) "--enable-openssl"; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + libpcap + openssl + ]; + + # rtpw tests hang + preConfigure = '' + rm test/rtpw_test.sh \ + test/rtpw_test_gcm.sh + ''; - buildFlags = [ "shared_library" ]; + mesonFlags = [ + "-Dcrypto-library=openssl" + "-Dcrypto-library-kdf=disabled" + "-Ddoc=disabled" + "-Dtests=${if doCheck then "enabled" else "disabled"}" + ]; - postInstall = '' - rm -rf $out/bin - ''; + doCheck = true; - meta = { + meta = with lib; { homepage = "https://github.com/cisco/libsrtp"; description = "Secure RTP (SRTP) Reference Implementation"; license = licenses.bsd3; platforms = platforms.all; + maintainers = with maintainers; [ r-burns ]; }; } diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index f04b22abe8c6..75c238a430c4 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ python @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (lapackSupport) # Check that the same index size is used for both libraries (assert (blas.isILP64 == lapack.isILP64); [ - gfortran blas lapack ]) diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index c42847ef5335..b017b3eb6618 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } : +{ lib +, stdenv +, fetchurl +, fetchpatch +, tcl +, tk +}: tcl.mkTclDerivation { version = "8.4.3"; @@ -13,6 +19,8 @@ tcl.mkTclDerivation { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj"; }) + # Remove duplicated definition of XLowerWindow + ./duplicated-xlowerwindow.patch ] ++ lib.optional (tcl.release == "8.6") (fetchpatch { name = "tix-8.4.3-tcl8.6.patch"; diff --git a/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch b/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch new file mode 100644 index 000000000000..0ea888749a2f --- /dev/null +++ b/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch @@ -0,0 +1,49 @@ +This is duplicated code from Tk. +It causes errors during build since XLowerWindow is not only a function but also "defined" in tkIntXlibDecls.h. + +See +https://github.com/tcltk/tk/blob/71dcaddc69769cbd3e2c4b5edb5810f974579527/generic/tkIntXlibDecls.h#L396 +and +https://github.com/tcltk/tk/blob/71dcaddc69769cbd3e2c4b5edb5810f974579527/generic/tkIntXlibDecls.h#L1487 + +--- a/unix/tixUnixWm.c 2005-03-25 13:15:53.000000000 -0700 ++++ b/unix/tixUnixWm.c 2021-03-20 07:31:52.000000000 -0700 +@@ -24,38 +24,3 @@ + { + return TCL_OK; + } +- +-#ifdef MAC_OSX_TK +-#include "tkInt.h" +-/* +- *---------------------------------------------------------------------- +- * +- * XLowerWindow -- +- * +- * Change the stacking order of a window. +- * +- * Results: +- * None. +- * +- * Side effects: +- * Changes the stacking order of the specified window. +- * +- *---------------------------------------------------------------------- +- */ +- +-int +-XLowerWindow( +- Display* display, /* Display. */ +- Window window) /* Window. */ +-{ +- TkWindow *winPtr = *((TkWindow **) window); +- +- display->request++; +- if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)) { +- TkWmRestackToplevel(winPtr, Below, NULL); +- } else { +- /* TODO: this should generate damage */ +- } +- return 0; +-} +-#endif diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix index 3058af46ab57..c5d5c478c670 100644 --- a/pkgs/development/libraries/tk/8.5.nix +++ b/pkgs/development/libraries/tk/8.5.nix @@ -1,4 +1,11 @@ -{ callPackage, fetchurl, tcl, ... } @ args: +{ lib +, stdenv +, callPackage +, fetchurl +, fetchpatch +, tcl +, ... +} @ args: callPackage ./generic.nix (args // { @@ -7,4 +14,15 @@ callPackage ./generic.nix (args // { sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03"; }; + patches = lib.optionals stdenv.isDarwin [ + # Define MODULE_SCOPE before including tkPort.h + # https://core.tcl-lang.org/tk/info/dba9f5ce3b + (fetchpatch { + name = "module_scope.patch"; + url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a"; + extraPrefix = ""; + sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv"; + }) + ]; + }) diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index fdffbeba2c93..c4825d2ccf9d 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,12 +1,29 @@ -{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args: +{ lib +, stdenv +, callPackage +, fetchurl +, fetchpatch +, tcl +, ... +} @ args: callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x - sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; + sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; }; - patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; + patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ + ./Fix-bad-install_name-for-libtk8.6.dylib.patch + # Define MODULE_SCOPE before including tkPort.h + # https://core.tcl-lang.org/tk/info/dba9f5ce3b + (fetchpatch { + name = "module_scope.patch"; + url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a"; + extraPrefix = ""; + sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv"; + }) + ]; }) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index b829d846be56..6aa67bf274de 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -41,6 +41,8 @@ tcl.mkTclDerivation { propagatedBuildInputs = [ libXft ]; + enableParallelBuilding = true; + doCheck = false; # fails. can't find itself inherit tcl; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index d367a56010ba..06e1ac9409a1 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -3,6 +3,14 @@ , openssl, json_c, curl, libgcrypt , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which }: +let + # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss, + # tpm2-tss tests depend on procps, procps depends on systemd by default). This + # needs to be conditional based on isLinux because procps for other systems + # might not support the withSystemd option. + procpsWithoutSystemd = procps.override { withSystemd = false; }; + procps_pkg = if stdenv.isLinux then procpsWithoutSystemd else procps; +in stdenv.mkDerivation rec { pname = "tpm2-tss"; @@ -20,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ - cmocka uthash ibm-sw-tpm2 iproute2 procps which + cmocka uthash ibm-sw-tpm2 iproute2 procps_pkg which ]; preAutoreconf = "./bootstrap"; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 7f3ec5f3d597..71131516f942 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.21"; + version = "1.23"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr"; + sha256 = "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"; }; postPatch = lib.optionalString doCheck '' diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 5b82c594b086..57d0c0a4d632 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,14 +1,17 @@ -{ stdenv, lib, fetchurl, nasm +{ stdenv, lib, fetchFromGitLab, nasm , enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "x264"; - version = "20191217-2245"; - - src = fetchurl { - url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; - sha256 = "0q214q4rhbhigyx3dfhp6d5v5gzln01cxccl153ps5ih567mqjdj"; + version = "unstable-2021-06-13"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = pname; + rev = "5db6aa6cab1b146e07b60cc1736a01f21da01154"; + sha256 = "0swyrkz6nvajivxvrr08py0jrfcsjvpxw78xm1k5gd9xbdrxvknh"; }; # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 5858dc0e7fd8..159625810bf0 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch }: +{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let since = (version: pkgs.lib.versionAtLeast nodejs.version version); @@ -280,13 +280,29 @@ let prisma = super.prisma.override { nativeBuildInputs = [ pkgs.makeWrapper ]; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz"; + sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ=="; + }; + dependencies = [ + { + name = "_at_prisma_slash_engines"; + packageName = "@prisma/engines"; + version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz"; + sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw=="; + }; + } + ]; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ - --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \ - --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \ - --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node" - --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \ - --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt" + --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \ + --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \ + --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \ + --set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \ + --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt ''; }; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ad23817fbf3a..ebfe703123a0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,6 +25,7 @@ , "bower" , "bower2nix" , "browserify" +, "browser-sync" , "btc-rpc-explorer" , "castnow" , "carbon-now-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index bb5097fe8984..cbbaf7b0db8c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1202.6" = { + "@angular-devkit/architect-0.1202.7" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.6"; + version = "0.1202.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.6.tgz"; - sha512 = "DQHK5VGfPof1TuSmRmt2Usw2BuNVLzxKSSy7+tEJbYzqf8N/wQO+1M67ye8qf8gAU88xGo378dD9++DFc/PJZA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.7.tgz"; + sha512 = "zqqw3h8jMDYsRrXUNY1J8xtUl6wmBO++yTka+CoEIFetNdLdoWmb5VpaA81i0aSBhXBgnBUUFvqZGdiI7BbV8A=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,13 +76,13 @@ let sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; - "@angular-devkit/core-12.2.6" = { + "@angular-devkit/core-12.2.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.2.6"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.6.tgz"; - sha512 = "E+OhY34Vmwyy1/PaX/nzao40XM70wOr7Urh00sAtV8sPLXMLeW0gHk4DUchCKohxQkrIL0AxYt1aeUVgIc7bSA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.7.tgz"; + sha512 = "WeLlDZaudpx10OGDPfVcWu/CaEWiWzAaLTUQz0Ww/yM+01FxR/P8yeH1sYAV1MS6d6KHvXGw7Lpf8PV7IA/zHA=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -103,13 +103,13 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-12.2.6" = { + "@angular-devkit/schematics-12.2.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.2.6"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.6.tgz"; - sha512 = "CmDNOdJg08p5QrV8dNdg3O5ErYM1hJT06PLnVZzTWkShAL0y/3zxXAP/Wwdg0vAvt9Kh38jvMtC3YTCOThR/hA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.7.tgz"; + sha512 = "E0hCFyyfbixjerf0Okt4ynC6F1dsT2Wl7MwAePe+wzPTHCnKIRTa2PQTxJzdWeTlSkQMkSK6ft2iyWOD/FODng=="; }; }; "@angular-devkit/schematics-cli-12.1.4" = { @@ -2515,13 +2515,13 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-2.17.0" = { + "@google-cloud/pubsub-2.18.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.17.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.17.0.tgz"; - sha512 = "9Xya69A5VAYVEGf651jy071RuBIjv+jpyozSc3j8V21LIiKRr9x+KyplHcLTYWdj+uXbP9cry8Ck8JEFc7GiqQ=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.18.0.tgz"; + sha512 = "pekDgDMhREHD7Mxo6aGcGRAq52c8Lv2bICQHYwHn9ET9EY9QMShLJXEhVTTCP7FrczfCJJcnAi6BYlZ6Fc/pWA=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -3991,13 +3991,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.214" = { + "@microsoft/load-themed-styles-1.10.216" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.214"; + version = "1.10.216"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.214.tgz"; - sha512 = "Bv3nSwBF0po+VbmFfbHzkCectTW9bjd1Pi6jq8WPNI83w7dgfMcPj18npfZGM2UqKNeykW7Sb/Y2Lr718dy4FQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.216.tgz"; + sha512 = "JHJwWWY3J1vKDMRREIm2U8JB5sgpGPqlF6Kf7Sjl2I8f0AeLFt43+fdPDm77sNyt5sVB1yp9hiV45i5K4s6Yag=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4072,13 +4072,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.12.0" = { + "@netlify/build-18.13.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.12.0"; + version = "18.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.12.0.tgz"; - sha512 = "PkITXAq3l5pyL5bG6JLGnwYPOi5SIr+n/9YbOcZZdoUIiLa4mTBUjee3y3lcsNUOLduMVkF4PTVLHz6F/6tyNA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.13.1.tgz"; + sha512 = "E5tmUV+fvC5mdQUiJjQpMrWgoHkvfqKFhmbnox43yJ2bU98xL2mq/tLLQqKV9STzMa8/amSBb+CLSJ9iB0THvA=="; }; }; "@netlify/cache-utils-2.0.3" = { @@ -4297,13 +4297,13 @@ let sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; - "@netlify/zip-it-and-ship-it-4.22.0" = { + "@netlify/zip-it-and-ship-it-4.23.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.22.0"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.22.0.tgz"; - sha512 = "etOGaq248ws55tYiJ16qnkpD9UKisiVH4g/RnO1oVP45+BSdRmNynUZkFbAZqpkEe8F61r4lxGBHsStuxXfXMQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.23.0.tgz"; + sha512 = "hefNXuzWnQqEClsgQMOAubkScTiIf+r+AmsrEShNkUUrg9pUoQpNVpbIpQUiP9VEIvnrCwAtPmSOaus0ijTOXQ=="; }; }; "@node-red/editor-api-2.0.6" = { @@ -4666,13 +4666,13 @@ let sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/openapi-types-10.4.0" = { + "@octokit/openapi-types-10.5.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.4.0.tgz"; - sha512 = "iA88Ke8FKnQ/HdAJ8J5X2mSwkp6zKCyKqXC161z7Xgnh0kJWWXXcDr8MNxkkGfPkaZ9RhnlDjKCoAasAvTTb1A=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.5.0.tgz"; + sha512 = "yt8GpYL0s1bLZR7602l0Im5zfmB3UdHYCfcrv3ZGRX95BjX66UQeH4asXjXo8xBit9HneCctVhTMN0On/duukQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4747,13 +4747,13 @@ let sha512 = "e30+ERbA4nXkzkaCDgfxS9H1A43Z1GvV5nqLfkxS81rYKbFE6+sEsrXsTRzV1aWLsRIQ+B75Vgnyzjw/ioTyVA=="; }; }; - "@octokit/types-6.30.0" = { + "@octokit/types-6.31.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.30.0"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.30.0.tgz"; - sha512 = "aQ8kUJLOwbIXP9Sz1fDGsdNf9cLiOmvim3gUgRmDOJVwTV3/JfKawQi2W2csku9mAzaalER+DYhsjyaqnmVcSw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.31.0.tgz"; + sha512 = "xobpvYmMYoFSxZB6jL1TPTMMZkxZIBlY145ZKibBJDKCczP1FrLLougtuVOZywGVZdcYs8oq2Bxb3aMjqIFeiw=="; }; }; "@opencensus/core-0.0.8" = { @@ -5203,7 +5203,7 @@ let version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f"; src = fetchurl { url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz"; - sha512 = "6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw=="; + sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -5458,13 +5458,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.2.6" = { + "@schematics/angular-12.2.7" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.6"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.6.tgz"; - sha512 = "53yVIB43jPpqitJXT5IxPm9Kq1P8AyRgzrCIKAl4mESsPsOIFR6ZCpuNRlaumEinHnbMpgzZ2M+RlialzAOS6w=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.7.tgz"; + sha512 = "wGqp0jC545Fwf0ydBkeoJHx9snFW+uqn40WwVqs/27Nh4AEHB5uzwzLY7Ykae95Zn802a61KPqSNWpez2fWWGA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5575,13 +5575,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.15.0" = { + "@serverless/utils-5.16.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.15.0.tgz"; - sha512 = "KH7sHbTRWCPNewp3Jg+CmmDox82L1xqr18byex3R6s0nAHSNmNwKJl30fIS1Co4u9qKOLCl4/rWjtofKJTFbCg=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.16.0.tgz"; + sha512 = "oxxfpJ7BowcJZ9cQxf02bPbCViEaU78iT6fN15/6DGD1KAm+b6h0o/962DNg5g1+QSVLsM1iP2upypf5iTjEzA=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -7843,31 +7843,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.13" = { + "@vue/compiler-core-3.2.16" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.13"; + version = "3.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.13.tgz"; - sha512 = "H8MUuKVCfAT6C0vth/+1LAriKnM+RTFo/5MoFycwRPwworTvkpWq/EuGoIXdLBblo8Y2/bNsOmIBEEoOtrb/bQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.16.tgz"; + sha512 = "60LD3f1GpMtoCPWKP7HacFxv97/EUY8m4WNqfFYmfaILVGO0icojdOCYOfgGFiYC+kgk1MOVdiI4vrWci0CnhQ=="; }; }; - "@vue/compiler-dom-3.2.13" = { + "@vue/compiler-dom-3.2.16" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.13"; + version = "3.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.13.tgz"; - sha512 = "5+2dYgQyNzM97EEgbdAusUpLjulcKkvLM26jOGpd14+qwEcW/KCnns5DGjlZD/tsdEwToOoTDCm+mjx7cO/G1Q=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.16.tgz"; + sha512 = "K7lYfwvsp5OLb0+/rKI9XT2RJy2RB7TyJBjvlfCDAF0KOJGqWAx++DLJPm+F3D29Mhxgt6ozSKP+rC3dSabvYA=="; }; }; - "@vue/shared-3.2.13" = { + "@vue/shared-3.2.16" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.13"; + version = "3.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz"; - sha512 = "F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.16.tgz"; + sha512 = "zpv8lxuatl3ruCJCsGzrO/F4+IlLug4jbu3vaIi/wJVZKQgnsW1R/xSRJMQS6K57cl4fT/2zkrYsWh1/6H7Esw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -11236,6 +11236,15 @@ let sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; + "async-each-series-0.1.1" = { + name = "async-each-series"; + packageName = "async-each-series"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz"; + sha1 = "7617c1917401fd8ca4a28aadce3dbae98afeb432"; + }; + }; "async-exit-hook-2.0.1" = { name = "async-exit-hook"; packageName = "async-exit-hook"; @@ -11542,13 +11551,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.993.0" = { + "aws-sdk-2.994.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.993.0"; + version = "2.994.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.993.0.tgz"; - sha512 = "uAxPVkGM0+hWt+OmFUtNgQmmo3tQUW1MJD8wBWFpfw97QpG2WPMv6fEFBJmuaVt0LkElgTs+9oKJsu9WkPIC9Q=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.994.0.tgz"; + sha512 = "NBGY9IgE3EsIkIhylR6pwVx9ETrVZ6fCzd7/Ptzjx7Ccw4L2sMhl4EiBAW2sp5M7PZz5DnEQHdAQstqmdxggaQ=="; }; }; "aws-sign2-0.6.0" = { @@ -13846,6 +13855,24 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; + "browser-sync-client-2.27.5" = { + name = "browser-sync-client"; + packageName = "browser-sync-client"; + version = "2.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.5.tgz"; + sha512 = "l2jtf60/exv0fQiZkhi3z8RgexYYLGS7DVDnyepkrp+oFAPlKW69daL6NrVSgrwu6lzSTCCTAiPXnUSrQ57e/Q=="; + }; + }; + "browser-sync-ui-2.27.5" = { + name = "browser-sync-ui"; + packageName = "browser-sync-ui"; + version = "2.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.5.tgz"; + sha512 = "KxBJhQ6XNbQ8w8UlkPa9/J5R0nBHgHuJUtDpEXQx1jBapDy32WGzD0NENDozP4zGNvJUgZk3N80hqB7YCieC3g=="; + }; + }; "browserify-16.5.2" = { name = "browserify"; packageName = "browserify"; @@ -13981,6 +14008,24 @@ let sha512 = "6SDY1lJMKXgt5TZ6voJQMH2zV1XPWWtm203PSkx3DSg9AYNYuRfOPFSBDkNemabzgpzFW9/neR4YhTvyJml8rQ=="; }; }; + "bs-recipes-1.3.4" = { + name = "bs-recipes"; + packageName = "bs-recipes"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz"; + sha1 = "0d2d4d48a718c8c044769fdc4f89592dc8b69585"; + }; + }; + "bs-snippet-injector-2.0.1" = { + name = "bs-snippet-injector"; + packageName = "bs-snippet-injector"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz"; + sha1 = "61b5393f11f52559ed120693100343b6edb04dd5"; + }; + }; "bs32-0.1.6" = { name = "bs32"; packageName = "bs32"; @@ -14999,13 +15044,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001259" = { + "caniuse-lite-1.0.30001260" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001259"; + version = "1.0.30001260"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001259.tgz"; - sha512 = "V7mQTFhjITxuk9zBpI6nYsiTXhcPe05l+364nZjK7MFK/E7ibvYBSAXr4YcA6oPR8j3ZLM/LN+lUqUVAQEUZFg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz"; + sha512 = "Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg=="; }; }; "canvas-2.8.0" = { @@ -15170,13 +15215,13 @@ let sha512 = "mThFg5t92Vu/pSpZVXppaokkSVIdFFnIN8pUoojIaiYL5gD1mG37IY1xt2+FDM6nncl1q6IzjKWipnGOoJYlcQ=="; }; }; - "cdk8s-plus-22-1.0.0-beta.2" = { + "cdk8s-plus-22-1.0.0-beta.4" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.2"; + version = "1.0.0-beta.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.2.tgz"; - sha512 = "KEGELreMBrDAdcidb8aUtBMoi7zfKIC4re8+aVoDXFDyxzR/NSPDx0ompH/qHcRt9TtA8nV4/31OmL3dNupOUw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.4.tgz"; + sha512 = "lxxXgDBaL3KtXDHsJy9Isg5LYctz7a9tiEtJ16zeJiGAJXqQo3VOpshV1eVbwD0E28l2NU1H2HLuFum1pw3C+w=="; }; }; "cdktf-0.6.3" = { @@ -17627,6 +17672,15 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; + "connect-3.6.6" = { + name = "connect"; + packageName = "connect"; + version = "3.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; + }; + }; "connect-3.7.0" = { name = "connect"; packageName = "connect"; @@ -17753,13 +17807,13 @@ let sha512 = "IwOwekzrASFC3qt4ozCtV09rteAIAesuCGsW0p+uBfqHd2XcvA5CXqJjgf4eUqm6g8e/noXlVCMDWwC8GaLtrg=="; }; }; - "constructs-3.3.150" = { + "constructs-3.3.152" = { name = "constructs"; packageName = "constructs"; - version = "3.3.150"; + version = "3.3.152"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.150.tgz"; - sha512 = "i++Z38CgBF7kDsKJ2PtdRpXbqL4vwule8tSxcI/PkCbj6LXmokyr7givjzPavgfMhYncDB6J4RoBjfLFMOKRxA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.152.tgz"; + sha512 = "66ByZlrzPUeY6BQ7Zs4hX81TutaKgqiieZxP7ln9voo4e6Py9mMrx/4PVgl+bwKQNw0m4ndtbkdZexuS16tiMw=="; }; }; "consume-http-header-1.0.0" = { @@ -21714,6 +21768,15 @@ let sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA=="; }; }; + "dev-ip-1.0.1" = { + name = "dev-ip"; + packageName = "dev-ip"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz"; + sha1 = "a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"; + }; + }; "devtools-protocol-0.0.869402" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -22803,6 +22866,15 @@ let sha512 = "iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug=="; }; }; + "easy-extender-2.3.4" = { + name = "easy-extender"; + packageName = "easy-extender"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz"; + sha512 = "8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q=="; + }; + }; "easy-stack-1.0.1" = { name = "easy-stack"; packageName = "easy-stack"; @@ -22812,6 +22884,15 @@ let sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; }; }; + "eazy-logger-3.1.0" = { + name = "eazy-logger"; + packageName = "eazy-logger"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.1.0.tgz"; + sha512 = "/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -22956,22 +23037,13 @@ let sha512 = "9oxNmKlDCaf651c+yJWCDIBpF6A9aY+wQtasLEeR5AsPYPuOKEX6xHnC2+WgCLOC94JEpCZznecyC84fbwZq4A=="; }; }; - "electron-to-chromium-1.3.846" = { + "electron-to-chromium-1.3.849" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.846"; + version = "1.3.849"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.846.tgz"; - sha512 = "2jtSwgyiRzybHRxrc2nKI+39wH3AwQgn+sogQ+q814gv8hIFwrcZbV07Ea9f8AmK0ufPVZUvvAG1uZJ+obV4Jw=="; - }; - }; - "electron-to-chromium-1.3.847" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.3.847"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.847.tgz"; - sha512 = "u2VQOKACHgflbu9TAAiJ9UPaQj6AD0dijL79wdqTAzFz86GXSTTPyaoxP3gZflH+r0DAlY0jD4G0TqzHzLN6Vg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.849.tgz"; + sha512 = "RweyW60HPOqIcxoKTGr38Yvtf2aliSUqX8dB3e9geJ0Bno0YLjcOX5F7/DPVloBkJWaPZ7xOM1A0Yme2T1A34w=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25073,13 +25145,13 @@ let sha1 = "96d13fa41c8de8fa5dcbfa2dacace6f594272888"; }; }; - "ext-1.5.0" = { + "ext-1.6.0" = { name = "ext"; packageName = "ext"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; - sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; + url = "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz"; + sha512 = "sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg=="; }; }; "ext-list-2.2.2" = { @@ -26171,6 +26243,15 @@ let sha512 = "lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg=="; }; }; + "finalhandler-1.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + }; + }; "finalhandler-1.1.1" = { name = "finalhandler"; packageName = "finalhandler"; @@ -26540,13 +26621,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.160.1" = { + "flow-parser-0.160.2" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.160.1"; + version = "0.160.2"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.160.1.tgz"; - sha512 = "EHdZ3/2oas3y6h4cj9sQkg4tboaz2xBPwyyjlowZgySbIobOFOO72veYz/dWbrpQO83Ucn0plmSESOl78dwdtw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.160.2.tgz"; + sha512 = "4QGORQvAkuYZH02gY9YRvOoV/BqXUEtMjTem/jxtxfLDp8BNW/LfyJxgksYnQoPIAT01CydkcKG03MTIDbqaFg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -27170,6 +27251,15 @@ let sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; }; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + }; "fs-extra-4.0.3" = { name = "fs-extra"; packageName = "fs-extra"; @@ -30817,13 +30907,13 @@ let sha512 = "boEiPCK848pNGACW1j111tJApu530e/UPpwbHytJZlrVf3YdgUIP1KL3aSi5xJFLUnuO8GLGl4lIsSeH8TaQQA=="; }; }; - "hypercore-9.11.0" = { + "hypercore-9.12.0" = { name = "hypercore"; packageName = "hypercore"; - version = "9.11.0"; + version = "9.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-9.11.0.tgz"; - sha512 = "/HwisY6gwkdMkEtn0vHkxrdJt6C0TK2YrnN59fCjSL3msfGLWOJ4lQxG39n0Ehd1dRdDWCj27MaTMI8krLU/Cw=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-9.12.0.tgz"; + sha512 = "wIlM4Iwl618NcmsY+1O/X08Cx/bY6ti3LXmQhRnPZFGQPqAeX0x53hASckW082IIAVWzXD3zcmREw5yEINzb4w=="; }; }; "hypercore-byte-stream-1.0.12" = { @@ -31276,6 +31366,15 @@ let sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="; }; }; + "immutable-3.8.2" = { + name = "immutable"; + packageName = "immutable"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz"; + sha1 = "c2439951455bb39913daf281376f1530e104adf3"; + }; + }; "import-cwd-2.1.0" = { name = "import-cwd"; packageName = "import-cwd"; @@ -32464,6 +32563,15 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; + "is-builtin-module-3.1.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz"; + sha512 = "OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg=="; + }; + }; "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; @@ -33058,6 +33166,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-number-like-1.0.8" = { + name = "is-number-like"; + packageName = "is-number-like"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz"; + sha512 = "6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA=="; + }; + }; "is-number-object-1.0.6" = { name = "is-number-object"; packageName = "is-number-object"; @@ -33895,13 +34012,13 @@ let sha512 = "0RHjbtw9QXeSYnIEY5Yrp2QZrdtz21xBDV9C/GIlY2POmgoS6a7qjkYS5siRKXScnuAj5/SPv1C3YForNCHTJA=="; }; }; - "istanbul-lib-coverage-3.0.0" = { + "istanbul-lib-coverage-3.0.1" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.1.tgz"; + sha512 = "GvCYYTxaCPqwMjobtVcVKvSHtAGe48MNhGjpK8LtVF8K0ISX7hCKl85LgtuaSneWVyQmaGcW3iXVV3GaZSLpmQ=="; }; }; "istanbul-lib-instrument-4.0.3" = { @@ -34625,13 +34742,13 @@ let sha512 = "GOGAy5b+zCGeyYziBoNVXgamL2CEZKMj5moeemkyN4AUHUqugNk3fSul2Zdbxs2S13Suk0D9iYAgChDxew0bOw=="; }; }; - "jsii-srcmak-0.1.351" = { + "jsii-srcmak-0.1.353" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.351"; + version = "0.1.353"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.351.tgz"; - sha512 = "ZiXB7nvNrxylnbf8gUWgcHwciizWLGrVlO9xVdqoAOqAxSEwLPZk721nYwp7LHTi6c4HAiBtAHsNZC4Dd4As5Q=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.353.tgz"; + sha512 = "XA4N72CqPEvdjD3SCRsCWhJIFZt+/8ekhDq8a/7k5t/9vGzdU1a79AvekqaP3tv4V1CGZqDgdyFeKvwcqEr6cw=="; }; }; "json-bigint-1.0.0" = { @@ -34922,13 +35039,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.27" = { + "json2jsii-0.2.29" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.27"; + version = "0.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.27.tgz"; - sha512 = "dl1jji4Z+YHm08ckQdW2f6gS7WF+f4UEEqPbduFpP8wTAxBvKnYFxuzPEUQCONi2MjSLBBPHgmtisUYqCONTYw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.29.tgz"; + sha512 = "m+vJPKYurkWIMyVw0k+Qvogu/gVFdAEOA5Ff7p0h6ENLamc3o9bMrgB/5oMyZxsfN/2jaf+pUAEM8KAFUSO+MQ=="; }; }; "json3-3.2.6" = { @@ -35048,6 +35165,15 @@ let sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -36749,6 +36875,15 @@ let sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; }; }; + "localtunnel-2.0.2" = { + name = "localtunnel"; + packageName = "localtunnel"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"; + sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; + }; + }; "locate-java-home-1.1.2" = { name = "locate-java-home"; packageName = "locate-java-home"; @@ -37568,6 +37703,15 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; + "lodash.isfinite-3.3.2" = { + name = "lodash.isfinite"; + packageName = "lodash.isfinite"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz"; + sha1 = "fb89b65a9a80281833f0b7478b3a5104f898ebb3"; + }; + }; "lodash.isfunction-2.4.1" = { name = "lodash.isfunction"; packageName = "lodash.isfunction"; @@ -39971,13 +40115,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.12.1" = { + "mermaid-8.13.0" = { name = "mermaid"; packageName = "mermaid"; - version = "8.12.1"; + version = "8.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.12.1.tgz"; - sha512 = "0UCcSF0FLoNcPBsRF4f9OIV32t41fV18//z8o3S+FDz2PbDA1CRGKdQF9IX84VP4Tv9kcgJI/oqJdcBEtB/GPA=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.13.0.tgz"; + sha512 = "/b8tCqyGhb+yiCQQ5cwpGcaesAfZV057kRBaUx+g6LHctebWaMvo5WmIPN+/jMHfLtAgCJIaQDZ1EsECz7FJIQ=="; }; }; "meros-1.1.4" = { @@ -41781,13 +41925,13 @@ let sha512 = "7sBZo9wthqNJ7QXnfVXZL7fkKJLN55GLOdX+RyZT34UOvxxnFtJe/c7K0ZRLAKOvaY1xJThFFn0Usw2H9R6Frg=="; }; }; - "nanocolors-0.1.6" = { + "nanocolors-0.1.12" = { name = "nanocolors"; packageName = "nanocolors"; - version = "0.1.6"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.6.tgz"; - sha512 = "2pvTw6vYRaBLGir2xR7MxaJtyWkrn+C53EpW8yPotG+pdAwBvt0Xwk4VJ6VHLY0aLthVZPvDfm9TdZvrvAm5UQ=="; + url = "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz"; + sha512 = "2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ=="; }; }; "nanoguard-1.3.0" = { @@ -44700,6 +44844,15 @@ let sha512 = "XLKtEfHxqrWyF1fzxznsv78w3csW41ucHnjiKnfzZLD5FN8UBDZZL1i4q0FR29zjxXhm+2Hop+5Vr/b8tKIvEg=="; }; }; + "openurl-1.1.1" = { + name = "openurl"; + packageName = "openurl"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; + sha1 = "3875b4b0ef7a52c156f0db41d4609dbb0f94b387"; + }; + }; "opn-3.0.3" = { name = "opn"; packageName = "opn"; @@ -44718,6 +44871,15 @@ let sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; + "opn-5.3.0" = { + name = "opn"; + packageName = "opn"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; + sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; + }; + }; "opn-5.5.0" = { name = "opn"; packageName = "opn"; @@ -47373,6 +47535,15 @@ let sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; }; }; + "portscanner-2.1.1" = { + name = "portscanner"; + packageName = "portscanner"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz"; + sha1 = "eabb409e4de24950f5a2a516d35ae769343fbb96"; + }; + }; "posix-character-classes-0.1.1" = { name = "posix-character-classes"; packageName = "posix-character-classes"; @@ -50200,6 +50371,15 @@ let sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="; }; }; + "qs-6.2.3" = { + name = "qs"; + packageName = "qs"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; + sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; + }; + }; "qs-6.3.2" = { name = "qs"; packageName = "qs"; @@ -53161,6 +53341,15 @@ let sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; }; }; + "resp-modifier-6.0.2" = { + name = "resp-modifier"; + packageName = "resp-modifier"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"; + sha1 = "b124de5c4fbafcba541f48ffa73970f4aa456b4f"; + }; + }; "responselike-1.0.2" = { name = "responselike"; packageName = "responselike"; @@ -55825,6 +56014,15 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; + "socket.io-2.4.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz"; + sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ=="; + }; + }; "socket.io-2.4.1" = { name = "socket.io"; packageName = "socket.io"; @@ -57193,13 +57391,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.73" = { + "sscaff-1.2.75" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.73"; + version = "1.2.75"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.73.tgz"; - sha512 = "mOFmcSfJq6Ck4G+qE3CcZzNFUhYsG9aonMN4fNY65aiiLQL9pufMVj/s85BjMrLmdVavnh7/CZ/FXYldPeBUjA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.75.tgz"; + sha512 = "yb/3nwGbZI3KSpwdjjS5FbEZGhKXLvC5quA/x45Af2r7U4QvM8szr7xI6/Mi3amAJIO9alVyvNPrcvslqhe2gg=="; }; }; "ssh-config-1.1.6" = { @@ -57463,6 +57661,15 @@ let sha512 = "+sGCE6FednJ/vI7vywErOg/mhVqmf6Zlktz7cdGRnF/cQWXD9ifMgtqU1CIIXmhSwm11SCk4zDN+bwNCvIR/Kg=="; }; }; + "statuses-1.3.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + }; "statuses-1.4.0" = { name = "statuses"; packageName = "statuses"; @@ -57742,6 +57949,15 @@ let sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg=="; }; }; + "stream-throttle-0.1.3" = { + name = "stream-throttle"; + packageName = "stream-throttle"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz"; + sha1 = "add57c8d7cc73a81630d31cd55d3961cfafba9c3"; + }; + }; "stream-to-array-2.3.0" = { name = "stream-to-array"; packageName = "stream-to-array"; @@ -58003,13 +58219,13 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string-width-4.2.2" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; - sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -58210,6 +58426,15 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; + "strip-ansi-6.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + }; "strip-ansi-7.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -59164,13 +59389,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.9.3" = { + "systeminformation-5.9.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.3.tgz"; - sha512 = "FmifqCPDU5uJZeORt1jCiATBTHwpX7luDzeFo8lojYbEiJk6oR3mtAZBOayCo3iEmgSILzmbcO855OXPHCeU+g=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.4.tgz"; + sha512 = "FOsiTn0CyJZoj9kIhla11ndsMzbbwwuriul81wpqIBt9IpbxHZ6P/oZCphIFgJrwqjTnme0Qp1HDzIkUD9Xr/g=="; }; }; "table-3.8.3" = { @@ -59867,6 +60092,15 @@ let sha512 = "mHE7/pDw/Hk+Q6YdSMNRrZPl5bCuWnFLbF+bxW+MsWQ64dw+Ia9irkammYbH5I0hVMMcfwb0MQc5nbsjqgWeyQ=="; }; }; + "tfunk-4.0.0" = { + name = "tfunk"; + packageName = "tfunk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz"; + sha512 = "eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ=="; + }; + }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -67429,6 +67663,15 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; + "yargs-17.2.0" = { + name = "yargs"; + packageName = "yargs"; + version = "17.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.2.0.tgz"; + sha512 = "UPeZv4h9Xv510ibpt5rdsUNzgD78nMa1rhxxCgvkKiq06hlKCEHJLiJ6Ub8zDg/wR6hedEI6ovnd2vCvJ4nusA=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -67876,15 +68119,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.6"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.6.tgz"; - sha512 = "nBCynOi5OVVAXA4ktsVhWP+UyWjjR/7+TlEjNgEfcbtlwkE+HIki+oHETAtXKdn5nPvNum3OXPLZPLX2B8MiRA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.7.tgz"; + sha512 = "FH34528+126Cxh/+1cBppBas8tExizKSJgbjpT3zgV6ijwHD7apT5zU9R1TyOhQPd6BhyaURo9Hnsjg49W4bRA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.6" - sources."@angular-devkit/core-12.2.6" - sources."@angular-devkit/schematics-12.2.6" + sources."@angular-devkit/architect-0.1202.7" + sources."@angular-devkit/core-12.2.7" + sources."@angular-devkit/schematics-12.2.7" sources."@gar/promisify-1.1.2" sources."@npmcli/fs-1.0.0" sources."@npmcli/git-2.1.0" @@ -67893,7 +68136,7 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" - sources."@schematics/angular-12.2.6" + sources."@schematics/angular-12.2.7" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -67980,7 +68223,7 @@ in ]; }) sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { @@ -68109,9 +68352,9 @@ in sources."sourcemap-codec-1.4.8" sources."sshpk-1.16.1" sources."ssri-8.0.1" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" sources."tar-6.1.11" @@ -68319,7 +68562,7 @@ in sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -68623,8 +68866,8 @@ in sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."steno-0.4.4" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."symbol-tree-3.2.4" sources."through-2.3.8" @@ -68824,9 +69067,9 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."split2-3.2.2" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" @@ -68843,7 +69086,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" sources."yocto-queue-0.1.0" ]; @@ -69053,7 +69296,7 @@ in sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" sources."hyperbee-1.6.3" - sources."hypercore-9.11.0" + sources."hypercore-9.12.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ sources."readable-stream-3.6.0" @@ -69362,8 +69605,8 @@ in sources."color-name-1.1.4" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -69411,7 +69654,7 @@ in sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.4.0" + sources."@octokit/openapi-types-10.5.0" sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.11.1" @@ -69419,7 +69662,7 @@ in sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.11.0" - sources."@octokit/types-6.30.0" + sources."@octokit/types-6.31.0" sources."@sideway/address-4.1.2" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" @@ -69479,7 +69722,7 @@ in sources."simple-git-2.45.1" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."tr46-0.0.3" sources."universal-user-agent-6.0.0" @@ -69585,7 +69828,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -69611,7 +69854,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.846" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -69649,7 +69892,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" @@ -69710,7 +69953,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mute-stream-0.0.8" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" sources."node-releases-1.1.76" @@ -69770,9 +70013,9 @@ in ]; }) sources."sourcemap-codec-1.4.8" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" @@ -69885,7 +70128,7 @@ in sources."safe-buffer-5.2.1" sources."signal-exit-3.0.4" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."util-deprecate-1.0.2" sources."wasm-feature-detect-1.2.11" @@ -70098,13 +70341,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.2.13" // { + (sources."@vue/compiler-core-3.2.16" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.13" - sources."@vue/shared-3.2.13" + sources."@vue/compiler-dom-3.2.16" + sources."@vue/shared-3.2.16" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -70226,7 +70469,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -70353,7 +70596,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -70436,7 +70679,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.160.1" + sources."flow-parser-0.160.2" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -70464,7 +70707,7 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -70661,7 +70904,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -70951,7 +71194,7 @@ in sources."steno-0.4.4" sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -70964,7 +71207,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."strip-ansi-6.0.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ sources."ansi-regex-5.0.1" ]; @@ -71371,7 +71614,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.17.1" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -71381,7 +71624,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -71427,7 +71670,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."node-releases-1.1.76" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { @@ -71483,7 +71726,7 @@ in sources."commander-5.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -71511,11 +71754,11 @@ in }; dependencies = [ sources."browserslist-4.17.1" - sources."caniuse-lite-1.0.30001259" - sources."electron-to-chromium-1.3.847" + sources."caniuse-lite-1.0.30001260" + sources."electron-to-chromium-1.3.849" sources."escalade-3.1.1" sources."fraction.js-4.1.1" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."node-releases-1.1.76" sources."normalize-range-0.1.2" sources."postcss-value-parser-4.1.0" @@ -71547,7 +71790,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.993.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71620,7 +71863,7 @@ in }) sources."get-stream-5.2.0" sources."get-uri-3.0.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" @@ -71702,9 +71945,9 @@ in sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."statuses-1.5.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" (sources."tar-fs-2.0.0" // { dependencies = [ @@ -71867,8 +72110,8 @@ in sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."type-fest-0.20.2" ]; @@ -71914,8 +72157,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -72042,8 +72285,8 @@ in sources."mute-stream-0.0.8" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."tmp-0.0.33" ]; @@ -72208,7 +72451,7 @@ in sources."cli-cursor-3.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" ]; }) @@ -72325,8 +72568,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) (sources."tabtab-2.2.2" // { @@ -72382,8 +72625,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wif-2.0.6" @@ -72399,8 +72642,8 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -72413,8 +72656,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -72488,7 +72731,7 @@ in sources."fs.realpath-1.0.0" sources."fuzzy-search-3.2.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."html-encoding-sniffer-1.0.2" @@ -72850,7 +73093,7 @@ in sources."resolve-1.20.0" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" ]; }) sources."semver-5.7.1" @@ -72976,7 +73219,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" @@ -73117,6 +73360,255 @@ in bypassCache = true; reconstructLock = true; }; + browser-sync = nodeEnv.buildNodePackage { + name = "browser-sync"; + packageName = "browser-sync"; + version = "2.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.5.tgz"; + sha512 = "0GMEPDqccbTxwYOUGCk5AZloDj9I/1eDZCLXUKXu7iBJPznGGOnMHs88mrhaFL0fTA0R23EmsXX9nLZP+k5YzA=="; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."after-0.8.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-3.1.2" + sources."arraybuffer.slice-0.0.7" + sources."async-1.5.2" + sources."async-each-series-0.1.1" + sources."axios-0.21.4" + sources."backo2-1.0.2" + sources."balanced-match-1.0.2" + sources."base64-arraybuffer-0.1.4" + sources."base64id-2.0.0" + sources."batch-0.6.1" + sources."binary-extensions-2.2.0" + sources."blob-0.0.5" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browser-sync-client-2.27.5" + sources."browser-sync-ui-2.27.5" + sources."bs-recipes-1.3.4" + sources."bs-snippet-injector-2.0.1" + sources."bytes-3.1.0" + sources."camelcase-5.3.1" + sources."chalk-1.1.3" + sources."chokidar-3.5.2" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-2.20.3" + sources."component-bind-1.0.0" + sources."component-emitter-1.3.0" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + (sources."connect-3.6.6" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."connect-history-api-fallback-1.6.0" + sources."cookie-0.4.1" + sources."debug-3.1.0" + sources."decamelize-1.2.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dev-ip-1.0.1" + sources."dlv-1.1.3" + sources."easy-extender-2.3.4" + sources."eazy-logger-3.1.0" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + (sources."engine.io-3.5.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.3" + ]; + }) + sources."engine.io-client-3.5.2" + sources."engine.io-parser-2.2.1" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."eventemitter3-4.0.7" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."find-up-4.1.0" + sources."follow-redirects-1.14.4" + sources."fresh-0.5.2" + sources."fs-extra-3.0.1" + sources."fsevents-2.3.2" + sources."get-caller-file-2.0.5" + sources."glob-parent-5.1.2" + sources."graceful-fs-4.2.8" + sources."has-ansi-2.0.0" + sources."has-binary2-1.0.3" + sources."has-cors-1.1.0" + (sources."http-errors-1.7.3" // { + dependencies = [ + sources."statuses-1.5.0" + ]; + }) + sources."http-proxy-1.18.1" + sources."iconv-lite-0.4.24" + sources."immutable-3.8.2" + sources."indexof-0.0.1" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-number-like-1.0.8" + sources."is-wsl-1.1.0" + sources."isarray-2.0.1" + sources."jsonfile-3.0.1" + sources."limiter-1.1.5" + (sources."localtunnel-2.0.2" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + sources."yargs-17.1.1" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lodash.isfinite-3.3.2" + sources."micromatch-4.0.4" + sources."mime-1.4.1" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."minimatch-3.0.4" + sources."mitt-1.2.0" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."normalize-path-3.0.0" + sources."on-finished-2.3.0" + sources."openurl-1.1.1" + sources."opn-5.3.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" + sources."parseurl-1.3.3" + sources."path-exists-4.0.0" + sources."picomatch-2.3.0" + sources."portscanner-2.1.1" + sources."qs-6.2.3" + sources."range-parser-1.2.1" + sources."raw-body-2.4.1" + sources."readdirp-3.6.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + (sources."resp-modifier-6.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."rx-4.1.0" + sources."rxjs-5.5.12" + sources."safer-buffer-2.1.2" + (sources."send-0.16.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" + ]; + }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" + ]; + }) + sources."serve-static-1.13.2" + sources."server-destroy-1.0.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + (sources."socket.io-2.4.0" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."debug-4.1.1" + sources."ms-2.1.3" + sources."socket.io-parser-3.4.1" + ]; + }) + sources."socket.io-adapter-1.1.2" + sources."socket.io-client-2.4.0" + sources."socket.io-parser-3.3.2" + sources."statuses-1.3.1" + sources."stream-throttle-0.1.3" + (sources."string-width-4.2.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."symbol-observable-1.0.1" + sources."tfunk-4.0.0" + sources."to-array-0.1.4" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."ua-parser-js-0.7.28" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."utils-merge-1.0.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."strip-ansi-6.0.1" + ]; + }) + sources."ws-7.4.6" + sources."xmlhttprequest-ssl-1.6.3" + sources."y18n-5.0.8" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" + sources."strip-ansi-6.0.1" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Live CSS Reload & Browser Syncing"; + homepage = "https://browsersync.io/"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; @@ -73712,7 +74204,7 @@ in sources."get-browser-rtc-1.1.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-1.2.2" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" @@ -74192,7 +74684,7 @@ in sources."get-stdin-6.0.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -74613,7 +75105,7 @@ in sources."camelcase-6.2.0" sources."case-1.6.3" sources."cdk8s-1.0.0-beta.46" - sources."cdk8s-plus-22-1.0.0-beta.2" + sources."cdk8s-plus-22-1.0.0-beta.4" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -74626,7 +75118,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.150" + sources."constructs-3.3.152" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -74704,14 +75196,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.351" // { + (sources."jsii-srcmak-0.1.353" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.27" + sources."json2jsii-0.2.29" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -74749,17 +75241,17 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.73" + sources."sscaff-1.2.75" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."tslib-2.3.1" sources."typescript-3.9.10" @@ -75216,7 +75708,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.351" // { + (sources."jsii-srcmak-0.1.353" // { dependencies = [ sources."ansi-styles-4.3.0" sources."camelcase-5.3.1" @@ -75383,7 +75875,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.73" + sources."sscaff-1.2.75" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -75398,7 +75890,7 @@ in sources."ms-2.1.2" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" @@ -75407,7 +75899,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" (sources."subscriptions-transport-ws-0.9.19" // { dependencies = [ @@ -75461,7 +75953,7 @@ in sources."xss-1.0.9" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" sources."yn-3.1.1" @@ -75497,7 +75989,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -75681,10 +76173,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.15.1.tgz"; - sha512 = "3ufaAOdcVDG1c6L7MlbPl2CMKpJeZvxh2rgz10EVGxbelreyKdoO+m66c+LT5ZydTwJZl86+CMOVFOK/YiAwQQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.16.0.tgz"; + sha512 = "3NTHssw+ZxZiq1XZVbyfSKxgD0vZ96yBjzYh5l/kyr4413KibNTMgF2gTBMQsOnrfFmrfDz6RF5Yy2ie2EkZXw=="; }; buildInputs = globalBuildInputs; meta = { @@ -75815,7 +76307,7 @@ in sources."execa-2.1.0" sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globby-7.1.1" sources."ignore-3.3.10" sources."indent-string-4.0.0" @@ -76157,7 +76649,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" @@ -76392,7 +76884,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -76490,7 +76982,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -76620,7 +77112,7 @@ in sources."get-stdin-5.0.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -76807,6 +77299,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" + sources."nanocolors-0.1.12" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -77107,10 +77600,10 @@ in sources."kind-of-5.1.0" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."stringify-entities-1.3.2" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" (sources."strip-indent-1.0.1" // { @@ -77501,7 +77994,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -77539,7 +78032,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -77561,7 +78054,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -77636,7 +78129,7 @@ in ]; }) sources."ms-2.1.2" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."node-releases-1.1.76" (sources."normalize-package-data-3.0.3" // { dependencies = [ @@ -77725,13 +78218,13 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" sources."style-search-0.1.0" sources."stylelint-13.13.1" @@ -77844,7 +78337,7 @@ in sources."esprima-4.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."inflight-1.0.6" @@ -78025,7 +78518,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-1.0.3" @@ -78081,8 +78574,8 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { @@ -78320,7 +78813,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-3.0.0" sources."git-clone-0.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-6.7.1" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" @@ -78738,9 +79231,9 @@ in sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."split2-3.2.2" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-indent-3.0.0" sources."supports-color-5.5.0" @@ -78845,8 +79338,8 @@ in sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."bplist-parser-0.2.0" @@ -78994,7 +79487,7 @@ in sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.4" @@ -79349,8 +79842,8 @@ in sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) (sources."windows-release-3.3.3" // { @@ -79510,7 +80003,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -79814,7 +80307,7 @@ in sources."es6-symbol-3.1.3" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -79950,7 +80443,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" @@ -80301,7 +80794,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" @@ -80746,7 +81239,7 @@ in "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage { name = "deltachat-desktop"; packageName = "deltachat-desktop"; - version = "1.22.1"; + version = "1.22.2"; src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -80944,7 +81437,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -81012,7 +81505,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.4.0" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -81187,7 +81680,7 @@ in sources."ms-2.1.2" sources."murmurhash-js-1.0.0" sources."nan-2.15.0" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."napi-macros-2.0.0" sources."node-fetch-2.6.5" @@ -81494,7 +81987,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."graceful-fs-4.2.8" @@ -81861,7 +82354,7 @@ in (sources."cliui-7.0.4" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."clone-1.0.4" @@ -82013,7 +82506,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-agent-2.2.0" sources."global-modules-1.0.0" @@ -82050,7 +82543,7 @@ in (sources."inquirer-8.1.5" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."ip-1.1.5" @@ -82281,7 +82774,7 @@ in ]; }) sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-indent-1.0.1" @@ -82333,7 +82826,7 @@ in (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."wrappy-1.0.2" @@ -82341,10 +82834,10 @@ in sources."xtend-2.1.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.1.1" // { + (sources."yargs-17.2.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."yargs-parser-20.2.9" @@ -82461,7 +82954,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -82490,7 +82983,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -82507,7 +83000,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stream-4.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-11.12.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -82579,7 +83072,7 @@ in sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."ms-2.1.2" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nice-try-1.0.5" sources."node-releases-1.1.76" sources."normalize-package-data-2.5.0" @@ -82663,8 +83156,8 @@ in sources."escape-string-regexp-2.0.0" ]; }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" sources."strip-indent-3.0.0" sources."supports-color-5.5.0" @@ -82749,7 +83242,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.214" + sources."@microsoft/load-themed-styles-1.10.216" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -83262,7 +83755,7 @@ in sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" sources."express-openapi-7.0.1" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -83359,7 +83852,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -84505,7 +84998,7 @@ in sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-flag-3.0.0" @@ -84553,8 +85046,8 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { @@ -84669,7 +85162,7 @@ in sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-flag-4.0.0" @@ -84718,8 +85211,8 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" (sources."table-6.7.1" // { @@ -85261,7 +85754,7 @@ in }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -85532,7 +86025,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -86133,7 +86626,7 @@ in sources."mv-2.1.1" sources."mz-2.7.0" sources."nan-2.15.0" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."ncp-2.0.0" (sources."needle-2.9.1" // { @@ -86554,6 +87047,7 @@ in sources."prompts-2.4.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."strip-ansi-6.0.0" sources."which-2.0.2" ]; }) @@ -86781,7 +87275,7 @@ in ]; }) sources."stream-shift-1.0.1" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -86790,7 +87284,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" (sources."style-loader-1.2.1" // { @@ -87280,7 +87774,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -87304,7 +87798,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -87319,7 +87813,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-11.12.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -87371,7 +87865,7 @@ in sources."minimist-options-4.1.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."node-fetch-2.6.5" sources."node-releases-1.1.76" (sources."normalize-package-data-3.0.3" // { @@ -87443,13 +87937,13 @@ in sources."escape-string-regexp-2.0.0" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" sources."supports-color-5.5.0" sources."tar-fs-2.1.1" @@ -87792,7 +88286,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" (sources."globby-8.0.2" // { @@ -88100,13 +88594,13 @@ in }) sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.2.0" // { @@ -88197,7 +88691,7 @@ in sources."@google-cloud/precise-date-2.0.4" sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-2.17.0" // { + (sources."@google-cloud/pubsub-2.18.0" // { dependencies = [ sources."google-auth-library-7.9.2" ]; @@ -88499,7 +88993,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -88578,7 +89072,7 @@ in ]; }) sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" @@ -88945,9 +89439,9 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" (sources."superstatic-7.1.0" // { dependencies = [ @@ -89132,7 +89626,7 @@ in sources."escalade-3.1.1" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" @@ -89141,8 +89635,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."require-directory-2.1.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" @@ -89305,8 +89799,8 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" @@ -89502,8 +89996,8 @@ in sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-hex-prefix-1.0.0" sources."supports-color-7.2.0" sources."through-2.3.8" @@ -89708,7 +90202,7 @@ in sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -90003,8 +90497,8 @@ in sources."indent-string-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."lossless-json-1.0.5" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" ]; buildInputs = globalBuildInputs; @@ -90202,7 +90696,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -90233,7 +90727,7 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" ]; }) @@ -90301,7 +90795,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -90375,7 +90869,7 @@ in sources."gatsby-core-utils-2.14.0" (sources."gatsby-recipes-0.25.0" // { dependencies = [ - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."gatsby-telemetry-2.14.0" @@ -90385,7 +90879,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-4.1.0" sources."git-up-4.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-dirs-3.0.0" sources."globals-11.12.0" @@ -90421,7 +90915,7 @@ in sources."inline-style-parser-0.1.1" (sources."inquirer-7.3.3" // { dependencies = [ - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."ipaddr.js-1.9.1" @@ -90533,7 +91027,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."no-case-3.0.4" @@ -90705,11 +91199,11 @@ in sources."state-toggle-1.0.3" sources."statuses-1.5.0" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."string_decoder-1.3.0" @@ -90789,7 +91283,7 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -90845,14 +91339,14 @@ in sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.4.0" + sources."@octokit/openapi-types-10.5.0" sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.11.1" sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.11.0" - sources."@octokit/types-6.30.0" + sources."@octokit/types-6.31.0" sources."@types/normalize-package-data-2.4.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" @@ -90880,7 +91374,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-5.2.0" sources."github-username-6.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-4.0.0" @@ -91575,9 +92069,9 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."statuses-1.5.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" @@ -91628,10 +92122,10 @@ in glob = nodeEnv.buildNodePackage { name = "glob"; packageName = "glob"; - version = "7.1.7"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -91822,7 +92316,7 @@ in (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -91903,7 +92397,7 @@ in sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.1" (sources."got-9.6.0" // { @@ -91951,7 +92445,7 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."internal-slot-1.0.3" @@ -92061,7 +92555,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.1.1" + sources."yargs-17.2.0" ]; }) sources."oas-schema-walker-1.1.5" @@ -92083,7 +92577,7 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."os-tmpdir-1.0.2" @@ -92159,10 +92653,10 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."string-env-interpolation-1.0.1" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."string.prototype.trimend-1.0.4" @@ -92174,7 +92668,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.1.1" + sources."yargs-17.2.0" ]; }) sources."symbol-observable-1.2.0" @@ -92206,7 +92700,7 @@ in (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -92510,10 +93004,10 @@ in sources."redeyed-2.1.1" sources."sax-1.2.4" sources."sparkline-0.1.2" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."string_decoder-0.10.31" @@ -92524,7 +93018,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.9.3" + sources."systeminformation-5.9.4" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -92688,7 +93182,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -92728,7 +93222,7 @@ in sources."get-caller-file-1.0.3" sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -93098,7 +93592,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -93671,7 +94165,7 @@ in sources."extsprintf-1.4.0" sources."fs.realpath-1.0.0" sources."fuzzyset.js-0.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."hue-sdk-0.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -93722,7 +94216,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.993.0" + sources."aws-sdk-2.994.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -93862,9 +94356,9 @@ in sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."static-eval-2.0.2" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" (sources."tough-cookie-2.5.0" // { dependencies = [ sources."punycode-2.1.1" @@ -94277,7 +94771,7 @@ in sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."historic-readline-1.0.8" sources."iconv-lite-0.6.3" @@ -94431,7 +94925,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-uri-3.0.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -94572,14 +95066,14 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" ]; }) sources."string_decoder-1.3.0" - (sources."strip-ansi-6.0.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ sources."ansi-regex-5.0.1" ]; @@ -94749,7 +95243,7 @@ in sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."hashish-0.0.4" @@ -94797,8 +95291,8 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."spiro-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" (sources."stylus-0.54.8" // { dependencies = [ sources."semver-6.3.0" @@ -94823,7 +95317,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."yargs-17.1.1" + sources."yargs-17.2.0" ]; }) sources."wawoff2-2.0.0" @@ -94915,7 +95409,7 @@ in sources."fast-json-patch-2.2.1" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-flag-3.0.0" sources."hexer-1.5.0" sources."inflight-1.0.6" @@ -95036,7 +95530,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.993.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -95102,40 +95596,79 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-5.16.0" - sources."d3-array-1.2.4" - sources."d3-axis-1.0.12" - sources."d3-brush-1.1.6" - sources."d3-chord-1.0.6" + sources."d3-7.0.3" + sources."d3-array-3.0.4" + sources."d3-axis-3.0.0" + sources."d3-brush-3.0.0" + sources."d3-chord-3.0.1" sources."d3-collection-1.0.7" - sources."d3-color-1.4.1" - sources."d3-contour-1.3.2" - sources."d3-dispatch-1.0.6" - sources."d3-drag-1.2.5" - sources."d3-dsv-1.2.0" - sources."d3-ease-1.0.7" - sources."d3-fetch-1.2.0" - sources."d3-force-1.2.1" - sources."d3-format-1.4.5" - sources."d3-geo-1.12.1" - sources."d3-hierarchy-1.1.9" - sources."d3-interpolate-1.4.0" - sources."d3-path-1.0.9" - sources."d3-polygon-1.0.6" - sources."d3-quadtree-1.0.7" - sources."d3-random-1.1.2" - sources."d3-scale-2.2.2" - sources."d3-scale-chromatic-1.5.0" - sources."d3-selection-1.4.2" - sources."d3-shape-1.3.7" - sources."d3-time-1.1.0" - sources."d3-time-format-2.3.0" - sources."d3-timer-1.0.10" - sources."d3-transition-1.3.2" + sources."d3-color-3.0.1" + sources."d3-contour-3.0.1" + sources."d3-delaunay-6.0.2" + sources."d3-dispatch-3.0.1" + sources."d3-drag-3.0.0" + (sources."d3-dsv-3.0.1" // { + dependencies = [ + sources."commander-7.2.0" + sources."iconv-lite-0.6.3" + ]; + }) + sources."d3-ease-3.0.1" + sources."d3-fetch-3.0.1" + sources."d3-force-3.0.0" + sources."d3-format-3.0.1" + sources."d3-geo-3.0.1" + sources."d3-hierarchy-3.0.1" + sources."d3-interpolate-3.0.1" + sources."d3-path-3.0.1" + sources."d3-polygon-3.0.1" + sources."d3-quadtree-3.0.1" + sources."d3-random-3.0.1" + sources."d3-scale-4.0.1" + sources."d3-scale-chromatic-3.0.0" + sources."d3-selection-3.0.0" + sources."d3-shape-3.0.1" + sources."d3-time-3.0.0" + sources."d3-time-format-4.0.0" + sources."d3-timer-3.0.1" + sources."d3-transition-3.0.1" sources."d3-voronoi-1.1.4" - sources."d3-zoom-1.8.3" + sources."d3-zoom-3.0.0" sources."dagre-0.8.5" - sources."dagre-d3-0.6.4" + (sources."dagre-d3-0.6.4" // { + dependencies = [ + sources."d3-5.16.0" + sources."d3-array-1.2.4" + sources."d3-axis-1.0.12" + sources."d3-brush-1.1.6" + sources."d3-chord-1.0.6" + sources."d3-color-1.4.1" + sources."d3-contour-1.3.2" + sources."d3-dispatch-1.0.6" + sources."d3-drag-1.2.5" + sources."d3-dsv-1.2.0" + sources."d3-ease-1.0.7" + sources."d3-fetch-1.2.0" + sources."d3-force-1.2.1" + sources."d3-format-1.4.5" + sources."d3-geo-1.12.1" + sources."d3-hierarchy-1.1.9" + sources."d3-interpolate-1.4.0" + sources."d3-path-1.0.9" + sources."d3-polygon-1.0.6" + sources."d3-quadtree-1.0.7" + sources."d3-random-1.1.2" + sources."d3-scale-2.2.2" + sources."d3-scale-chromatic-1.5.0" + sources."d3-selection-1.4.2" + sources."d3-shape-1.3.7" + sources."d3-time-1.1.0" + sources."d3-time-format-2.3.0" + sources."d3-timer-1.0.10" + sources."d3-transition-1.3.2" + sources."d3-zoom-1.8.3" + ]; + }) sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."debug-3.2.7" @@ -95144,6 +95677,7 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" + sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -95224,7 +95758,7 @@ in sources."get-stdin-5.0.1" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" @@ -95280,6 +95814,7 @@ in sources."split-skip-0.0.1" ]; }) + sources."internmap-2.0.3" sources."iota-array-1.0.0" sources."ip-regex-2.1.0" sources."is-absolute-0.2.6" @@ -95370,7 +95905,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.12.1" + sources."mermaid-8.13.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."mimic-response-2.1.0" @@ -95505,6 +96040,7 @@ in sources."resolve-url-0.2.1" sources."retry-0.10.1" sources."rimraf-2.7.1" + sources."robust-predicates-3.0.1" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -95692,7 +96228,7 @@ in sources."config-chain-1.1.13" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -95810,7 +96346,7 @@ in sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -95977,7 +96513,7 @@ in (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."clone-response-1.0.2" @@ -96136,12 +96672,12 @@ in sources."signal-exit-3.0.4" sources."statuses-1.5.0" sources."steno-0.4.4" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."strip-ansi-5.2.0" @@ -96162,7 +96698,7 @@ in (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -96889,7 +97425,7 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."event-emitter-0.3.5" - sources."ext-1.5.0" + sources."ext-1.6.0" sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" @@ -96992,8 +97528,8 @@ in sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.2.0" // { dependencies = [ @@ -97114,7 +97650,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."http-errors-1.7.2" @@ -97183,8 +97719,8 @@ in sources."ms-2.1.2" ]; }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -97324,7 +97860,7 @@ in sources."bytes-3.1.0" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.3.0" @@ -97375,7 +97911,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -97421,7 +97957,7 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-11.12.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" @@ -97500,7 +98036,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.1.2" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."negotiator-0.6.2" sources."node-environment-flags-1.0.6" sources."node-fetch-2.6.5" @@ -97576,7 +98112,7 @@ in sources."split-on-first-1.1.0" sources."statuses-1.5.0" sources."strict-uri-encode-2.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.3.0" // { @@ -97584,7 +98120,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" sources."symbol-tree-3.2.4" sources."to-fast-properties-2.0.0" @@ -97666,7 +98202,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.8" @@ -97811,7 +98347,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -98069,7 +98605,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -98213,8 +98749,8 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" sources."y18n-4.0.3" ]; @@ -98371,7 +98907,7 @@ in ]; }) sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.4.0" + sources."@octokit/openapi-types-10.5.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" @@ -98383,7 +98919,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.11.0" - sources."@octokit/types-6.30.0" + sources."@octokit/types-6.31.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -98447,7 +98983,7 @@ in (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -98578,7 +99114,7 @@ in sources."git-up-4.0.5" sources."git-url-parse-11.6.0" sources."gitconfiglocal-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."graceful-fs-4.2.8" @@ -98623,7 +99159,7 @@ in (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."internal-slot-1.0.3" @@ -98903,10 +99439,10 @@ in sources."sshpk-1.16.1" sources."ssri-8.0.1" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."string.prototype.trimend-1.0.4" @@ -98973,7 +99509,7 @@ in (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -100228,7 +100764,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -100351,7 +100887,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -100456,7 +100992,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" (sources."global-modules-2.0.0" // { dependencies = [ @@ -100551,7 +101087,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."istanbul-lib-coverage-3.0.0" + sources."istanbul-lib-coverage-3.0.1" sources."istanbul-lib-instrument-4.0.3" sources."jest-haste-map-25.5.1" sources."jest-regex-util-25.2.6" @@ -100635,7 +101171,7 @@ in }) sources."ms-2.1.2" sources."nan-2.15.0" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.2" @@ -101091,7 +101627,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -101347,7 +101883,7 @@ in sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."exit-hook-1.1.1" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -101369,7 +101905,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-9.18.0" sources."glogg-1.0.2" sources."graceful-fs-4.2.8" @@ -101627,45 +102163,82 @@ in sources."color-name-1.1.4" sources."commander-8.2.0" sources."concat-map-0.0.1" - sources."d3-5.16.0" - sources."d3-array-1.2.4" - sources."d3-axis-1.0.12" - sources."d3-brush-1.1.6" - sources."d3-chord-1.0.6" + sources."d3-7.0.3" + sources."d3-array-3.0.4" + sources."d3-axis-3.0.0" + sources."d3-brush-3.0.0" + sources."d3-chord-3.0.1" sources."d3-collection-1.0.7" - sources."d3-color-1.4.1" - sources."d3-contour-1.3.2" - sources."d3-dispatch-1.0.6" - sources."d3-drag-1.2.5" - (sources."d3-dsv-1.2.0" // { + sources."d3-color-3.0.1" + sources."d3-contour-3.0.1" + sources."d3-delaunay-6.0.2" + sources."d3-dispatch-3.0.1" + sources."d3-drag-3.0.0" + (sources."d3-dsv-3.0.1" // { dependencies = [ - sources."commander-2.20.3" + sources."commander-7.2.0" ]; }) - sources."d3-ease-1.0.7" - sources."d3-fetch-1.2.0" - sources."d3-force-1.2.1" - sources."d3-format-1.4.5" - sources."d3-geo-1.12.1" - sources."d3-hierarchy-1.1.9" - sources."d3-interpolate-1.4.0" - sources."d3-path-1.0.9" - sources."d3-polygon-1.0.6" - sources."d3-quadtree-1.0.7" - sources."d3-random-1.1.2" - sources."d3-scale-2.2.2" - sources."d3-scale-chromatic-1.5.0" - sources."d3-selection-1.4.2" - sources."d3-shape-1.3.7" - sources."d3-time-1.1.0" - sources."d3-time-format-2.3.0" - sources."d3-timer-1.0.10" - sources."d3-transition-1.3.2" + sources."d3-ease-3.0.1" + sources."d3-fetch-3.0.1" + sources."d3-force-3.0.0" + sources."d3-format-3.0.1" + sources."d3-geo-3.0.1" + sources."d3-hierarchy-3.0.1" + sources."d3-interpolate-3.0.1" + sources."d3-path-3.0.1" + sources."d3-polygon-3.0.1" + sources."d3-quadtree-3.0.1" + sources."d3-random-3.0.1" + sources."d3-scale-4.0.1" + sources."d3-scale-chromatic-3.0.0" + sources."d3-selection-3.0.0" + sources."d3-shape-3.0.1" + sources."d3-time-3.0.0" + sources."d3-time-format-4.0.0" + sources."d3-timer-3.0.1" + sources."d3-transition-3.0.1" sources."d3-voronoi-1.1.4" - sources."d3-zoom-1.8.3" + sources."d3-zoom-3.0.0" sources."dagre-0.8.5" - sources."dagre-d3-0.6.4" + (sources."dagre-d3-0.6.4" // { + dependencies = [ + sources."commander-2.20.3" + sources."d3-5.16.0" + sources."d3-array-1.2.4" + sources."d3-axis-1.0.12" + sources."d3-brush-1.1.6" + sources."d3-chord-1.0.6" + sources."d3-color-1.4.1" + sources."d3-contour-1.3.2" + sources."d3-dispatch-1.0.6" + sources."d3-drag-1.2.5" + sources."d3-dsv-1.2.0" + sources."d3-ease-1.0.7" + sources."d3-fetch-1.2.0" + sources."d3-force-1.2.1" + sources."d3-format-1.4.5" + sources."d3-geo-1.12.1" + sources."d3-hierarchy-1.1.9" + sources."d3-interpolate-1.4.0" + sources."d3-path-1.0.9" + sources."d3-polygon-1.0.6" + sources."d3-quadtree-1.0.7" + sources."d3-random-1.1.2" + sources."d3-scale-2.2.2" + sources."d3-scale-chromatic-1.5.0" + sources."d3-selection-1.4.2" + sources."d3-shape-1.3.7" + sources."d3-time-1.1.0" + sources."d3-time-format-2.3.0" + sources."d3-timer-1.0.10" + sources."d3-transition-1.3.2" + sources."d3-zoom-1.8.3" + sources."iconv-lite-0.4.24" + ]; + }) sources."debug-4.3.1" + sources."delaunator-5.0.0" sources."devtools-protocol-0.0.901419" sources."dompurify-2.3.1" sources."end-of-stream-1.4.4" @@ -101675,18 +102248,19 @@ in sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graphlib-2.1.8" sources."has-flag-4.0.0" sources."https-proxy-agent-5.0.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internmap-2.0.3" sources."khroma-1.4.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mermaid-8.12.1" + sources."mermaid-8.13.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -101707,6 +102281,7 @@ in sources."puppeteer-10.4.0" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" + sources."robust-predicates-3.0.1" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -101763,8 +102338,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."color-convert-2.0.1" @@ -101831,8 +102406,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -101841,8 +102416,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.4" @@ -101980,9 +102555,9 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."signal-exit-3.0.4" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -102068,10 +102643,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.9.12"; + version = "6.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.12.tgz"; - sha512 = "FSzZxQk0yaWMvsnrBqHkIiJ1V/wikNDk1SdlnM8NBuNdlDvH4FuuTa7qfO5CjTMq/T21o9ga69qMZZ8tOvi7lA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.15.tgz"; + sha512 = "745oz8iT+BdHYBJYl7AOsHyYRhEjcLBbnydJuMHOgbPzl7XrLCX1SQ7M0h/BSQ7C18C9WFZ5qihFWtF/Vi4pcw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -102206,7 +102781,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.12.0" // { + (sources."@netlify/build-18.13.1" // { dependencies = [ sources."resolve-2.0.0-next.3" ]; @@ -102257,7 +102832,7 @@ in sources."@netlify/plugins-list-3.6.0" sources."@netlify/routing-local-proxy-0.33.2" sources."@netlify/run-utils-2.0.1" - (sources."@netlify/zip-it-and-ship-it-4.22.0" // { + (sources."@netlify/zip-it-and-ship-it-4.23.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -102395,7 +102970,7 @@ in ]; }) sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.4.0" + sources."@octokit/openapi-types-10.5.0" sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.11.1" @@ -102406,7 +102981,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.11.0" - sources."@octokit/types-6.30.0" + sources."@octokit/types-6.31.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -102468,7 +103043,6 @@ in sources."@typescript-eslint/visitor-keys-4.31.2" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" - sources."acorn-8.5.0" sources."agent-base-6.0.2" (sources."aggregate-error-3.1.0" // { dependencies = [ @@ -102599,7 +103173,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { dependencies = [ @@ -102862,7 +103436,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -103026,7 +103600,7 @@ in sources."gh-release-fetch-2.0.3" sources."git-repo-info-2.1.1" sources."gitconfiglocal-2.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -103162,6 +103736,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" + sources."is-builtin-module-3.1.0" (sources."is-ci-2.0.0" // { dependencies = [ sources."ci-info-2.0.0" @@ -103372,7 +103947,7 @@ in ]; }) sources."mute-stream-0.0.7" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanoid-3.1.25" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" @@ -103808,9 +104383,9 @@ in sources."statsd-client-0.4.7" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-ansi-control-characters-2.0.0" sources."strip-bom-3.0.0" sources."strip-dirs-2.1.0" @@ -104060,7 +104635,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" @@ -104302,7 +104877,7 @@ in sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; @@ -104391,7 +104966,7 @@ in sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."rimraf-2.7.1" ]; }) @@ -104478,7 +105053,7 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.4" @@ -104727,7 +105302,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-11.8.2" sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" @@ -105006,7 +105581,7 @@ in sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -105145,10 +105720,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz"; - sha512 = "egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.13.tgz"; + sha512 = "UMXMpsZsv1UXUttCn6gv8eQPhn6DR4BW+txnL3IN5IHqrCwcrT/yWHfL35UsClGXknTH79r5xbu+6J1zNHuSyA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -105164,7 +105739,7 @@ in sources."anymatch-3.1.2" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" - sources."boxen-4.2.0" + sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" (sources."cacheable-request-6.1.0" // { @@ -105173,8 +105748,8 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-5.3.1" - (sources."chalk-3.0.0" // { + sources."camelcase-6.2.0" + (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -105202,7 +105777,7 @@ in sources."fsevents-2.3.2" sources."get-stream-4.1.0" sources."glob-parent-5.1.2" - sources."global-dirs-2.1.0" + sources."global-dirs-3.0.0" sources."got-9.6.0" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" @@ -105211,14 +105786,14 @@ in sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."ini-1.3.7" + sources."ini-2.0.0" sources."is-binary-path-2.1.0" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.3.2" - sources."is-npm-4.0.0" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" @@ -105228,6 +105803,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -105252,7 +105828,11 @@ in sources."pstree.remy-1.1.8" sources."pump-3.0.0" sources."pupa-2.1.1" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -105264,22 +105844,21 @@ in ]; }) sources."signal-exit-3.0.4" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."term-size-2.2.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."touch-3.1.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" (sources."undefsafe-2.0.3" // { dependencies = [ @@ -105288,12 +105867,23 @@ in ]; }) sources."unique-string-2.0.0" - sources."update-notifier-4.1.3" + (sources."update-notifier-5.1.0" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) sources."url-parse-lax-3.0.0" sources."widest-line-3.1.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -105449,7 +106039,7 @@ in sources."function-bind-1.1.1" sources."get-stream-6.0.1" sources."github-url-from-git-1.5.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.4" @@ -105780,8 +106370,8 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."split-1.0.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" @@ -105840,10 +106430,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.24.0"; + version = "7.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.24.0.tgz"; - sha512 = "4zd4txmN7dYEx32kH/K+gecnZhnGDdCrRFK6/n5TGUtqtyjevw0uPul0knJ9PzwDXeNf9MsWzGhjxGeI1M43FA=="; + url = "https://registry.npmjs.org/npm/-/npm-7.24.1.tgz"; + sha512 = "U7/C++ZgB3zNH/kzhSJMnp3pO2iLrZRGUUXAgCCLB/by+sR+dKVhP/ik9+sTOGk9wk3zbmwHAYDT8igkv1ss0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -105909,8 +106499,8 @@ in sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."brace-expansion-1.1.11" @@ -105981,7 +106571,7 @@ in sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" (sources."global-dirs-3.0.0" // { dependencies = [ @@ -106192,8 +106782,8 @@ in sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) (sources."wrap-ansi-7.0.0" // { @@ -106201,8 +106791,8 @@ in sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -106305,7 +106895,7 @@ in }) sources."gauge-3.0.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-2.0.3" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -106697,7 +107287,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -106834,7 +107424,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106898,7 +107488,7 @@ in sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -107083,7 +107673,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nan-2.15.0" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -107577,7 +108167,7 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."handlebars-4.7.7" sources."har-schema-2.0.0" @@ -107779,7 +108369,7 @@ in sources."find-yarn-workspace-root-2.0.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."inflight-1.0.6" @@ -107923,7 +108513,7 @@ in sources."get-browser-rtc-1.1.0" sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -108266,7 +108856,7 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -108652,9 +109242,9 @@ in sources."slash-3.0.0" sources."source-map-0.6.1" sources."stream-meter-1.0.4" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tar-fs-2.1.1" @@ -108808,7 +109398,7 @@ in sources."get-uri-3.0.2" sources."git-node-fs-1.0.0" sources."git-sha1-0.1.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."has-1.0.3" @@ -108900,7 +109490,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.9.3" + sources."systeminformation-5.9.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -108988,7 +109578,7 @@ in sha512 = "9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ=="; }; dependencies = [ - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanoid-3.1.25" sources."source-map-js-0.6.2" ]; @@ -109074,8 +109664,8 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."slash-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."universalify-2.0.0" @@ -109143,7 +109733,7 @@ in version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz"; - sha512 = "+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ=="; + sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ=="; }; dependencies = [ sources."@prisma/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f" @@ -109172,8 +109762,12 @@ in sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" - sources."glob-7.1.7" - sources."globule-1.3.3" + sources."glob-7.2.0" + (sources."globule-1.3.3" // { + dependencies = [ + sources."glob-7.1.7" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isexe-2.0.0" @@ -109301,8 +109895,12 @@ in sources."function-bind-1.1.1" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.7" - sources."globule-1.3.3" + sources."glob-7.2.0" + (sources."globule-1.3.3" // { + dependencies = [ + sources."glob-7.1.7" + ]; + }) sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."hash-base-3.1.0" // { @@ -109524,7 +110122,7 @@ in sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -110075,7 +110673,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" @@ -110480,7 +111078,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -110709,7 +111307,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110865,7 +111463,7 @@ in sources."get-value-2.0.6" sources."git-clone-0.1.0" sources."git-promise-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" (sources."globby-6.1.0" // { @@ -111141,7 +111739,7 @@ in sources."mutation-observer-1.0.3" sources."mute-stream-0.0.7" sources."nan-2.15.0" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."neo-async-2.6.2" @@ -112039,8 +112637,8 @@ in sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."source-map-0.6.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."symbol-tree-3.2.4" sources."tough-cookie-4.0.0" sources."tr46-2.1.0" @@ -112058,7 +112656,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -112341,9 +112939,9 @@ in sources."stickyfill-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."styled-components-5.3.1" sources."supports-color-5.5.0" sources."swagger2openapi-7.0.8" @@ -112386,7 +112984,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -112517,8 +113115,8 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-indent-2.0.0" sources."supports-color-7.2.0" @@ -112570,7 +113168,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -112830,7 +113428,7 @@ in sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."globby-11.0.4" @@ -112897,6 +113495,7 @@ in sources."ms-2.1.2" ]; }) + sources."glob-7.1.7" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" sources."ms-2.1.3" @@ -112975,13 +113574,13 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { @@ -113390,7 +113989,7 @@ in ]; }) sources."ramda-0.27.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."write-file-atomic-3.0.3" ]; }) @@ -113416,7 +114015,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.15.0" // { + (sources."@serverless/utils-5.16.0" // { dependencies = [ sources."get-stream-6.0.1" sources."has-flag-4.0.0" @@ -113496,7 +114095,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.993.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -113535,8 +114134,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."type-fest-0.20.2" ]; }) @@ -113710,7 +114309,7 @@ in sources."events-1.1.1" sources."exit-on-epipe-1.0.1" sources."expand-template-2.0.3" - sources."ext-1.5.0" + sources."ext-1.6.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" sources."extend-3.0.2" @@ -113757,7 +114356,7 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" (sources."got-11.8.2" // { @@ -113812,8 +114411,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."inquirer-autocomplete-prompt-1.4.0" @@ -114183,8 +114782,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."winston-3.2.1" @@ -114202,8 +114801,8 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -115783,7 +116382,7 @@ in sources."right-pad-1.0.1" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" ]; }) sources."rng-0.2.2" @@ -115868,7 +116467,7 @@ in sources."level-codec-6.2.0" ]; }) - sources."glob-7.1.7" + sources."glob-7.2.0" sources."level-6.0.1" sources."level-js-5.0.2" sources."mkdirp-1.0.4" @@ -116128,7 +116727,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.993.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -116755,7 +117354,7 @@ in sources."switchback-2.0.5" (sources."temp-0.8.4" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."rimraf-2.6.3" ]; }) @@ -116967,7 +117566,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -117005,7 +117604,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -117026,7 +117625,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -117101,7 +117700,7 @@ in ]; }) sources."ms-2.1.2" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."node-releases-1.1.76" (sources."normalize-package-data-3.0.3" // { dependencies = [ @@ -117189,13 +117788,13 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" sources."style-search-0.1.0" sources."sugarss-2.0.0" @@ -117271,7 +117870,7 @@ in sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" @@ -117410,15 +118009,14 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.6.1.tgz"; - sha512 = "SDo274ymyG1jJ3HtCr3hkfwS8NqWdF0fMr6xPlrJ5y2QMofsQxIEFWgR1epwb197teKGgnZbzozxvJyIeJpE2Q=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.7.0.tgz"; + sha512 = "aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w=="; }; dependencies = [ sources."@trysound/sax-0.2.0" sources."boolbase-1.0.0" - sources."colorette-1.4.0" sources."commander-7.2.0" sources."css-select-4.1.3" sources."css-tree-1.1.3" @@ -117430,6 +118028,7 @@ in sources."domutils-2.8.0" sources."entities-2.2.0" sources."mdn-data-2.0.14" + sources."nanocolors-0.1.12" sources."nth-check-2.0.1" sources."source-map-0.6.1" sources."stable-0.1.8" @@ -117644,7 +118243,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -118320,7 +118919,7 @@ in sources."enhanced-resolve-2.3.0" sources."errno-0.1.8" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -118453,7 +119052,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -118581,7 +119180,7 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."strip-ansi-6.0.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ sources."ansi-regex-5.0.1" ]; @@ -118592,7 +119191,7 @@ in (sources."table-6.7.1" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."text-table-0.2.0" @@ -118797,7 +119396,7 @@ in }) sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."global-dirs-2.1.0" // { dependencies = [ sources."ini-1.3.7" @@ -119003,12 +119602,12 @@ in sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."string_decoder-0.10.31" @@ -119655,7 +120254,7 @@ in sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-11.5.2" sources."graceful-fs-4.2.8" sources."grapheme-splitter-1.0.4" @@ -120022,7 +120621,7 @@ in sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -120319,7 +120918,7 @@ in sources."diff-2.2.3" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-ansi-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -120415,7 +121014,7 @@ in sources."fill-range-7.0.1" sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."graceful-fs-4.2.8" @@ -120609,7 +121208,7 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."getmac-5.17.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-9.6.0" sources."hasher-1.2.0" (sources."hogan.js-3.0.2" // { @@ -120741,13 +121340,13 @@ in }) sources."stack-trace-0.0.10" sources."statuses-1.5.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" (sources."temp-0.9.4" // { dependencies = [ @@ -120967,8 +121566,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."code-point-at-1.1.0" @@ -121008,7 +121607,7 @@ in sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-unicode-2.0.1" sources."https-proxy-agent-5.0.0" @@ -121097,19 +121696,19 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.1.1" // { + (sources."yargs-17.2.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -121149,8 +121748,8 @@ in sources."is-fullwidth-code-point-3.0.0" sources."json-stringify-pretty-compact-3.0.0" sources."require-directory-2.1.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."tslib-2.3.1" sources."vega-event-selector-2.0.6" sources."vega-expression-4.0.1" @@ -121263,12 +121862,12 @@ in sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."source-map-support-0.5.20" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."strip-ansi-5.2.0" @@ -121410,7 +122009,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-1.0.3" @@ -121466,8 +122065,8 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { @@ -121772,7 +122371,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -121786,8 +122385,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-deep-4.0.1" @@ -121812,7 +122411,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -121913,7 +122512,7 @@ in sources."mocha-8.4.0" sources."ms-2.1.3" sources."mute-stream-0.0.8" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."nanoid-3.1.20" sources."neo-async-2.6.2" sources."node-releases-1.1.76" @@ -122041,8 +122640,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -122055,8 +122654,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.4" @@ -122178,7 +122777,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."git-clone-0.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-6.7.1" sources."graceful-fs-4.2.8" sources."gray-matter-2.1.1" @@ -122673,7 +123272,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -123232,8 +123831,8 @@ in sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-6.1.0" sources."unist-util-stringify-position-2.0.3" ]; @@ -123338,9 +123937,9 @@ in sources."ansi-regex-5.0.1" sources."fs-extra-10.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - sources."yargs-17.1.1" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-17.2.0" ]; }) sources."brace-expansion-1.1.11" @@ -123353,8 +123952,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."code-point-at-1.1.0" @@ -123403,7 +124002,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."html-encoding-sniffer-2.0.1" @@ -123506,8 +124105,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -123520,8 +124119,8 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -123651,7 +124250,7 @@ in (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -123723,7 +124322,7 @@ in ]; }) sources."ms-2.1.2" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."eslint-plugin-no-unsanitized-3.1.5" @@ -124048,10 +124647,10 @@ in sources."sshpk-1.16.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) (sources."string_decoder-1.1.1" // { @@ -124071,7 +124670,7 @@ in sources."ajv-8.6.3" sources."ansi-regex-5.0.1" sources."json-schema-traverse-1.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."text-table-0.2.0" @@ -124110,7 +124709,7 @@ in (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -124177,10 +124776,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.17.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001259" + sources."caniuse-lite-1.0.30001260" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.847" + sources."electron-to-chromium-1.3.849" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -124204,7 +124803,7 @@ in sources."merge-stream-2.0.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" - sources."nanocolors-0.1.6" + sources."nanocolors-0.1.12" sources."neo-async-2.6.2" sources."node-releases-1.1.76" sources."p-limit-3.1.0" @@ -124954,10 +125553,10 @@ in sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" sources."streamx-2.11.2" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."thirty-two-1.0.2" sources."through-2.3.8" @@ -125008,7 +125607,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -125151,8 +125750,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."require-directory-2.1.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."universalify-0.1.2" sources."wrap-ansi-7.0.0" @@ -125710,7 +126309,7 @@ in sources."log-symbols-4.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" ]; }) @@ -126088,8 +126687,8 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."string-width-4.2.2" - (sources."strip-ansi-6.0.0" // { + sources."string-width-4.2.3" + (sources."strip-ansi-6.0.1" // { dependencies = [ sources."ansi-regex-5.0.1" ]; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 3161b56239d0..bef06975ac55 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -38,6 +38,10 @@ let version = "8.06.10"; sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a"; }; + "4.13" = mkNewParam { + version = "8.06.11"; + sha256 = "1zjpg9jvs6i9jvbgn6zgispwqiv8rxvaszxcx9ha9fax3wzhv9qy"; + }; }; param = params . ${lib.versions.majorMinor ocaml.version} or (throw "labltk is not available for OCaml ${ocaml.version}"); diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index a19fae878182..8556294e2b68 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -6,7 +6,6 @@ , pytestCheckHook , pytest-asyncio , pytest-tornado -, pytest-cov , sqlalchemy , tornado , twisted @@ -23,6 +22,7 @@ buildPythonPackage rec { pname = "APScheduler"; version = "3.8.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { @@ -38,7 +38,6 @@ buildPythonPackage rec { pytest-asyncio pytest-tornado pytestCheckHook - pytest-cov sqlalchemy tornado twisted @@ -54,7 +53,14 @@ buildPythonPackage rec { setuptools ]; - disabledTests = lib.optionals stdenv.isDarwin [ + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov --tb=short" "" + ''; + + disabledTests = [ + "test_broken_pool" + ] ++ lib.optionals stdenv.isDarwin [ "test_submit_job" "test_max_instances" ]; @@ -65,5 +71,6 @@ buildPythonPackage rec { description = "A Python library that lets you schedule your Python code to be executed"; homepage = "https://github.com/agronholm/apscheduler"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix new file mode 100644 index 000000000000..b9428449d2c8 --- /dev/null +++ b/pkgs/development/python-modules/aioapns/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, h2 +, lib +, pyjwt +, pyopenssl +}: + +buildPythonPackage rec { + pname = "aioapns"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea58ce685aa6d0ffbdc3be4a6999c7268b9c765f806d3e4da7677c098fb72cbc"; + }; + + propagatedBuildInputs = [ + h2 + pyopenssl + pyjwt + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aioapns" ]; + + meta = with lib; { + description = "An efficient APNs Client Library for Python/asyncio"; + homepage = "https://github.com/Fatal1ty/aioapns"; + license = licenses.asl20; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index b6f44308b5ce..82e046c7b378 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.12.2"; + version = "0.12.3"; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c3a5aabac3d5dd5560f147fc8758034fa17bbd2d06793f6e6a30d99eeab2cbda"; + sha256 = "441262c36b450286132fde7f110823f7ae7ae909c0f6483a0a2d56150b62f2b5"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 42fc3b5460b4..e985dbf28c0f 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "bitlist"; - version = "0.4.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IL1tpP/F6O3BvJab6aC6r6PhRgKFpLp9aXmOK1rQXaU="; + sha256 = "sha256-bX/Z5FBm21gX4ax/HfqD2bNotZyNFX7dHCEN5uZzQJQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 772ad57e7fe3..948d734d5317 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.8b0"; + version = "21.9b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VwYI0oqjrxeSuYxKM326xjZ4d7R7EriKtCCVz8GmJ8I="; + sha256 = "sha256-feTPx+trcQ3jJXEtQBJWiRAdIdJSg+7X6ZmHIs8Q65E="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 9b35b5654e26..2fea6e89494d 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.4.7"; # Also update the hash in vectors.nix + version = "3.4.8"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "04x7bhjkglxpllad10821vxddlmxdkd3gjvp35iljmnj2s0xw41x"; + sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62"; + sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m"; }; cargoRoot = "src/rust"; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 0cb23d53c03c..7602582f8306 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1hh4j88ywil3jf62ppj1blygmdirbqz86pynd9lqfijiaym3mb57"; + sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"; }; # No tests included diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index 1f664fe1b000..06b915e814de 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.5.1"; + version = "3.5.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "3347d07fab5dcadcfa7798383ba0a2e026d4bfdc0a7c2a7584d7fbf128a3c233"; + sha256 = "36dc6279f547cc0947daceb568e2b5ac1e274655f642c133e2700c22892163ce"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index b706930b3ef3..690f3dcbd3d3 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fountains"; - version = "0.2.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0jk5y099g6ggaq5lwp0jlg4asyhcdxnl3him3ibmzc1k9nnknp30"; + sha256 = "47c28e598cc3a723327daee28c757de3a40f4d8eb48e6be37081932c1d00fa6f"; }; propagatedBuildInputs = [ @@ -19,6 +19,7 @@ buildPythonPackage rec { # Project has no test doCheck = false; + pythonImportsCheck = [ "fountains" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix index 0da2ef18a864..493304428524 100644 --- a/pkgs/development/python-modules/fpyutils/default.nix +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-VYknHuBoU7XWkm6mt8ckBzFLMcYTPW5CXMGdOn3perY="; + sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/goalzero/default.nix b/pkgs/development/python-modules/goalzero/default.nix index c533af8b7fdc..b2cf6e7eadaf 100644 --- a/pkgs/development/python-modules/goalzero/default.nix +++ b/pkgs/development/python-modules/goalzero/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "goalzero"; - version = "0.1.59"; + version = "0.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0d0f11aa31672f3ef4ab617db92c87ef6f143804473022405f6da9d830f17638"; + sha256 = "6cb67cf772a758225b2e23b394feb697e8cbfb1aff5a2d7a17a0d4ccf61e55cd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 5eaf6f1199eb..c30566a45109 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.11.0"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "9d5504e35388e665db5086edf75d2425831573c6569bb0bf3c2c6eaff30e034e"; + sha256 = "f905c59d32d88d3f67571fe5a8a78de4659e04798ad809de439f667247d13626"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 7b0b09dcb14c..4002f527a451 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, python, fetchFromGitHub +, fetchpatch , cmake, sip_4, protobuf, pythonOlder }: buildPythonPackage rec { @@ -13,7 +14,16 @@ buildPythonPackage rec { sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; }; - disabled = pythonOlder "3.4.0"; + patches = [ + # Fix build against protobuf 3.18+ + # https://github.com/Ultimaker/libArcus/issues/121 + (fetchpatch { + url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch"; + sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2"; + }) + ]; + + disabled = pythonOlder "3.4"; propagatedBuildInputs = [ sip_4 ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index aa2784cd1dbb..6b5394ac2770 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -1,32 +1,43 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , marshmallow - # Check Inputs +, pythonOlder , pytestCheckHook -, pytest-cov }: buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.9"; + version = "5.10"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; repo = pname; rev = "v${version}"; - sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd"; + sha256 = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; }; propagatedBuildInputs = [ marshmallow ]; - # setuptools check can run, but won't find tests - checkInputs = [ pytestCheckHook pytest-cov ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + pythonImportsCheck = [ + "marshmallow" + ]; meta = with lib; { - description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; + description = "Extension to Marshmallow to allow for polymorphic fields"; homepage = "https://github.com/Bachmann1234/marshmallow-polyfield"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 3de64fea37fa..a4f60d8202a4 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -9,26 +9,27 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.11.1"; - disabled = pythonOlder "3.5"; + version = "3.13.0"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "marshmallow-code"; repo = pname; rev = version; - sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6"; + sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0="; }; - pythonImportsCheck = [ - "marshmallow" - ]; - checkInputs = [ pytestCheckHook pytz simplejson ]; + pythonImportsCheck = [ + "marshmallow" + ]; + meta = with lib; { description = '' A lightweight library for converting complex objects to and from @@ -38,5 +39,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ cript0nauta ]; }; - } diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 318d519e57ce..b75936817426 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -1,23 +1,29 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pymongo, mockupdb +{ lib +, buildPythonPackage +, fetchFromGitHub +, mockupdb +, pymongo +, pythonOlder }: buildPythonPackage rec { pname = "motor"; - version = "2.4.0"; + version = "2.5.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = version; - sha256 = "1sgaqg98h35lazzdi015q1i60ig7krid8b10a5rm6lf755y8yj2c"; + sha256 = "sha256-r+HyIEC+Jafn7eMqkAldsZ5hbem+n+P76RJGAymmBks="; }; propagatedBuildInputs = [ pymongo ]; + checkInputs = [ mockupdb ]; + # network connections doCheck = false; - checkInputs = [ mockupdb ]; pythonImportsCheck = [ "motor" ]; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index f9c003395182..8a92882ff364 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.46"; + version = "1.18.47"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4061100ba506866c3ac530733bdefd302acbd67add17daeb22ca02ce3105fcf0"; + sha256 = "0687354a1970a157f293ff57f8b38379497b606643633912cc28f76e0333b301"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 54ce6b3747bf..52a77826f2d6 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -105,6 +105,8 @@ buildPythonPackage rec { "test_missing_required_dependency" # AssertionError with 1.2.3 "test_from_coo" + # AssertionError: No common DType exists for the given inputs + "test_comparison_invalid" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 1ad8a7564dd0..6a0281b756ec 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5WRJlDWiZz1Yb2shMLtblfBKO6Bvgbj4lbZRo8dqq7E="; + sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; }; meta = { diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index 508ba27b2943..1a793644fb29 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pefile"; - version = "2021.9.2"; + version = "2021.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "erocarrera"; repo = pname; rev = "v${version}"; - sha256 = "1pgsw84i9r6ydkfzqifgl5lvcz3cf3xz5c2543kl3q8mgb21wxaz"; + sha256 = "0sr17rmqpr874m8rpkp8xdz8kjshhimbfgq13qy4lscaiznmlf0d"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index af6c3d80deaf..c6bb944c232b 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.3.1"; + version = "8.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792"; + sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index d5262ee22c47..7eef9e740d31 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -53,6 +53,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "poetry.core" ]; + # allow for package to use pep420's native namespaces + pythonNamespaces = [ "poetry" ]; + meta = with lib; { description = "Core utilities for Poetry"; homepage = "https://github.com/python-poetry/poetry-core/"; diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 4b7d35093662..29477474c845 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -99,6 +99,9 @@ buildPythonPackage rec { }) ]; + # allow for package to use pep420's native namespaces + pythonNamespaces = [ "poetry" ]; + meta = with lib; { homepage = "https://python-poetry.org/"; description = "Python dependency management and packaging made easy"; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index b81edaac6688..0d18175d7e6d 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -1,20 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "pymongo"; - version = "3.11.4"; + version = "3.12.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6"; + sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I="; }; # Tests call a running mongodb instance doCheck = false; + pythonImportsCheck = [ "pymongo" ]; + meta = with lib; { + description = "Python driver for MongoDB"; homepage = "https://github.com/mongodb/mongo-python-driver"; license = licenses.asl20; - description = "Python driver for MongoDB"; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix index 3afdacd18034..13936ba090c2 100644 --- a/pkgs/development/python-modules/pysyncobj/default.nix +++ b/pkgs/development/python-modules/pysyncobj/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pysyncobj"; - version = "0.3.8"; + version = "0.3.10"; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; rev = version; - sha256 = "sha256-T7ecy5/1eF0pYaOv74SBEp6V6Z23E2b9lo5Q/gig3Cw="; + sha256 = "sha256-tcoG0KZewPRYPwDSV7aqrAGw3NF4yj/Ukc+I7HHI9+I="; }; # Tests require network features diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 592a13506936..b8c1ab527220 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.3"; + version = "3.6.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ExNiaSQGFbx5BB+K+PyW4OPghdpy3SKxhiVFH9okQ7g="; + sha256 = "sha256-m2oxE7q46TWadhZgpwTAHKep5ZN9LG1VNCRJkPz5W1E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix new file mode 100644 index 000000000000..5f060fd9b9e4 --- /dev/null +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-osc"; + version = "1.7.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c7d68a7719d9425ab2a4ee9a2b9d5a9f5b66593fb46e20e38f91e1452bea2d2"; + }; + + pythonImportsCheck = [ "pythonosc" ]; + + meta = with lib; { + description = "Open Sound Control server and client in pure python"; + homepage = "https://github.com/attwad/python-osc"; + license = licenses.unlicense; + maintainers = with maintainers; [ anirrudh ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-learn/0.20.nix b/pkgs/development/python-modules/scikit-learn/0.20.nix index 81915e83d2dc..0ed863755897 100644 --- a/pkgs/development/python-modules/scikit-learn/0.20.nix +++ b/pkgs/development/python-modules/scikit-learn/0.20.nix @@ -16,7 +16,8 @@ buildPythonPackage rec { sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z"; }; - buildInputs = [ pillow gfortran glibcLocales ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ pillow glibcLocales ]; propagatedBuildInputs = [ numpy scipy numpy.blas ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 6f4ad1d2bd15..e7ac79b42837 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { buildInputs = [ pillow - gfortran glibcLocales ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp @@ -46,6 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython + gfortran ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index cba6ddc0acf6..47276ad305c7 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "ddbdb3ef8c068aa1fd37a5fa65a122a80673c9fd73fdc5668a4604f99ccf5943"; + sha256 = "b776bd6ce8c8385aa9a025b64a9815b5d798f12d4ef0d712d569503f62aece8b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index 5465fe7c9942..d7c37e7c433b 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -1,37 +1,47 @@ { lib +, attrs , buildPythonPackage -, fetchFromGitHub -, pythonOlder , cryptography +, fetchFromGitHub +, idna , ipaddress , pyasn1 , pyasn1-modules -, idna -, attrs -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - pname = "service_identity"; - version = "18.1.0"; + pname = "service-identity"; + version = "21.1.0"; src = fetchFromGitHub { owner = "pyca"; repo = pname; rev = version; - sha256 = "1aw475ksmd4vpl8cwfdcsw2v063nbhnnxpy633sb75iqp9aazhlx"; + sha256 = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ="; }; propagatedBuildInputs = [ - pyasn1 pyasn1-modules idna attrs cryptography - ] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ]; + attrs + cryptography + idna + pyasn1 + pyasn1-modules + ] ++ lib.optionals (pythonOlder "3.3") [ + ipaddress + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytest ]; - checkPhase = "py.test"; + pythonImportsCheck = [ "service_identity" ]; meta = with lib; { description = "Service identity verification for pyOpenSSL"; - license = licenses.mit; homepage = "https://service-identity.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 87f8c3d13ae4..6713e5e84f4b 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,29 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, toml, tomli }: +{ buildPythonPackage +, callPackage +, fetchPypi +, packaging +, tomli +, lib +}: buildPythonPackage rec { pname = "setuptools-scm"; - # don't update to 6.1.0 or 6.2.0, releases were pulled because of regression - # https://github.com/pypa/setuptools_scm/issues/615 - version = "6.0.1"; + version = "6.3.1"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; + sha256 = "sha256-D2omORKxN5jAKLmicdka873g5CeECRx5fezMOtOn9ZY="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "tomli~=1.0.0" "tomli>=1.0.0" - ''; + propagatedBuildInputs = [ + packaging + tomli + ]; - # TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm - # if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages - propagatedBuildInputs = [ toml tomli ]; + pythonImportsCheck = [ + "setuptools_scm" + ]; - # Requires pytest, circular dependency + # check in passhtru.tests.pytest to escape infinite recursion on pytest doCheck = false; - pythonImportsCheck = [ "setuptools_scm" ]; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { homepage = "https://github.com/pypa/setuptools_scm/"; diff --git a/pkgs/development/python-modules/setuptools-scm/tests.nix b/pkgs/development/python-modules/setuptools-scm/tests.nix new file mode 100644 index 000000000000..174b54aca9cd --- /dev/null +++ b/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, setuptools-scm +, pytestCheckHook +, git +, mercurial +, pip +, virtualenv +}: + +buildPythonPackage rec { + pname = "setuptools-scm-tests"; + inherit (setuptools-scm) version; + + src = setuptools-scm.src; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + setuptools-scm + pip + virtualenv + git + mercurial + ]; + + disabledTests = [ + # network access + "test_pip_download" + ]; +} diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index cf792da1249e..a04a0585019f 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -23,7 +23,6 @@ , sphinxcontrib-websupport # check phase , html5lib -, imagemagick , pytestCheckHook , typed-ast }: @@ -70,7 +69,6 @@ buildPythonPackage rec { ]; checkInputs = [ - imagemagick html5lib pytestCheckHook ] ++ lib.optionals (pythonOlder "3.8") [ @@ -83,6 +81,10 @@ buildPythonPackage rec { "test_defaults" "test_defaults_json" "test_latex_images" + + # requires imagemagick (increases build closure size), doesn't + # test anything substantial + "test_ext_imgconverter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 37e89abf8da9..819f29497246 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.22"; + version = "1.4.23"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg="; + sha256 = "sha256-dv8kaIH1KAib8ZOFExuWYZe7SUZTmQOW0s4TjipEdYM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index ac17be723d1e..dfa7a95e3970 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tlsh"; - version = "4.9.3"; + version = "4.10.0"; src = fetchFromGitHub { owner = "trendmicro"; repo = "tlsh"; rev = version; - sha256 = "sha256-12bhxJTJJWzoiWt4YwhcdwHDvJNoBenWl3l26SFuIGU="; + sha256 = "sha256-9Vkj7a5xU/coFyM/8i8JB0DdnbgDAEMOjmmMF8ckKuE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 556ca3e2e6ed..103878ccac69 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3dcfbe186bf33d146347c6180b67564257f2708960027ab6d24fea2865daabca"; + sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; }; checkInputs = [ @@ -42,10 +42,12 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = { + pythonImportsCheck = [ "trustme" ]; + + meta = with lib; { description = "High quality TLS certs while you wait, for the discerning tester"; homepage = "https://github.com/python-trio/trustme"; - license = with lib.licenses; [ mit asl20 ]; - maintainers = with lib.maintainers; [ catern ]; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ed39d1c653a8..149d9c0ac9fd 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -583,6 +583,7 @@ let "RandomFields" "rareNMtests" "rAverage" + "RclusTool" "Rcmdr" "RcmdrPlugin_coin" "RcmdrPlugin_depthTools" diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix new file mode 100644 index 000000000000..144ec8be9d4e --- /dev/null +++ b/pkgs/development/tools/abuild/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitLab +, pkg-config +, openssl +, zlib +, busybox +}: + +stdenv.mkDerivation rec { + pname = "abuild"; + version = "3.7.0"; + + src = fetchFromGitLab { + domain = "gitlab.alpinelinux.org"; + owner = "alpine"; + repo = pname; + rev = "v${version}"; + sha256 = "1xsik9hyzzq861bi922sb5r8c6r4wpnpxz5kd30i9f20vvfpp5jx"; + }; + + buildInputs = [ + openssl + zlib + busybox + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'chmod 4555' '#chmod 4555' + ''; + + makeFlags = [ + "prefix=${placeholder "out"}" + "CFLAGS=-Wno-error" + ]; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + + meta = with lib; { + description = "Alpine Linux build tools"; + homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ onny ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 314a1a8b0572..5000d42b47d8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tPjjYudUI+LlmdnEvHh+kUpAbmhiNPYhjf8fMglrzIM="; + sha256 = "sha256-pTsiXyIgY0caKZbucwaJqdOs9a+w7PH6tVzNNNxqYyg="; }; - vendorSha256 = "sha256-JNVzy4WbpwH9ZfO78AHQM8pak/ZVQqapxxs9QraMhDo="; + vendorSha256 = "sha256-N0UfC/M6EBbnpBpOTNkGgFEJpTA3VQ2jg9M7kxQQQc8="; doCheck = false; diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index ca0a24133045..9b77740979e5 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -1,10 +1,20 @@ -{ ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev -, autoconf, sqlite, stdenv }: +{ ocamlPackages +, fetchFromGitHub +, lib +, zlib +, pkg-config +, cacert +, gmp +, libev +, autoconf +, sqlite +, stdenv +}: let - mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }: + mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ], preBuild ? "" }: ocamlPackages.buildDunePackage rec { - inherit pname; - version = "1.5.1"; + inherit pname preBuild; + version = "1.7.0"; useDune2 = true; minimumOcamlVersion = "4.08.1"; doCheck = true; @@ -13,7 +23,7 @@ let owner = "comby-tools"; repo = "comby"; rev = version; - sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf"; + sha256 = "sha256-Y2RcYvJOSqppmxxG8IZ5GlFkXCOIQU+1jJZ6j+PBHC4"; }; nativeBuildInputs = [ @@ -41,9 +51,21 @@ let }; combyKernel = mkCombyPackage { pname = "comby-kernel"; }; -in mkCombyPackage { + combySemantic = mkCombyPackage { pname = "comby-semantic"; extraBuildInputs = [ ocamlPackages.cohttp-lwt-unix ]; }; +in +mkCombyPackage { pname = "comby"; + # tests have to be removed before building otherwise installPhase will fail + # cli tests expect a path to the built binary + preBuild = '' + substituteInPlace test/common/dune \ + --replace "test_cli_list" "" \ + --replace "test_cli_helper" "" \ + --replace "test_cli" "" + rm test/common/{test_cli_list,test_cli_helper,test_cli}.ml + ''; + extraBuildInputs = [ zlib gmp @@ -62,6 +84,7 @@ in mkCombyPackage { ocamlPackages.lwt_react ocamlPackages.tls combyKernel + combySemantic ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then [ ocamlPackages.hack_parallel ] else @@ -74,4 +97,5 @@ in mkCombyPackage { ocamlPackages.ppx_expect ocamlPackages.dune-configurator ]; + } diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index a7021411b4c3..6a100bb799d7 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -4,31 +4,26 @@ , pkg-config , protobuf , rustPlatform +, stdenv }: -rustPlatform.buildRustPackage rec { +let + node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so"); +in rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "2.30.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg="; + sha256 = "sha256-7c9jlqMKocA3Kp39zDu2in9nRw4hZRZO1+u/eFfzWa4="; }; - cargoPatches = [ - # Remove test from compilation targets: - # they add time to an already long compilation and some fail out-of-the-box. - ./no_tests.patch - ]; - # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM="; - - outputs = [ "out" "lib" "bin" ]; + cargoSha256 = "sha256-W3VaxG9taRv62RW6hQkfdGJo72uHK2X6JIESJEu3PXg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf ]; @@ -44,8 +39,10 @@ rustPlatform.buildRustPackage rec { export SQLITE_MAX_EXPR_DEPTH=10000 ''; + cargoBuildFlags = "-p query-engine -p query-engine-node-api -p migration-engine-cli -p introspection-core -p prisma-fmt"; + postInstall = '' - cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node + mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node ''; # Tests are long to compile @@ -56,6 +53,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ pamplemousse ]; + maintainers = with maintainers; [ pamplemousse pimeys ]; }; } diff --git a/pkgs/development/tools/database/prisma-engines/no_tests.patch b/pkgs/development/tools/database/prisma-engines/no_tests.patch deleted file mode 100644 index fb88d92e485d..000000000000 --- a/pkgs/development/tools/database/prisma-engines/no_tests.patch +++ /dev/null @@ -1,459 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 1070c7a30..310f7302f 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -479,18 +479,6 @@ version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - --[[package]] --name = "bitvec" --version = "0.19.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" --dependencies = [ -- "funty", -- "radium", -- "tap", -- "wyz", --] -- - [[package]] - name = "block-buffer" - version = "0.7.3" -@@ -706,19 +694,6 @@ dependencies = [ - "wasm-bindgen", - ] - --[[package]] --name = "console" --version = "0.14.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" --dependencies = [ -- "encode_unicode", -- "lazy_static", -- "libc", -- "terminal_size", -- "winapi", --] -- - [[package]] - name = "const_fn" - version = "0.4.5" -@@ -1011,24 +986,12 @@ dependencies = [ - "uuid", - ] - --[[package]] --name = "dtoa" --version = "0.4.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" -- - [[package]] - name = "either" - version = "1.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - --[[package]] --name = "encode_unicode" --version = "0.3.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -- - [[package]] - name = "encoding" - version = "0.2.33" -@@ -1114,18 +1077,6 @@ dependencies = [ - "syn", - ] - --[[package]] --name = "enum_dispatch" --version = "0.3.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" --dependencies = [ -- "once_cell", -- "proc-macro2", -- "quote", -- "syn", --] -- - [[package]] - name = "enumflags2" - version = "0.7.1" -@@ -1261,12 +1212,6 @@ dependencies = [ - "percent-encoding", - ] - --[[package]] --name = "funty" --version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" -- - [[package]] - name = "futures" - version = "0.3.13" -@@ -1573,15 +1518,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "html-escape" --version = "0.2.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233" --dependencies = [ -- "utf8-width", --] -- - [[package]] - name = "http" - version = "0.2.3" -@@ -1744,21 +1680,6 @@ version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - --[[package]] --name = "insta" --version = "1.7.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244" --dependencies = [ -- "console", -- "lazy_static", -- "serde", -- "serde_json", -- "serde_yaml", -- "similar", -- "uuid", --] -- - [[package]] - name = "instant" - version = "0.1.9" -@@ -1804,34 +1725,6 @@ dependencies = [ - "user-facing-errors", - ] - --[[package]] --name = "introspection-engine-tests" --version = "0.1.0" --dependencies = [ -- "barrel", -- "datamodel", -- "datamodel-connector", -- "enumflags2", -- "expect-test", -- "indoc", -- "introspection-connector", -- "introspection-core", -- "migration-connector", -- "pretty_assertions", -- "quaint", -- "serde_json", -- "sql-datamodel-connector", -- "sql-introspection-connector", -- "sql-migration-connector", -- "sql-schema-describer", -- "test-macros", -- "test-setup", -- "tokio", -- "tracing", -- "tracing-futures", -- "user-facing-errors", --] -- - [[package]] - name = "ipconfig" - version = "0.2.2" -@@ -2178,39 +2071,6 @@ dependencies = [ - "user-facing-errors", - ] - --[[package]] --name = "migration-engine-tests" --version = "0.1.0" --dependencies = [ -- "bigdecimal", -- "chrono", -- "connection-string", -- "datamodel", -- "datamodel-connector", -- "enumflags2", -- "expect-test", -- "indoc", -- "migration-connector", -- "migration-core", -- "once_cell", -- "pretty_assertions", -- "prisma-value", -- "quaint", -- "serde", -- "serde_json", -- "sql-datamodel-connector", -- "sql-migration-connector", -- "sql-schema-describer", -- "tempfile", -- "test-macros", -- "test-setup", -- "tokio", -- "tracing", -- "tracing-futures", -- "url", -- "user-facing-errors", --] -- - [[package]] - name = "mime" - version = "0.3.16" -@@ -2517,19 +2377,6 @@ dependencies = [ - "socket2 0.4.0", - ] - --[[package]] --name = "nom" --version = "6.1.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" --dependencies = [ -- "bitvec", -- "funty", -- "lexical-core", -- "memchr", -- "version_check", --] -- - [[package]] - name = "ntapi" - version = "0.3.6" -@@ -2773,18 +2620,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "parse-hyperlinks" --version = "0.19.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff" --dependencies = [ -- "html-escape", -- "nom", -- "percent-encoding", -- "thiserror", --] -- - [[package]] - name = "pbkdf2" - version = "0.7.5" -@@ -3388,72 +3223,6 @@ dependencies = [ - "user-facing-errors", - ] - --[[package]] --name = "query-engine-tests" --version = "0.1.0" --dependencies = [ -- "anyhow", -- "base64 0.13.0", -- "chrono", -- "colored", -- "datamodel-connector", -- "indoc", -- "insta", -- "prisma-value", -- "query-test-macros", -- "query-tests-setup", -- "serde_json", -- "tokio", -- "tracing", -- "tracing-futures", -- "uuid", --] -- --[[package]] --name = "query-test-macros" --version = "0.1.0" --dependencies = [ -- "darling", -- "indoc", -- "itertools 0.10.0", -- "proc-macro2", -- "query-tests-setup", -- "quote", -- "syn", --] -- --[[package]] --name = "query-tests-setup" --version = "0.1.0" --dependencies = [ -- "async-trait", -- "colored", -- "datamodel", -- "datamodel-connector", -- "enum_dispatch", -- "enumflags2", -- "indoc", -- "itertools 0.10.0", -- "lazy_static", -- "migration-core", -- "mongodb-datamodel-connector", -- "nom", -- "parse-hyperlinks", -- "prisma-models", -- "query-core", -- "regex", -- "request-handlers", -- "serde", -- "serde_json", -- "sql-datamodel-connector", -- "thiserror", -- "tokio", -- "tracing", -- "tracing-error", -- "tracing-futures", -- "tracing-subscriber", --] -- - [[package]] - name = "quick-error" - version = "1.2.3" -@@ -3469,12 +3238,6 @@ dependencies = [ - "proc-macro2", - ] - --[[package]] --name = "radium" --version = "0.5.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" -- - [[package]] - name = "rand" - version = "0.7.3" -@@ -3922,18 +3685,6 @@ dependencies = [ - "syn", - ] - --[[package]] --name = "serde_yaml" --version = "0.8.17" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" --dependencies = [ -- "dtoa", -- "linked-hash-map", -- "serde", -- "yaml-rust", --] -- - [[package]] - name = "serial_test" - version = "0.5.1" -@@ -4028,12 +3779,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "similar" --version = "1.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" -- - [[package]] - name = "simple-mutex" - version = "1.1.5" -@@ -4372,12 +4117,6 @@ version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - --[[package]] --name = "tap" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -- - [[package]] - name = "tempfile" - version = "3.2.0" -@@ -4392,16 +4131,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "terminal_size" --version = "0.1.16" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" --dependencies = [ -- "libc", -- "winapi", --] -- - [[package]] - name = "test-cli" - version = "0.1.0" -@@ -5094,12 +4823,6 @@ dependencies = [ - "user-facing-error-macros", - ] - --[[package]] --name = "utf8-width" --version = "0.1.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa" -- - [[package]] - name = "uuid" - version = "0.8.2" -@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" - dependencies = [ - "winapi", - ] -- --[[package]] --name = "wyz" --version = "0.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" -- --[[package]] --name = "yaml-rust" --version = "0.4.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" --dependencies = [ -- "linked-hash-map", --] -diff --git a/Cargo.toml b/Cargo.toml -index 2411986ea..2eb2bb82d 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -3,7 +3,6 @@ members = [ - "introspection-engine/connectors/introspection-connector", - "introspection-engine/connectors/sql-introspection-connector", - "introspection-engine/core", -- "introspection-engine/introspection-engine-tests", - "libs/datamodel/connectors/datamodel-connector", - "libs/datamodel/connectors/sql-datamodel-connector", - "libs/datamodel/connectors/mongodb-datamodel-connector", -@@ -12,14 +11,12 @@ members = [ - "migration-engine/connectors/sql-migration-connector", - "migration-engine/connectors/mongodb-migration-connector", - "migration-engine/core", -- "migration-engine/migration-engine-tests", - "query-engine/connectors/query-connector", - "query-engine/connectors/sql-query-connector", - "query-engine/connectors/mongodb-query-connector", - "query-engine/core", - "query-engine/query-engine", - "query-engine/query-engine-node-api", -- "query-engine/connector-test-kit-rs/query-engine-tests", - "query-engine/request-handlers", - "prisma-fmt", - "libs/datamodel/core", diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index af87dbf2d193..38944e41ce41 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.8"; + version = "3.14.9"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oCqN9iG4+vBvIJoW1v4ww9SALlhcX5bEgqSjTArPQ2g="; + sha256 = "sha256-LyPa6x72dz59TYWYqTrpnqUpXz9Ruf+worLvIfFJRHY="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index 261da1ddbdf7..c007d2d1ca2b 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.14.1"; + version = "4.15.0"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "1mgs3bngghmirmn0pw351m54darv8d5iymlxcjqw3vr0cyn5aqj0"; + sha256 = "sha256-fl6gPKZlc8K6yD8xHC6XbmCHUJl6nI+X2I4JmXABWdY="; }; - vendorSha256 = "071gfyx6iqla8ir7ianw1z62rdsds9shakzqs9wn34ll1kdbd4rv"; + vendorSha256 = "sha256-/N1sglGPwb77HLnVOzMYlFPSmeUvWs+wld7Fd7rjWrA="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/development/tools/gokart/default.nix index 3c973126c7a2..7722e0b36afe 100644 --- a/pkgs/development/tools/gokart/default.nix +++ b/pkgs/development/tools/gokart/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gokart"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = pname; rev = "v${version}"; - sha256 = "0wfv33yi83klnnyfas7wnsnx34cf28k1yvq06lkii96fvnzcar36"; + sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ="; }; vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd"; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 161aba5d68f6..5ab7497c9a22 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X gotest.tools/gotestsum/cmd.version=${version}" ]; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch b/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch deleted file mode 100644 index b14d8be6ef16..000000000000 --- a/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch +++ /dev/null @@ -1,15 +0,0 @@ -With format string strictness, High Sierra also enforces that %n isn't used -in dynamic format strings, but we should just disable its use on darwin in -general. - ---- a/lib/vasnprintf.c 2017-06-22 15:19:15.000000000 -0700 -+++ b/lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 -@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index d0b5911b71d9..806625934d95 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -7,28 +7,17 @@ stdenv.mkDerivation rec { pname = "gnum4"; - version = "1.4.18"; + version = "1.4.19"; src = fetchurl { url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; + sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; }; doCheck = false; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; - # Upstream is aware of it; it may be in the next release. - patches = - [ - ./s_isdir.patch - (fetchurl { - url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch"; - sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; - }) - ] - ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; - meta = { homepage = "https://www.gnu.org/software/m4/"; description = "GNU M4, a macro processor"; diff --git a/pkgs/development/tools/misc/gnum4/s_isdir.patch b/pkgs/development/tools/misc/gnum4/s_isdir.patch deleted file mode 100644 index a009a4ba4465..000000000000 --- a/pkgs/development/tools/misc/gnum4/s_isdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fails to build with glibc 2.12.1 without this patch. - -http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html - ---- a/src/path.c -+++ b/src/path.c -@@ -22,6 +22,7 @@ - /* Handling of path search of included files via the builtins "include" - and "sinclude". */ - - #include "m4.h" -+#include "sys/stat.h" - - struct includes diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/development/tools/rust/cargo-supply-chain/default.nix index d8b9788dc32c..d5876f240a93 100644 --- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -1,17 +1,15 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib, rustPlatform, fetchCrate, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-supply-chain"; - version = "0.0.2"; + version = "0.2.0"; - src = fetchFromGitHub { - owner = "rust-secure-code"; - repo = pname; - rev = "v${version}"; - sha256 = "0kpm842p7l0vwbfa99zq3w3nsasy5sp1b99si7brjjvq99bad9gr"; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-zjDZJOUjnEQ03rmo5CdSY1emE6YohOPlf7SKuvNLuV0="; }; - cargoSha256 = "sha256-Mn5s6pfTHoFXtHqn6ii8PtAIBz/RJaR0zO5U5jS3UDU="; + cargoSha256 = "sha256-xSJ5rx8k+my0NeGYHZyvDzbM7uMdbViT7Ou9a9JACfs="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index f37b17057e59..9d6fb1588a11 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.15"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b1fce6fcef7b117b245a72dc8658a128635749d01dc7e9d1316490f89f9c2fde"; + sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index a82542760c28..7522052ea9a6 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "8.3.0"; + version = "8.3.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "sha256-MmdAi/AZ4CI/dPWbJxAXYTg/h0Dr/eEVYcZLMHaDQQ0="; + sha256 = "sha256-aBnF3Ij7oTws+0qOHwIIioxy1sJslb02wn8eGyKFt/c="; }; # don't remove runtime deps diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index c46bb564a1ea..e5de7c116c7e 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation { pname = "cnijfilter2"; - version = "6.00"; + version = "6.10"; src = fetchzip { - url = "https://gdlp01.c-wss.com/gds/9/0100010739/01/cnijfilter2-source-6.00-1.tar.gz"; - sha256 = "1n4vq44zya0n4a7jvq3yyqy7dcvc2911cjvxmq48zqicb2xdgafr"; + url = "https://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz"; + sha256 = "0w121issdjxdv5i9ksa5m23if6pz1r9ql8p894f1pqn16w0kw1ix"; }; buildInputs = [ diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 856a56f5f5eb..2e89aa296a23 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -19,13 +19,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6954"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7047"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "31cbd09a75a9d5f4814c3907a060e0961eb2bb15"; - sha256 = "00qql0wmlzs722s0igip3v0yjlqhc31jcr7nghwibcqrmx031azk"; + rev = "7c5ead1c196d597384085cc9a609afdc89a43774"; + sha256 = "00c6il67y9ky0f8f97nn8aqm4klwz59842nsh554w98gwv8w1jjb"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 5d403b7e93cb..6ebf7acd048e 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -11,7 +11,7 @@ (fetchNuGet { name = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { name = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { name = "LibHac"; version = "0.12.0"; sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; }) + (fetchNuGet { name = "LibHac"; version = "0.13.3"; sha256 = "0mh7q1i9wk5mj7xc1rbsasfmd0d1y6xs5m4nllmclk4drzkzsi56"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) @@ -102,7 +102,7 @@ (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { name = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build7"; sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) - (fetchNuGet { name = "Ryujinx.SDL2-CS"; version = "2.0.15-build11"; sha256 = "0s4h69l2b508l5wxp4v4ip8k83k78p3963xxv8bfamin9517przi"; }) + (fetchNuGet { name = "Ryujinx.SDL2-CS"; version = "2.0.17-build18"; sha256 = "0j0vs6075c4fniydqxhpp18pg3x679mq463x4gxqgkri3vhpj4vl"; }) (fetchNuGet { name = "SharpZipLib"; version = "1.3.0"; sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) (fetchNuGet { name = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { name = "SixLabors.ImageSharp"; version = "1.0.2"; sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; }) @@ -176,7 +176,6 @@ (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0-preview.7.20364.11"; sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 760ec2bc0534..369add0a586b 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs, lcms2, fetchpatch +, libiconv, ijs, lcms2, fetchpatch, callPackage , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: @@ -45,6 +45,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch"; sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w"; }) + (fetchpatch { + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=a9bd3dec9fde"; + name = "CVE-2021-3781.patch"; + sha256 = "FvbH7cb3ZDCbNRz9DF0kDmLdF7OWNYk90wv44pimU58="; + }) ./urw-font-files.patch ./doc-no-ref.diff ]; @@ -85,7 +90,8 @@ stdenv.mkDerivation rec { "--with-cups-datadir=$(out)/share/cups" ]; - doCheck = true; + # make check does nothing useful + doCheck = false; # don't build/install statically linked bin/gs buildFlags = [ "so" ]; @@ -115,10 +121,25 @@ stdenv.mkDerivation rec { runHook preInstallCheck $out/bin/gs --version + pushd examples + for f in *.{ps,eps,pdf}; do + echo "Rendering $f" + $out/bin/gs \ + -dNOPAUSE \ + -dBATCH \ + -sDEVICE=bitcmyk \ + -sOutputFile=/dev/null \ + -r600 \ + -dBufferSpace=100000 \ + $f + done + popd # examples runHook postInstallCheck ''; + passthru.tests.test-corpus-render = callPackage ./test-corpus-render.nix {}; + meta = { homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/misc/ghostscript/test-corpus-render.nix new file mode 100644 index 000000000000..544392090ff7 --- /dev/null +++ b/pkgs/misc/ghostscript/test-corpus-render.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchgit +, ghostscript +}: + +stdenv.mkDerivation { + pname = "ghostscript-test-corpus-render"; + version = "unstable-2020-02-19"; + + src = fetchgit { + url = "git://git.ghostscript.com/tests.git"; + rev = "efdd224340d9a407ed3ec22afa1cb127c8fee73c"; + sha256 = "1v1iqz897zzrwa8ng22zcf3y61ab5798jdwidgv10w1r9mjrl7ax"; + }; + + dontConfigure = true; + dontBuild = true; + + doCheck = true; + checkPhase = '' + find . -iregex '.*\.\(ps\|eps\|pdf\)' | while read f; do + echo "Rendering $f" + ${ghostscript}/bin/gs \ + -dNOPAUSE \ + -dBATCH \ + -sDEVICE=bitcmyk \ + -sOutputFile=/dev/null \ + -r600 \ + -dBufferSpace=100000 \ + $f + done + ''; + + installPhase = '' + touch $out + ''; +} diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 81b8ba0ab5bf..1808197498b5 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: +{ lib, fetchFromGitHub, fetchpatch, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -15,6 +15,14 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; + patches = [ + (fetchpatch { + # Build fix for aarch64, possibly other systems, merged in beats 7.x https://github.com/elastic/beats/pull/9493 + url = "https://github.com/elastic/beats/commit/5d796571de1aa2a299393d2045dacc2efac41a04.diff"; + sha256 = "sha256:0b79fljbi5xd3h8iiv1m38ad0zhmj09f187asc0m9rxlqrz2l9r2"; + }) + ]; + meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; diff --git a/pkgs/os-specific/bsd/netbsd/compat.patch b/pkgs/os-specific/bsd/netbsd/compat-cxx-safe-header.patch index f67ca2e50791..f67ca2e50791 100644 --- a/pkgs/os-specific/bsd/netbsd/compat.patch +++ b/pkgs/os-specific/bsd/netbsd/compat-cxx-safe-header.patch diff --git a/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch b/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch new file mode 100644 index 000000000000..1a69e73e255f --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch @@ -0,0 +1,22 @@ +commit f2d0ff85e05b49e9d11735ce4810b242c1dbf5af +Author: John Ericson <John.Ericson@Obsidian.Systems> +Date: Wed Sep 1 15:38:56 2021 +0000 + + Make should not hit configure + +diff --git a/Makefile b/Makefile +index b5adb8a5f2e9..1a914ef16739 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,11 +76,6 @@ _CURDIR:= ${.CURDIR} + + SRCS:= ${SRCS:M*.c} + +-config.cache: include/.stamp configure nbtool_config.h.in defs.mk.in +- rm -f ${.TARGET} +- CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} LDFLAGS=${HOST_LDFLAGS:Q} \ +- ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache +- + defs.mk: config.cache + @touch ${.TARGET} + diff --git a/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch b/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch new file mode 100644 index 000000000000..cd442d95f412 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch @@ -0,0 +1,101 @@ +commit 5acf3bdea5140e90135d15d6479f29fbf624f75e +Author: John Ericson <John.Ericson@Obsidian.Systems> +Date: Wed Sep 1 15:38:56 2021 +0000 + + Don't force building and installing for the build platform + + Also remove `compat/` subdir from install directories. + +diff --git a/Makefile b/Makefile +index 4bcf227f0e75..9ed1d6eea6ff 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + # $NetBSD: Makefile,v 1.87 2019/05/08 02:25:50 thorpej Exp $ + +-HOSTLIB= nbcompat ++LIB= nbcompat + +-.include <bsd.hostinit.mk> ++.include <bsd.own.mk> + +@@ -94,63 +94,37 @@ include/.stamp: + + # Install rules + +-HOST_LIBDIR= ${TOOLDIR}/lib +-HOST_INCSDIR= ${TOOLDIR}/include +-HOST_SHAREDIR= ${TOOLDIR}/share +- +-install: .PHONY install.lib includes install.defs.mk +- +-# Install lib${HOSTLIB}.a in ${TOOLDIR}/lib +-install.lib: .PHONY ${HOST_LIBDIR}/lib${HOSTLIB}.a +-${HOST_LIBDIR}/lib${HOSTLIB}.a: lib${HOSTLIB}.a +- ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_DIR} ${HOST_LIBDIR} +- ${HOST_INSTALL_FILE} -m ${LIBMODE} ${.ALLSRC} ${.TARGET} ++install: .PHONY includes install.defs.mk + + .for _f in ${INCFILES} +-HOST_INCINSTFILES+= ${HOST_INCSDIR}/compat/${_f} +-${HOST_INCSDIR}/compat/${_f}: ${_f} ++INCINSTFILES+= ${INCSDIR}/${_f} ++${INCSDIR}/${_f}: ${_f} + ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} ++ ${INSTALL_FILE} ${.ALLSRC} ${.TARGET} + .endfor + + .for _d in ${INCSUBDIRS} +-HOST_INCINSTDIRS+= ${HOST_INCSDIR}/compat/${_d} +-${HOST_INCSDIR}/compat/${_d}: ++INCINSTDIRS+= ${INCSDIR}/${_d} ++${INCSDIR}/${_d}: + ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_DIR} ${.TARGET} ++ ${INSTALL_DIR} ${.TARGET} + .endfor + +-# Install include files in ${TOOLDIR}/include/compat +-includes: .PHONY ${HOST_INCINSTDIRS} .WAIT ${HOST_INCINSTFILES} ++# Install include files in ${INCSDIR} ++includes: .PHONY ${INCINSTDIRS} .WAIT ${INCINSTFILES} + @(cd include && find . -name '*.h' -print | while read f ; do \ +- ${HOST_INSTALL_FILE} $$f ${HOST_INCSDIR}/compat/$$f ; \ ++ ${INSTALL_FILE} $$f ${INCSDIR}/$$f ; \ + done) + + +-# Install defs.mk in ${TOOLDIR}/share/compat +-install.defs.mk: .PHONY ${HOST_SHAREDIR}/compat/defs.mk +-${HOST_SHAREDIR}/compat/defs.mk: defs.mk ++# Install defs.mk in ${DATADIR} ++install.defs.mk: .PHONY ${DATADIR}/defs.mk ++${DATADIR}/defs.mk: defs.mk + ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_DIR} ${HOST_SHAREDIR} +- ${HOST_INSTALL_DIR} ${HOST_SHAREDIR}/compat +- ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} +- +-# bsd.hostlib.mk wants HOST_CPPFLAGS, not CPPFLAGS +- +-HOST_CPPFLAGS:= ${CPPFLAGS} +-CPPFLAGS:= # empty +- +-.include <bsd.hostlib.mk> +- +-# Use uninstalled copy of host-mkdep +-HOST_MKDEP_OBJ!= cd ${.CURDIR}/../host-mkdep && ${PRINTOBJDIR} +-HOST_MKDEP= ${HOST_MKDEP_OBJ}/host-mkdep +-MKDEP= ${HOST_MKDEP} ++ ${INSTALL_DIR} ${DATADIR} ++ ${INSTALL_FILE} ${.ALLSRC} ${.TARGET} + +-# Use uninstalled copy of the install program +-INSTALL_OBJ!= cd ${NETBSDSRCDIR}/tools/binstall && ${PRINTOBJDIR} +-INSTALL= ${INSTALL_OBJ}/xinstall ++.include <bsd.lib.mk> + + # Run "${TOOLDIR}/bin/nbmake-${MACHINE} regen" by hand after editing + # configure.ac. See more detailed instructions in configure.ac. diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 1e9331480007..8f24d28409f9 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -16,6 +16,10 @@ let tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; + netbsdSetupHook = makeSetupHook { + name = "netbsd-setup-hook"; + } ./setup-hook.sh; + otherSplices = { selfBuildBuild = pkgsBuildBuild.netbsd; selfBuildHost = pkgsBuildHost.netbsd; @@ -24,6 +28,12 @@ let selfTargetTarget = pkgsTargetTarget.netbsd or {}; # might be missing }; + defaultMakeFlags = [ + "MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" + then "yes" + else "no"}" + ]; + in lib.makeScopeWithSplicing splicePackages newScope @@ -60,7 +70,7 @@ in lib.makeScopeWithSplicing extraPaths = [ ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder mandoc groff statHook rsync ]; @@ -86,6 +96,8 @@ in lib.makeScopeWithSplicing BSD_PATH = attrs.path; + makeFlags = defaultMakeFlags; + strictDeps = true; meta = with lib; { @@ -93,6 +105,7 @@ in lib.makeScopeWithSplicing platforms = platforms.unix; license = licenses.bsd2; }; + } // lib.optionalAttrs stdenv'.hasCC { # TODO should CC wrapper set this? CPP = "${stdenv'.cc.targetPrefix}cpp"; @@ -118,7 +131,7 @@ in lib.makeScopeWithSplicing version = "9.2"; buildInputs = with self; []; - nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook rsync ]; + nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook rsync ]; skipIncludesPhase = true; @@ -126,6 +139,7 @@ in lib.makeScopeWithSplicing patchShebangs configure ${self.make.postPatch} ''; + buildPhase = '' runHook preBuild @@ -133,6 +147,7 @@ in lib.makeScopeWithSplicing runHook postBuild ''; + installPhase = '' runHook preInstall @@ -143,6 +158,7 @@ in lib.makeScopeWithSplicing runHook postInstall ''; + extraPaths = with self; [ make.src ] ++ make.extraPaths; }; @@ -159,13 +175,17 @@ in lib.makeScopeWithSplicing ./compat-setup-hook.sh ]; - # the build system re-runs `./configure` with `HOST_CC` (which is their - # name for Build CC) as a compiler to make `defs.mk`, which is installed - depsBuildBuild = [ buildPackages.stdenv.cc ] ++ commonDeps; - HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc"; + preConfigure = '' + make include/.stamp configure nbtool_config.h.in defs.mk.in + ''; + + configurePlatforms = [ "build" "host" ]; + configureFlags = [ + "--cache-file=config.cache" + ]; nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal rsync ]; @@ -174,18 +194,36 @@ in lib.makeScopeWithSplicing # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = [ + makeFlags = defaultMakeFlags ++ [ "INSTALL=${buildPackages.coreutils}/bin/install" - "TOOLDIR=$(out)" + "DATADIR=$(out)/share" + # Can't sort object files yet + "LORDER=echo" + "TSORT=cat" + # Can't process man pages yet + "MKSHARE=no" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # GNU objcopy produces broken .a libs which won't link into dependers. + # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. + "OBJCOPY=${buildPackages.darwin.cctools}/bin/strip" ]; RENAME = "-D"; - patches = [ ./compat.patch ]; + passthru.tests = { netbsd-install = self.install; }; - postInstall = '' - mv $out/include/compat/* $out/include - rmdir $out/include/compat + patches = [ + ./compat-cxx-safe-header.patch + ./compat-dont-configure-twice.patch + ./compat-no-force-native.patch + ]; + + preInstall = '' + makeFlagsArray+=('INSTALL_FILE=''${INSTALL} ''${COPY} ''${PRESERVE} ''${RENAME}') + makeFlagsArray+=('INSTALL_DIR=''${INSTALL} -d') + makeFlagsArray+=('INSTALL_SYMLINK=''${INSTALL} ''${SYMLINK} ''${RENAME}') + ''; + postInstall = '' # why aren't these installed by netbsd? install -D compat_defs.h $out/include/compat_defs.h install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h @@ -238,7 +276,7 @@ in lib.makeScopeWithSplicing sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = with self; [ mtree.src make.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal mandoc groff rsync ]; @@ -254,6 +292,7 @@ in lib.makeScopeWithSplicing runHook postInstall ''; + setupHook = ./install-setup-hook.sh; }; fts = mkDerivation { @@ -262,7 +301,7 @@ in lib.makeScopeWithSplicing sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "9.2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook rsync + bsdSetupHook netbsdSetupHook rsync ]; propagatedBuildInputs = with self; compatIfNeeded; extraPaths = with self; [ @@ -298,7 +337,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -320,7 +359,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -331,7 +370,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -347,7 +386,41 @@ in lib.makeScopeWithSplicing path = "usr.bin/make"; sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; version = "9.2"; - postPatch = '' + + postPatch = '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \ + --replace '-o ''${DOCOWN}' "" \ + --replace '-g ''${DOCGRP}' "" + for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do + substituteInPlace $mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" + done + substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \ + --replace '-o ''${KMODULEOWN}' "" \ + --replace '-g ''${KMODULEGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \ + --replace '-o ''${MANOWN}' "" \ + --replace '-g ''${MANGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \ + --replace '-o ''${NLSOWN}' "" \ + --replace '-g ''${NLSGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" \ + --replace '-o ''${RUMPBINOWN}' "" \ + --replace '-g ''${RUMPBINGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" + # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" @@ -433,11 +506,11 @@ in lib.makeScopeWithSplicing HOSTPROG = "tic"; buildInputs = with self; compatIfNeeded; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff nbperf ]; - makeFlags = [ "TOOLDIR=$(out)" ]; + makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = with self; [ libterminfo.src (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") @@ -465,7 +538,7 @@ in lib.makeScopeWithSplicing sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc byacc flex rsync ]; buildInputs = with self; compatIfNeeded; @@ -483,15 +556,31 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync nbperf rpcgen ]; + + # The makefiles define INCSDIR per subdirectory, so we have to set + # something else on the command line so those definitions aren't + # overridden. + postPatch = '' + find "$BSDSRCDIR" -name Makefile -exec \ + sed -i -E \ + -e 's_/usr/include_''${INCSDIR0}_' \ + {} \; + ''; + + # multiple header dirs, see above + postConfigure = '' + makeFlags=''${makeFlags/INCSDIR/INCSDIR0} + ''; + extraPaths = with self; [ common ]; headersOnly = true; noCC = true; meta.platforms = lib.platforms.netbsd; - makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; + makeFlags = defaultMakeFlags ++ [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; }; common = fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9"; @@ -502,15 +591,23 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; - # Fix this error when building bootia32.efi and bootx64.efi: - # error: PHDR segment not covered by LOAD segment - patches = [ ./no-dynamic-linker.patch ]; + patches = [ + # Fix this error when building bootia32.efi and bootx64.efi: + # error: PHDR segment not covered by LOAD segment + ./no-dynamic-linker.patch + + # multiple header dirs, see above + ./sys-headers-incsdir.patch + ]; + + # multiple header dirs, see above + inherit (self.include) postPatch; CONFIG = "GENERIC"; propagatedBuildInputs = with self; [ include ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder statHook rsync uudecode config genassym ]; @@ -518,9 +615,11 @@ in lib.makeScopeWithSplicing pushd arch/$MACHINE/conf config $CONFIG popd - ''; + '' + # multiple header dirs, see above + + self.include.postConfigure; - makeFlags = [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; + makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; hardeningDisable = [ "pic" ]; MKKMOD = "no"; NIX_CFLAGS_COMPILE = [ "-Wa,--no-warn" ]; @@ -573,7 +672,7 @@ in lib.makeScopeWithSplicing sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = with self; [ common libc.src sys.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal byacc install tsort lorder mandoc statHook ]; @@ -588,7 +687,7 @@ in lib.makeScopeWithSplicing buildInputs = with self; [ libterminfo libcurses ]; propagatedBuildInputs = with self; compatIfNeeded; SHLIBINSTALLDIR = "$(out)/lib"; - makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; postPatch = '' sed -i '1i #undef bool_t' el.h substituteInPlace config.h \ @@ -607,7 +706,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder mandoc statHook nbperf tic ]; buildInputs = with self; compatIfNeeded; @@ -640,7 +739,7 @@ in lib.makeScopeWithSplicing ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; propagatedBuildInputs = with self; compatIfNeeded; MKDOC = "no"; # missing vfontedpr - makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ @@ -667,10 +766,10 @@ in lib.makeScopeWithSplicing path = "lib/librpcsvc"; version = "9.2"; sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; - makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; + makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder rpcgen statHook ]; @@ -748,7 +847,7 @@ in lib.makeScopeWithSplicing sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync @@ -766,7 +865,7 @@ in lib.makeScopeWithSplicing # Hack to prevent a symlink being installed here for compatibility. SHLINKINSTALLDIR = "/usr/libexec"; USE_FORT = "yes"; - makeFlags = [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; extraPaths = with self; [ libc.src ] ++ libc.extraPaths; }; @@ -786,7 +885,7 @@ in lib.makeScopeWithSplicing (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync rpcgen @@ -797,7 +896,7 @@ in lib.makeScopeWithSplicing SHLIBINSTALLDIR = "$(out)/lib"; MKPICINSTALL = "yes"; NLSDIR = "$(out)/share/nls"; - makeFlags = [ "FILESDIR=$(out)/var/db"]; + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db"]; postInstall = '' pushd ${self.headers} find . -type d -exec mkdir -p $out/\{} \; @@ -851,7 +950,7 @@ in lib.makeScopeWithSplicing noCC = true; version = "9.2"; sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; - makeFlags = [ "BINDIR=$(out)/share" ]; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; }; misc = mkDerivation { @@ -859,7 +958,7 @@ in lib.makeScopeWithSplicing noCC = true; version = "9.2"; sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; - makeFlags = [ "BINDIR=$(out)/share" ]; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; }; man = mkDerivation { @@ -867,7 +966,7 @@ in lib.makeScopeWithSplicing noCC = true; version = "9.2"; sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; - makeFlags = [ "FILESDIR=$(out)/share" ]; + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/share" ]; }; # # END MISCELLANEOUS diff --git a/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh new file mode 100644 index 000000000000..4bfd4d785fac --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh @@ -0,0 +1,8 @@ +addNetBSDInstallMakeFlags() { + export INSTALL_FILE="install -U -c" + export INSTALL_DIR="install -U -d" + export INSTALL_LINK="install -U -l h" + export INSTALL_SYMLINK="install -U -l s" +} + +preConfigureHooks+=(addNetBSDInstallMakeFlags) diff --git a/pkgs/os-specific/bsd/netbsd/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/setup-hook.sh new file mode 100644 index 000000000000..fa8b19e7d8ce --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/setup-hook.sh @@ -0,0 +1,15 @@ +mergeNetBSDSourceDir() { + # merge together all extra paths + # there should be a better way to do this + chmod -R u+w $BSDSRCDIR + for path in $extraPaths; do + rsync -Er --chmod u+w $path/ $BSDSRCDIR/ + done +} + +addNetBSDMakeFlags() { + makeFlags="INCSDIR=${!outputDev}/include $makeFlags" +} + +postUnpackHooks+=(mergeNetBSDSourceDir) +preConfigureHooks+=(addNetBSDMakeFlags) diff --git a/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch b/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch new file mode 100644 index 000000000000..ed85f8ea5b0c --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 3f1e18dc659d..163362b82f94 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,6 +2,8 @@ + + .include <bsd.own.mk> + ++INCSDIR= ${INCSDIR0} ++ + SUBDIR= altq arch compat dev fs miscfs \ + net net80211 netatalk netbt netcan netipsec netinet netinet6 \ + netmpls netsmb \ diff --git a/pkgs/os-specific/bsd/setup-hook.sh b/pkgs/os-specific/bsd/setup-hook.sh index 98fee66f5dfe..4bdfde68b62e 100644 --- a/pkgs/os-specific/bsd/setup-hook.sh +++ b/pkgs/os-specific/bsd/setup-hook.sh @@ -36,11 +36,6 @@ addMakeFlags() { export MKUNPRIVED=yes export EXTERNAL_TOOLCHAIN=yes - export INSTALL_FILE="install -U -c" - export INSTALL_DIR="xinstall -U -d" - export INSTALL_LINK="install -U -l h" - export INSTALL_SYMLINK="install -U -l s" - makeFlags="MACHINE=$MACHINE $makeFlags" makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags" makeFlags="AR=$AR $makeFlags" @@ -63,15 +58,9 @@ addMakeFlags() { } setBSDSourceDir() { - # merge together all extra paths - # there should be a better way to do this sourceRoot=$PWD/$sourceRoot export BSDSRCDIR=$sourceRoot export _SRC_TOP_=$BSDSRCDIR - chmod -R u+w $sourceRoot - for path in $extraPaths; do - rsync -Er --chmod u+w $path/ $sourceRoot/ - done cd $sourceRoot if [ -d "$BSD_PATH" ] @@ -85,7 +74,7 @@ includesPhase() { local flagsArray=( $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - DESTDIR=${!outputInclude} includes + includes ) echoCmd 'includes flags' "${flagsArray[@]}" diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix index 6c600097f09b..4c573af95be1 100644 --- a/pkgs/os-specific/darwin/sigtool/default.nix +++ b/pkgs/os-specific/darwin/sigtool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sigtool"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "thefloweringash"; repo = "sigtool"; rev = "v${version}"; - sha256 = "sha256-GSVkF1BkZEkIF+q0SsoCuE0q48DRclE3E+qKc6JEc/0="; + sha256 = "sha256-v4udqW37vwcqBdqfvfwHnoyXpuLFt188ekVCPCPsTPM"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 57f8ba0d33b3..b67d737034e4 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "915resolution-0.5.3"; + pname = "915resolution"; + version = "0.5.3"; src = fetchurl { - url = "http://915resolution.mango-lang.org/${name}.tar.gz"; + url = "http://915resolution.mango-lang.org/915resolution-${version}.tar.gz"; sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; }; diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index d28ff447681e..2b8dac0c8e43 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "acpid-2.0.32"; + pname = "acpid"; + version = "2.0.32"; src = fetchurl { - url = "mirror://sourceforge/acpid2/${name}.tar.xz"; + url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz"; sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj"; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 4a3d1a36bd74..d494e95e3db6 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -7,10 +7,11 @@ let }; in stdenv.mkDerivation rec { - name = "acpitool-0.5.1"; + pname = "acpitool"; + version = "0.5.1"; src = fetchurl { - url = "mirror://sourceforge/acpitool/${name}.tar.bz2"; + url = "mirror://sourceforge/acpitool/acpitool-${version}.tar.bz2"; sha256 = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f"; }; diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index e5cc3bd9790a..5bf32fbe6661 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }: stdenv.mkDerivation rec { - pname = "afuse-0.4.1"; + pname = "afuse"; version = "0.4.1"; src = fetchFromGitHub { owner = "pcarrier"; repo = "afuse"; rev = "v${version}"; - hash = "sha256-JivJ/xRxUiR0Mnm41T0514kF+T7ePeGpk4IHhWApKBo="; + sha256 = "06i855h8a1w2jfly2gfy7vwhb2fp74yxbf3r69s28lki2kzwjar6"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index a627a7762a89..8ad48c41408b 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "alsa-firmware-1.2.1"; + pname = "alsa-firmware"; + version = "1.2.1"; src = fetchurl { - url = "mirror://alsa/firmware/${name}.tar.bz2"; + url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2"; sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 30327fb1082e..6fa7ba28d8e3 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -8,10 +8,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.5"; # at the next release, remove the patches below! + pname = "audit"; + version = "2.8.5"; # at the next release, remove the patches below! src = fetchurl { - url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + url = "https://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz"; sha256 = "1dzcwb2q78q7x41shcachn7f4aksxbxd470yk38zh03fch1l2p8f"; }; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index a3899fd47c58..3d345e68f3c3 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -21,11 +21,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.60"; + version = "5.61"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-cQmZWA0B7lnsWF5efAf9lO3e3AAaom/nRkxUb52UUwQ="; + sha256 = "sha256-g6/WxSF5VUv+q7y1OP7C62vpCorDxAhxtJ162LScQjs="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 12655c3bed66..92e7606c9bdb 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "bridge-utils-1.5"; + pname = "bridge-utils"; + version = "1.5"; src = fetchurl { - url = "mirror://sourceforge/bridge/${name}.tar.gz"; + url = "mirror://sourceforge/bridge/bridge-utils-${version}.tar.gz"; sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; }; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 6f94d0f89254..d64996c4961e 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libtool, gettext }: stdenv.mkDerivation rec { - name = "cpufrequtils-008"; + pname = "cpufrequtils"; + version = "008"; src = fetchurl { - url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/${name}.tar.gz"; + url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${version}.tar.gz"; sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0"; }; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e7304e196798..9522e9e52241 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.3.6"; + version = "2.4.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz"; - sha256 = "sha256-spa3oh6ldsKxgGEcyxnQauyN3a7ffHBLDGqBIQwlY18="; + url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; + sha256 = "sha256-xci9oxFZqcAQ6nLnCAU8xCUs9e69ylIOFQq8Bgkof/g="; }; # Disable 4 test cases that fail in a sandbox @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" + "--disable-ssh-token" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index 86f6f916cefc..fbf47204b3e6 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "devmem2-2004-08-05"; + pname = "devmem2"; + version = "unstable-2004-08-05"; src = fetchurl { urls = [ diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index f754882ccd01..8a083b8b894d 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libX11 }: stdenv.mkDerivation { - name = "disk-indicator-2014-05-19"; + pname = "disk-indicator"; + version = "unstable-2014-05-19"; src = fetchgit { url = "git://github.com/MeanEYE/Disk-Indicator.git"; diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index a4e09492debd..a12d97280f19 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "dmidecode-3.2"; + pname = "dmidecode"; + version = "3.2"; src = fetchurl { - url = "mirror://savannah/dmidecode/${name}.tar.xz"; + url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index c1e0dfc5ae43..3a6f31fa5523 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, lvm2 }: stdenv.mkDerivation rec { - name = "dmraid-1.0.0.rc16"; + pname = "dmraid"; + version = "1.0.0.rc16"; src = fetchurl { - url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index ae3e986e14af..85be205749ac 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, flex, systemd, perl }: stdenv.mkDerivation rec { - name = "drbd-8.4.4"; + pname = "drbd"; + version = "8.4.4"; src = fetchurl { - url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz"; + url = "http://oss.linbit.com/drbd/8.4/drbd-${version}.tar.gz"; sha256 = "1w4889h1ak7gy9w33kd4fgjlfpgmp6hzfya16p1pkc13bjf22mm0"; }; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index 63c539602f12..6171f8ed3073 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -2,7 +2,8 @@ , sysfsutils, dmidecode, kmod }: stdenv.mkDerivation { - name = "edac-utils-2015-01-07"; + pname = "edac-utils"; + version = "unstable-2015-01-07"; src = fetchFromGitHub { owner = "grondo"; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 7cc28e7f314f..5fea8c197963 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.42"; + version = "0.43"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "sha256-GgQhSzVqGCpljWewtevCc9rpkks7devRNp5TN+5JNN4="; + sha256 = "sha256-ttKFKV8spxnkFpZHV4Dn9BxJdjxYLWYrHY+qq6uAOlg="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 79de65fcb981..389078db0af5 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "b43-fwcutter-019"; + pname = "b43-fwcutter"; + version = "019"; src = fetchurl { - url = "https://bues.ch/b43/fwcutter/${name}.tar.bz2"; + url = "https://bues.ch/b43/fwcutter/b43-fwcutter-${version}.tar.bz2"; sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 6cbaa4acb8d2..3363140ad569 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: with lib; stdenv.mkDerivation { - name = "rtl8192su-unstable-2016-10-05"; + pname = "rtl8192su"; + version = "unstable-2016-10-05"; src = fetchFromGitHub { owner = "chunkeey"; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index 18cdc21f0b60..08c35d79f3dc 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libv4l, gd }: stdenv.mkDerivation rec { - name = "fswebcam-20200725"; + pname = "fswebcam"; + version = "2020-07-25"; src = fetchurl { - url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; + url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${lib.replaceStrings ["."] [""] version}.tar.gz"; sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; }; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 3255c992f864..8c1a778ec8bf 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "fxload-2002_04_11"; +stdenv.mkDerivation rec { + pname = "fxload"; + version = "2002.04.11"; src = fetchurl { - url = "mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"; + url = "mirror://sourceforge/linux-hotplug/fxload-${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; }; diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/os-specific/linux/hd-idle/default.nix index 3e4b08151463..301a218ff62e 100644 --- a/pkgs/os-specific/linux/hd-idle/default.nix +++ b/pkgs/os-specific/linux/hd-idle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hd-idle-1.05"; + pname = "hd-idle"; + version = "1.05"; src = fetchurl { - url = "mirror://sourceforge/project/hd-idle/${name}.tgz"; + url = "mirror://sourceforge/project/hd-idle/hd-idle-${version}.tgz"; sha256 = "031sm996s0rhy3z91b9xvyimsj2yd2fhsww2al2hxda5s5wzxzjf"; }; diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix index 543495ec2afc..6da154648fc2 100644 --- a/pkgs/os-specific/linux/ioport/default.nix +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -1,12 +1,16 @@ { lib, stdenv, perl, fetchurl }: -stdenv.mkDerivation { - name = "ioport-1.2"; +stdenv.mkDerivation rec { + pname = "ioport"; + version = "1.2"; + src = fetchurl { - url = "https://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; + url = "https://people.redhat.com/rjones/ioport/files/ioport-${version}.tar.gz"; sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; }; + buildInputs = [ perl ]; + meta = with lib; { description = "Direct access to I/O ports from the command line"; homepage = "https://people.redhat.com/rjones/ioport/"; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index a91175aa59f3..0376ff1a55ec 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,10 +1,11 @@ { lib, fetchurl, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { - name = "iotop-0.6"; + pname = "iotop"; + version = "0.6"; src = fetchurl { - url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"; sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index ea3c4d36958f..74003ff83b83 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , buildPackages, bison, flex, pkg-config , db, iptables, libelf, libmnl }: stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cqLlN3TKyeZfe2F97rsgWfh+iWDW6XE+TXiM6pZvGzY="; + sha256 = "1m4ifnxq7lxnm95l5354z8dk3xj6w9isxmbz53266drgln2sf3r1"; }; + patches = [ + # To avoid ./configure failing due to invalid arguments: + (fetchpatch { # configure: restore backward compatibility + url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0"; + sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv"; + }) + ]; + preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 127232139016..8a4cde0c79ed 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -11,12 +11,13 @@ iproute2.overrideAttrs (oa: rec { sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; }; - preConfigure = '' - # Don't try to create /var/lib/arpd: - sed -e '/ARPDDIR/d' -i Makefile + preConfigure = oa.preConfigure + '' patchShebangs configure ''; + # We override "patches" to never apply any iproute2 patches: + patches = [ ]; + meta = with lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 33152cc51c13..f10364121a46 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -7,10 +7,11 @@ # the time being. stdenv.mkDerivation rec { - name = "ipsec-tools-0.8.2"; + pname = "ipsec-tools"; + version = "0.8.2"; src = fetchurl { - url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2"; + url = "mirror://sourceforge/ipsec-tools/ipsec-tools-${version}.tar.bz2"; sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; }; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index fbae4a6011ba..33e1f1783ab3 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -8,16 +8,17 @@ , readline , openssl , python3Packages +, fetchpatch }: stdenv.mkDerivation rec { pname = "iwd"; - version = "1.16"; + version = "1.17"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-Nu6vb5UOJ/KgmJZM4bMKwLpOoKMLcnZPYCqFBQjuCYY="; + sha256 = "sha256-uWWdKjxctz8fdiIkSiuOYNcZPhxEWDXaA8QPLnd/I9c="; }; outputs = [ "out" "man" ] @@ -56,6 +57,14 @@ stdenv.mkDerivation rec { "--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/" ]; + patches = [ + # Fix failure in test-eapol. Remove when bumping to 1.18 + (fetchpatch { + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=ed10b00afa3f4c087b46d7ba0b60a47bd05d8b39"; + sha256 = "0n8ixrbfh428ajncakcb9kd2n4fw82kw9sfskn1d9ny0lrg39nvg"; + }) + ]; + postUnpack = '' mkdir -p iwd/ell ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 554898cedebc..12e4c15e62c0 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, linuxHeaders }: -stdenv.mkDerivation { - name = "jujuutils-0.2"; +stdenv.mkDerivation rec { + pname = "jujuutils"; + version = "0.2"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-0.2.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-${version}.tar.gz"; sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; }; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1ce4a21e2424..717fdaee72a5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -35,7 +35,12 @@ let options = { debug = { - DEBUG_INFO = if (features.debug or false) then yes else no; + # Necessary for BTF + DEBUG_INFO = mkMerge [ + (whenOlder "5.2" (if (features.debug or false) then yes else no)) + (whenAtLeast "5.2" yes) + ]; + DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); DEBUG_KERNEL = yes; DEBUG_DEVRES = no; DYNAMIC_DEBUG = yes; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 77add0aef539..12eca63e2162 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk, python3Minimal +, libelf, cpio, elfutils, zstd, gawk, python3Minimal, zlib, pahole , writeTextFile }: @@ -316,10 +316,12 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] - ++ optional (lib.versionAtLeast version "5.2") cpio + ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] ++ optional (lib.versionAtLeast version "5.8") elfutils ; + buildInputs = optional (lib.versionAtLeast version "5.2") zlib; + hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. diff --git a/pkgs/os-specific/linux/kmod/darwin.patch b/pkgs/os-specific/linux/kmod/darwin.patch index e112e6915250..4d9931b03eef 100644 --- a/pkgs/os-specific/linux/kmod/darwin.patch +++ b/pkgs/os-specific/linux/kmod/darwin.patch @@ -69,14 +69,17 @@ diff --git a/shared/macro.h b/shared/macro.h index 4fc5405..b5a2702 100644 --- a/shared/macro.h +++ b/shared/macro.h -@@ -71,3 +71,7 @@ - #endif - - #define UNIQ __COUNTER__ -+ -+ #if !defined(__linux__) +@@ -53,6 +53,10 @@ + #define CONCATENATE(x, y) XCONCATENATE(x, y) + #define UNIQ(x) CONCATENATE(x, __COUNTER__) + ++#if !defined(__linux__) +#define program_invocation_short_name getprogname() +#endif ++ + /* Temporaries for importing index handling */ + #define NOFAIL(x) (x) + #define fatal(x...) do { } while (0) diff --git a/shared/missing.h b/shared/missing.h index 4c0d136..ad8ec0f 100644 --- a/shared/missing.h diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index ef8296cf16f0..2cb263854ab8 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, pkg-config -, libxslt, xz, elf-header +, libxslt, xz, zstd, elf-header , withStatic ? stdenv.hostPlatform.isStatic }: @@ -9,23 +9,24 @@ let in stdenv.mkDerivation rec { pname = "kmod"; - version = "27"; + version = "29"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz"; - sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"; + sha256 = "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b"; }; nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; - buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header; + buildInputs = [ xz zstd ] ++ lib.optional stdenv.isDarwin elf-header; configureFlags = [ "--sysconfdir=/etc" "--with-xz" + "--with-zstd" "--with-modulesdirs=${modulesDirs}" ] ++ lib.optional withStatic "--enable-static"; - patches = [ ./module-dir.patch ./no-name-field.patch ] + patches = [ ./module-dir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch ++ lib.optional withStatic ./enable-static.patch; @@ -49,7 +50,7 @@ in stdenv.mkDerivation rec { homepage = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/"; downloadPage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; changelog = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/plain/NEWS?h=v${version}"; - license = licenses.lgpl21; + license = with licenses; [ lgpl21Plus gpl2Plus ]; # GPLv2+ for tools platforms = platforms.unix; }; } diff --git a/pkgs/os-specific/linux/kmod/no-name-field.patch b/pkgs/os-specific/linux/kmod/no-name-field.patch deleted file mode 100644 index 282f59e55e52..000000000000 --- a/pkgs/os-specific/linux/kmod/no-name-field.patch +++ /dev/null @@ -1,24 +0,0 @@ - ---- - tools/modinfo.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tools/modinfo.c b/tools/modinfo.c -index 0231bb0..7b2259e 100644 ---- a/tools/modinfo.c -+++ b/tools/modinfo.c -@@ -178,7 +178,10 @@ static int modinfo_do(struct kmod_module *mod) - is_builtin = (filename == NULL); - - if (is_builtin) { -- printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator); -+ if (field == NULL || field != NULL && streq(field, "name")){ -+ printf("%-16s%s%c", "name:", -+ kmod_module_get_name(mod), separator); -+ } - filename = "(builtin)"; - } - --- -2.28.0 - diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 6db3a9583ecd..53b4cd60fb1c 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: stdenv.mkDerivation { - name = "kmscube-2018-06-17"; + pname = "kmscube"; + version = "unstable-2018-06-17"; src = fetchgit { url = "git://anongit.freedesktop.org/mesa/kmscube"; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 30ec6cdc7b51..56e412379f80 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "latencytop-0.5"; + pname = "latencytop"; + version = "0.5"; patchPhase = "sed -i s,/usr,$out, Makefile"; preInstall = "mkdir -p $out/sbin"; src = fetchurl { - urls = [ "http://latencytop.org/download/${name}.tar.gz" + urls = [ "http://latencytop.org/download/latencytop-${version}.tar.gz" "http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ]; sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index c422f5e01bb4..d5be78e913b7 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, udev, buildPackages }: stdenv.mkDerivation rec { - name = "libatasmart-0.19"; + pname = "libatasmart"; + version = "0.19"; src = fetchurl { - url = "http://0pointer.de/public/${name}.tar.xz"; + url = "http://0pointer.de/public/libatasmart-${version}.tar.xz"; sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 2e497584fab8..649ad88a3d18 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -7,30 +7,15 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.1.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv"; + sha256 = "1by5w7g3i2fc10bi6f0j8jqi2nq0x8r973j2qx7qlfryjxr7b2v3"; }; - patches = [ - (fetchpatch { # included upstream for > 0.1.0 - name = "link-zlib.patch"; - url = "https://github.com/libbpf/libbpf/commit/8b14cb43ff837.diff"; - sha256 = "17mvjrs7s727drz013a8qlyj0345ldi2kph6pazcmxv6kl1qrz2z"; - }) - ]; - patchFlags = "-p2"; - # https://github.com/libbpf/libbpf/pull/201#issuecomment-689174740 - postPatch = '' - substituteInPlace ../scripts/check-reallocarray.sh \ - --replace 'mktemp /tmp/' 'mktemp ' \ - --replace '/bin/rm' 'rm' - ''; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 87b7d33c5d84..653094c91884 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libvolume_id-0.81.1"; +stdenv.mkDerivation rec { + pname = "libvolume_id"; + version = "0.81.1"; src = fetchurl { - url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; + url = "https://www.marcuscom.com/downloads/libvolume_id-${version}.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; @@ -21,5 +22,6 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.linux; license = licenses.gpl2; + homepage = "http://www.marcuscom.com/downloads/"; }; } diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index ec56a89ce88f..8da12d78bc93 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { - name = "lightum-2014-06-07"; + pname = "lightum"; + version = "unstable-2014-06-07"; src = fetchgit { url = "https://github.com/poliva/lightum"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index 8bbd3ab7f427..19d6f10e3de1 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lksctp-tools-1.0.17"; + pname = "lksctp-tools"; + version = "1.0.17"; src = fetchurl { - url = "mirror://sourceforge/lksctp/${name}.tar.gz"; + url = "mirror://sourceforge/lksctp/lksctp-tools-${version}.tar.gz"; sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs"; }; diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 6286735b758b..d87820f24664 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "lsscsi-0.32"; +stdenv.mkDerivation rec { + pname = "lsscsi"; + version = "0.32"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.32.tgz"; + url = "http://sg.danny.cz/scsi/lsscsi-${version}.tgz"; sha256 = "sha256-CoAOnpTcoqtwLWXXJ3eujK4Hjj100Ly+1kughJ6AKaE="; }; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 441476d5f065..fe9c11ace1f6 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,7 +1,8 @@ { fetchFromGitHub, kernel, lib, stdenv }: stdenv.mkDerivation { - name = "mba6x_bl-2016-12-08"; + pname = "mba6x_bl"; + version = "unstable-2016-12-08"; src = fetchFromGitHub { owner = "patjak"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 935ded637097..01d2bba32a4d 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }: stdenv.mkDerivation rec { - name = "mdadm-4.1"; + pname = "mdadm"; + version = "4.1"; src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz"; sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index 8a2cf69dd368..eb58dc553676 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "mingetty-1.08"; +stdenv.mkDerivation rec { + pname = "mingetty"; + version = "1.08"; src = fetchurl { - url = "mirror://sourceforge/mingetty/mingetty-1.08.tar.gz"; + url = "mirror://sourceforge/mingetty/mingetty-${version}.tar.gz"; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index eeea1d74dcac..da2ba4b9ff2d 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mkinitcpio-nfs-utils-0.3"; + pname = "mkinitcpio-nfs-utils"; + version = "0.3"; src = fetchurl { - url = "https://sources.archlinux.org/other/mkinitcpio/${name}.tar.xz"; + url = "https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-nfs-utils-${version}.tar.xz"; sha256 = "0fc93sfk41ycpa33083kyd7i4y00ykpbhj5qlw611bjghj4x946j"; # ugh, upstream... - name = "${name}.tar.gz"; + name = "mkinitcpio-nfs-utils-${version}.tar.gz"; }; makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 3498625be757..d5129ca7f73a 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation { - name = "mxu11x0-1.4-${kernel.version}"; + pname = "mxu11x0"; + version = "1.4-${kernel.version}"; src = fetchurl { url = "https://www.moxa.com/Moxa/media/PDIM/S100000385/moxa-uport-1000-series-linux-3.x-and-4.x-for-uport-11x0-series-driver-v1.4.tgz"; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 0121c4a6f1c8..23bc8ff0dfad 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, openldap, perl}: -stdenv.mkDerivation { - name = "nss_ldap-265"; +stdenv.mkDerivation rec { + pname = "nss_ldap"; + version = "265"; src = fetchurl { - url = "http://www.padl.com/download/nss_ldap-265.tar.gz"; + url = "http://www.padl.com/download/nss_ldap-${version}.tar.gz"; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; }; diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 21d5a871f4e9..0526c02f75f8 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "numad-0.5"; + pname = "numad"; + version = "0.5"; src = fetchurl { - url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/${name}.tar.xz"; + url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/numad-${version}.tar.xz"; sha256 = "08zd1yc3w00yv4mvvz5sq1gf91f6p2s9ljcd72m33xgnkglj60v4"; }; diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 33df8c0cc345..b7f1b6574404 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -9,7 +9,8 @@ {lib, stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { - name = "xorg-sys-opengl-3"; + pname = "xorg-sys-opengl"; + version = "3"; builder = ./builder.sh; neededLibs = map (p: p.out) [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index fed7930bf148..14381ac68c16 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam }: stdenv.mkDerivation rec { - name = "otpw-1.3"; + pname = "otpw"; + version = "1.3"; src = fetchurl { - url = "https://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/download/otpw-${version}.tar.gz"; sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk"; }; diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index bfe9ac7c830c..4b2cc7a3822b 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, pam, openssl, db}: stdenv.mkDerivation rec { - name = "pam_ccreds-10"; + pname = "pam_ccreds"; + version = "10"; src = fetchurl { - url = "https://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/pam_ccreds-${version}.tar.gz"; sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index cb04fa5b4242..af5fbccff052 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam, libkrb5 }: stdenv.mkDerivation rec { - name = "pam-krb5-4.10"; + pname = "pam-krb5"; + version = "4.10"; src = fetchurl { - url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; + url = "https://archives.eyrie.org/software/kerberos/pam-krb5-${version}.tar.gz"; sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79"; }; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index e327a551b231..988256808dbb 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pam, openldap, perl }: stdenv.mkDerivation rec { - name = "pam_ldap-186"; + pname = "pam_ldap"; + version = "186"; src = fetchurl { - url = "https://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/pam_ldap-${version}.tar.gz"; sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 1a66e986d8b2..8411c4fdbfaf 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -33,10 +33,11 @@ let in stdenv.mkDerivation rec { - name = "pam_usb-0.5.0"; + pname = "pam_usb"; + version = "0.5.0"; src = fetchurl { - url = "mirror://sourceforge/pamusb/${name}.tar.gz"; + url = "mirror://sourceforge/pamusb/pam_usb-${version}.tar.gz"; sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1"; }; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index a4da6be691e9..bca58bd808eb 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -7,10 +7,11 @@ # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { - name = "pcmciautils-018"; + pname = "pcmciautils"; + version = "018"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz"; + url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${version}.tar.gz"; sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index 113cceb50a45..8c3e31e45384 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "perf-tools-20171219"; + pname = "perf-tools"; + version = "unstable-2017-12-19"; src = fetchFromGitHub { owner = "brendangregg"; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 17723983c696..4076641717f4 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -12,10 +12,11 @@ let in stdenv.mkDerivation rec { - name = "pm-utils-1.4.1"; + pname = "pm-utils"; + version = "1.4.1"; src = fetchurl { - url = "https://pm-utils.freedesktop.org/releases/${name}.tar.gz"; + url = "https://pm-utils.freedesktop.org/releases/pm-utils-${version}.tar.gz"; sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index 851a903cf072..facf690a9bd4 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -3,7 +3,8 @@ assert lib.versionAtLeast kernel.version "4.4"; stdenv.mkDerivation { - name = "sch_cake-2017-07-16"; + pname = "sch_cake"; + version = "unstable-2017-07-16"; src = fetchFromGitHub { owner = "dtaht"; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index 4daac076e587..b5f067fffd72 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sysfsutils-2.1.0"; + pname = "sysfsutils"; + version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/linux-diag/${name}.tar.gz"; + url = "mirror://sourceforge/linux-diag/sysfsutils-${version}.tar.gz"; sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"; }; diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 78992a0f870a..4d9844f516b0 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "sysklogd-1.5.1"; +stdenv.mkDerivation rec { + pname = "sysklogd"; + version = "1.5.1"; src = fetchurl { - url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz"; + url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${version}.tar.gz"; sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2eff999ac7cf..2d5b3e2ab558 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.4.3"; + pname = "sysstat"; + version = "12.4.3"; src = fetchurl { - url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; + url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; }; diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index ac2d00181602..8a1cdc1da847 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 2f4a5e9c9ef1cd57662e8bd4c24e1029a00d55b5 Mon Sep 17 00:00:00 2001 +From 57e31a2d4a5d5bd7a9e1cd8a0d8bc6a00624ad68 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices @@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index 7c22eefdb7..e3a55e00b5 100644 +index 25b8a590a6..d18999ea87 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in @@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" @@ -28,5 +28,5 @@ index 7c22eefdb7..e3a55e00b5 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index f54430f764e4..129e0825d9fe 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From 4e96b2e074c4a4f4ce900409872ce2f86704ee5b Mon Sep 17 00:00:00 2001 +From 43465a392b47238a32f8719f603ed9e2c9bb0363 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store @@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126 2 files changed, 4 insertions(+) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index 292b97cd69..791b8e6b7e 100644 +index f683f05981..5a04c2c2a6 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { @@ -25,10 +25,10 @@ index 292b97cd69..791b8e6b7e 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 3a72a13e1a..541320dc9d 100644 +index c2a26242c0..9936398f32 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -500,6 +500,8 @@ static int delete_md(MountPoint *m) { +@@ -496,6 +496,8 @@ static int delete_md(MountPoint *m) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") @@ -38,5 +38,5 @@ index 3a72a13e1a..541320dc9d 100644 || path_equal(path, "/usr") #endif -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 37caffb97d76..91fdebc7ad38 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From 3d1b2e56a6ed6cc86a64f6f89765a2900e576402 Mon Sep 17 00:00:00 2001 +From a99666d3d7012c2162fdacf84a57fc0b848fd957 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/19] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 7515380fcd..14f8a82eb8 100644 +index 04685fecba..0e5ece5f91 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5323,6 +5323,7 @@ static int run(int argc, char *argv[]) { +@@ -5590,6 +5590,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 7515380fcd..14f8a82eb8 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5337,6 +5338,7 @@ static int run(int argc, char *argv[]) { +@@ -5604,6 +5605,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 7515380fcd..14f8a82eb8 100644 } else { -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 2f14a9d6a7e8..bdd205dd29e8 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From 3a721cf70e952e933ef5374006bbb11a3a0ad36a Mon Sep 17 00:00:00 2001 +From 3f0780b25bdbe4156a2f761c90083bbba5f4d473 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/19] Look for fsck in the right place @@ -8,7 +8,7 @@ Subject: [PATCH 04/19] Look for fsck in the right place 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 510689f3b7..25cab5acae 100644 +index cd7adfaeb9..68cebdd158 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -368,7 +368,7 @@ static int run(int argc, char *argv[]) { @@ -21,5 +21,5 @@ index 510689f3b7..25cab5acae 100644 cmdline[i++] = "-T"; -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 0acccacd6135..8680d147ad17 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From 8b7f881cf22e98e907506f4c403b9e304e332bf9 Mon Sep 17 00:00:00 2001 +From 82698c6a5142e710c302f9c38367ed00d8ec94ba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/19] Add some NixOS-specific unit directories @@ -10,14 +10,14 @@ units provided by packages installed into the default profile via Also, remove /usr and /lib as these don't exist on NixOS. --- src/basic/path-lookup.c | 17 ++--------------- - src/core/systemd.pc.in | 5 +++-- - 2 files changed, 5 insertions(+), 17 deletions(-) + src/core/systemd.pc.in | 8 ++++---- + 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 96b82170d0..bf66bd6b77 100644 +index 05eb17d66c..1cd141d012 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c -@@ -94,11 +94,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +@@ -91,11 +91,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { @@ -29,7 +29,7 @@ index 96b82170d0..bf66bd6b77 100644 NULL }; -@@ -616,15 +612,13 @@ int lookup_paths_init( +@@ -613,15 +609,13 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", @@ -40,13 +40,13 @@ index 96b82170d0..bf66bd6b77 100644 STRV_IFNOTNULL(runtime_attached), STRV_IFNOTNULL(generator), - "/usr/local/lib/systemd/system", - SYSTEM_DATA_UNIT_PATH, + SYSTEM_DATA_UNIT_DIR, - "/usr/lib/systemd/system", - STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), STRV_IFNOTNULL(generator_late)); break; -@@ -640,14 +634,11 @@ int lookup_paths_init( +@@ -637,14 +631,11 @@ int lookup_paths_init( persistent_config, USER_CONFIG_UNIT_DIR, "/etc/systemd/user", @@ -62,7 +62,7 @@ index 96b82170d0..bf66bd6b77 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -797,7 +788,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -794,7 +785,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_SYSTEM: add = strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", @@ -70,7 +70,7 @@ index 96b82170d0..bf66bd6b77 100644 SYSTEM_GENERATOR_DIR); break; -@@ -805,7 +795,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -802,7 +792,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_USER: add = strv_new("/run/systemd/user-generators", "/etc/systemd/user-generators", @@ -78,7 +78,7 @@ index 96b82170d0..bf66bd6b77 100644 USER_GENERATOR_DIR); break; -@@ -844,12 +833,10 @@ char **env_generator_binary_paths(bool is_system) { +@@ -841,12 +830,10 @@ char **env_generator_binary_paths(bool is_system) { if (is_system) add = strv_new("/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", @@ -92,10 +92,10 @@ index 96b82170d0..bf66bd6b77 100644 if (!add) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index b5cc8f94a5..a701cd05f8 100644 +index fc0f8c34fa..ded74ce50a 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in -@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir} +@@ -38,10 +38,10 @@ systemdsystemconfdir=${systemd_system_conf_dir} systemd_user_conf_dir=${sysconfdir}/systemd/user systemduserconfdir=${systemd_user_conf_dir} @@ -105,10 +105,22 @@ index b5cc8f94a5..a701cd05f8 100644 -systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user +systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} -+ systemduserunitpath=${systemd_user_unit_path} systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators +@@ -50,10 +50,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir} + systemd_user_generator_dir=${prefix}/lib/systemd/user-generators + systemdusergeneratordir=${systemd_user_generator_dir} + +-systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir} ++systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:${systemd_system_generator_dir} + systemdsystemgeneratorpath=${systemd_system_generator_path} + +-systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:/usr/local/lib/systemd/user-generators:${systemd_user_generator_dir} ++systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:${systemd_user_generator_dir} + systemdusergeneratorpath=${systemd_user_generator_path} + + systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index bda27ac1762f..f6fa5833518c 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From 7a6529ee27028860b93bc539e8bbf3f2374d712f Mon Sep 17 00:00:00 2001 +From e2a8db60ebfb1e0477ce989f6c3d4a95f2e08120 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/19] Get rid of a useless message in user sessions @@ -9,23 +9,23 @@ Namely lots of variants of in containers. --- - src/core/unit.c | 3 ++- + src/core/manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/core/unit.c b/src/core/unit.c -index 45a417a090..8af3cb08d6 100644 ---- a/src/core/unit.c -+++ b/src/core/unit.c -@@ -2163,7 +2163,8 @@ static void unit_check_binds_to(Unit *u) { - } +diff --git a/src/core/manager.c b/src/core/manager.c +index 8884437347..e23d47b4a4 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -1375,7 +1375,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { + if (!unit_is_bound_by_inactive(u, &culprit)) + continue; - assert(other); -- log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); -+ if (u->type != UNIT_MOUNT || detect_container() <= 0) -+ log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); +- log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id); ++ if (u->type != UNIT_MOUNT || detect_container() <= 0) ++ log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id); - /* A unit we need to run is gone. Sniff. Let's stop this. */ - r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); + /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the + * service being unnecessary after a while. */ -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index d51e1c0f5668..17c53e2e5180 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,4 +1,4 @@ -From 5580303956ca7d8eb431d23c2af0030c9cc0e6e9 Mon Sep 17 00:00:00 2001 +From 56ae06b48c6852071dfc57c1203c04f07309d757 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner <gebner@gebner.org> Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that @@ -11,10 +11,10 @@ Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index a1794bdab1..77134731e1 100644 +index 36702f2fb0..669257ea2f 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -643,6 +643,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -797,6 +797,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -24,7 +24,7 @@ index a1794bdab1..77134731e1 100644 name = empty_to_null(name); context_read_etc_hostname(c); -@@ -702,6 +705,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -860,6 +863,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -35,20 +35,20 @@ index a1794bdab1..77134731e1 100644 context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 736dacdee9..53e0ee935e 100644 +index df0eb030d4..d026eae97e 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -360,6 +360,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); ++ "Changing system settings via systemd is not supported on NixOS."); + + use_localegen = locale_gen_check_available(); + /* If single locale without variable name is provided, then we assume it is LANG=. */ - if (strv_length(l) == 1 && !strchr(l[0], '=')) { - if (!locale_is_valid(l[0])) -@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro +@@ -485,6 +488,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -58,7 +58,7 @@ index 736dacdee9..53e0ee935e 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -665,6 +671,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -69,10 +69,10 @@ index 736dacdee9..53e0ee935e 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 76fe04900d..e87c4c8919 100644 +index 66b454269d..0a8fe25d0f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -668,6 +668,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index 76fe04900d..e87c4c8919 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -747,6 +751,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -93,7 +93,7 @@ index 76fe04900d..e87c4c8919 100644 if (lrtc == c->local_rtc && !fix_system) return sd_bus_reply_method_return(m, NULL); -@@ -907,6 +914,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -930,6 +937,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; @@ -104,5 +104,5 @@ index 76fe04900d..e87c4c8919 100644 if (r < 0) return r; -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index 2b1c02b233c7..f272ef23dc01 100644 --- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,32 +1,28 @@ -From 874698425f6d68fc0d662cb17c7c29e0af3e8c25 Mon Sep 17 00:00:00 2001 +From b783b2da164482f26ac5e6e347dc41930c072ea5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/19] Fix hwdb paths Patch by vcunat. --- - src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) + src/libsystemd/sd-hwdb/hwdb-internal.h | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) -diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c -index cb3c77ce96..7b8c80071f 100644 ---- a/src/libsystemd/sd-hwdb/sd-hwdb.c -+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c -@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { - } +diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h +index 5ddc2211e6..ee621eec46 100644 +--- a/src/libsystemd/sd-hwdb/hwdb-internal.h ++++ b/src/libsystemd/sd-hwdb/hwdb-internal.h +@@ -82,8 +82,5 @@ struct trie_value_entry2_f { + } _packed_; - static const char hwdb_bin_paths[] = -- "/etc/systemd/hwdb/hwdb.bin\0" - "/etc/udev/hwdb.bin\0" -- "/usr/lib/systemd/hwdb/hwdb.bin\0" --#if HAVE_SPLIT_USR -- "/lib/systemd/hwdb/hwdb.bin\0" --#endif -- UDEVLIBEXECDIR "/hwdb.bin\0"; -+ ; - - _public_ int sd_hwdb_new(sd_hwdb **ret) { - _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; + #define hwdb_bin_paths \ +- "/etc/systemd/hwdb/hwdb.bin\0" \ +- "/etc/udev/hwdb.bin\0" \ +- "/usr/lib/systemd/hwdb/hwdb.bin\0" \ +- _CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \ +- UDEVLIBEXECDIR "/hwdb.bin\0" ++ "/etc/udev/hwdb.bin\0" ++ -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index a1e8ec963c71..791e47065d6f 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From 367d0dad3d1853048569e315931cb8a27e16a098 Mon Sep 17 00:00:00 2001 +From e24c05ef8cfe48c4f0ebdb92e8147ae2151e4c87 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -6,11 +6,11 @@ Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo NixOS uses this path. --- man/localtime.xml | 4 ++-- - src/basic/time-util.c | 6 +++--- + src/basic/time-util.c | 8 ++++---- src/firstboot/firstboot.c | 2 +- src/nspawn/nspawn.c | 4 ++-- src/timedate/timedated.c | 8 ++++---- - 5 files changed, 12 insertions(+), 12 deletions(-) + 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/man/localtime.xml b/man/localtime.xml index e486474c44..5f373d0723 100644 @@ -35,28 +35,37 @@ index e486474c44..5f373d0723 100644 <literal>Etc/UTC</literal>. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 5318d6378d..04069dc27b 100644 +index 5d162e8ffe..1bec83e555 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1277,7 +1277,7 @@ int get_timezones(char ***ret) { - n_allocated = 2; - n_zones = 1; +@@ -1269,7 +1269,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { + + assert(ret); - f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); + f = fopen("/etc/zoneinfo/zone1970.tab", "re"); - if (f) { - for (;;) { - _cleanup_free_ char *line = NULL; -@@ -1372,7 +1372,7 @@ bool timezone_is_valid(const char *name, int log_level) { + if (!f) + return -errno; + +@@ -1308,7 +1308,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { + _cleanup_strv_free_ char **zones = NULL; + int r; + +- f = fopen("/usr/share/zoneinfo/tzdata.zi", "re"); ++ f = fopen("/etc/zoneinfo/tzdata.zi", "re"); + if (!f) + return -errno; + +@@ -1421,7 +1421,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) - return false; + return -ENAMETOOLONG; - t = strjoina("/usr/share/zoneinfo/", name); + t = strjoina("/etc/zoneinfo/", name); fd = open(t, O_RDONLY|O_CLOEXEC); - if (fd < 0) { -@@ -1470,7 +1470,7 @@ int get_timezone(char **ret) { + if (fd < 0) +@@ -1512,7 +1512,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -66,10 +75,10 @@ index 5318d6378d..04069dc27b 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 742b43f9fc..f2cb121816 100644 +index 2cb4f80d5d..ebeaeac52f 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -459,7 +459,7 @@ static int process_timezone(void) { +@@ -491,7 +491,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -79,10 +88,10 @@ index 742b43f9fc..f2cb121816 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 14f8a82eb8..8632dadec6 100644 +index 0e5ece5f91..cc46435472 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1810,8 +1810,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u +@@ -1887,8 +1887,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -94,10 +103,10 @@ index 14f8a82eb8..8632dadec6 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index e87c4c8919..964a40ba81 100644 +index 0a8fe25d0f..2f02b9a520 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -269,7 +269,7 @@ static int context_read_data(Context *c) { +@@ -279,7 +279,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) @@ -106,7 +115,7 @@ index e87c4c8919..964a40ba81 100644 else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); -@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) { +@@ -303,7 +303,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { @@ -115,7 +124,7 @@ index e87c4c8919..964a40ba81 100644 if (unlink("/etc/localtime") < 0 && errno != ENOENT) return -errno; -@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) { +@@ -311,9 +311,9 @@ static int context_write_data_timezone(Context *c) { return 0; } @@ -128,5 +137,5 @@ index e87c4c8919..964a40ba81 100644 return -ENOMEM; -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 334156495fcf..d9b048113862 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From bf285fe7e12bd22f95c14bcefbb5008888c32bfa Mon Sep 17 00:00:00 2001 +From 09f6ca91b4131637038686dafd57b5da642c100e Mon Sep 17 00:00:00 2001 From: Imuli <i@imu.li> Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-* @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 7d2e887660..91c5139eed 100644 +index 548ac8eb2c..5e372f1566 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -280,7 +280,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -23,5 +23,5 @@ index 7d2e887660..91c5139eed 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index 902018ee4b91..f88b802b2988 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From 293b19c5fdbda1b4ee579a7e8ba12f024a6f34c9 Mon Sep 17 00:00:00 2001 +From d5716cd93fdaad16b590a581f39d95954f40748e Mon Sep 17 00:00:00 2001 From: Franz Pletz <fpletz@fnordicwalking.de> Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir @@ -8,11 +8,11 @@ Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index 580964c3fa..f99d4f3ab5 100644 +index 738879eb21..453ee4b1c0 100644 --- a/meson.build +++ b/meson.build -@@ -3518,9 +3518,6 @@ install_data('LICENSE.GPL2', - 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', +@@ -3538,9 +3538,6 @@ install_data('LICENSE.GPL2', + 'docs/GVARIANT-SERIALIZATION.md', install_dir : docdir) -meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) @@ -20,7 +20,7 @@ index 580964c3fa..f99d4f3ab5 100644 - ############################################################ - check_help = find_program('tools/check-help.sh') + # Ensure that changes to the docs/ directory do not break the -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch index 05fce10e8568..f5a6fde26b1f 100644 --- a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 63777e7f690b67952bf4571f8e09e5d8e769d3c0 Mon Sep 17 00:00:00 2001 +From 40a5df71e7af5feefacae9fc95bf94e72c6c12f4 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 12/19] inherit systemd environment when calling generators. @@ -12,19 +12,20 @@ tries to gather environments with that they call "environment-generators" and then seems to pass that on to all the other executables that are being called from managers. --- - src/core/manager.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) + src/core/manager.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 6858950107..07a599ede7 100644 +index e23d47b4a4..1047aadebc 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4142,9 +4142,14 @@ static int manager_run_generators(Manager *m) { +@@ -4145,10 +4145,15 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) - (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, -- (char**) argv, m->transient_environment, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); +- (char**) argv, m->transient_environment, +- EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); - + (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, + // On NixOS we must propagate PATH to generators so they are @@ -33,10 +34,11 @@ index 6858950107..07a599ede7 100644 + // function (envp) is set to NULL. This propagates systemd's + // environment (e.g. PATH) that was setup + // before calling systemd from stage-2-init.sh. -+ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); ++ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, ++ EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); r = 0; finish: -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch index b9bab2d387e9..da6aa2627ff8 100644 --- a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From 561dc3b864d96753b5dc448e6e1a80460d5f0bc4 Mon Sep 17 00:00:00 2001 +From fe3aff271cf127c1484533237fe0a024e07ae7bc Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 13/19] add rootprefix to lookup dir paths @@ -34,5 +34,5 @@ index 2e60abb4f1..732ec51d36 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index c737b61e749a..1ed19358a151 100644 --- a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From 8f619304804b02f4e9d7a340ca90359f96adc6e8 Mon Sep 17 00:00:00 2001 +From 31732478745f7a200004fb8ec013f54dbc536f2e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 14/19] systemd-shutdown: execute scripts in @@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 0d07865542..26d974ef73 100644 +index a98cfc4d8a..b0b34edda7 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) { @@ -23,5 +23,5 @@ index 0d07865542..26d974ef73 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 3059216f7c58..2777de09fadb 100644 --- a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 577b11afe38fc185d785ca8f125f518a4eb21a00 Mon Sep 17 00:00:00 2001 +From 3f2277b86f39cb55936ae11c2365feb283b547cb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 15/19] systemd-sleep: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 39ab554290..880ac7ccb0 100644 +index a3aeb24633..0ed6a34d79 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { +@@ -182,6 +182,7 @@ static int execute( }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, @@ -22,5 +22,5 @@ index 39ab554290..880ac7ccb0 100644 }; -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index ad19d910e1e7..6ef53e95d023 100644 --- a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From ba19f629c1806ca2d2ab58154e45bce4ae4a3f0c Mon Sep 17 00:00:00 2001 +From 330490aa8a44206bc03205654680913ab01408a1 Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty @@ -10,10 +10,10 @@ On NixOS, kernel modules of the currently booted systems are located at 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index f4170d6a99..9a6a591bea 100644 +index 777e82d16b..b6abc2bba0 100644 --- a/units/kmod-static-nodes.service.in +++ b/units/kmod-static-nodes.service.in -@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel +@@ -12,7 +12,7 @@ Description=Create List of Static Device Nodes DefaultDependencies=no Before=sysinit.target systemd-tmpfiles-setup-dev.service ConditionCapability=CAP_SYS_MODULE @@ -23,5 +23,5 @@ index f4170d6a99..9a6a591bea 100644 [Service] Type=oneshot -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 585a0aa112e3..775c8e098479 100644 --- a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From c639f311bd27c2bff62a22c34bc92613aaf77587 Mon Sep 17 00:00:00 2001 +From 216018be7b422586b937dae8fd83f51989479a41 Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index d613709f0b..5cced4c115 100644 +index 26e7362d1f..a8f8a863ec 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -24,11 +24,11 @@ @@ -29,5 +29,5 @@ index d613709f0b..5cced4c115 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch b/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch index f634e74e663a..21d466b02bb8 100644 --- a/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch +++ b/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch @@ -1,4 +1,4 @@ -From ebb37f81c28aaa80acd9187a7d77dcb3cb3828db Mon Sep 17 00:00:00 2001 +From beb594ff3bceb95598ffa8ec47c31bacb2449473 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Mon, 26 Oct 2020 21:21:38 +0100 Subject: [PATCH 18/19] logind-seat-debus: show CanMultiSession again @@ -9,10 +9,10 @@ Fixes the "switch user" function in Plasma < 5.20. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c -index a60ed2d3c2..69b6271075 100644 +index cceb3b1d2d..94b4723bb9 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c -@@ -450,7 +450,7 @@ static const sd_bus_vtable seat_vtable[] = { +@@ -419,7 +419,7 @@ static const sd_bus_vtable seat_vtable[] = { SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), @@ -22,5 +22,5 @@ index a60ed2d3c2..69b6271075 100644 SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0), -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch b/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch index 2d93cdef9a34..da071603557a 100644 --- a/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch +++ b/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch @@ -1,4 +1,4 @@ -From 5439a516995f9fd57fc91c2cdd016bb18f31aadf Mon Sep 17 00:00:00 2001 +From 2e7477dc29095141a0556ded11f0ee370d82bfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Sun, 6 Dec 2020 08:34:19 +0100 Subject: [PATCH 19/19] pkg-config: derive prefix from --prefix @@ -16,7 +16,7 @@ Co-Authored-By: Florian Klink <flokli@flokli.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index a701cd05f8..85d6911bdf 100644 +index ded74ce50a..0262f53154 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -11,7 +11,7 @@ @@ -24,10 +24,10 @@ index a701cd05f8..85d6911bdf 100644 # shall have underscores. -prefix=/usr -+prefix=@prefix@ - root_prefix=@rootprefix_noslash@ ++prefix={{PREFIX}} + root_prefix={{ROOTPREFIX_NOSLASH}} rootprefix=${root_prefix} - sysconf_dir=@sysconfdir@ + sysconf_dir={{SYSCONF_DIR}} -- -2.30.1 +2.32.0 diff --git a/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch b/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch new file mode 100644 index 000000000000..4567c2fa3164 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch @@ -0,0 +1,31 @@ +From 1a2d24d210c9329e8b900fdb01576c57374581d8 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Mon, 26 Jul 2021 16:57:43 +0200 +Subject: [PATCH 20/20] core: respect install_sysconfdir_samples in meson file + +The refactoring done in e11a25cadbe caused the configuration files to be +installed into the pkgsysconfdir regardless of the state of the +install_sysconfdir_samples boolean that indicated whether or not the +sample files should be installed. +--- + src/core/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/core/meson.build b/src/core/meson.build +index f0d2c6f642..4ff7e00e36 100644 +--- a/src/core/meson.build ++++ b/src/core/meson.build +@@ -187,6 +187,10 @@ foreach item : in_files + file = item[0] + dir = item[1] + ++ if not install_sysconfdir_samples and dir == pkgsysconfdir ++ continue ++ endif ++ + custom_target( + file, + input : file + '.in', +-- +2.32.0 + diff --git a/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch b/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch new file mode 100644 index 000000000000..b048249e0519 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch @@ -0,0 +1,29 @@ +From 189ba3af8b21cfc53527453907e800a2917b1bfd Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Mon, 26 Jul 2021 17:20:34 +0200 +Subject: [PATCH] login: respect install_sysconfdir_samples in meson file + +The refactoring done in c900d89faa0 caused the configuration files to be +installed into the pkgsysconfdir regardless of the state of the +install_sysconfdir_samples boolean that indicates whether or not the +sample files should be installed. +--- + src/login/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/meson.build b/src/login/meson.build +index 8c20e6be65..b637adc9a2 100644 +--- a/src/login/meson.build ++++ b/src/login/meson.build +@@ -67,7 +67,7 @@ pam_systemd_c = files('pam_systemd.c') + + enable_logind = conf.get('ENABLE_LOGIND') == 1 + in_files = [ +- ['logind.conf', pkgsysconfdir, enable_logind], ++ ['logind.conf', pkgsysconfdir, enable_logind and install_sysconfdir_samples], + ['70-uaccess.rules', udevrulesdir, enable_logind and conf.get('HAVE_ACL') == 1], + ['71-seat.rules', udevrulesdir, enable_logind], + ['73-seat-late.rules', udevrulesdir, enable_logind], +-- +2.32.0 + diff --git a/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch b/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch new file mode 100644 index 000000000000..c7d022b1ffde --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch @@ -0,0 +1,80 @@ +From 5f17b65d30480e489e135b403a072b38535b2911 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Wed, 18 Aug 2021 19:10:08 +0200 +Subject: [PATCH] core: handle lookup paths being symlinks + +With a recent change paths leaving the statically known lookup paths +would be treated differently then those that remained within those. That +was done (AFAIK) to consistently handle alias names. Unfortunately that +means that on some distributions, especially those where /etc/ consists +mostly of symlinks, would trigger that new detection for every single +unit in /etc/systemd/system. The reason for that is that the units +directory itself is already a symlink. +--- + src/basic/unit-file.c | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c +index 884a0674a9..3ae2a115d0 100644 +--- a/src/basic/unit-file.c ++++ b/src/basic/unit-file.c +@@ -254,6 +254,7 @@ int unit_file_build_name_map( + + _cleanup_hashmap_free_ Hashmap *ids = NULL, *names = NULL; + _cleanup_set_free_free_ Set *paths = NULL; ++ _cleanup_strv_free_ char **expanded_search_paths = NULL; + uint64_t timestamp_hash; + char **dir; + int r; +@@ -273,6 +274,34 @@ int unit_file_build_name_map( + return log_oom(); + } + ++ /* Go over all our search paths, chase their symlinks and store the ++ * result in the expanded_search_paths list. ++ * ++ * This is important for cases where any of the unit directories itself ++ * are symlinks into other directories and would therefore cause all of ++ * the unit files to be recognized as linked units. ++ * ++ * This is important for distributions such as NixOS where most paths ++ * in /etc/ are symlinks to some other location on the filesystem (e.g. ++ * into /nix/store/). ++ */ ++ STRV_FOREACH(dir, (char**) lp->search_path) { ++ _cleanup_free_ char *resolved_dir = NULL; ++ r = strv_extend(&expanded_search_paths, *dir); ++ if (r < 0) ++ return log_oom(); ++ ++ r = chase_symlinks(*dir, NULL, 0, &resolved_dir, NULL); ++ if (r < 0) { ++ if (r != -ENOENT) ++ log_warning_errno(r, "Failed to resolve symlink %s, ignoring: %m", *dir); ++ continue; ++ } ++ ++ if (strv_consume(&expanded_search_paths, TAKE_PTR(resolved_dir)) < 0) ++ return log_oom(); ++ } ++ + STRV_FOREACH(dir, (char**) lp->search_path) { + struct dirent *de; + _cleanup_closedir_ DIR *d = NULL; +@@ -351,11 +380,11 @@ int unit_file_build_name_map( + continue; + } + +- /* Check if the symlink goes outside of our search path. ++ /* Check if the symlink goes outside of our (expanded) search path. + * If yes, it's a linked unit file or mask, and we don't care about the target name. + * Let's just store the link source directly. + * If not, let's verify that it's a good symlink. */ +- char *tail = path_startswith_strv(simplified, lp->search_path); ++ char *tail = path_startswith_strv(simplified, expanded_search_paths); + if (!tail) { + log_debug("%s: linked unit file: %s → %s", + __func__, filename, simplified); +-- +2.32.0 + diff --git a/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch b/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch new file mode 100644 index 000000000000..026d0278797e --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch @@ -0,0 +1,29 @@ +From 93413acd3ef3a637a0f31a1d133b103e1dc81fd6 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe <watanabe.yu+github@gmail.com> +Date: Mon, 23 Aug 2021 06:16:48 +0900 +Subject: [PATCH] path-util: make find_executable() work without /proc mounted + +Follow-up for 888f65ace6296ed61285d31db846babf1c11885e. + +Hopefully fixes #20514. +--- + src/basic/path-util.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/basic/path-util.c b/src/basic/path-util.c +index d11f254a9f6a..a21981616b59 100644 +--- a/src/basic/path-util.c ++++ b/src/basic/path-util.c +@@ -630,7 +630,11 @@ static int check_x_access(const char *path, int *ret_fd) { + return r; + + r = access_fd(fd, X_OK); +- if (r < 0) ++ if (r == -ENOSYS) { ++ /* /proc is not mounted. Fallback to access(). */ ++ if (access(path, X_OK) < 0) ++ return -errno; ++ } else if (r < 0) + return r; + + if (ret_fd) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 63f82923cb7f..9f92c34cee6b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -39,6 +39,7 @@ , gnupg , zlib , xz +, tpm2-tss , libuuid , libapparmor , intltool @@ -57,6 +58,12 @@ , bashInteractive , libmicrohttpd + # the (optional) BPF feature requires bpftool, libbpf, clang and llmv-strip to be avilable during build time. + # Only libbpf should be a runtime dependency. +, bpftools +, libbpf +, llvmPackages + , withAnalyze ? true , withApparmor ? true , withCompression ? true # adds bzip2, lz4 and xz @@ -64,10 +71,12 @@ , withCryptsetup ? true , withDocumentation ? true , withEfi ? stdenv.hostPlatform.isEfi +, withFido2 ? true , withHomed ? false , withHostnamed ? true , withHwdb ? true , withImportd ? true +, withLibBPF ? false # currently fails while generating BPF objects , withLocaled ? true , withLogind ? true , withMachined ? true @@ -82,6 +91,7 @@ , withShellCompletions ? true , withTimedated ? true , withTimesyncd ? true +, withTpm2Tss ? true , withUserDb ? true , libfido2 , p11-kit @@ -106,15 +116,13 @@ assert withCoredump -> withCompression; assert withHomed -> withCryptsetup; -assert withCryptsetup -> -(cryptsetup != null); +assert withCryptsetup -> (cryptsetup != null); let wantCurl = withRemote || withImportd; - + version = "249.4"; in -stdenv.mkDerivation rec { - inherit pname; - version = "247.6"; +stdenv.mkDerivation { + inherit pname version; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. @@ -122,7 +130,7 @@ stdenv.mkDerivation rec { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-7XYEq3Qw25suwjbtPzx9lVPHUu9ZY/1bADXl2wQbkJc="; + sha256 = "0pqi9gbk9kgwvd0idf13ybxz7s4h5przn01bwj6fna44jr0wy41c"; }; # If these need to be regenerated, `git am path/to/00*.patch` them into a @@ -150,18 +158,26 @@ stdenv.mkDerivation rec { ./0018-logind-seat-debus-show-CanMultiSession-again.patch ./0019-pkg-config-derive-prefix-from-prefix.patch - # Fix -Werror=format. - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch"; - sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add"; - }) - - # Fix CVE-2021-33910, disclosed 2021-07-20 - (fetchpatch { - name = "CVE-2021-33910.patch"; - url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch"; - sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4"; - }) + # In v249 a bunch of meson files had been touched as part of the migration to + # jinja2 for templating. Unfortunately some of those files lost the `install_sysconfdir_samples` check. + # The following two patches are part of a PR that was filed to fix those cases. + # https://github.com/systemd/systemd/pull/20303 + ./0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch + ./0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch + + # In v248 or v249 we started to get in trouble due to our /etc/systemd/sytem being + # a symlink and thus being treated differently by systemd. With the below + # patch we mitigate that effect by special casing all our root unit dirs + # if they are symlinks. This does exactly what we need (AFAICT). + ./0022-core-Handle-lookup-paths-being-symlinks.patch + + # The way files are being tested for being executable changed in v248/v249 + # which caused our confinement setup to fail as we do not mount /proc by + # default. + # The issue has been reported upstream and this patch carries the upstream + # fix for the same. Upstream now has a test for this scenario. + # https://github.com/systemd/systemd/issues/20514 + ./0023-path-util-make-find_executable-work-without-proc-mounted.patch ]; postPatch = '' @@ -175,14 +191,14 @@ stdenv.mkDerivation rec { "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" '' + ( let - # The folllowing dlopen patches ensure that all the features that are - # implemented via dlopen(3) are available (or explicitly deactivated) by - # pointing dlopen to the absolute store path instead of relying on the - # linkers runtime lookup code. + # The folllowing patches references to dynamic libraries to ensure that + # all the features that are implemented via dlopen(3) are available (or + # explicitly deactivated) by pointing dlopen to the absolute store path + # instead of relying on the linkers runtime lookup code. # - # All of the dlopen calls have to be handled. When new ones are introduced - # by upstream (or one of our patches) they must be explicitly declared, - # otherwise the build will fail. + # All of the shared library references have to be handled. When new ones + # are introduced by upstream (or one of our patches) they must be + # explicitly declared, otherwise the build will fail. # # As of systemd version 247 we've seen a few errors like `libpcre2.… not # found` when using e.g. --grep with journalctl. Those errors should @@ -201,32 +217,45 @@ stdenv.mkDerivation rec { # path location). # # To get a list of dynamically loaded libraries issue something like - # `grep -ri 'dlopen("lib' $src` and update the below list. - dlopenLibs = [ - # We did never provide support for libxkbcommon & qrencode - { name = "libxkbcommon.so.0"; pkg = null; } - { name = "libqrencode.so.4"; pkg = null; } - - # We did not provide libpwquality before so it is safe to disable it for - # now. - { name = "libpwquality.so.1"; pkg = null; } - - # Only include cryptsetup if it is enabled. We might not be able to - # provide it during "bootstrap" in e.g. the minimal systemd build as - # cryptsetup has udev (aka systemd) in it's dependencies. - { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; } - - # We are using libidn2 so we only provide that and ignore the others. - # Systemd does this decision during configure time and uses ifdef's to - # enable specific branches. We can safely ignore (nuke) the libidn "v1" - # libraries. - { name = "libidn2.so.0"; pkg = libidn2; } - { name = "libidn.so.12"; pkg = null; } - { name = "libidn.so.11"; pkg = null; } - - # journalctl --grep requires libpcre so lets provide it - { name = "libpcre2-8.so.0"; pkg = pcre2; } - ]; + # `grep -ri '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"'' $src` and update the below list. + dlopenLibs = + let + opt = condition: pkg: if condition then pkg else null; + in + [ + # bpf compilation support + { name = "libbpf.so.0"; pkg = opt withLibBPF libbpf; } + + # We did never provide support for libxkbcommon & qrencode + { name = "libxkbcommon.so.0"; pkg = null; } + { name = "libqrencode.so.4"; pkg = null; } + + # We did not provide libpwquality before so it is safe to disable it for + # now. + { name = "libpwquality.so.1"; pkg = null; } + + # Only include cryptsetup if it is enabled. We might not be able to + # provide it during "bootstrap" in e.g. the minimal systemd build as + # cryptsetup has udev (aka systemd) in it's dependencies. + { name = "libcryptsetup.so.12"; pkg = opt withCryptsetup cryptsetup; } + + # We are using libidn2 so we only provide that and ignore the others. + # Systemd does this decision during configure time and uses ifdef's to + # enable specific branches. We can safely ignore (nuke) the libidn "v1" + # libraries. + { name = "libidn2.so.0"; pkg = libidn2; } + { name = "libidn.so.12"; pkg = null; } + { name = "libidn.so.11"; pkg = null; } + + # journalctl --grep requires libpcre so lets provide it + { name = "libpcre2-8.so.0"; pkg = pcre2; } + + # Support for TPM2 in systemd-cryptsetup, systemd-repart and systemd-cryptenroll + { name = "libtss2-esys.so.0"; pkg = opt withTpm2Tss tpm2-tss; } + { name = "libtss2-rc.so.0"; pkg = opt withTpm2Tss tpm2-tss; } + { name = "libtss2-mu.so.0"; pkg = opt withTpm2Tss tpm2-tss; } + { name = "libfido2.so.1"; pkg = opt withFido2 libfido2; } + ]; patchDlOpen = dl: let @@ -234,9 +263,9 @@ stdenv.mkDerivation rec { in if dl.pkg == null then '' # remove the dependency on the library by replacing it with an invalid path - for file in $(grep -lr 'dlopen("${dl.name}"' src); do + for file in $(grep -lr '"${dl.name}"' src); do echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' + substituteInPlace "$file" --replace '"${dl.name}"' '"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' done '' else '' # ensure that the library we provide actually exists @@ -245,76 +274,94 @@ stdenv.mkDerivation rec { exit 1 fi # make the path to the dependency explicit - for file in $(grep -lr 'dlopen("${dl.name}"' src); do + for file in $(grep -lr '"${dl.name}"' src); do echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…" - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' + substituteInPlace "$file" --replace '"${dl.name}"' '"${library}"' done + ''; in # patch all the dlopen calls to contain absolute paths to the libraries lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs ) - # finally ensure that there are no left-over dlopen calls that we didn't handle + # finally ensure that there are no left-over dlopen calls (or rather strings pointing to shared libraries) that we didn't handle + '' - if grep -qr 'dlopen("[^/]' src; then - echo "Found unhandled dlopen calls: " - grep -r 'dlopen("[^/]' src + if grep -qr '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src; then + echo "Found unhandled dynamic library calls: " + grep -r '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src exit 1 fi + '' + # Finally patch shebangs that might need patching. + # Should no longer be necessary with v250. + # https://github.com/systemd/systemd/pull/19638 + + '' + patchShebangs . ''; outputs = [ "out" "man" "dev" ]; - nativeBuildInputs = [ - pkg-config - gperf - ninja - meson - glibcLocales - getent - m4 - - intltool - gettext - - libxslt - docbook_xsl - docbook_xml_dtd_42 - docbook_xml_dtd_45 - (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) - ]; + nativeBuildInputs = + [ + pkg-config + gperf + ninja + meson + glibcLocales + getent + m4 + + intltool + gettext + + libxslt + docbook_xsl + docbook_xml_dtd_42 + docbook_xml_dtd_45 + (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) + ] + ++ lib.optional withLibBPF [ + bpftools + llvmPackages.clang + llvmPackages.libllvm + ] + ; - buildInputs = [ - acl - audit - glib - kmod - libcap - libgcrypt - libidn2 - libuuid - linuxHeaders - pam - ] - - ++ lib.optional withApparmor libapparmor - ++ lib.optional wantCurl (lib.getDev curl) - ++ lib.optionals withCompression [ bzip2 lz4 xz ] - ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) - ++ lib.optional withEfi gnu-efi - ++ lib.optional withKexectools kexec-tools - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional withNetworkd iptables - ++ lib.optional withPCRE2 pcre2 - ++ lib.optional withResolved libgpgerror - ++ lib.optional withSelinux libselinux - ++ lib.optional withRemote libmicrohttpd - ++ lib.optionals withHomed [ p11-kit libfido2 ] + buildInputs = + [ + acl + audit + glib + kmod + libcap + libgcrypt + libidn2 + libuuid + linuxHeaders + pam + ] + + ++ lib.optional withApparmor libapparmor + ++ lib.optional wantCurl (lib.getDev curl) + ++ lib.optionals withCompression [ bzip2 lz4 xz ] + ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) + ++ lib.optional withEfi gnu-efi + ++ lib.optional withKexectools kexec-tools + ++ lib.optional withLibseccomp libseccomp + ++ lib.optional withNetworkd iptables + ++ lib.optional withPCRE2 pcre2 + ++ lib.optional withResolved libgpgerror + ++ lib.optional withSelinux libselinux + ++ lib.optional withRemote libmicrohttpd + ++ lib.optionals withHomed [ p11-kit ] + ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ] + ++ lib.optionals withLibBPF [ libbpf ] ; #dontAddPrefix = true; mesonFlags = [ + "-Dversion-tag=${version}" "-Ddbuspolicydir=${placeholder "out"}/share/dbus-1/system.d" "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services" "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" @@ -405,6 +452,8 @@ stdenv.mkDerivation rec { "-Dnss-mymachines=false" "-Dnss-resolve=false" "-Dnss-systemd=false" + ] ++ lib.optionals withLibBPF [ + "-Dbpf-framework=true" ]; preConfigure = '' @@ -453,7 +502,8 @@ stdenv.mkDerivation rec { --replace '"tar"' '"${gnutar}/bin/tar"' done - substituteInPlace src/journal/catalog.c \ + + substituteInPlace src/libsystemd/sd-journal/catalog.c \ --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ ''; diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index d2b0bc08071e..f2a7b692baa3 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -18,7 +18,8 @@ let }; in stdenv.mkDerivation { - name = "tbs-2018.04.18-${kernel.version}"; + pname = "tbs"; + version = "2018.04.18-${kernel.version}"; srcs = [ media build ]; sourceRoot = build.name; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 549a607b1522..646e3702fed0 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "tunctl-1.5"; +stdenv.mkDerivation rec { + pname = "tunctl"; + version = "1.5"; + src = fetchurl { - url = "mirror://sourceforge/tunctl/tunctl-1.5.tar.gz"; + url = "mirror://sourceforge/tunctl/tunctl-${version}.tar.gz"; sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff"; }; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index d0c690a95274..87b38b9af6e4 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { - name = "usermount-0.1"; + pname = "usermount"; + version = "0.1"; src = fetchgit { url = "https://github.com/tom5760/usermount.git"; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 7c93fa91854b..bba646e583b8 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation { - name = "xf86-video-nested-2017-06-12"; + pname = "xf86-video-nested"; + version = "unstable-2017-06-12"; src = fetchgit { url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested"; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 4337820683d0..206ac6131e42 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch"; sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2"; }) + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + url = "https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a.patch"; + sha256 = "1q5hl5m61pci2f0x7r5in99rmqh328v1k0zj2693wdlafk9dabks"; + }) ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ed8d34db28b7..27c34e10e382 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -829,8 +829,9 @@ in with py.pkgs; buildPythonApplication rec { "test_onboarding_core_no_rpi_power" # hue/test_sensor_base.py: Race condition when counting events "test_hue_events" - # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' + # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' / assert 'off' == 'on' "test_lock_update_via_pubnub" + "test_door_sense_update_via_pubnub" ]; preCheck = '' diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index f02a65658149..7ec2937e1046 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -46,4 +46,11 @@ stdenv.mkDerivation { ''; dontCheck = true; dontFixup = true; + meta = with lib; { + description = "Powerful, fast, and an easy to use search engine "; + homepage = https://docs.meilisearch.com/; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index 8e0ce6bedac5..0f21690bbee3 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,22 +1,36 @@ -{ lib, stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, perl +, zlib, db +}: + +let + inherit (ocamlPackages) + ocaml + findlib + cryptokit + num + ; +in stdenv.mkDerivation rec { pname = "sks"; - version = "1.1.6"; + version = "unstable-2021-02-04"; - src = fetchFromBitbucket { - owner = "skskeyserver"; + src = fetchFromGitHub { + owner = "SKS-Keyserver"; repo = "sks-keyserver"; - rev = version; - sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; + rev = "c3ba6d5abb525dcb84745245631c410c11c07ec1"; + sha256 = "0fql07sc69hv6jy7x5svb19977cdsz0p1j8wv53k045a6v7rw1jw"; }; # pkgs.db provides db_stat, not db$major.$minor_stat - patches = [ ./adapt-to-nixos.patch ]; + patches = [ + ./adapt-to-nixos.patch + ]; outputs = [ "out" "webSamples" ]; - buildInputs = [ ocaml zlib db perl camlp4 ]; + nativeBuildInputs = [ ocaml findlib perl ]; + buildInputs = [ zlib db cryptokit num ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; preConfigure = '' @@ -44,9 +58,9 @@ stdenv.mkDerivation rec { spotty connectivity, can fully synchronize with rest of the system. ''; inherit (src.meta) homepage; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ primeos fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 1f9a1ffc018b..d991b858a300 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -198,18 +198,18 @@ let in self: { postgresql_9_6 = self.callPackage generic { - version = "9.6.22"; + version = "9.6.23"; psqlSchema = "9.6"; - sha256 = "0c19kzrj5ib5ygmavf5d6qvxdwrxzzz6jz1r2dl5b815208cscix"; + sha256 = "1fa735lrmv2vrfiixg73nh024gxlagcbrssklvgwdf0s82cgfjd8"; this = self.postgresql_9_6; thisAttr = "postgresql_9_6"; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.17"; + version = "10.18"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0v5jahkqm6gkq67s4bac3h7297bscn2ab6y128idi73cc1qq1wjs"; + sha256 = "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; @@ -217,36 +217,36 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.12"; + version = "11.13"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "016bacpmqxc676ipzc1l8zv1jj44mjz7dv7jhqazg3ibdfqxiyc7"; + sha256 = "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0"; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.7"; + version = "12.8"; psqlSchema = "12"; - sha256 = "15frsmsl1n2i4p76ji0wng4lvnlzw6f01br4cs5xr3n88wgp9444"; + sha256 = "0an6v5bsp26d276wbdx76lsq6cq86hgi2fmkzwawnk63j3h02r72"; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.3"; + version = "13.4"; psqlSchema = "13"; - sha256 = "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w"; + sha256 = "1kf0gcsrl5n25rjlvkh87aywmn28kbwvakm5c7j1qpr4j01y34za"; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14beta1"; + version = "14beta3"; psqlSchema = "14"; - sha256 = "0lih2iykychhvis3mxqyp087m1hld3lyi48n3qwd2js44prxv464"; + sha256 = "1yjbc8q4hk9pvlfr3lwhk2zp4bavxqpil83ncl871nwk06c6b8if"; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 3c0551a2de87..4060917ad537 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-xkCnBRGSryFf90dOeoZKQhugX66zkF/gYF1v6N9yjTQ="; + sha256 = "sha256-UUqETnvkdLBoxUHUpcfE3bxE7fZJEToDxz2Q6kN1/n4="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index ca0f30d78942..c699c9fb1ed2 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -290,7 +290,7 @@ let cp -r . $out/share/discourse rm -r $out/share/discourse/log ln -sf /var/log/discourse $out/share/discourse/log - ln -sf /run/discourse/tmp $out/share/discourse/tmp + ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp ln -sf /run/discourse/config $out/share/discourse/config ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0acf8b099891..1223b0a50739 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1017,11 +1017,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { pname = "libXft"; - version = "2.3.3"; + version = "2.3.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; - sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; + url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2"; + sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9932e46839a9..9b119aa71013 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -200,11 +200,19 @@ self: super: ++ malloc0ReturnsNullCrossFlag; patches = [ - # Adds color emoji rendering support. + # The following three patches add color emoji rendering support. # https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1 (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/fe41537b5714a2301808eed2d76b2e7631176573.patch"; - sha256 = "045lp1q50i2wlwvpsq6ycxdc6p3asm2r3bk2nbad1dwkqw2xf9jc"; + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/723092ece088559f1af299236305911f4ee4d450.patch"; + sha256 = "1y5s6x5b7n2rqxapdx65zlcz35s7i7075qxkfnj859hx7k5ybx53"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/e0fc4ce7e87ab9c4b47e5c8e693f070dfd0d2f7b.patch"; + sha256 = "1x7cbhdrprrmngyy3l3b45bz6717dzp881687h5hxa4g2bg5c764"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/d385aa3e5320d18918413df0e8aef3a713a47e0b.patch"; + sha256 = "1acnks2g88hari2708x93ywa9m2f4lm60yhn9va45151ma2qb5n0"; }) ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 9b36ca362599..b24dc504288e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2 -mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 527c95676fae..0e176d0505f5 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-sk7uAYVw/9OLKi3ClBXwEEnfaiprM/gQcNJMDFGqhE0="; + sha256 = "sha256-WNixw2vVn1mBEDSeIFrWZHHUcX4TNgr+motBemBQfr0="; }; installPhase = '' diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 79bf21ab4730..2d8d784982a8 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -6,12 +6,14 @@ done mkdir $out -echo "export SHELL=$shell" > $out/setup -echo "initialPath=\"$initialPath\"" >> $out/setup -echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup -echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup -echo "$preHook" >> $out/setup -cat "$setup" >> $out/setup +{ + echo "export SHELL=$shell" + echo "initialPath=\"$initialPath\"" + echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" + echo "defaultBuildInputs=\"$defaultBuildInputs\"" + echo "$preHook" + cat "$setup" +} > "$out/setup" # Allow the user to install stdenv using nix-env and get the packages # in stdenv. diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4431936e3d40..f90d9020f89f 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,7 +1,7 @@ set -eu set -o pipefail -if [ -n "${BASH_VERSINFO-}" ] && [ "${BASH_VERSINFO-}" -lt 4 ]; then +if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" echo "Please install Bash 4 or greater to continue." exit 1 @@ -121,14 +121,12 @@ exitHandler() { set +e if [ -n "${showBuildStats:-}" ]; then - times > "$NIX_BUILD_TOP/.times" - local -a times=($(cat "$NIX_BUILD_TOP/.times")) - # Print the following statistics: - # - user time for the shell - # - system time for the shell - # - user time for all child processes - # - system time for all child processes - echo "build time elapsed: " "${times[@]}" + read -r -d '' -a buildTimes < <(times) + echo "build times:" + echo "user time for the shell ${buildTimes[0]}" + echo "system time for the shell ${buildTimes[1]}" + echo "user time for all child processes ${buildTimes[2]}" + echo "system time for all child processes ${buildTimes[3]}" fi if (( "$exitCode" != 0 )); then @@ -207,14 +205,19 @@ isMachO() { exec {fd}< "$fn" read -r -n 4 -u "$fd" magic exec {fd}<&- + + # nix uses 'declare -F' in get-env.sh to retrieve the loaded functions. + # If we use the $'string' syntax instead of 'echo -ne' then 'declare' will print the raw characters and break nix. + # See https://github.com/NixOS/nixpkgs/pull/138334 and https://github.com/NixOS/nix/issues/5262. + # https://opensource.apple.com/source/lldb/lldb-310.2.36/examples/python/mach_o.py.auto.html - if [[ "$magic" = $'\xfe\xed\xfa\xcf' || "$magic" = $'\xcf\xfa\xed\xfe' ]]; then + if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then # MH_MAGIC_64 || MH_CIGAM_64 return 0; - elif [[ "$magic" = $'\xfe\xed\xfa\xce' || "$magic" = $'\xce\xfa\xed\xfe' ]]; then + elif [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then # MH_MAGIC || MH_CIGAM return 0; - elif [[ "$magic" = $'\xca\xfe\xba\xbe' || "$magic" = $'\xbe\xba\xfe\xca' ]]; then + elif [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then # FAT_MAGIC || FAT_CIGAM return 0; else @@ -329,6 +332,10 @@ declare -a pkgTargetHookVars=(envTargetTargetHook) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) +# those variables are declared here, since where and if they are used varies +# shellcheck disable=SC2034 +declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks + # Add env hooks for all sorts of deps with the specified host offset. addEnvHooks() { local depHostOffset="$1" @@ -370,14 +377,14 @@ declare -a allPlatOffsets=(-1 0 1) # implements. findInputs() { local -r pkg="$1" - local -ri hostOffset="$2" - local -ri targetOffset="$3" + local -r hostOffset="$2" + local -r targetOffset="$3" # Sanity check - (( "$hostOffset" <= "$targetOffset" )) || exit -1 + (( hostOffset <= targetOffset )) || exit -1 - local varVar="${pkgAccumVarVars[$hostOffset + 1]}" - local varRef="$varVar[\$targetOffset - \$hostOffset]" + local varVar="${pkgAccumVarVars[hostOffset + 1]}" + local varRef="$varVar[$((targetOffset - hostOffset))]" local var="${!varRef}" unset -v varVar varRef @@ -404,21 +411,21 @@ findInputs() { # offsets to current offset local -i mapOffsetResult function mapOffset() { - local -ri inputOffset="$1" - if (( "$inputOffset" <= 0 )); then - local -ri outputOffset="$inputOffset + $hostOffset" + local -r inputOffset="$1" + if (( inputOffset <= 0 )); then + local -r outputOffset=$((inputOffset + hostOffset)) else - local -ri outputOffset="$inputOffset - 1 + $targetOffset" + local -r outputOffset=$((inputOffset - 1 + targetOffset)) fi mapOffsetResult="$outputOffset" } # Host offset relative to that of the package whose immediate # dependencies we are currently exploring. - local -i relHostOffset + local relHostOffset for relHostOffset in "${allPlatOffsets[@]}"; do # `+ 1` so we start at 0 for valid index - local files="${propagatedDepFilesVars[$relHostOffset + 1]}" + local files="${propagatedDepFilesVars[relHostOffset + 1]}" # Host offset relative to the package currently being # built---as absolute an offset as will be used. @@ -496,11 +503,11 @@ done # Add package to the future PATH and run setup hooks activatePackage() { local pkg="$1" - local -ri hostOffset="$2" - local -ri targetOffset="$3" + local -r hostOffset="$2" + local -r targetOffset="$3" # Sanity check - (( "$hostOffset" <= "$targetOffset" )) || exit -1 + (( hostOffset <= targetOffset )) || exit -1 if [ -f "$pkg" ]; then source "$pkg" @@ -517,7 +524,7 @@ activatePackage() { addToSearchPath _PATH "$pkg/bin" fi - if [[ "$hostOffset" -le -1 ]]; then + if (( hostOffset <= -1 )); then addToSearchPath _XDG_DATA_DIRS "$pkg/share" fi @@ -531,13 +538,13 @@ activatePackage() { } _activatePkgs() { - local -i hostOffset targetOffset + local hostOffset targetOffset local pkg for hostOffset in "${allPlatOffsets[@]}"; do - local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}" for targetOffset in "${allPlatOffsets[@]}"; do - (( "$hostOffset" <= "$targetOffset" )) || continue + (( hostOffset <= targetOffset )) || continue local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]" local pkgsSlice="${!pkgsRef}[@]" for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do @@ -559,14 +566,14 @@ _activatePkgs # with this information to the relevant env hook array, but bash # doesn't have closures, so it's easier to just pass this in. _addToEnv() { - local -i depHostOffset depTargetOffset + local depHostOffset depTargetOffset local pkg for depHostOffset in "${allPlatOffsets[@]}"; do - local hookVar="${pkgHookVarVars[$depHostOffset + 1]}" - local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}" + local hookVar="${pkgHookVarVars[depHostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}" for depTargetOffset in "${allPlatOffsets[@]}"; do - (( "$depHostOffset" <= "$depTargetOffset" )) || continue + (( depHostOffset <= depTargetOffset )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" if [[ -z "${strictDeps-}" ]]; then @@ -578,12 +585,12 @@ _addToEnv() { # # TODO(@Ericson2314): Don't special-case native compilation for pkg in \ - ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \ - ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \ - ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \ - ${pkgsHostHost+"${pkgsHostHost[@]}"} \ - ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ - ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} + "${pkgsBuildBuild[@]}" \ + "${pkgsBuildHost[@]}" \ + "${pkgsBuildTarget[@]}" \ + "${pkgsHostHost[@]}" \ + "${pkgsHostTarget[@]}" \ + "${pkgsTargetTarget[@]}" do if [[ "$visitedPkgs" = *"$pkg"* ]]; then continue @@ -656,26 +663,21 @@ export NIX_INDENT_MAKE=1 # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. -if [ -z "${NIX_BUILD_CORES:-}" ]; then - NIX_BUILD_CORES="1" -elif [ "$NIX_BUILD_CORES" -le 0 ]; then - NIX_BUILD_CORES=$(nproc 2>/dev/null || true) - if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then - : - else - NIX_BUILD_CORES="1" - fi +NIX_BUILD_CORES="${NIX_BUILD_CORES:-1}" +if ((NIX_BUILD_CORES <= 0)); then + guess=$(nproc 2>/dev/null || true) + ((NIX_BUILD_CORES = guess <= 0 ? 1 : guess)) fi export NIX_BUILD_CORES # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. # Leave it in impure shells for convenience. -if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export NIX_SSL_CERT_FILE=/no-cert-file.crt fi # Another variant left for compatibility. -if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export SSL_CERT_FILE=/no-cert-file.crt fi @@ -739,9 +741,11 @@ substituteStream() { printf "%s" "${!var}" } +# put the content of a file in a variable +# fail loudly if provided with a binary (containing null bytes) consumeEntire() { # read returns non-0 on EOF, so we want read to fail - if IFS='' read -r -N 0 $1; then + if IFS='' read -r -d '' $1 ; then echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2 return 1 fi @@ -1010,17 +1014,19 @@ configurePhase() { configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi - # Add --disable-dependency-tracking to speed up some builds. - if [ -z "${dontAddDisableDepTrack:-}" ]; then - if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then - configureFlags="--disable-dependency-tracking $configureFlags" + if [[ -f "$configureScript" ]]; then + # Add --disable-dependency-tracking to speed up some builds. + if [ -z "${dontAddDisableDepTrack:-}" ]; then + if grep -q dependency-tracking "$configureScript"; then + configureFlags="--disable-dependency-tracking $configureFlags" + fi fi - fi - # By default, disable static builds. - if [ -z "${dontDisableStatic:-}" ]; then - if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then - configureFlags="--disable-static $configureFlags" + # By default, disable static builds. + if [ -z "${dontDisableStatic:-}" ]; then + if grep -q enable-static "$configureScript"; then + configureFlags="--disable-static $configureFlags" + fi fi fi @@ -1028,7 +1034,7 @@ configurePhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"} + $configureFlags "${configureFlagsArray[@]}" ) echoCmd 'configure flags' "${flagsArray[@]}" # shellcheck disable=SC2086 @@ -1058,8 +1064,8 @@ buildPhase() { local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $buildFlags "${buildFlagsArray[@]}" ) echoCmd 'build flags' "${flagsArray[@]}" @@ -1097,8 +1103,8 @@ checkPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget} ) @@ -1123,8 +1129,8 @@ installPhase() { # shellcheck disable=SC2086 local flagsArray=( SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $installFlags "${installFlagsArray[@]}" ${installTargets:-install} ) @@ -1231,8 +1237,8 @@ installCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck} ) @@ -1251,7 +1257,7 @@ distPhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} + $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} ) echo 'dist flags: %q' "${flagsArray[@]}" diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix index 91095fbd3ac4..ff256028cdf0 100644 --- a/pkgs/test/cuda/cuda-library-samples/default.nix +++ b/pkgs/test/cuda/cuda-library-samples/default.nix @@ -1,8 +1,8 @@ { callPackage , cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 , cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2 -, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2 +, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2, cutensor_cudatoolkit_11_3, cutensor_cudatoolkit_11_4 }: rec { @@ -37,6 +37,16 @@ rec { cutensor_cudatoolkit = cutensor_cudatoolkit_11_2; }; + cuda-library-samples_cudatoolkit_11_3 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_3; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_3; + }; + + cuda-library-samples_cudatoolkit_11_4 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_4; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_4; + }; + cuda-library-samples_cudatoolkit_11 = - cuda-library-samples_cudatoolkit_11_2; + cuda-library-samples_cudatoolkit_11_4; } diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix index 1a361c57214c..5b46a0651eba 100644 --- a/pkgs/test/cuda/cuda-samples/default.nix +++ b/pkgs/test/cuda/cuda-samples/default.nix @@ -1,6 +1,6 @@ { callPackage , cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 }: rec { @@ -40,5 +40,15 @@ rec { sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1"; }; - cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2; + cuda-samples_cudatoolkit_11_3 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_3; + sha256 = "0kbibb6pgz8j5iq6284axcnmycaha9bw8qlmdp6yfwmnahq1v0yz"; + }; + + cuda-samples_cudatoolkit_11_4 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_4; + sha256 = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; + }; + + cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_4; } diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index 2e3dcc8891f4..c5a9e24abd43 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, addOpenGLRunpath -, sha256, cudatoolkit +{ addOpenGLRunpath +, cudatoolkit +, fetchFromGitHub +, fetchpatch +, lib +, pkg-config +, sha256 +, stdenv }: let @@ -22,6 +27,14 @@ stdenv.mkDerivation { buildInputs = [ cudatoolkit ]; + # See https://github.com/NVIDIA/cuda-samples/issues/75. + patches = lib.optionals (version == "11.3") [ + (fetchpatch { + url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; + sha256 = "sha256:15bydf59scmfnldz5yawbjacdxafi50ahgpzq93zlc5xsac5sz6i"; + }) + ]; + enableParallelBuilding = true; preConfigure = '' diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index aac52e6a4f5d..7989e4e2b7d2 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -10,7 +10,9 @@ rec { cuda-samples_cudatoolkit_11 cuda-samples_cudatoolkit_11_0 cuda-samples_cudatoolkit_11_1 - cuda-samples_cudatoolkit_11_2; + cuda-samples_cudatoolkit_11_2 + cuda-samples_cudatoolkit_11_3 + cuda-samples_cudatoolkit_11_4; cuda-library-samplesPackages = callPackage ./cuda-library-samples { }; inherit (cuda-library-samplesPackages) @@ -20,5 +22,7 @@ rec { cuda-library-samples_cudatoolkit_11 cuda-library-samples_cudatoolkit_11_0 cuda-library-samples_cudatoolkit_11_1 - cuda-library-samples_cudatoolkit_11_2; + cuda-library-samples_cudatoolkit_11_2 + cuda-library-samples_cudatoolkit_11_3 + cuda-library-samples_cudatoolkit_11_4; } diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 5b88e10b1c37..c172edd1fd98 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: let version = "2.13"; @@ -11,6 +11,14 @@ in stdenv.mkDerivation { sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-38185.patch"; + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b"; + sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32"; + }) + ]; + preConfigure = if stdenv.isCygwin then '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' '' else null; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 2d61a984a00d..ef725408b13e 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -54,6 +54,9 @@ stdenv.mkDerivation { # fix up this call: # https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/VersionHelper.cmake#L8 echo 0 + elif [[ "$1" == "rev-parse" ]]; then + echo ${openfst.rev} + echo 0 fi true EOF diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 15ebb93e4e80..d9f408bf9eda 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "playerctl"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn"; + sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY="; }; nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ]; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 600967e996c0..c8dc645d69b4 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "1yjni0mr3rqrrk4ynwb8i0whpqhd56cck4mxd97qmxn7wbr826i9"; + sha256 = "0w6990ggns4xsdmgj3aq527q15frrxfmxwa3m6igabd4ai498n6x"; }; patches = [ diff --git a/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch b/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch new file mode 100644 index 000000000000..70c941ddd125 --- /dev/null +++ b/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch @@ -0,0 +1,27 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "adler32" + version = "1.2.0" +@@ -530,13 +532,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "lexical-core" +-version = "0.7.4" ++version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" ++checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" + dependencies = [ + "arrayvec", + "bitflags 1.2.1", +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "ryu", + "static_assertions", + ] diff --git a/pkgs/tools/filesystems/supertag/default.nix b/pkgs/tools/filesystems/supertag/default.nix index a9a16582c115..4e7cb8beae57 100644 --- a/pkgs/tools/filesystems/supertag/default.nix +++ b/pkgs/tools/filesystems/supertag/default.nix @@ -14,7 +14,11 @@ rustPlatform.buildRustPackage rec { sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; }; - cargoSha256 = "093vrpp4in8854hb0h1lxrp8v6i9vfja0l69dnnp7z15qkpbir4f"; + # lexical-core is outdated and incompatible with newer versions of rust + # patches Cargo.lock to include a more up-to-date version of lexical-core + cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; + + cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ="; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 248351272d89..c5485a5b3fb1 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ removeReferencesTo ] + ++ optional (gfortran != null) gfortran; buildInputs = [] - ++ optional (gfortran != null) gfortran ++ optional (szip != null) szip ++ optional javaSupport jdk; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 2652f6823425..b57633b750f8 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "8.6p1"; + version = "8.7p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1bnpivgk98h2f9afpp88jv6g9ps83vnpxd031n2jqxi12vdf9rn3"; + sha256 = "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw"; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 2482c1749959..8a4b5f2e0514 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools -, hcxdumptool, pyrit, which, bully }: +, hcxdumptool, pyrit, which, bully, pixiewps }: python3.pkgs.buildPythonApplication rec { version = "2.5.7"; @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { pyrit which bully + pixiewps ]; postFixup = let diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 94c5f0afb2c6..a94ae45ccea5 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.2"; + version = "1.0.3.3"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "0srfclmqrqcx8b756yxww24ya0xn2ajxbgj07mcvdvwbwl09pys8"; + sha256 = "1x26s9gzcygn96600g0r1a1sxqav6c38iq981rhmc808mqlyxmp8"; rev = "v${version}"; }; isLibrary = true; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 61c6ab3efb51..fd85cd2e72ae 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -234,13 +234,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210908_${lib.substring 0 7 src.rev}"; + suffix = "pre20210922_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3c56f62093601143838af923195f630d8ffae2d4"; - sha256 = "sha256-pjdzLOEt8i1NQe4drLpp8+LrRd2MgsISSQEsMebz2kc="; + rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4"; + sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA="; }; boehmgc = boehmgc_nixUnstable; diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix new file mode 100644 index 000000000000..7342c34ee367 --- /dev/null +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "ssh-to-age"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "ssh-to-age"; + rev = version; + sha256 = "sha256-ccwCHu6RlWqMnt5nBy54bVEzfE9/3PEL4C5LnYTtnwU="; + }; + + vendorSha256 = "sha256-jiFPcdWnAk54RJv4mHB3A+5tqKzqitfsiRXYZLa3Gu0="; + + checkPhase = '' + runHook preCheck + go test ./... + runHook postCheck + ''; + + doCheck = true; + + meta = with lib; { + description = "Convert ssh private keys in ed25519 format to age keys"; + homepage = "https://github.com/Mic92/ssh-to-age"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index fcc79a10a8f4..8c70910a9925 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.8.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "14sl0a5c3vfsqxsbai6wvfmxp121rl9wz1vih6gyk6ibvkvlq793"; + sha256 = "1410mmijzjvcylrynyq4p2fayi1wjy61sibd3kws96k3k7ylb14n"; }; vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 6dc84da1e14e..175c34020307 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,33 +1,89 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib, openjdk, perl, ant }: stdenv.mkDerivation rec { version = "4.11.0"; pname = "sleuthkit"; - src = fetchFromGitHub { + sleuthsrc = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = "${pname}-${version}"; - sha256 = "sha256-cY55zK6N3tyCLBJtZn4LhK9kLkikJjg640Pm/NA0ALY="; + sha256 = "1dh06k8grrj3wcx3h9m490p69bw41dz6cv8j5j1drpldmv67k3ki"; }; + # Fetch libraries using a fixed output derivation + rdeps = stdenv.mkDerivation rec { + + version = "1.0"; + pname = "sleuthkit-deps"; + nativeBuildInputs = [ openjdk ant ]; + + src = sleuthsrc; + + # unpack, build, install + dontConfigure = true; + + buildPhase = '' + export IVY_HOME=$NIX_BUILD_TOP/.ant + pushd bindings/java + ant retrieve-deps + popd + pushd case-uco/java + ant get-ivy-dependencies + popd + ''; + + installPhase = '' + export IVY_HOME=$NIX_BUILD_TOP/.ant + mkdir -m 755 -p $out/bindings/java + cp -r bindings/java/lib $out/bindings/java + mkdir -m 755 -p $out/case-uco/java + cp -r case-uco/java/lib $out/case-uco/java + cp -r $IVY_HOME/lib $out + chmod -R 755 $out/lib + ''; + + outputHashMode = "recursive"; + outputHash = "0fq7v6zlgybg4v6k9wqjlk4gaqgjrpihbnr182vaqriihflav2s8"; + outputHashAlgo = "sha256"; + }; + + src = sleuthsrc; + postPatch = '' substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset ''; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook openjdk perl ant rdeps ]; buildInputs = [ libewf afflib openssl zlib ]; - # Hack to fix the RPATH. - preFixup = "rm -rf */.libs"; + # Hack to fix the RPATH + preFixup = '' + rm -rf */.libs + ''; + + postUnpack = '' + export IVY_HOME="$NIX_BUILD_TOP/.ant" + export JAVA_HOME="${openjdk}" + export ant_args="-Doffline=true -Ddefault-jar-location=$IVY_HOME/lib" + + # pre-positioning these jar files allows -Doffline=true to work + mkdir -p source/{bindings,case-uco}/java $IVY_HOME + cp -r ${rdeps}/bindings/java/lib source/bindings/java + chmod -R 755 source/bindings/java + cp -r ${rdeps}/case-uco/java/lib source/case-uco/java + chmod -R 755 source/case-uco/java + cp -r ${rdeps}/lib $IVY_HOME + chmod -R 755 $IVY_HOME + ''; - meta = { + meta = with lib; { description = "A forensic/data recovery tool"; homepage = "https://www.sleuthkit.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - license = lib.licenses.ipl10; + maintainers = with maintainers; [ raskin gfrascadorio ]; + platforms = platforms.linux; + license = licenses.ipl10; }; } diff --git a/pkgs/tools/text/align/default.nix b/pkgs/tools/text/align/default.nix new file mode 100644 index 000000000000..4f67d747da4c --- /dev/null +++ b/pkgs/tools/text/align/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "align"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "Guitarbum722"; + repo = pname; + rev = "v${version}"; + sha256 = "17gs3417633z71kc6l5zqg4b3rjhpn2v8qs8rnfrk4nbwzz4nrq3"; + }; + + vendorSha256 = null; + + meta = with lib; { + homepage = "https://github.com/Guitarbum722/align"; + description = "A general purpose application and library for aligning text"; + maintainers = with maintainers; [ hrhino ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index d95e7ae399db..d5f27747cf1c 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "diffutils"; - version = "3.7"; + version = "3.8"; src = fetchurl { url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; - sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; + sha256 = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w="; }; outputs = [ "out" "info" ]; diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 6e1a7b24b594..8817b7a09fda 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost }: +{ lib, stdenv, fetchpatch, fetchurl, boost }: stdenv.mkDerivation rec { pname = "source-highlight"; @@ -9,10 +9,19 @@ stdenv.mkDerivation rec { sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; + patches = [ + # gcc-11 compat upstream patch + (fetchpatch { + url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; + sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; + excludes = [ "ChangeLog" ]; + }) + ]; + # source-highlight uses it's own binary to generate documentation. # During cross-compilation, that binary was built for the target # platform architecture, so it can't run on the build host. - patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace Makefile.in --replace "src doc tests" "src tests" ''; @@ -21,7 +30,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost=${boost.out}" ]; - enableParallelBuilding = false; + doCheck = !stdenv.cc.isClang; + + enableParallelBuilding = true; + # Upstream uses the same intermediate files in multiple tests, running + # them in parallel by make will eventually break one or more tests. + enableParallelChecking = false; outputs = [ "out" "doc" "dev" ]; diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/tools/text/tv/default.nix index bb3dd9582c90..686433ff4290 100644 --- a/pkgs/tools/text/tv/default.nix +++ b/pkgs/tools/text/tv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tv"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "uzimaru0000"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4PcD0keG3OVZPv6MA+rNSL9lysrseJUA6C5cd2f6LRY="; + sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM="; }; - cargoSha256 = "sha256-E4qMxCqgJYIA8E6A0d8iUYTbKif5T51zcFdc+Ptq7qc="; + cargoSha256 = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI="; meta = with lib; { description = "Format json into table view"; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 05c1644c8c7d..9aa2cde0f3c9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -103,7 +103,9 @@ core = stdenv.mkDerivation rec { installTargets = [ "install" "texlinks" ]; # TODO: perhaps improve texmf.cnf search locations - postInstall = /* a few texmf-dist files are useful; take the rest from pkgs */ '' + postInstall = /* links format -> engine will be regenerated in texlive.combine */ '' + PATH="$out/bin:$PATH" ${texlinks} --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" + '' + /* a few texmf-dist files are useful; take the rest from pkgs */ '' mv "$out/share/texmf-dist/web2c/texmf.cnf" . rm -r "$out/share/texmf-dist" mkdir -p "$out"/share/texmf-dist/{web2c,scripts/texlive/TeXLive} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dde0c63b9aad..ad615a67b8c7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -66,6 +66,8 @@ mapAliases ({ badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 + bash_5 = bash; # added 2021-08-20 + bashInteractive_5 = bashInteractive; # added 2021-08-20 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86179124261d..9933bfc4af47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -167,6 +167,8 @@ with pkgs; alda = callPackage ../development/interpreters/alda { }; + align = callPackage ../tools/text/align { }; + althttpd = callPackage ../servers/althttpd { }; among-sus = callPackage ../games/among-sus { }; @@ -244,6 +246,8 @@ with pkgs; clj-kondo = callPackage ../development/tools/clj-kondo { }; + cloak = callPackage ../applications/misc/cloak { }; + cmark = callPackage ../development/libraries/cmark { }; cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; @@ -4135,7 +4139,9 @@ with pkgs; cudatoolkit_11 cudatoolkit_11_0 cudatoolkit_11_1 - cudatoolkit_11_2; + cudatoolkit_11_2 + cudatoolkit_11_3 + cudatoolkit_11_4; cudatoolkit = cudatoolkit_10; @@ -4160,7 +4166,9 @@ with pkgs; cutensor_cudatoolkit_11 cutensor_cudatoolkit_11_0 cutensor_cudatoolkit_11_1 - cutensor_cudatoolkit_11_2; + cutensor_cudatoolkit_11_2 + cutensor_cudatoolkit_11_3 + cutensor_cudatoolkit_11_4; cutensor = cutensor_cudatoolkit_10; @@ -9119,7 +9127,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; }; + sks = callPackage ../servers/sks { }; skydns = callPackage ../servers/skydns { }; @@ -9209,6 +9217,8 @@ with pkgs; ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; + ssh-to-age = callPackage ../tools/security/ssh-to-age { }; + ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { }; suricata = callPackage ../applications/networking/ids/suricata { @@ -10742,24 +10752,24 @@ with pkgs; any-nix-shell = callPackage ../shells/any-nix-shell { }; - bash = lowPrio (callPackage ../shells/bash/4.4.nix { + bash_4 = lowPrio (callPackage ../shells/bash/4.4.nix { binutils = stdenv.cc.bintools; }); - bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { + bash = lowPrio (callPackage ../shells/bash/5.1.nix { binutils = stdenv.cc.bintools; }); - bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { + # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed + bashInteractive = callPackage ../shells/bash/5.1.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; - }); + }; - # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = callPackage ../shells/bash/4.4.nix { + bashInteractive_4 = lowPrio (callPackage ../shells/bash/4.4.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; - }; + }); bash-completion = callPackage ../shells/bash/bash-completion { }; @@ -12360,19 +12370,19 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_10 = llvmPackages_10.libllvm; }; - rust_1_54 = callPackage ../development/compilers/rust/1_54.nix { + rust_1_55 = callPackage ../development/compilers/rust/1_55.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_12 = llvmPackages_12.libllvm; }; - rust = rust_1_54; + rust = rust_1_55; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_54 = rust_1_54.packages.stable; - rustPackages = rustPackages_1_54; + rustPackages_1_55 = rust_1_55.packages.stable; + rustPackages = rustPackages_1_55; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -13385,6 +13395,8 @@ with pkgs; abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; + abuild = callPackage ../development/tools/abuild { }; + adtool = callPackage ../tools/admin/adtool { }; inherit (callPackage ../development/tools/alloy { @@ -18542,8 +18554,9 @@ with pkgs; python = python37; }; - protobuf = protobuf3_17; + protobuf = protobuf3_18; + protobuf3_18 = callPackage ../development/libraries/protobuf/3.18.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { }; protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; @@ -19085,9 +19098,7 @@ with pkgs; srt = callPackage ../development/libraries/srt { }; - srtp = callPackage ../development/libraries/srtp { - libpcap = if stdenv.isLinux then libpcap else null; - }; + srtp = callPackage ../development/libraries/srtp { }; stb = callPackage ../development/libraries/stb { }; @@ -22020,9 +22031,11 @@ with pkgs; withCryptsetup = false; withDocumentation = false; withEfi = false; + withFido2 = false; withHostnamed = false; withHwdb = false; withImportd = false; + withLibBPF = false; withLocaled = false; withLogind = false; withMachined = false; @@ -22036,6 +22049,7 @@ with pkgs; withShellCompletions = false; withTimedated = false; withTimesyncd = false; + withTpm2Tss = false; withUserDb = false; glib = null; libgcrypt = null; @@ -22305,6 +22319,8 @@ with pkgs; cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; + chonburi-font = callPackage ../data/fonts/chonburi { }; + cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { }; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; @@ -24477,6 +24493,7 @@ with pkgs; firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + inherit (gnome) adwaita-icon-theme; channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; }; @@ -24488,6 +24505,7 @@ with pkgs; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { + inherit (gnome) adwaita-icon-theme; channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; @@ -24499,6 +24517,7 @@ with pkgs; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + inherit (gnome) adwaita-icon-theme; channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; }; @@ -26306,6 +26325,8 @@ with pkgs; prevo-data = callPackage ../applications/misc/prevo/data.nix { }; prevo-tools = callPackage ../applications/misc/prevo/tools.nix { }; + psi-notify = callPackage ../applications/misc/psi-notify { }; + ptex = callPackage ../development/libraries/ptex {}; pyright = nodePackages.pyright; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 73b4b4266a79..13949955c825 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3709,10 +3709,10 @@ let ConvertASN1 = buildPerlPackage { pname = "Convert-ASN1"; - version = "0.27"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz"; - sha256 = "12nmsca6hzgxq57sx7dp8yq6zxqhl41z5a6018877sf5w25ag93l"; + url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.33.tar.gz"; + sha256 = "0xk0s2rnwjb7ydhwfinpjcbw25im54b8cs7r9hj3m7n7412h1pqz"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50803af17df7..1d95c5ff5414 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -245,6 +245,8 @@ in { aioambient = callPackage ../development/python-modules/aioambient { }; + aioapns = callPackage ../development/python-modules/aioapns { }; + ailment = callPackage ../development/python-modules/ailment { }; aioamqp = callPackage ../development/python-modules/aioamqp { }; @@ -7371,6 +7373,8 @@ in { python_openzwave = callPackage ../development/python-modules/python_openzwave { }; + python-osc = callPackage ../development/python-modules/python-osc { }; + python-packer = callPackage ../development/python-modules/python-packer { }; python-pam = callPackage ../development/python-modules/python-pam { |