diff --git a/.gitattributes b/.gitattributes index d77c01fd626..01d363cbb1c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ **/deps.nix linguist-generated **/deps.json linguist-generated -**/deps.toml lingust-generated +**/deps.toml linguist-generated **/node-packages.nix linguist-generated pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 5c281d6d860..9cd80b93854 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -411,7 +411,7 @@ with import {}; version = "0.10.0"; format = "setuptools"; - src = python311.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; @@ -1229,7 +1229,7 @@ with import {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: rec { version = "0.19.1"; - src = super.fetchPypi { + src = fetchPypi { pname = "pandas"; inherit version; hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE="; @@ -1286,6 +1286,7 @@ specifying an interpreter version), like this: ```nix { lib , python3 +, fetchPypi }: python3.pkgs.buildPythonApplication rec { @@ -1293,7 +1294,7 @@ python3.pkgs.buildPythonApplication rec { version = "2.7.9"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98b75f8867e..4d43e2d215c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4609,6 +4609,12 @@ githubId = 18535642; name = "Emily"; }; + emilylange = { + email = "nix@emilylange.de"; + github = "emilylange"; + githubId = 55066419; + name = "Emily Lange"; + }; emilytrau = { name = "Emily Trau"; email = "nix@angus.ws"; @@ -6775,12 +6781,6 @@ githubId = 36667224; name = "Yingchi Long"; }; - indeednotjames = { - email = "nix@indeednotjames.com"; - github = "IndeedNotJames"; - githubId = 55066419; - name = "Emily Lange"; - }; indexyz = { email = "indexyz@pm.me"; github = "5aaee9"; @@ -7942,6 +7942,12 @@ githubId = 1792886; name = "Julien Malka"; }; + juliusrickert = { + email = "nixpkgs@juliusrickert.de"; + github = "juliusrickert"; + githubId = 5007494; + name = "Julius Rickert"; + }; julm = { email = "julm+nixpkgs@sourcephile.fr"; github = "ju1m"; @@ -14824,6 +14830,12 @@ githubId = 2825204; name = "Steven Pease"; }; + spectre256 = { + name = "Ellis Gibbons"; + email = "egibbons256@gmail.com"; + github = "spectre256"; + githubId = 72505298; + }; spencerjanssen = { email = "spencerjanssen@gmail.com"; matrix = "@sjanssen:matrix.org"; diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 4fd7d455df0..326e23b3700 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -343,6 +343,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `pict-rs` package was updated from an 0.3 alpha release to 0.3 stable, and related environment variables now require two underscores instead of one. +- `espanso` has been updated to major version 2. Therefore, migration steps may need to be performed. See [the official migration instructions](https://espanso.org/docs/migration/overview/) for how to perform these migrations. Further, `espanso-wayland` can now be used for Wayland support. + ## Other Notable Changes {#sec-release-23.05-notable-changes} @@ -563,6 +565,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `make-disk-image` handles `contents` arguments that are directories better, fixing a bug where it used to put them in a subdirectory of the intended `target`. +- The option `services.jitsi-videobridge.apis` has been renamed to `colibriRestApi` and turned into a boolean. Setting it to `true` will enable the private rest API, useful for monitoring using `services.prometheus.exporters.jitsi.enable`. Learn more about the API: "[The COLIBRI control interface (/colibri/)](https://github.com/jitsi/jitsi-videobridge/blob/v2.3/doc/rest.md)". + ## Detailed migration information {#sec-release-23.05-migration} ### Pipewire configuration overrides {#sec-release-23.05-migration-pipewire} diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index d881ea91369..a296fd3816b 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -419,7 +419,7 @@ in Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; - ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; + ExecStart="${bundle} exec rails server -u webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; }; }; diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 2537bb1b8d8..a5c370b5be8 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -172,8 +172,8 @@ in emptyRepo = mkOption { type = types.bool; - default = false; - description = lib.mdDoc "If set to true, the repo won't be initialized with help files"; + default = true; + description = lib.mdDoc "If set to false, the repo will be initialized with help files"; }; settings = mkOption { @@ -331,7 +331,7 @@ in preStart = '' if [[ ! -f "$IPFS_PATH/config" ]]; then - ipfs init ${optionalString cfg.emptyRepo "-e"} + ipfs init --empty-repo=${lib.boolToString cfg.emptyRepo} else # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. rm -vf "$IPFS_PATH/api" diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix index 09f2ddf92c5..37b0b1e5bf5 100644 --- a/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/nixos/modules/services/networking/jitsi-videobridge.nix @@ -43,6 +43,7 @@ let muc_nickname = xmppConfig.mucNickname; disable_certificate_verification = xmppConfig.disableCertificateVerification; }); + apis.rest.enabled = cfg.colibriRestApi; }; }; @@ -50,6 +51,11 @@ let jvbConfig = recursiveUpdate defaultJvbConfig cfg.config; in { + imports = [ + (mkRemovedOptionModule [ "services" "jitsi-videobridge" "apis" ] + "services.jitsi-videobridge.apis was broken and has been migrated into the boolean option services.jitsi-videobridge.colibriRestApi. It is set to false by default, setting it to true will correctly enable the private /colibri rest API." + ) + ]; options.services.jitsi-videobridge = with types; { enable = mkEnableOption (lib.mdDoc "Jitsi Videobridge, a WebRTC compatible video router"); @@ -192,14 +198,13 @@ in ''; }; - apis = mkOption { - type = with types; listOf str; + colibriRestApi = mkOption { + type = bool; description = lib.mdDoc '' - What is passed as --apis= parameter. If this is empty, "none" is passed. - Needed for monitoring jitsi. + Whether to enable the private rest API for the COLIBRI control interface. + Needed for monitoring jitsi, enabling scraping of the /colibri/stats endpoint. ''; - default = []; - example = literalExpression "[ \"colibri\" \"rest\" ]"; + default = false; }; }; @@ -233,7 +238,7 @@ in "export ${toVarName name}=$(cat ${xmppConfig.passwordFile})\n" ) cfg.xmppConfigs)) + '' - ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=${if (cfg.apis == []) then "none" else concatStringsSep "," cfg.apis} + ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge ''; serviceConfig = { diff --git a/nixos/modules/services/security/vault-agent.nix b/nixos/modules/services/security/vault-agent.nix index 244004f7c91..17b8ff83592 100644 --- a/nixos/modules/services/security/vault-agent.nix +++ b/nixos/modules/services/security/vault-agent.nix @@ -123,6 +123,6 @@ in }) [ "consul-template" "vault-agent" ]); - meta.maintainers = with maintainers; [ indeednotjames tcheronneau ]; + meta.maintainers = with maintainers; [ emilylange tcheronneau ]; } diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 3d1d7a27c21..a395294ec14 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -264,6 +264,9 @@ in description = "EPGStation user"; group = config.users.groups.epgstation.name; isSystemUser = true; + + # NPM insists on creating ~/.npm + home = "/var/cache/epgstation"; }; users.groups.epgstation = { }; @@ -318,11 +321,14 @@ in ++ lib.optional config.services.mirakurun.enable "mirakurun.service" ++ lib.optional config.services.mysql.enable "mysql.service"; + environment.NODE_ENV = "production"; + serviceConfig = { ExecStart = "${cfg.package}/bin/epgstation start"; ExecStartPre = "+${preStartScript}"; User = username; Group = groupname; + CacheDirectory = "epgstation"; StateDirectory = "epgstation"; LogsDirectory = "epgstation"; ConfigurationDirectory = "epgstation"; diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 4e6f9c79a6f..2285bb5a425 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -26,7 +26,7 @@ let supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeGiteaTest = type: nameValuePair type (makeTest { name = "${giteaPackage.pname}-${type}"; - meta.maintainers = with maintainers; [ aanderse indeednotjames kolaente ma27 ]; + meta.maintainers = with maintainers; [ aanderse emilylange kolaente ma27 ]; nodes = { server = { config, pkgs, ... }: { diff --git a/nixos/tests/headscale.nix b/nixos/tests/headscale.nix index a3d0155cad3..80188b65dbf 100644 --- a/nixos/tests/headscale.nix +++ b/nixos/tests/headscale.nix @@ -1,17 +1,82 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "headscale"; - meta.maintainers = with lib.maintainers; [ misterio77 ]; +import ./make-test-python.nix ({ pkgs, lib, ... }: + let + tls-cert = + pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req \ + -x509 -newkey rsa:4096 -sha256 -days 365 \ + -nodes -out cert.pem -keyout key.pem \ + -subj '/CN=headscale' -addext "subjectAltName=DNS:headscale" - nodes.machine = { ... }: { - services.headscale.enable = true; - environment.systemPackages = [ pkgs.headscale ]; - }; + mkdir -p $out + cp key.pem cert.pem $out + ''; + in { + name = "headscale"; + meta.maintainers = with lib.maintainers; [ misterio77 ]; - testScript = '' - machine.wait_for_unit("headscale") - machine.wait_for_open_port(8080) - # Test basic functionality - machine.succeed("headscale namespaces create test") - machine.succeed("headscale preauthkeys -u test create") - ''; -}) + nodes = let + headscalePort = 8080; + stunPort = 3478; + peer = { + services.tailscale.enable = true; + security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; + }; + in { + peer1 = peer; + peer2 = peer; + + headscale = { + services = { + headscale = { + enable = true; + port = headscalePort; + settings = { + server_url = "https://headscale"; + ip_prefixes = [ "100.64.0.0/10" ]; + derp.server = { + enabled = true; + region_id = 999; + stun_listen_addr = "0.0.0.0:${toString stunPort}"; + }; + }; + }; + nginx = { + enable = true; + virtualHosts.headscale = { + addSSL = true; + sslCertificate = "${tls-cert}/cert.pem"; + sslCertificateKey = "${tls-cert}/key.pem"; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString headscalePort}"; + proxyWebsockets = true; + }; + }; + }; + }; + networking.firewall = { + allowedTCPPorts = [ 80 443 ]; + allowedUDPPorts = [ stunPort ]; + }; + environment.systemPackages = [ pkgs.headscale ]; + }; + }; + + testScript = '' + start_all() + headscale.wait_for_unit("headscale") + headscale.wait_for_open_port(443) + + # Create headscale user and preauth-key + headscale.succeed("headscale users create test") + authkey = headscale.succeed("headscale preauthkeys -u test create --reusable") + + # Connect peers + up_cmd = f"tailscale up --login-server 'https://headscale' --auth-key {authkey}" + peer1.execute(up_cmd) + peer2.execute(up_cmd) + + # Check that they are reachable from the tailnet + peer1.wait_until_succeeds("tailscale ping peer2") + peer2.wait_until_succeeds("tailscale ping peer1") + ''; + }) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index bb87f1a3df9..9e9e3b0fa14 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -234,9 +234,7 @@ let exporterTest = '' wait_for_unit("prometheus-domain-exporter.service") wait_for_open_port(9222) - succeed( - "curl -sSf 'http://localhost:9222/probe?target=nixos.org' | grep 'domain_probe_success 0'" - ) + succeed("curl -sSf 'http://localhost:9222/probe?target=nixos.org'") ''; }; @@ -328,7 +326,7 @@ let systemd.services.prometheus-jitsi-exporter.after = [ "jitsi-videobridge2.service" ]; services.jitsi-videobridge = { enable = true; - apis = [ "colibri" "rest" ]; + colibriRestApi = true; }; }; exporterTest = '' @@ -1198,13 +1196,15 @@ let wait_for_unit("prometheus-statsd-exporter.service") wait_for_open_port(9102) succeed("curl http://localhost:9102/metrics | grep 'statsd_exporter_build_info{'") - succeed( - "echo 'test.udp:1|c' > /dev/udp/localhost/9125", - "curl http://localhost:9102/metrics | grep 'test_udp 1'", + wait_until_succeeds( + "echo 'test.udp:1|c' > /dev/udp/localhost/9125 && \ + curl http://localhost:9102/metrics | grep 'test_udp 1'", + timeout=10 ) - succeed( - "echo 'test.tcp:1|c' > /dev/tcp/localhost/9125", - "curl http://localhost:9102/metrics | grep 'test_tcp 1'", + wait_until_succeeds( + "echo 'test.tcp:1|c' > /dev/tcp/localhost/9125 && \ + curl http://localhost:9102/metrics | grep 'test_tcp 1'", + timeout=10 ) ''; }; diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index f98b02117c2..3a10bd72d30 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "contrast"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "contrast"; rev = version; - hash = "sha256-waoXv8dzqynkpfEPZSgZnS6fyo9+9+3Q2oy2fMtEsoE="; + hash = "sha256-5OFmLsP+Xk3sKJcUG/s8KwedvfS8ri+JoinliyJSmrY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-94QwPSiGjjPuskg5w6QfM5FuChFno7f9dh0Xr2wWKCI="; + hash = "sha256-8WukhoKMyApkwqPQ6KeWMsL40sMUcD4I4l7UqXf2Ld0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index afe3cde3a59..68d3d92b169 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "44.0"; + version = "44.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-dIH6VPgzJxvXEUtPAYQzpQ8I9R9MwsfeylV25ASfW/k="; + sha256 = "sha256-+Z8o45ZJOmYN+G4viGJW+9BPL6gNitfFBu76qx+sOF0="; }; patches = [ diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index d181493f7b3..8978eb86041 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2023.04"; + version = "2023.05"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - sha256 = "sha256-3HQF0wKk0iRV5fKzuCTv7X7MC+snMDrodgqScCZQVY4="; + sha256 = "sha256-EuFKoqOzKoaBCiVAsb8K053kAL4bw1WqmmybVJX2Fmo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index b4b0f36c725..292156ef548 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.194.0"; + version = "1.194.4"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-+zdboXU4Tg6RLRVwjS2FQGLfYZu/A09eoZUrYX4SK0o="; + hash = "sha256-suZROvrbi02jRnueoet2wT2+dxNuWgv8X6tIvlOPHPI="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index a1327f8fc77..d2cf2fc59a1 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.05.07", - "hash": "sha256-B1+de0ze17GTAFuWxgmk95sdYiUmDGdeNTJmyy74Vmc=" + "rev": "2023.05.17", + "hash": "sha256-yt5i3txXqHs7MoQepY+tbzv1wxwAegm9C+rWZtxJ4zE=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.05.13", - "hash": "sha256-GP7qzCfL8KNXF/CvoeJshA3YbNE5+wuZ2VYn8hLEPlo=" + "rev": "2023.05.17", + "hash": "sha256-6hz1oOnappiXktvvEBWXsaI/hnJ9mbnS5hWnyCVN2Ys=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,8 +26,8 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2023.04.18", - "hash": "sha256-Eb8ynxZP3OQ7TGFZMbw8r0HXXvaoR6yotwnwK6nwZxg=" + "rev": "2023.05.17", + "hash": "sha256-tzQEL23k7ZhnOxN9IOD0lG/2FNOdjuS8vP+0f6IU8Ks=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix index 1ac8b2f7076..07322879b5b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix @@ -1,7 +1,6 @@ { lib , trivialBuild , fetchFromGitHub -, emacs , color-theme }: @@ -16,23 +15,12 @@ trivialBuild { hash = "sha256-oxX0lo6sxotEiR3nPrKPE9H01HKB3ohB/p8eEHFTp5k="; }; - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ color-theme ]; - - buildPhase = '' - runHook preBuild - - emacs -L . -L ${color-theme}/share/emacs/site-lisp/elpa/color-theme-* \ - --batch -f batch-byte-compile *.el - - runHook postBuild - ''; + packageRequires = [ color-theme ]; meta = with lib; { homepage = "http://ethanschoonover.com/solarized"; description = "Precision colors for machines and people; Emacs implementation"; license = licenses.mit; maintainers = with maintainers; [ samuelrivas AndersonTorres ]; - inherit (emacs.meta) platforms; }; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ef01afbc4b5..3a775b1ceb7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2549,6 +2549,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; + denops-vim = buildVimPluginFrom2Nix { + pname = "denops.vim"; + version = "2023-01-20"; + src = fetchFromGitHub { + owner = "vim-denops"; + repo = "denops.vim"; + rev = "44baa0666e69976dd82311a67a220c7f71273368"; + sha256 = "1wdl2sq6vl4lmyqrhnp0mspxbfaza3h8pgkgdhf27jdkavg793ij"; + }; + meta.homepage = "https://github.com/vim-denops/denops.vim/"; + }; + deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; version = "2023-05-19"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 262eab02b4c..7045c0248a6 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -18,6 +18,7 @@ , Cocoa , code-minimap , dasht +, deno , direnv , fish , fzf @@ -408,6 +409,13 @@ self: super: { dependencies = with self; [ nvim-yarp ]; }); + denops-vim = super.denops-vim.overrideAttrs (old: { + postPatch = '' + # Use Nix's Deno instead of an arbitrary install + substituteInPlace ./autoload/denops.vim --replace "call denops#_internal#conf#define('denops#deno', 'deno')" "call denops#_internal#conf#define('denops#deno', '${deno}/bin/deno')" + ''; + }); + deoplete-fish = super.deoplete-fish.overrideAttrs (old: { dependencies = with self; [ deoplete-nvim vim-fish ]; }); diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4ebe97129ad..8644c1fef1f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -213,6 +213,7 @@ https://github.com/Raimondi/delimitMate/,, https://github.com/neoclide/denite-extra/,, https://github.com/neoclide/denite-git/,, https://github.com/Shougo/denite.nvim/,, +https://github.com/vim-denops/denops.vim/,HEAD, https://github.com/Shougo/deol.nvim/,, https://github.com/deoplete-plugins/deoplete-clang/,, https://github.com/deoplete-plugins/deoplete-dictionary/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5060a0c621c..f252e39a3ee 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -309,8 +309,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "0.29.7"; - sha256 = "sha256-hr8opkNnYpnc8ZRd8tkO8GgMN2lK0YwCETDNe4QnUNQ="; + version = "1.0.6"; + sha256 = "sha256-/gpZtOO8MA/MJ1o9eG4qmPqhWRZ5E+elA9Rr/kpOprI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; @@ -1924,8 +1924,8 @@ let mktplcRef = { name = "caddyfile-support"; publisher = "matthewpi"; - version = "0.2.4"; - sha256 = "sha256-7D7fNlI55MxD6M8ml/dzBAMwCGCEkC+9aKhreZCVMv4="; + version = "0.3.0"; + sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY="; }; meta = { description = "Rich Caddyfile support for Visual Studio Code"; @@ -2837,8 +2837,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "107.2.5"; - sha256 = "sha256-IsZFIk+jOIxzACaZagL64I8Cs0NLI0aWwUPy6xwAmlQ="; + version = "107.4.3"; + sha256 = "sha256-z1foIJXVKmJ0G4FfO9xsjiQgmq/ZtoB3b6Ch8Nyj1zY="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index aa6611f0d51..71d8e8ddaf3 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.3"; + version = "1.5.4"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vNjXY/Qz6IT7rV+as2EBkSWd4O98slcXLNgAO9Dkc9E="; + sha256 = "sha256-cfPQTSINEdii/A2czAIxKDUw6RZOH4xZI7HnUmKuR9k="; }; # There are no checks, it seems. diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index 05e7e73b491..fd85333ba44 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "gnome-extension-manager"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "mjakeman"; repo = "extension-manager"; rev = "v${version}"; - sha256 = "sha256-M+jMEJXtzUP6dQp9vpyMhh1wuKG9YJ8i0ys92nbmmpw="; + sha256 = "sha256-6LZaDNkWI/zaWAy+Rfp3DwYpnprxcbcZA7DOwaiBmt0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/applications/misc/livecaptions/default.nix index b64b16a416d..5ef77918360 100644 --- a/pkgs/applications/misc/livecaptions/default.nix +++ b/pkgs/applications/misc/livecaptions/default.nix @@ -19,13 +19,13 @@ owner = "abb128"; repo = "april-asr"; rev = "c2f138c674cad58e2708ecaddc95cc72e7f85549"; - sha256 = "hZe2iss3BGdzeTM5FCp9wp6LaDOjtGJrZS5vB5F6uLg="; + hash = "sha256-hZe2iss3BGdzeTM5FCp9wp6LaDOjtGJrZS5vB5F6uLg="; }; aprilModel = fetchurl { - name = "aprilv0_en-us.april"; - url = "https://april.sapples.net/aprilv0_en-us.april"; - sha256 = "9aMPiI55d2mxt94UPAXSySoXAsJjtbcdYv0gKM7eVic="; + name = "april-english-dev-01110_en.april"; + url = "https://april.sapples.net/april-english-dev-01110_en.april"; + hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index ff12f5d159c..71b1bccb089 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RCVG38Y8VV7qGz/CaOZ4aw4Sg3PQdrB29zZqATjvYDQ="; + sha256 = "sha256-4cyhE9CJz/4omvzucLuTR4QLQnd5iVANCG/BI6Sdhq8="; }; - vendorSha256 = "sha256-WDygnKdldZda4GadfStHWsDel1KLdzjVjw0RxmnFPRE="; + vendorHash = "sha256-WDygnKdldZda4GadfStHWsDel1KLdzjVjw0RxmnFPRE="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 967904c6e19..8f8fff9c7f7 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.43.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-yNYoVz6vITKkAkqH/0p7D4sifTpjtEZS4syFSwN4v98="; + hash = "sha256-VNt+47EN+7EoChJjpg7B5ziu54Xt7egjfOye1IZPEvw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-iiGn0dYHNEp5Bs54X44sHbsG3HD92Xs4oah4iZXqqvQ="; + vendorHash = "sha256-9RvVBup07FHCjfV/Q6ryU28inqydL/pMGVUfbo2OG5s="; doCheck = false; diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 8662032fbe7..1cec644ba92 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-k9VmEg/HZECUwHaD491ZmfGUxZ14hLOaJD5x3zMK2jI="; + sha256 = "sha256-21cn43qyKg8jL6FF8D9H7dgcgSKggqaxb4cJVc0ljl0="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-0SFph9quh4QWR3nU5IJr4FyLGqrYvmHcZHDRli6phsc="; + cargoHash = "sha256-9VjrDE/1VAgNrRmSYxCYKPrnilPQF+OXAYpFkF2lpAE="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 54fe6558924..90b776d2123 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-qtewd4sm3urFwoDkqdUHfr2SvJRR1nVLLE5d28BocYg="; + hash = "sha256-d7oHPe1R0KZaVTTxmed27VZ2PphiQfy7CXYhVKHWUhE="; }; - vendorHash = "sha256-s1ISU7VEH9o7SBF3Vy+2kVZNxOFUYLmh/le5vU8rOqg="; + vendorHash = "sha256-jrXdbxH5hJrd5yyVsTOeIYJciJ6wVTydkD6aSuWYKPQ="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c4f4281a26a..9c5f04ad7ef 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": "113.0.5672.92", - "sha256": "199vi4ay9yrvi95r0ccfih1i7wnnqfh5vkqbr35mpmr4r19hnlm4", - "sha256bin64": "0xx1c4wy0px2sndllkzbfgmjihfysxcxdpxk0zmy5yranfqbxvdv", + "version": "113.0.5672.126", + "sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd", + "sha256bin64": "1w8b41ij6xl8byh1977skxwwq0nivpfn8wb3gv12xvm7sw24jqka", "deps": { "gn": { "version": "2023-03-18", @@ -19,9 +19,9 @@ } }, "beta": { - "version": "114.0.5735.26", - "sha256": "0v73vzgyg08683my0bc29nvbqqpq3zx9qdnxvdvp72rmyrbc5aiy", - "sha256bin64": "0viy4ibzh04vnkv111vcz4y0s7vg3f2470j2s1b4nzwxmqadxi3n", + "version": "114.0.5735.35", + "sha256": "1ik3d886pcpqs7fnqf7ck0y8x8dbi1d4aqm227qwv0jw2p4a0qyb", + "sha256bin64": "0xx53x6c7r8cji7d2663zn4p4yklzyc124abqlhyr14w8p2lfldq", "deps": { "gn": { "version": "2023-04-19", @@ -32,15 +32,15 @@ } }, "dev": { - "version": "115.0.5762.4", - "sha256": "0jlqnd4cmbm3c4xz6dcgs7p8clraldl7hncm4wc28yxv5bsxhyqi", - "sha256bin64": "1zcpzji22fpb04bfhqlp0wy3rnjk3ylfh39r1c2zgqks31n6niz6", + "version": "115.0.5773.4", + "sha256": "18as1yqp7jyv92mn6lq4fl6mzq3w5qx4aqsw5nyixmgys4hfx6a6", + "sha256bin64": "0d0anrc2bdh9c8rs06jng45xd7sxw0raky3wrngbda2g4aqh817k", "deps": { "gn": { "version": "2023-05-09", "url": "https://gn.googlesource.com/gn", - "rev": "ad1e5ce10f06ef9a1a1d91b2e48231d6b3eecbe2", - "sha256": "1m00wqkkvgs52a9bikirnmvsw2d9kfzk59a45mg4n8m4sgpvmxc7" + "rev": "26aa46c283e40199b6f847ecca088dcea7099ded", + "sha256": "1z5w4fiypv4aq12qlc8in832n7k6wi4k64k4axardrsy24316r9d" } } }, diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 3b207532ea5..077989dc398 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1015 +1,1015 @@ { - version = "113.0b9"; + version = "114.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ach/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ach/firefox-114.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bf37354a110882db36b5112e6212b6c41812280a78e1bc107c7f33a89c8256d1"; + sha256 = "dc76c59325f314449669e3b6dc11df8320dadddbc420cecf3e78df5e2a15bea3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/af/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/af/firefox-114.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "acb192bb60d9b1cf7099b64fff505fdbdeab9affdff9244436f9f6f562a49bbd"; + sha256 = "967bf21d6bfe4bf34359635c3f258be5db6b8dcff1452c28a59fa3f03386df2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/an/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/an/firefox-114.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d8cc34bdae02fd5b2c0915738db92a3bce14d1ebd58f5b80e72845726e5cc5d2"; + sha256 = "136b643e2b54e657254984041e68692e08b5eb6136f04a5ff7567ffc0459f4f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ar/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ar/firefox-114.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "4375cd8b9b50e206f96a6b4af34b7d9353511cb2bc69894b3d8d8e25038a85b5"; + sha256 = "ca382bcf523840d4e296c0946680720c0d2d3041276c4e2aadccaab24606b8c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ast/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ast/firefox-114.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a0e9dd82564713447d2a58a28be2e30a3fcdf4208d653f5ec73aedcee157260a"; + sha256 = "a30e7d136a9ba6fa7c65e1cc1f6a00bec4dc526b90ce6acc2fa3c9645ab68349"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/az/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/az/firefox-114.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "05476676f674aef2a3db6faf8eda6a408811f6fbaa7b5e4cdcf08a27269f0fbb"; + sha256 = "7b455cd839ee8e125824e238721d9984dc0dc19371426fc262f5bea59612b1e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/be/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/be/firefox-114.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ddec265363cf870f8ffa363294bca77ecacfe38f9dabdd2a8d0a87088c4e8873"; + sha256 = "c7f4aafb54485c38cba997d2fb2e171d7137c8d6138558ec12a0b83a52197101"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/bg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/bg/firefox-114.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "89d64f783cf0579631f10caf3b28aaba2afdcaf2f5fa37c2b99488d98a338b2a"; + sha256 = "2046ada746bed3ed98e5c46197cd30266017ddd2de139202b2c37afe8716903a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/bn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/bn/firefox-114.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0fbd49d694e7fcc206b51aed7b0acbd92f4fce8ba1f0c3fcee12f4a57d585e6e"; + sha256 = "08e38c75d1d24a0f2e087ce6195bbd27eb8e02a97ae58f791f7fe05281ff8aca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/br/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/br/firefox-114.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9ecd657bfa96c9a9f2a7c1b639c6a6186826b32af416bb69aa79f64b9553e2c8"; + sha256 = "eaff321a25ea38de4ec90452ba6e1a3635ca55a056803560901cea79ed45e978"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/bs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/bs/firefox-114.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "67c2015588c815d11675782d606ac8602002ab68db57537ba441f6cf3a37e940"; + sha256 = "2840111783207053d85ebaea325b9ad7d58a7a0102ee452e3ed33c24c88937f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ca-valencia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ca-valencia/firefox-114.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "a1462095f3233fbe74f9623128f3d08b769857ce11882d41c81b97c70d864982"; + sha256 = "e34b0dd6db392c10cc8623d02f714836d374f6bb34fc02261fe9759ca72cd73f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ca/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ca/firefox-114.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "10a528f99b3b42ae6c1c598101e3352d0e23509c0094163fa072490d5fae7b08"; + sha256 = "43e673552941a13c2bdaf20991f622bbe9f7dbfbffd68e82de72d8d0d9405388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/cak/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/cak/firefox-114.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "35a2a38b79e6438c5216257aa9c4d9e0bba3083988a85311e243252a7fe3c21d"; + sha256 = "cfaca9d8afd53def6defff1775070de6a3ee82f15591502d3f368b9e8d81dbab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/cs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/cs/firefox-114.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "00bec4c57f4b4b84b5158b8a1e63ec03f7c07649266a7a90e00ce22c2dba1652"; + sha256 = "b44ba87988e13698dc5715df0214da6d46187763b19cce5311b46a785bb961ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/cy/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/cy/firefox-114.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3d2461e6c147d7adaa787aae0b796cc7bb8f71c758a678eb3cfd3794a9b58ae1"; + sha256 = "4c27a1ddff887563afa68b36eb4725a43d80a9c11e92d23a560dd0b1e26097e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/da/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/da/firefox-114.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1832342c65bb017dcca582f06c01735f8139f18d6a8730f6d93cde79d2d7818d"; + sha256 = "3a354cab6247a4e73eaf6694817f3c6a3ca7f131664c44fed7b55212c240daf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/de/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/de/firefox-114.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0b4ddaad13832e4ce8cc2333b82bb6bcae2229c09c9163bcc4ac96622bc2813c"; + sha256 = "27cbd95b8264e7eb38d1e13684503a21f5de16ab162dacd1b3343bd9c1d9758c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/dsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/dsb/firefox-114.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "12034bcc0530209cd0244d3ee1f1925cc69ef57c5f669e6c6b874f7b65b1537c"; + sha256 = "d9c26c60742975070268ef975c6b788c2683eec839acddf73c6c09ada93858c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/el/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/el/firefox-114.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "980856e56b28f08d1b89cb1fa7f6a7ac7160992481cd8ec9f3e118fc00473cb7"; + sha256 = "96e6ea5a0ef53599dbdc8f3524395e5449ccab108cf902740293874bf557cb6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/en-CA/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/en-CA/firefox-114.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "76ad769640c1f7f9e3c6bc6e43d205ce13534e64e7b8431ecab803a7688ad3ee"; + sha256 = "18dc7e4186b03373e3cf3c1d2afc7305fa40697d77f41ec21248aa74726fd521"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/en-GB/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/en-GB/firefox-114.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c52effada0b38f2c567d787eb62c254f4168535f3c6d5ed56776be4c9b020d0b"; + sha256 = "ad07f4a4b4d5b6f47e2283a4d9456f80fabeafcbf1763595f8ab9dfcac1cb567"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/en-US/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/en-US/firefox-114.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f57ef25d7550bb6ddd1d4ec7d78cc6a24dec0ef6bd2a3d9a99e1ccab247e2de3"; + sha256 = "38d2c50eafb43b8015952f60f575728318d819e2173a3197d6c6ad943d0e7ce0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/eo/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/eo/firefox-114.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "70872f8616fd776cc948714e3145d4e74705f44f1d2fd5efb8bb96a02e300c86"; + sha256 = "84323cd034980757f760f9fdb333ae6b4223bf8fe5ff49ab51f39fa45255c807"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-AR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/es-AR/firefox-114.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e92401a0e98351587f5eda1be77049f545722e59e8ff8bf3e845892c2fc95668"; + sha256 = "ec1c6a34cd77982122ed1c7354b9115156abc4ab52df95c03adff02c10545087"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-CL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/es-CL/firefox-114.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "9393b49f5aabd3c51e6de3a028af556e823e020739a73085cff253c5cb97dcc0"; + sha256 = "30c731872081d47b9bcb81cb654ce156fcadb8dd201f9208c8bc29672bd69d38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-ES/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/es-ES/firefox-114.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a2c5f9bf3e8bdfa903affd12f06ec303135065e220c2df1b886a12d245efd1fb"; + sha256 = "2924c33a10a7a7f377507b5c22f0ee648cd1f22b8c6054c0b761f0304528d30a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-MX/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/es-MX/firefox-114.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a957cffa6b81159e01d08c62d4f6971efa73f5880b44dc628fde95eb2329836c"; + sha256 = "0d2347ed8aae4ddbc3887b522afc831bcb072ec387a0be57f07d0c9ab5315d95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/et/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/et/firefox-114.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4349983d056402209e5d1095fcf0d3fe71430d5d843c2f50f1d8d95fb5ad5da2"; + sha256 = "d4c2ce29293428fd449f6de46214193acca5add07a748a85e438000fba98ca6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/eu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/eu/firefox-114.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3c8cc5fb4001c9db5847be7dc130d3ad9e53627203e795d2d71d8711090814e4"; + sha256 = "20cd0cd90c2f2273af7478041adab7b487109bf58883cb0da6da3798e962388a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fa/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/fa/firefox-114.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b44aa38f0e4d844448358ed627cb3f37cd77850a0585ae4016b536750faeb51e"; + sha256 = "84503ccd9ba781eb87a4744dc87cec3e64f086dd753b4d9d684fe0b38fc4f1ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ff/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ff/firefox-114.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "310a8adedffdd761eda3724ccef02b9716653eff2fb9d57a19156adbf540e261"; + sha256 = "7b66e9e0332b8ecec56f402e8a9397670b072bc595c9bff5dd9146096121027f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/fi/firefox-114.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cb3fd7e92cab2f67d6761d683cd8e251f2c458290481f33b5cd315391f30306d"; + sha256 = "8253b263671dafbf6f1fac0bf8a6999c30b9c6c296389b6adfe1d9ff34d1ff38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/fr/firefox-114.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d18a2992446ed7ccae3303c457ced3fe876421ae87186a3284641fe7658162c7"; + sha256 = "e1f1a58b26994c240df11986e4fb06c01ec80e1e7720811a25c4130bf36a0921"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/fur/firefox-114.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "73c698e3d6ee95e676ce969082c14ee0a3e436f6bfe22c64a63738594c7cd028"; + sha256 = "5cc1cfef2a75bff92f25b589ae7db9405210d4ac36357a2e9a451f11026a9548"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fy-NL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/fy-NL/firefox-114.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "97443e9f9cf8b1f539ecbb58aac85936e6a1da8919c8fc104233c52d6f12d67a"; + sha256 = "9a15cd723e0830ff2c29c8ce0f34116655940072e623790a5ad1713b460f679e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ga-IE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ga-IE/firefox-114.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "fb228d6195bd85187d9826a2e281b38ee0a43f2f7858be5db602113e088f7c51"; + sha256 = "6043e3ee596be5a9c5c8c9ba5fc1d3efb08b9a4e2f77723267cb9a309d1d7a5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gd/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/gd/firefox-114.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fe0e79062595250570a6854ad351b0d56126bda4e8a16fa1ad91f8a9c43f5bf1"; + sha256 = "78012bcc5e8d9dd456000114ad9955013f4a61adb3ef1a9fd2dc7e8714cc5f3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/gl/firefox-114.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8e118ca4f8e50053ebf9e3ee634d841a78e94030fe6a2951e93a23b2a90a8a30"; + sha256 = "92e7f73977858ba34122fbc035f65c667ab1eb493af3b3fbb9aecef6ff48ac0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/gn/firefox-114.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "d3f55dbb4285c18b465ff016e0127a6f4ecdb42da1ca526da642d3625a423995"; + sha256 = "df94ca4d30a2487e70056faacb576604aa9d02901b09595c87fa0923bb4bdfd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gu-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/gu-IN/firefox-114.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "7a0ef37a288cc99c6351ca6774000b70479c64b5d1c00aacaf5745f37e53c0a2"; + sha256 = "e502531c2a05231c195859642c5c3395d9f4906f83e6bdfe90ae55b1c598d4e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/he/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/he/firefox-114.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "354b2aaa46600b21c4d45bd7144f8e41945a9463d2598c953675bbb32c91012f"; + sha256 = "79e92599530747fb88916483491d84aff7971d7f6397603f1a3bb931db46a0ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hi-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/hi-IN/firefox-114.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "39b3f402f736cd0b578f5ceb4b968057f7815e858b7d0b739a58a6627131744b"; + sha256 = "266496963ec235cbb30c7e107633b62fd3f859fdb8eb485775c7b0f934ba3122"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/hr/firefox-114.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d8f8cd5cf572df2364535896b012511c55684c00409b65b5da39847d9c9c5fff"; + sha256 = "51fb690e1ed643c66c4c4e8647137067739fd0a09ecfdf82a60ab2dc967ef1b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/hsb/firefox-114.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "51e849e33bceff938114478a5d30e0134f86ddd1784d0d1ee4c0dd002e6dd43b"; + sha256 = "43da40bffab38dd2ce002ee92d98a89da13a2f59343d24ee270b091d44d4bd27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/hu/firefox-114.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1cba3499b00bf791f1f73347dd0eb8fdd75590c845baaa4fc6caecebedc4882c"; + sha256 = "9cb0f8fade3194ea52fed15db252ea26ac74e64373ad0a731614fd5f2c3b5f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hy-AM/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/hy-AM/firefox-114.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5add82d7bf3bf6ef3696a8b2f7abd56602c6e8b449be8b7efa0a5153c3a8f048"; + sha256 = "0dff1d64ba15758c4e897639efc047c514fccb6051041249947f22cc2d62c422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ia/firefox-114.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b53a0de21211a8c18972e222e99bce6f9e898e5003e5af4e2ac41b633a321bee"; + sha256 = "aef3bdcae5400f23d808c8998bdaa79ee4619f9410a747b40215047a34c65645"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/id/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/id/firefox-114.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5ad92f37e7e9971ae19e826af3f29431e8bf26faa9fc4f09b73a9f2196c015d1"; + sha256 = "99fff29123903c67ad2cc35891b88a3aede904fa10d4450da5178f0640db29db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/is/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/is/firefox-114.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "06142c86c4f94fa27ecd1253253ad3ac0c2c80b38d12d0a8b22910e4025839f7"; + sha256 = "a174fbc07a4010e710dcbfb85975436b50af8d6205fbcae84d8657025a30631d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/it/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/it/firefox-114.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "934d8bc7af80275908ded3b36379985215f2263acfe3409c9a48cadcadbbe152"; + sha256 = "53d92c86ca1296e1b8dec3d358b0d49b1fc26c35593b3d9b2699f538d2ef3700"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ja/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ja/firefox-114.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "60e9ff96c14b1066c2cf021cecec46d673e6b8229aace87e4aa7c87acf3dc4df"; + sha256 = "5581f0775191c47b8bab82f22342867639bbd595868c1d9f6480f2a963e8af27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ka/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ka/firefox-114.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e339149dde7cbd6507cfcaff5b7bc5270a3e95d62d6d7b35a6f95f5ac7898035"; + sha256 = "ae578f34193b6b48b2e33a8e7bded315d662ced6d1117d7bbeaf77d95ceb81b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/kab/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/kab/firefox-114.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "6c2a11cd09f11b5c54f2b130ff21a37cc9464f8f19b7679da66e870305c67277"; + sha256 = "5f84b4bdd178c0745c465522c5db6c2e19245810d23632b14b4e1da65fb780f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/kk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/kk/firefox-114.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8a0f921987a54606d4e812533e678bd15d3d8e36832494555976f8cdeacfd51d"; + sha256 = "2c4a19360af71cd0c612a638473945bcf8b2e830f677ceb7994fa9be96283f77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/km/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/km/firefox-114.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "399d02fc79d01f2d1677d4b5d3d3b10f79abab3c8935379b4c54d8c9a6b16366"; + sha256 = "4ef2824daa4e92c8adddfd2460b6141fdcf494bd470ddadef3e23af8396865da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/kn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/kn/firefox-114.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "eedb85a910e952461c8d349b5b2db4130e6821055ad70e1ff723d684c8dc964b"; + sha256 = "fa2020d06ee162c67316c653ba27e47935fb714ff47a933e91591a41dc8281cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ko/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ko/firefox-114.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "0dee36458326a2d5fb3f1764c92c1e3bccea1a47f2479ffcf769c97348a13783"; + sha256 = "f1973f4332e0dc5d5ec0845079b71b812f4237edc1bacbdecd52bf5c53d51bba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/lij/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/lij/firefox-114.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4ad41499b6bd174f5849f0699792025ac7e37807d0d43ecf92584fed629976c0"; + sha256 = "a7e2b2a5132333ef3d34b3d7d8e8fbdf0fca4dac1c577a675accd59fd31a0564"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/lt/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/lt/firefox-114.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "43a64dff5e47c6ba2ed0c51a84b82c309b05259c0ef2dc60a25df307bdb709dd"; + sha256 = "f2f831fd7426809afa4a0d7e6b484a8b38e258dcdd345d4c9f5a6c798a871287"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/lv/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/lv/firefox-114.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "6a92121065b9fb881df3ee25d93eeb201a71953770798fcaa1d623dd02fe11d2"; + sha256 = "964cca98f747ab191d19b3db8a91c62c56dc596fab77a418d4138fdd3444528e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/mk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/mk/firefox-114.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "57e373e76afe342a5bb47edd807d86858e9806f248a28a8bcc34c3679dd4b285"; + sha256 = "a1d94cc9aa8f359c94b77cb0c563e4fa2dd90bd8732d1e8af9caef040f9d0398"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/mr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/mr/firefox-114.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b1255c47970d3e32e14d000f185c0f18fcfc3bf1df6a7b5986bb751029bb736c"; + sha256 = "6da031ff376bf4cfde973617914575a1ad4ddc67fbcec024249d46809c623ba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ms/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ms/firefox-114.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "55f2d076fbddfa7fa6a40570f3588b9d1fcbb980af744f3cb7d87d23e7712943"; + sha256 = "3afec89bad7eedd5e39e72ff43fba71715444155199f1fc8dcfbe47ca098c334"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/my/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/my/firefox-114.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "e1645e880f7c99d12b03d3e647f974401a365b508d3c878309a773de17530b9f"; + sha256 = "6375f7216eb198bceae18912ce4ed3dda7b244fbb92829e179700b0b5aa122e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/nb-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/nb-NO/firefox-114.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f379ab26d7ea277827adbd41a5d0ec9b2f965013ac82df769425affb0147695b"; + sha256 = "43808937956cd402ee59d124c71772173d27df08c06c3a218196c6a7291ef7d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ne-NP/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ne-NP/firefox-114.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "43719374f08eba452873ec55376e9deb427ba68d9753977fd302224db9111d6e"; + sha256 = "6733875bf4ab7ee5ae4c3735c9b5378705c068a769d3ba267b837bdf65a7bb8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/nl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/nl/firefox-114.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "34b10175db5f3d5a4d0da5686a6a26599966fae5a81f23b8cdd47bd2354fede9"; + sha256 = "03b8d0b4eda37df52570015d55ff308609998e87f7efa69f4a9fc3a2e8b254b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/nn-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/nn-NO/firefox-114.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "9042f22ba6abe771af8cf9d036e0afc6e00f0b3a5342f027d5fefd7790f9d9ee"; + sha256 = "7455933aee7fb1275c1a643b1e792eb8ded2ca743b51458a173b3ef2283a2f6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/oc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/oc/firefox-114.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "04c76b40e3da68cff3954c5cabb4b03cf806c9b2d7915da712a5208414884aba"; + sha256 = "2fd68549cc25eac2e4140432cef58ef378300b0ec925160d4c8eb2a6c1f0e361"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pa-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/pa-IN/firefox-114.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ce79da9f8f41e1d3d7d9fcf5ea1253ffab4df4ee71e6f9f16fb87e915d6c4e46"; + sha256 = "0c1591a4a07b70d10aa8da11c4e789c368317d91c2fdabccd86aa70000b8149c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/pl/firefox-114.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f37d598ab4079c40de92d59bfacc591c3e870ec1d9b8f0fee202daf953535b56"; + sha256 = "c0ae671360652714ea152c60bc529ddfc4d5e2c1cd1faae802cbb57d90ada086"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pt-BR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/pt-BR/firefox-114.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1e77c01ccd08e5a558a9e83a2b4a1852ba9324248095e9125bae5b0eda3b5e42"; + sha256 = "5a7fc0b4501a4eac09f8d21ce6f7c669c8eb7d2dd27e09fd89f47c09a74197ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pt-PT/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/pt-PT/firefox-114.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2a7a99a0f585e6ffc416c387be6b615d4aa3d59e3fbcc6c07377450eb7d107c3"; + sha256 = "504bf75a19c4ebd32c0b3f564ad1afba1fadc4c0733ae7cb61edf33ee6d70714"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/rm/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/rm/firefox-114.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7bd997ec2fd111d8d9d0ed8cb7dcb6c147294bc131515c8efedf51d99847c6fc"; + sha256 = "0a533a2a24f786f9687cad7456594cc609c02a29bc166600050975f2f23cf534"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ro/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ro/firefox-114.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "58aeca4359472ef7f454574ecad596a132668419ce3dac5a516fe15e95bd532f"; + sha256 = "cb4550344e894a96d87e14c27d166dd7efbec2ea6b1a92f3ffb053663c80e509"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ru/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ru/firefox-114.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a380f042917ceb4232b2cb00b2fe41b3562de1855ca9da12169c26c93110cc0d"; + sha256 = "09d9096bccca241c655faaf0004dcca2a71f0646f9163aa622e69513ef37e40a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/sc/firefox-114.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "e51c6c02ff7932a43c9a2176a9dca79acdc392fc459aa652cb3cafe4fff8f81d"; + sha256 = "b96dc922310fc0aa4c119ba120eb96098e6077616c53d947da07bfc062e62fc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sco/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/sco/firefox-114.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0e4503874f17bf4e28f4ce0067f1c57b47ffb08dbd51a1174ea5123784b2ee1f"; + sha256 = "ad3abdbbc464519480e247d0a4d83430a1580f1dc7247aef28300f0e163dc7de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/si/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/si/firefox-114.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3620a56e36619a9d13f1e5718a54544e2461ed3cd57194c5bdb3e82f35d5c7da"; + sha256 = "da1ed626fc2457f61a11f9a945682ca352b0a710d4e5cf6b411e3031d616c669"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/sk/firefox-114.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "04be99c1479505ae1020ead421627e0c54a9b630364a06ddce31ac9497431a0b"; + sha256 = "f72349b7005caa75d6eaac975a914a83465a6b42a9c8dcfb4bbf5757851d6d6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/sl/firefox-114.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "95163e0fad6886d506d2dc8305ee6e49e0feaeb81b670c699088a7930967d05a"; + sha256 = "f9ff9ad8a5128e185cc3f758b6fa3694b2eee20a0789f84c7f0107499c255d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/son/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/son/firefox-114.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3b59887d89a629fac44ba9b3f9ae2b008c4a72a1c3009f8805c69a3aeab61ac6"; + sha256 = "891a599e2fdaacb5105de8836714a562ee0369c798f2ee948881add98cb700f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sq/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/sq/firefox-114.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e3e3e7ad4e93c85b74906785345724ca12d6c672d8c8f86455aedbd409184a62"; + sha256 = "0993d3b714774272dc072c7a009ca025f2fdd6809177f0fd11b101221f35e9f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/sr/firefox-114.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "fb7a034eab40cbb2bf0fc0be44516ace2d7a0f420cf0e45de41ca73493d399bf"; + sha256 = "58c2c48cba051b709722960e634941869813e771fbc87102efb8854fe4996ea7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sv-SE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/sv-SE/firefox-114.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5ce8bd9e7d949807bf1c79a2cae9e00f67db0889de45a21c600a7e9d9efeeb17"; + sha256 = "bc00dcc68f9b6bd6b6cfa2658a1bc67d151ec20aa36b0f57e29c0b77b6c3c8ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/szl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/szl/firefox-114.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "81aa017303c68a6a8edbab76cebec09eabcc1679f1952b558ad82aedd660bc2e"; + sha256 = "fb43685ce5eae0692beae05f906ff314dc7699aed62d13982fcdbfbc02288710"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ta/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ta/firefox-114.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "e635b00c4157143d4fcaff07fd1a60b441e43d3cd5cf5bf7bf12162ff8a32a8c"; + sha256 = "5b551f1cd174c0e3e5a93c65d643e5940c9cf547caf80635b9acdfcf48efe3bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/te/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/te/firefox-114.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1a5a50682f7c9c6f8b950a163f148121148770afe12fcc74e4583fbe669837bf"; + sha256 = "d8202fd27e553eb132be6658fbbfcd0df19059831c68a9c266f5ff1245d823af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/tg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/tg/firefox-114.0b6.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "7c556522cc2dd4c86dc2fb5909f38074126cf0ecf6f930ff87089880cd6c6986"; + sha256 = "938a69a1402639057966d3f6b5df31e678fe1f20e2f0e15faf5c02eeb870512b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/th/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/th/firefox-114.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4955552817314dca3fe585fcc29b509aaf995ab6183e34919ddf9722edd355c8"; + sha256 = "06dc5b4612d097ed22ffd58ca264fbf19f3be88096796a8e871b4b9738c8544d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/tl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/tl/firefox-114.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3efa59f44ac3945d85d1ab7f26c22a9bff57ad136e49d42c0a0fabf30a74c74a"; + sha256 = "858451aa7c86836848becc2fd17ac6da82a11b9a46219b6e3b74db8d15fa14f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/tr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/tr/firefox-114.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a9b839e2d0d561c6899255dac676308af02d8b978157036299b3b1855704fc5b"; + sha256 = "ab15d16c8ccd4251d17713da727aa2a6651b0624bc67b29da32c2a8070823a09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/trs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/trs/firefox-114.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f5cefd3ac5ede0c14cce148f540992c8b86fc31452fd392cace3d0fe3af9d08e"; + sha256 = "14422a3225c0f82f0922f7fc5ad762ed0ab8b94a1c28e69d4dc4c96b1c63f21a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/uk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/uk/firefox-114.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6f7fcc4592ece31b7dbf1151b3ce285446fe2425e8dcada50a869a8e17b4a6d3"; + sha256 = "07bee7374c347492c74ce3f0c19988976749e5e7980fc2297f83d5363d51b391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/ur/firefox-114.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "c36495d94c374798a85664952e44d4fc45eedd5eaa890c035b77c0bd5bde9e81"; + sha256 = "9a0bf143398f0750ad0c9e09f7d33e1319b2e0207d1e601290c2217f8691159f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/uz/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/uz/firefox-114.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "49143062e7989db0e4e2c09d3f9e38947824d7df4eaa2165c34a0fe0e877ae19"; + sha256 = "33b53d0b39ad4576d0076f6742e7c8a91a8b1ceba172b375d432fc84edfeee8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/vi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/vi/firefox-114.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "81003d8b9f48952bed992513db3fb01a6cd65ffce19020586206d1a01b10a910"; + sha256 = "06508a3868194198ad3aff152ada787348227b670bcc578a1a1b8d3060660508"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/xh/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/xh/firefox-114.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1cfab2f857f7b29dd02d7593cd6727e70141f3e4642a0251054b3a5771a5ad73"; + sha256 = "b46ef5cf93de36a638f5f4bfa251411fb66e1c2a383afacc77232878efb07c21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/zh-CN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/zh-CN/firefox-114.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ddcda8e792391c9bec5d394de2d1f5b9e7eb2cf94ccd4935f42dc643f3b0184c"; + sha256 = "da22e1e78e185249733b787cacc27ed64b35d4a53634118ea4d360002492a2e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/zh-TW/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-x86_64/zh-TW/firefox-114.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8f3a86d5e7f4f6f7f268408ec6d5432911a77bd724d6d9dc2fe3c1f10d36129a"; + sha256 = "776c9eb7a5fd8d7e4a948033451d3b555f9606ac6ffade3f602e8f1836e9cd41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ach/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ach/firefox-114.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f9e0022a9b2ae3510a0a991ac93f6955acfd7ebce553dff64695b03465bc429e"; + sha256 = "78c26247d6bdc336a5b06dd907dd08874cbc776d14c1d55a313cc19ea18907de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/af/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/af/firefox-114.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "86afdca6617f548711d06a6a041a2deb987ecb6366f35e64fff7d904f853be8b"; + sha256 = "9cefffe5895d0c900806cd770891e8d74edc5ba1d2de16f4378f7f567cc772df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/an/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/an/firefox-114.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2eb0f84c986a528b44a8771400c7e086602dc98a9d289ae1229ce30ceb7f6dbf"; + sha256 = "6fbb8707c5256d13afc5d74b9b6b251b3721a58e0026bb0b6ab65cdadd910944"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ar/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ar/firefox-114.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4d6e3e05d5fb14e96b4f1062eadeab126f1559c2dfe4ea84e4cd6e5bb1f66ee1"; + sha256 = "7f033310aac84b9f391c2379f4aa75b2f381db0eb220216d465758fd536db427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ast/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ast/firefox-114.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "30425c1c4ce1694db1eb7725f6ba18ad6c0142d2d1e4951605b551268ce87e3f"; + sha256 = "5b9d297707473fe9bde04dd652807f62076d9bef2e869333942364af652127c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/az/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/az/firefox-114.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ee516b2ab21415e5ac2bdd0fde54bcd870ba1511d3007671b981fadcc4826736"; + sha256 = "a26343f06e594b48ad9fa95d3339786f6805e161165a6d3bab1dcab9dfff06c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/be/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/be/firefox-114.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e3c54103e912890c94e2b3f9e4999649e97d396cc93415dd4ecb01c87aa5b4c8"; + sha256 = "a083c86626ceb1f271af96f78dfbe4f2fcc5993999ea088dc2d044d5a7b66ed7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/bg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/bg/firefox-114.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b1a11ae51a1bf386b56d2645edae98a7e541c42862d5b77fa00aba24330d27f7"; + sha256 = "da8d8077a5d73633b9ad007cca5b6540f86ec7b2d2a8be4afbbc0750c4be1609"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/bn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/bn/firefox-114.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f1cbec0320780a85f9bbbdea75b8081d020ad3517922c2098e1615c9ce5c9ecb"; + sha256 = "e95ffd90442f82de9ef8b43886a436d08ec8ecba59c0a8e751b8d6ad0b4ed60e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/br/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/br/firefox-114.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f3f9755d62364c18ac407e8d26f6cbf552faf79c3e69ea1c949aac131804e45c"; + sha256 = "35efe4756a9bd1fae76cfa045b5b9f1ee8ed7836a060196f7dbd4b87a111589a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/bs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/bs/firefox-114.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "bd7d0070959cc662d13eefc080ec30bfd65ab2fb18404de523e5a748247e719f"; + sha256 = "fea14d924ed728bb438e9a0a771dc0d34bb0855f5abf16358da46c7bbcf71451"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ca-valencia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ca-valencia/firefox-114.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "67e85a13b2a178be372665b366bbf4803640a0d4a2644fb0c6f3afb064855ac9"; + sha256 = "78629605a541c4686e2ec76da6525e59c6af8c90e4f97e99627fbc00fa5a3421"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ca/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ca/firefox-114.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "be137a856bc21089aabb32737d1d5b7e56c30efe712b82d7d5e9763db7a8e12d"; + sha256 = "691f02f9d4a4cb8506ef35fb9481c66894339cac9175dc6f4218efd8a2b825c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/cak/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/cak/firefox-114.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e2dd719f9b49aedcd9f22fb225e457e179e23ab69832e24dd47ac77ab1a50fe9"; + sha256 = "2fc464448df8484d8bf08b3da00d4740575c0e33f64c734471f9abc816f64d4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/cs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/cs/firefox-114.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "e88506b5b0292ba820f82abe9474544f34eef79dd3a31313fed6e9f4516fe415"; + sha256 = "6bdc817ee7954cd992b887a31e581ce6d880b27b3160ca533ed3dccdbceb45f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/cy/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/cy/firefox-114.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "21d5df9331cc5584fbf4aa8dc4c561c2cf5d5a9096126e6b6201aad8b29c198c"; + sha256 = "164909e78905cf38634ae1e52ed34c6549c3292d7c556eff359e5f32d22862b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/da/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/da/firefox-114.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "be01439b3fe1e1f90b5ff13e4961e8abdcaa7f3513b4a47c0a3185a73eca7dd1"; + sha256 = "8342fa358626d1e59f63768cffdd1690bff02edc9c9b2f7d4973c0abf8f3ea16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/de/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/de/firefox-114.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3284d2efbd755fb0fe308c2839c95282309aaa422261fef74769420f69c002c6"; + sha256 = "8af8a42a3a6eda9c0dbec62148e978fd8dbc32b0bf2b7d7e9cba33ce3ca67094"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/dsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/dsb/firefox-114.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ff30b4f27aedf0beffc9004854ebe9f3b7563a861c12fe7b8698ac5f370e8718"; + sha256 = "e48d123a40adc10c158a5868a647d4bf9c8bb55062e59a3f1239ae820411c411"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/el/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/el/firefox-114.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8900a98bae3882729654f291dc3d52b11f417902cadaf80c823de5dbec70047b"; + sha256 = "21d4f3082a1e51980fc2ee87e4a8ede604a55cf69a310ae46166b07e19b7b253"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/en-CA/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/en-CA/firefox-114.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c00548d6151d6071e7e23b2be32711b52da069d9325e5dee9438d770fd19a544"; + sha256 = "c963281efc1528cf211eb1807f20005f5ca5e53da877d113336602f0198eddf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/en-GB/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/en-GB/firefox-114.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d8ff0068f8a3be4cab1cb78c85380099a1fb8569638725257d73de39c016beda"; + sha256 = "a61a6435d523eb220fa3963366a1744cee831a9a9586b6e529a06b7e6ee0bb4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/en-US/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/en-US/firefox-114.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5a311340339bd32f09d79294b2c862a9214ee3468a23f6a1533fbaa6889b3d80"; + sha256 = "37ec3595adb4368d7ed110533943dfbb1a0b82257cf04f2eba69a7a5e9a6ba6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/eo/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/eo/firefox-114.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "b4737a8eb6b3307e2cfbca4878936471cf754d5f074f5da689e5c7b84f140cb3"; + sha256 = "5d04a0116d1cfa895188d2b5ce294e29ad00db94cb9f6feaa62ad353606df5f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-AR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/es-AR/firefox-114.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e77f0b8f1c3816bffb64ab938a889900928e7891a9f991c8457b6e49336c76e3"; + sha256 = "24a5b64cfff08e6ab144e50dd00f31ecacbb28b14872078c29c19109ca2d3ad7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-CL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/es-CL/firefox-114.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "db458087b28a5f37e0ea9b253f2d26171d5804564dc322567487ec0db5a174fe"; + sha256 = "343bd8b72ea033a76c14ed7f84d3ce7e3b6123e160b8112f29d7be5eec0b5481"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-ES/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/es-ES/firefox-114.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "7a38fec5f08c732a1bbb70e849022a5ab2f41c9d094a4dba1eaac62c684737de"; + sha256 = "cabc3b05686e983ed0a784e7ad0e959ec18abb20bf3f7f364d23984f33c82568"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-MX/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/es-MX/firefox-114.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a7cc55ec8ceca76a64fcfadbae26e0d157826b93d9e362f8d7b34a238697c968"; + sha256 = "c1ec675f335cb2f2f1d171140af0a6cfb10df4285f533fb257ba1b3a99d5c288"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/et/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/et/firefox-114.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "aa8dddcba415d0bede1f329fb5a7a386c9240636a40a9ec10f4628c633a8e004"; + sha256 = "153fa0b9a39d67b3bc2439691db8d3112a2df2bbe7236ff24fabf6c82fc8c6a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/eu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/eu/firefox-114.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "217d65b47df73f798d4d7298a32e6383b3919db6f9ae4ca819950f52e584696a"; + sha256 = "cc0f3b39f9e725a2a041d648d477fce3afbea652c0a2a6906c7252f937a8c5fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fa/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/fa/firefox-114.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0a82acfae52d093f7c935cd6d256b641cc094c6a96d4c0d322972889c9f12178"; + sha256 = "00554f17cca9cb29b4def2efc918f23d23aa8becf958a3df412dc90113f61b1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ff/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ff/firefox-114.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "de6a5bb3ef1f43d1ca6cb2b6214109b079120a6b6c14435724de6004417ff186"; + sha256 = "a1cc20cfe6967da22fa43335710086a3319922e2d35f42152307d18080cdfb93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/fi/firefox-114.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5e12bd89e597cc74b20a0910a4dd60ae19a439b165d0bb6b3fdea2ee6fe5b41d"; + sha256 = "42a646caa869924351dda9aecac5095d7a809f36e59854794c4c78dabddf043d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/fr/firefox-114.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ce0bb4095fe83804be858770d56a74b264d6cc8aca24c49a60c95b1f7cc62cfa"; + sha256 = "1fcd35b571a75cf6550ff6fc0f47de598fea32bea1e2f55ddc4b3f1531f5661e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/fur/firefox-114.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "34a0fa3fc4f96a8b9bb27f4422c631761023d626ec1920c5ef07c5d408b3fd1c"; + sha256 = "44e203226deeb531860ad806a930cbfc6fcbab97dcf3d6a2d59ebda3aed0f17f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fy-NL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/fy-NL/firefox-114.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4ec58211f6b244dd13be7f68909e8d1d178d56c73c04c8fdb5a6c246ddf9066a"; + sha256 = "928edd9c1af12d90fb1da9a5e5deee0ead4a72e6e720e768b933d659e27301a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ga-IE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ga-IE/firefox-114.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "631ad527a31cba22ca0d0be6ef4fdcc96b446fdf591dda8f75af3c40be600796"; + sha256 = "f78970e1d433c60d3f93cbe2f18f3670aea82ff291fbeba5e906c6f4052c6da0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gd/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/gd/firefox-114.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1bdb7b1879a07800d87449b75cd7ab747ad1687923918781db8ade0b575a4faa"; + sha256 = "8bca035719aeb90c7b3da0d3fb7d51e0b2316b39e54ade61533c779b43fee4c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/gl/firefox-114.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7ce4889145a1f8866d6aee136e7d09c5ac9971048473b7d35ddaf0c237cb28fe"; + sha256 = "096125a084981ea64337c50df8aabc65a98925c0fd72f09f0671a4626eabcd7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/gn/firefox-114.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d0e25dfe444962eff604b36a47e3cc9f56c939deed02b4482a47b722f39753b0"; + sha256 = "83840aa40c16742640748a9a3f389db86dd9c22977efe47a88b749ca97972c2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gu-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/gu-IN/firefox-114.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "e6094adc81217c79b84bbc23364f2ac409485c7d2021e1996b5d23356eec779f"; + sha256 = "c1aac40f37294ae129864dae1be6c9006e9a6e747bd3b72e178589a068ad814a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/he/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/he/firefox-114.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "98f6b432610e8dbcbeabbff7610dc6e6076842bea56bbb1ad5d9ce112be5c40f"; + sha256 = "3769b8b4e76e68a8119ae3dad2db6bba17ff9331171b43c14bcbed0b0c635da2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hi-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/hi-IN/firefox-114.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2107b4e3418f312f5dd09d1b8a6179221bbcaf5f701ef839f3127b776d70c07f"; + sha256 = "4aea4a3ffee01e1a57b2d8dcc90db9e6820c5e11c7523460ced667daec85902b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/hr/firefox-114.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f4bc64fb075591e3e075b372389d025e2ea7ca1af160afc2e46bdc4b09ff0fa4"; + sha256 = "12e696254e178655272bbc1448f0d581fde732fb0fba268a2b4db54f6e337363"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/hsb/firefox-114.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "3f7c00cfe1b323ff8381bdca377b1b3f0ac0c8aeb6c177e385e4f44eca96e018"; + sha256 = "0085fdf93c4f4aab647dbe808e9febd6be304341e01316bc026e14362ef8d887"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/hu/firefox-114.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d1f1f4c6083410cc217fc3e548a3c40dfc2fc115bc1ea494b0a5949a9e78b95b"; + sha256 = "37cbd335ba2ef06227a53bdd788b760c3392c18e2e032ffe0b372a20ae9c9b07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hy-AM/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/hy-AM/firefox-114.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "c647bc2eb770777ee4e07afda88359dcb8a3cf1d38e1b6d1e46c37975cc45c87"; + sha256 = "9bb77b17d644f287eaff9a3f3da72e7a56a9a186525afbe757c4bbcf44bbb1ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ia/firefox-114.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "1ac9ff84723602905a5ebe187c14123fd39abce581d65f3c0e8d968b7b4ae393"; + sha256 = "5e251227588852e4f3b0e6c7c35adfd69bcf3369499e4d20e1fcde41ab973a83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/id/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/id/firefox-114.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "46334a2415d8086e24346e5771aa8dd368cf76dacd1ed9b9aa920b74da261d1e"; + sha256 = "9ba5b241046f0e8650d210eacca41b8fbd578f1341ad1a391bc9f30df04c3c4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/is/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/is/firefox-114.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "17b5e2e6478a75b071dc56b662391d6a24ff514680794274733e94d8e6810575"; + sha256 = "a92858333ce6795201277e50dc64052186d49deb0558086ffde5fe5017c23a43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/it/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/it/firefox-114.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8707063a11c5ac39411fcd329c1a9668192d3b48828980c00e3580a0a0346e50"; + sha256 = "c4e47ea170b667e94f33a468c1f99369faaedebcd66c6ca71884344901e97594"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ja/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ja/firefox-114.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0baddc68befe585499ae4259ba34f07d43b46e3d07635619a08376b329f0d6d8"; + sha256 = "a461ff4c0f729b9108f89789ec363bce8e1807bdd386b779bb45b814860cfaac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ka/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ka/firefox-114.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "39e59405284faed2300122a8e92511f236c686f05ddbc6b45b40d8f7fe5fd1c4"; + sha256 = "646901e1bcb947142f03800e52b18657d92a3ba0ba07419a795328007b2a74e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/kab/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/kab/firefox-114.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cebd5ee8dbd6ae616b58557e23e2eb5e813b05c9c149b75b36c325a8850605bd"; + sha256 = "be5bf1c9f78ea040b1594697af65b09f73d12e57ee9980a6a753500bd78430a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/kk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/kk/firefox-114.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c0619d389877fbfacd26598670d6c032b91cba51646fe76f6946c7fc2577a9c4"; + sha256 = "a1ee62b4f2cef6c90c539dec1be9aa1523ba5adcf1170dc4edc2abbb05039276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/km/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/km/firefox-114.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4341a700a433ab5890b45b9ebd89f001f8e8f6cfc803172855ee0b058cc028bc"; + sha256 = "cf46bea354837cb49cb82fba9420684411ad8be8fd2bca249a919f21d5868691"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/kn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/kn/firefox-114.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c1be3cbafad95411d4516e9ddefb8740ffd10851c3b3f121f9fd61f17c388131"; + sha256 = "3890657b16851d224911ac83c7f7922119c888bae5cc7d042dc8b32e5a4a80df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ko/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ko/firefox-114.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4942dff263b2ed717f17908a92631504087feb15fe490a13e43dc03392220eb5"; + sha256 = "75b049be863c099db45ca4beb6b72f3c3f268b294b9eeec02eb601c92ad53827"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/lij/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/lij/firefox-114.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "9c107846073b08a01d4e19f6574b74c99621ce2f4aa4043b5953b345780e4ad5"; + sha256 = "51bb4324cb4d6e82cfe82c0f610b69336db1e6bcd227bc05252c8d80e00c635f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/lt/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/lt/firefox-114.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a9bff97829a95030c400a1d8514a897f74aa63b96dd7051f3fb2eb3c895359eb"; + sha256 = "70d33b382c7e07d0836060bb69127a8f4d1e3aa7c72483a9629242459f675262"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/lv/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/lv/firefox-114.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5770ddbb810b333b3b5ded1854ff6376b502f649d57e64dc048b70b99fdbe3ec"; + sha256 = "e87d67dca28fe8e13f5b3e7f8b1d50b2bc4da57ebc76fc0d34e4041f6b423ab3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/mk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/mk/firefox-114.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "eaf55390ed8822a843a8c97ef8e547ce53eac54cd7fdb9e78f053bc19f85baef"; + sha256 = "57f6620d4de4865428bc8a6ba6a0fa3bba3f3f80ed54d793b744b0f8323a33f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/mr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/mr/firefox-114.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "f5e8d195249bb42a2682094605a5b7b66a46bd61ae4ed67d9df90ac585a79b35"; + sha256 = "22e5bdbb13917434fff3a4056e944b1e609365bce4e22dfe50085de2ec532e59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ms/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ms/firefox-114.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4479fd63269baef0ba699b84a9b013d4f031e1e5aaa704a11ef7557ab3415912"; + sha256 = "bf03d8f781decd928bcb016dda617a71fe51620691d72a8887449ab03a1890c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/my/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/my/firefox-114.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ae3b67a285edca870119241473efebf988b81878604b8058eb5a73736498ccb8"; + sha256 = "1f55b13ab6d333a7423e507cabc502336bc1f1694bebb4539c65e3df4f440b93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/nb-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/nb-NO/firefox-114.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2283581a00763630f7bd40a4577a5a56e07cabf97d4a5e3606d36c27688f0ea1"; + sha256 = "e29f6b45f6707092203269a53dc7719fe273fd7f49e88f041127cb9463a221a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ne-NP/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ne-NP/firefox-114.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "2b3b89118cfbecd733014097df6020a80c74b58150b4ea4a1c7d2ef9b4aa155c"; + sha256 = "61e814293742caf0bc4b4fdf7d9f8e393750a52d59179ebc17094377f95dd86d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/nl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/nl/firefox-114.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e61a1968d98f46f4f0c281988e74f2c5fe0eab540cf2ea71b962edb361ed6350"; + sha256 = "03db1cdb30867aae1f347b7093d88b34dcc2d8092ef4369b56d669d27a5c1e15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/nn-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/nn-NO/firefox-114.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a978a22d160132a85ef37841b5ef1cc6c80718955b3e5c48a915b2359004e916"; + sha256 = "59d8719cd7fd064b674964d8a3a67a30ab5996a4cbc3356c8e49e435506c2274"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/oc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/oc/firefox-114.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "04a8ac538bd4098787220f03ca5395e0dcf423c133454ed7749067233142bcc8"; + sha256 = "7473b1261138e1f7ffa73a1100caf969e38a618df8eb559bcc2a3839ea15312a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pa-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/pa-IN/firefox-114.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "73a40acaecaa68eb26bbe44208bb484af4b67e330636015c776984d76b343ca6"; + sha256 = "52191c4ba5d5c95d54b6f60ecf81b9bef85fed62bc8571f6d46b6f88fb457f4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/pl/firefox-114.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "2b5e57e69f43d8825494ee01706d3667d48ed0a8c3bcf25ee2472e38053016fb"; + sha256 = "8e0090103c03ebd117231a03b2b5be7019ab71d69663572b0161134e5542984d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pt-BR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/pt-BR/firefox-114.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3696d7871e564e6b2c59ce8e915617b9025162c836f9e6d5b2a885a3478cc79c"; + sha256 = "bd59536fb6dc09a747264bb7b7a323822a7062e514791e4b58a0347acc8a3db6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pt-PT/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/pt-PT/firefox-114.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e7ee84ad6408322cd470328b3b1bf961337b881080640fcf7ed3bca8ad9de0ea"; + sha256 = "ee8897148001eea6f941f91e58b7a44043bfa3eb22fdad9f8bd1276e1304c489"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/rm/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/rm/firefox-114.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fe7d553569681797f10a335a2d67ed94e82ff50823d9619937286e2e44b567f9"; + sha256 = "667a9b77c531283a4966bf1957b6b28d83839beb5e96cb1e9a2c768c764d312e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ro/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ro/firefox-114.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "50a46f459e482ba86d2b72e2373a5ca8a2865cd1b7f0b5980136fb3423ee497f"; + sha256 = "55cfe6b54a7e631145828f84f67a99d4e7c38b77b17fb17a8257fedf76f87703"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ru/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ru/firefox-114.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "31977766a98e481529db4e0bb128fa60ede8be5b06663618e2ec3e4299a5fb55"; + sha256 = "96ffdacbe4676f90c944a7f1125ff89bb625d8990ff5b3f9c31ec1fdfa7eed8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/sc/firefox-114.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "30a768e77431bcd6c2fec5d5a16c410f2010f00d2b04d2c94db2feb4a1633396"; + sha256 = "7742b6fe328e3802777667d663265d559bf30962573d5af1bf61717494689f8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sco/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/sco/firefox-114.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "0c2e876b3f617fcaf3cb94465906756e554ffcb62cab625a8fcf97288c2051f2"; + sha256 = "bef3e5dd623cf989d6a2d26f54ae6722270b56aa0d9c6b1d45e3febc11c79acc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/si/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/si/firefox-114.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "e4d79bda02cb18c61f12e998fa40f538b032f2f402a892d5b533790ce3a124b4"; + sha256 = "0e2cc4df235e4f94e965bb2c770ceb50454a3c923606d26c8e443697556eb959"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/sk/firefox-114.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b4363288ac3deb13d4c4e4894ba36f13bad1908997d749d8520b827e9312d1a7"; + sha256 = "8d6bc792f456f014ea05896e56ce95bd1f30881f0e65ded7efe6a20179525cf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/sl/firefox-114.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "22e5c04f8d413d49e9f197a84355a3d11811b3200c3255509bd524274bb81f45"; + sha256 = "d5df71b405aa1cfa73f48e1471c7bbff84c6d65d7301d92145238ba1ff0b6d7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/son/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/son/firefox-114.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "b5ced74c0fd3673fe61a9092ba2371786daf270cf51a06e6c15c3fa393652f4d"; + sha256 = "311f903eb49e7e31800907a661110d8131633b50ececc6fe89fb5f80f2c669cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sq/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/sq/firefox-114.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ec64341c7a3924d9eea619e04e5c174c6284cdcc22f109d30b74876cbca85494"; + sha256 = "4484ad5a1439c02aeec306f92f4964e3736b52f52e8245eae2e91bebdec39d8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/sr/firefox-114.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "be2f248866ab9b5618d31b993246e5733c8165339777f308d035e9b61e0d2ff4"; + sha256 = "1e8912ecc3e25f06e6b54c7778d063da19f09046d5875b826d80d020b88592cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sv-SE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/sv-SE/firefox-114.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "09f94a1715d17bd9aca19131ec1da0ad50f47ef8a2915a27b370551ad9ac5ba2"; + sha256 = "221b4b69843ab556938b572e0fe3e90adbb375b1da0a5fe076850e13196f6367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/szl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/szl/firefox-114.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "4ed3db1e8c2158d71c31dd5c6b25f49be047be50cdb27e5e62da8f66b12c1620"; + sha256 = "63b53a32759eb1aa7eb28d19398b2e9b71ae9e1d992952bd6651785cffb6fec8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ta/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ta/firefox-114.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "29d64c6358b42971fe068eebc409017afa71d7b7b0d488862f87b0a8d289574b"; + sha256 = "ed9bf4d950bd879bd35f00e05f1dea49d835692233a5b1f7522c140fcb150859"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/te/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/te/firefox-114.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a970b11a4a984f307a4811d348636201c031347f2f23f15f3a4c3baab6027eda"; + sha256 = "4de9c5617d6ab19a45746ca5a367736a2332acd3e1c89deb26f9aadd23b9e790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/tg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/tg/firefox-114.0b6.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "6c070ebb7bd124698f8841410f8a96bf3af450d838948429b8bd22a1b8524490"; + sha256 = "323b5aafc64032dcf58fad4388f8555e491ad9b11f8a5a0b3a811568a07c26df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/th/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/th/firefox-114.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "12f4ec1dfbd83d6449bc9533753b33bd8fd901ab48b5ec8e7f00243446ad08d8"; + sha256 = "708057be5d03a743f368a3b67cc1b0abd6cb55df994ef0ef5c41f1bfb9f9fbe1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/tl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/tl/firefox-114.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "58504f21137afba998250f2970e9486b3badcb201726a55c1db81b065f21acd4"; + sha256 = "4de594ab8d152f9eef1270a47285747354f36d253d7476b97783c1589fe7ef9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/tr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/tr/firefox-114.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a597ab2ca3f2e04e6cdee195ee9c3e1ab4346182f8d11f707fe35b6e6cfd8c75"; + sha256 = "41d23564918241862696cd993ceaa70ce8c44a2cb8ec3fa031657db9e068cc79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/trs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/trs/firefox-114.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "28bad7892055b2ac4b0e6536cce6f580d46ecee7a23f3555c9674d7a06e0faca"; + sha256 = "c6126cf01bd6cbd8b4b1c7ed06681e7272298dff0dfa4a172e0142d50b90e12f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/uk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/uk/firefox-114.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "30b8565e6b9c0a84c353557b4990ddc0fb6ef7c5ebcca389352d895cbb48c9d4"; + sha256 = "da96e4022f45e81845a357ceab43d102b6626365ef4b14f53d65d08f623f066c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/ur/firefox-114.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f46b58f0879e0b2e560f37185572a8f1e73ded9c989cff14a29fe19b3be3108c"; + sha256 = "a3002eadd9f00fd56aad02c6f79349bc8b4c6e19c2833d63160b766da3a4b716"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/uz/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/uz/firefox-114.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1b7925198bcde9df5cd473d142120c0aca49121b9567c24478c5f3b42f568500"; + sha256 = "0f87132d1d326e4e6b6373340d9e9a7226da7ed0a13db6093022dc00f02a9db5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/vi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/vi/firefox-114.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b4809e5cedcaf71ea967cb6666ce53b393799c929304ad5786df7722c791791f"; + sha256 = "582e3d37ae3d2e4405ded6ee307480ddcd751729491c5909bbd43ee6252b3f98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/xh/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/xh/firefox-114.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "3ab444e4552b7d26ce041cf5e80265b815371cbb063db698a94cbd5c125dcabb"; + sha256 = "323b50df1f7e03667ba6c9a4ea6e8aa853e8a2876f2624e97205f7a88c4e00f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/zh-CN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/zh-CN/firefox-114.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "2285ab5184c7051cb3bf79717bc1bc54809541fc937508eb61c80f4e5791ddd4"; + sha256 = "043af2e44c3de09122549b1fca48dfebcbf0cd59de48ef13317074995e9a7d27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/zh-TW/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/114.0b6/linux-i686/zh-TW/firefox-114.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "923c6682d4ce81df5facb6aae4ba0137e9e293c8713c1db58ecaa45fe21f9403"; + sha256 = "6ef76322647d8ab3d05302756a5037cc979c445e5172608c5ae559c2320b518e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index e83d95a939f..75a94ee5105 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1015 +1,1015 @@ { - version = "113.0b9"; + version = "114.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ach/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ach/firefox-114.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "dc158c80dfb28579bd80b46b8d62354a2c81aea73af2a30ced5759110e6776c3"; + sha256 = "892a498f6214e6fc1979ba7f8f51d807b8a7c8f41fa297c31b572bd68527cd1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/af/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/af/firefox-114.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4b3d114bca0fafa66c86f150e488a5cae0572e87a7fab84767b6714117fceef9"; + sha256 = "1cd75c7d58126a274f426a6fbccfc74ee6a8791bcff1c112eca39ad36feeef7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/an/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/an/firefox-114.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "2b3b4c3f326e9f58c74b675c6a548b31378800a9eebfc26af4ade435776f94dc"; + sha256 = "06bbd0a4eeb899240dfb67a90221b6538dc26991d5d4c38ad98c54863af19dfe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ar/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ar/firefox-114.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "e74d601ee67c9b81ab1b4d81cf4f9be9c27511c9b457796b8a2e113a0f46a39f"; + sha256 = "bf48e69c13adcb8864ff1595ab7446cd232283e29874e8d4b7e1489d0db60af7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ast/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ast/firefox-114.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6b4534f7b2c33acd75c5d1c55820e5b45d12cf3fc0e72a719eed8e6978980bfa"; + sha256 = "6fdbac1e7c614cfe21cae7fec02df3dae490c1d4210c1181e951be5c730f7f84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/az/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/az/firefox-114.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "034b019553be4b94c3aba4db466e46e68469a127bf69cc88aaeb886191b3dbef"; + sha256 = "433e7fd4b919dab62aa3ed5d740faa011adb62b799039d22b4c13eae1640bc39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/be/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/be/firefox-114.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b303e3975fc9daafde7aa4e3e9d516857c8493fe6a76de4fbf9c02c19a3f040a"; + sha256 = "5ce1f9f26f012f6849b945cf480c253fec862eebe7f0cec89e5afdb2cca5469c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/bg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/bg/firefox-114.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c2f0d3ab18c11e1ce8468025b2454a8eb8cc2730eddcd7d2d385625f9496339e"; + sha256 = "933dfeefbc7c2b9ed0ebc1591872a65f7a18ec1ea0ea820a63257b7985c74628"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/bn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/bn/firefox-114.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "4d34adf3b2a579503de8abd5462a562d0b62e2605f04813a6a88be1b64935c3c"; + sha256 = "b9f44b4609b9fe67dcf8c1a6f9c033f1abec2e722fc3b358f14e9c89ee6e1ca2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/br/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/br/firefox-114.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f5474ef7f1b0983a25da0bca716dab3056f4892c05c71620b055fe523f762764"; + sha256 = "827b987831222fad14157afd5b136e6d094926b84066c83febf4a78c3f8d3b73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/bs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/bs/firefox-114.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b18c3715cd10a4913a33e2deb1270a2df69a2674148aebadbc007699445bba8e"; + sha256 = "3eddc55a742bd35074ed84982e4f25304f41d635e78eaf107ec3939e96a2d876"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ca-valencia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ca-valencia/firefox-114.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f9f09f77cf0e2785ce6fd143191c07d4138aaefaae5763858086efbc6ae1cd85"; + sha256 = "bcad8b0926a761c3469eec2c4b1caf75822b0fb253faa9226be27e68a5a76bd4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ca/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ca/firefox-114.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d807facc456fa1a249558e11bd36ac95f739474ef77cbfadd80b8cd47e70bd3e"; + sha256 = "dfde8881acbd456214a16aec907e39cb2bbcef59b121a1480a0838049f0dbd72"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/cak/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/cak/firefox-114.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "261947d078bf41063848734e92f88452299eb53122924a767350fb4b74ee9bf7"; + sha256 = "b694810e19e4b5ac592c7bfd11bf97c615adadbbd55caba95e93cfe36f338793"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/cs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/cs/firefox-114.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "836d10d1f45b748dad92e9fd01d0f45b42bd2378fd89f00681192f663e5c12d4"; + sha256 = "678be534f40026662bf4dc6af55c34f9baa6da623e7e7c26785b44ecc3ca45bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/cy/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/cy/firefox-114.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "bf688d5c5a3dfc7d0ca63f2482fd8a06c2633fcba5a031466d9ba76c328094ad"; + sha256 = "15959187b97127e6e7a59c8e58ad406f4d63dda1cf4983bfe4e71a38e3dff470"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/da/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/da/firefox-114.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3e60d481bc4e68a507eb3f0f6d38dd8ee7d1934364a4d800b44d62b03c9e199e"; + sha256 = "0ffc58a84c077bdc363b6cd19354fa3a9fd8edab6bc4ef71ddbcd7809643b8ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/de/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/de/firefox-114.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a09a75e2132c73ddf22b52b75b2b8236fd09c401705ba56f658b85848504125e"; + sha256 = "167b374f1af3727dacec443bc4e5934e14139da295ce066450e1d35673b66d82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/dsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/dsb/firefox-114.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "68ba26f1fb9255abcf42f18864c5c0681ca62a0f2cbd8b5eb00c8687a803aff7"; + sha256 = "dd51cca7431f728c10c041c8edce987273bb9ae049379ca65ffc32735dc83466"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/el/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/el/firefox-114.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5b1b4e392b0e33cbf16a0c9cbc5612b69631b725958f97d47522bf158d7c3aa0"; + sha256 = "917951dc5ca95a3f01a80bd97e6aff00024c160e48e3a4d72c0191a56f60dfbf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/en-CA/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/en-CA/firefox-114.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4040dd3f61156946d63890fe5b3db550cf128d61cd66c51113bed3b4d31eebe3"; + sha256 = "4f3890551054267816ffcd8aa3722b8b755ab3c73df866030e96e99596bfda0d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/en-GB/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/en-GB/firefox-114.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "48db3df2408151d2ef7ea2e6d02b265348a5a6f91e7cb7918169aa1631bbfe17"; + sha256 = "5ff88a148beb65b70f43d417adf6777fd53ab25d227391893b43bbd6e2dfc0cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/en-US/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/en-US/firefox-114.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "66f54b02162ba597892efef36f95659431e04aa4b866fa1396132d63d1163912"; + sha256 = "6d2fa8c02651e05c2ffa8daad61550e36e43915145bb538b76706a4ba9a82333"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/eo/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/eo/firefox-114.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "885a1169a2bc3a753da283032599f9e3280b9f44fbc1a5cdc8e12a770f85658a"; + sha256 = "1682decf486a742aa62317bf501c355a40e0cf76ea7fa4b16d0be2c1139f9b9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-AR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/es-AR/firefox-114.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d7f02d814e3912564078a8388bf18cf5ddda223ec15b0c2f8ff2f94ff00111b8"; + sha256 = "3ac459dbe6798c683afb9f2929b3ef850185f32ba81d8bbf5511a2a8944e6360"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-CL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/es-CL/firefox-114.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "83614e8db3ab6c25b264f339c968a3334af2d29c1a041b3f6aedfe6b5f5963c4"; + sha256 = "5ade2bc00917acba6dac6a0c55c38c4dc472c8fabefb93a58857bcb320c5931f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-ES/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/es-ES/firefox-114.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "63f25742b4d9a8584f097f2a76f86b50245ff09c738607b4fcd85f3cef02aadc"; + sha256 = "db297b032a09e57282ef838b77d8ba58132245cb90b4dd4fe47e8fdc67d3c71c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-MX/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/es-MX/firefox-114.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e39d75851cfa7a512f5f2aba69679212afa60a22709edd787e560b51ea60bac4"; + sha256 = "f1ec79ccbecff8fee68276f01d674e936ea986072ef1e2e7df0979e99117374f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/et/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/et/firefox-114.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ad77319e455dcd6678b43c21979504f4e1de4a3c1f5f3492b1157d3112ab242f"; + sha256 = "9219ac32d74401209d53d43143e691f5fdd002f1b2373fe443f82466c71278ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/eu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/eu/firefox-114.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3d4c2ba8839c41d272dbccaa74285ffd62f8fdeeb4c4f40b502b0126a7d04a39"; + sha256 = "3862dac630beb3e94c86aa628b3b1242c18371439693e8be5de5f49a222a87bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fa/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/fa/firefox-114.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f38c309d7ac3f942bfdd16387c3dc70ee27c966236022e1a558b8ab5b4d8059f"; + sha256 = "aa46820e723b55db9392bb4d690cbfac80160f858cd00a1433be6e13a8f07453"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ff/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ff/firefox-114.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ca85c752fc7cf4f6cd4baa2b56104bdbd772f823bfdd5731349c6234dc146fa7"; + sha256 = "56d9e951820682049af01d98feea256ef130603dcbe97691b2a32267b3ac8725"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/fi/firefox-114.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "074b519d3907b03cf22c464e7a888ba12a2e2a3169aba859261dc5f7c1276fac"; + sha256 = "db802bfa8f5365311fc6fa8c2d7668f6409616b9181c1df40d70d7182181a5ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/fr/firefox-114.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f6a92462940fc5386335b6f477f49b20c703e58505c5a43ee2fd9bb04cc33e3b"; + sha256 = "fb0c7c06d31fc19cc4243f162acca2e370be78c8b00960fca988cf5d4d63b249"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/fur/firefox-114.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "884ba026f976c6776520d4536daa91553fea6f759c3c56f0bd884391ea4573fc"; + sha256 = "c196349210ab24f691f99acac69be19df5e9d79757b466705e6c6451af137b39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fy-NL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/fy-NL/firefox-114.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eea6e15f026894eda457c8900a24b057fe32960f56b39d28719e65cb43d6ee17"; + sha256 = "0585d64028335123d8254bdb13fc346349e25ac05132df7cfce0bf0efcbe5a9a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ga-IE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ga-IE/firefox-114.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9ca4d3e4b0022192ec2c028d4741164935f0b31444fec7b43edbd21a265d583a"; + sha256 = "de182c5884da22e7c61ebf7146542e65d4fc401697be6c00df259985a8c0881f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gd/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/gd/firefox-114.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5c70bf5c25611db71ee9ac8cb6cebd16ce8564f7acfaf7b9bc83a7ed5063b9fd"; + sha256 = "fed2364dd1809ba8fb39a2c24c5147e00c30933f72e1bb906c4a9617b9bfd12f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/gl/firefox-114.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d2a6da38ba64866f51ef98926e7199a41b857d983f836c9c14315ccfbec6b530"; + sha256 = "ef7524ad60a6a463ac995233b4420a072be54a46ac8790f3608185b586ddb5bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/gn/firefox-114.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "190c68400b1bab7b6540125d3d8fcb933e259e5a0fdb22d0c9125855e32c39e3"; + sha256 = "25af35fe22c74e6ab408b6fb95f2d65c93dc41558a1ac1b5e776386514fbf0fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gu-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/gu-IN/firefox-114.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f7f83aa3d17aba4aa3f5ea7aa23f16ebcae174fc49f5139c87f93cb807f49091"; + sha256 = "14c5a0da042bc5886578e34742132494209bd4a24988584ab8c70b03beb26660"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/he/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/he/firefox-114.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b24374cd20a154d15dd95aee939d92637281cecead79bfc88aa65a6246df79b5"; + sha256 = "6c71bc3a7bce3fc7a98efc62bef69c31d9176fb2fbaa03a53a360a340935bf4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hi-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/hi-IN/firefox-114.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "cdce840c3ddec26d3717a2a2bae0de2b1d0cd392941027c7711a449197b6b8b5"; + sha256 = "a93deaf0d3a159b73f8f9501891dae4ce7b8a17e97a2a4a1b172758358e51195"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/hr/firefox-114.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e5fc4f632968891df4e91c8a211dc54501f4660b6ce6062df338f2c9c474de33"; + sha256 = "60df27e3ab75efbdf5d45e5735f58b5581e16a77152d59e4aa2891f9ea8b1efa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/hsb/firefox-114.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "4bc5f354353a4530303f9fb3c8c6077721c95c775044f4c3866fd6740cc73267"; + sha256 = "d831f93bb3f8f0c0a1db477e37671926dc2bb4a174d3264a22eee7ca94c5263f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/hu/firefox-114.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "fbfe193897a394358d420fb54ff6505a50657a3f90e8cc90fa42a6f777c8b601"; + sha256 = "1729d645ac20d4797d4f2685736e83bce9e1764fadf568202bb3fe04fccd19cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hy-AM/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/hy-AM/firefox-114.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ef54df1e984d57b17e31246b9d2390013b13bdbb5c6fa9f7d96c05c8df870b95"; + sha256 = "9ef8c5c60882979f47ba006750cc8af891b0a75b798a4f9b5e2f6e18775cd3d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ia/firefox-114.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d08fd66c7c77f987377a99f65b90459a834cf3d049788aa16f4aa1dfcfb68bbc"; + sha256 = "5b3205aa2eb4d51838a8943db95e2ca4759ab85215334e6830bd59cd60bfcfb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/id/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/id/firefox-114.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ac5a8ea463c8f6fd2ae095a0ef654f840571167e296a2ffb3e0da5aa86e43c3d"; + sha256 = "d41d73f069e7bc17a509063556bf7c4985239a2f4e6b01438a7697603c7786e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/is/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/is/firefox-114.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c023abbc95d09a970f392524b074db72b3f42bccf1da69e9893ef22a35bd9f1d"; + sha256 = "e6cd06e470f1b92bcbb523e94d24d82ff5db71e10b0ee063b4087d2302d854ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/it/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/it/firefox-114.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ff02a3a5e533d1ce1f3ac42f731ca914ea50cf467f0d7cff4e011a9f6825a7ae"; + sha256 = "923ba30248e5e446f0dde27f17fe6c777e29ad3033d433d7e239099e67182546"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ja/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ja/firefox-114.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b322e8c691cb26ed46eb9e50c4d337094dd1b75f38905f7f4557555a835e067e"; + sha256 = "7305bae64aaafd058477f29fa9a93c080b41b53ae0f8e8d1d5163b082093f1a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ka/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ka/firefox-114.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1fe5183b36d952188df64859b2886ef87ba5ebdb35d907df709ca12d10709e1d"; + sha256 = "73b689eb8ed5129df02ec8bfad217336301b5a6fccbdf76ae9e0bdde73d24149"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/kab/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/kab/firefox-114.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "36e373026ae27b4eedf51a0a1a5dafed61daaa50fb03911669624649cd65d6f5"; + sha256 = "b5ccc9fb429d7b381052777a54306abee4a37b8f371655738fc8ee43f0f006b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/kk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/kk/firefox-114.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "17131c348b2006bf55ed0911fd80c9885a54737b1e18d98e0165a159f5d5b73a"; + sha256 = "3788d9d133c36012cc74f21825c10bd7c84ff5e0227e8c2ec3558a549a38a61b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/km/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/km/firefox-114.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7c846566b8998799cf3ea7401a7a00afb3a2ccbdf52e6ccde58d8e0c3654db00"; + sha256 = "82cd35b64de7dfcf4cebd4ac0cca0647a703731e90369cb72d8c3fe2bf31036b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/kn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/kn/firefox-114.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "fe8536512affd2aa546e00f0f2893df16ed1722b37bebd3f8cdf7a2b112cbafb"; + sha256 = "66130c2873ea7bd4e21ca7ac0bde194c2122eab60875647d81e33d42d07975be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ko/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ko/firefox-114.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4c9e9356a0e32fe5d765312f715ccda7abb9faf85d5bc06cc6f42ed41242120d"; + sha256 = "8dcab654d779fca1c31607ad09e7af841b8bef4861d4372a47e568f07d2a9294"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/lij/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/lij/firefox-114.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c3e65cd5f3a7adf595b53d4fab3ee482c019f9908bbeb003c3eba83945342edb"; + sha256 = "f829df3116619e64d20f602d499f82dc60df8a56007d3fe550108bc51cb9023c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/lt/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/lt/firefox-114.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "dede6788ceb5b9ff42d4342e1c117e11fc889dec62433aec2c8d14be2395234c"; + sha256 = "76aa7f183c2785aa13a8cbdb1e6a9bc365cd04d9cfa3ca0d0d93fe51f6051831"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/lv/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/lv/firefox-114.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e19539da8f21b3055ad6da06c345a80055a2f4705d469a40e026db2b5e4d2c8e"; + sha256 = "7f5b6709a516a5feec2c9576eb7389f21098dba6f3fb5e4021528e4f5e2efc54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/mk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/mk/firefox-114.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "bb33b7878dc76e2be2a3d45bd86d6bfadc5b9134be9bb7750fd78eccbcad8ab5"; + sha256 = "b7cab2e84bf2ae37127d5e991f16b40ca63ebf251a5b09c1edf723eba1e9fee6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/mr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/mr/firefox-114.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "bbd907c7deef8438b05aebd0aef2d6062b4fcf366fa55a7f82e1a390ff69b682"; + sha256 = "453a26f95122e66ef66c98e1b658f58f70a89ef8300b6584515f573d53b042c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ms/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ms/firefox-114.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "fc1f88e708dfbcdd7e3d3ebddd649fe94eb85f4874489b84449ed0f3e02ae6c9"; + sha256 = "1c87e02f03af9298f956c24b0b4e2635814ba0143bcad6a9a5711fc54b44956b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/my/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/my/firefox-114.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "113e5e2b07882ab425967fe926c4c61e95d6a3b7f160fa49a72c0e34447400d5"; + sha256 = "5f1c1347316c4438f75e26800097a86b76a06f04286abfa0fe08d6acf30821f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/nb-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/nb-NO/firefox-114.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6f808c9d3293d237bff3225c21c4de755c0a2a1edb7330426c6db99cc91e953d"; + sha256 = "ee93003217f2884dde8587b1d008de96ab833ff9187ed5e72d3d1219e6e69070"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ne-NP/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ne-NP/firefox-114.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "6199ea26291bea5d10bd17d43b1abf2f74ef96513929c655edbee527b931467e"; + sha256 = "aec84e7e6e7a611821159e0988733bc3498a643166cc6a6d2ef79b3602d8b1e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/nl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/nl/firefox-114.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "38f7ee12715ba235f15596ed5a2be984768ae15aae30d850813210ff1c9985fc"; + sha256 = "2196631eb796ed9e85fd26d1c40f0c2e8a0b8a4a71b548e49e4a072cd555176b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/nn-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/nn-NO/firefox-114.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1234343fc68003f5bc1114fca1271d0b278363cbfb39c7372acc70005b4ad3f8"; + sha256 = "b2243fc3bb7249c4d6b373842d9fd581bd31a582712a04c318edcac66bf83b6a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/oc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/oc/firefox-114.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "834b66efe98f3ba9435622680c7d90395aa993f9ff6329640a3212816c29a8ef"; + sha256 = "9fbd4fb7abd649f4d5ee38d582d5d7e250d2aa281721357f4275f2af97fc711c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pa-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/pa-IN/firefox-114.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "858f4e2d5deb533116bdb9c6bee089139075425e81bd96e98e34d33888d768b8"; + sha256 = "26fcbbe86e387a6c1535e4c15a01ad09f3a8a8c7fca166b4c2a7d9a697648743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/pl/firefox-114.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "df6e50d5c6e4fa31277e9b855ad64d1efdc2dca13fe0f1f529aa69118e7522dd"; + sha256 = "051833100a32f282613666c9ed07d354e8fcbc37f83afb7e2c1839f875434c51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pt-BR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/pt-BR/firefox-114.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2311eed3044e6defded8f894273b66263f7603404f541f1869687275af3063f1"; + sha256 = "71385488afd8085c015523cfc38983ad5e0b6f1b3f599d79f7cb24dd2b814c4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pt-PT/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/pt-PT/firefox-114.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6a3b14908ddc79d2a420c9523814ff000dd1465fffbed457756ccbff870d7dcd"; + sha256 = "1a3cc0ed52eb28a36f826c306e2ad4a9d23549f8265d2a5f43dd20a202d528b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/rm/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/rm/firefox-114.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "e533e996e3e885cd79299effc46978f01cb797c37dc0fe9a37d0b363a18e5d08"; + sha256 = "763d1c931ed807e59025fbb2695693b58ec63116d2f0196fa4b5c8d55350d1de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ro/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ro/firefox-114.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d8e7e40ce30982c36409144bb694e0243be3077ec94a1589fef147ee2632b007"; + sha256 = "458491359967731511dc2392aa8aca3acfe0209111848e89251ac9e5cf2d160e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ru/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ru/firefox-114.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d6ac06d4f6676992762bff826163aef256248544e9fefe734f7b897ae26f4040"; + sha256 = "0cd7990b4612d6c1af5ed0a5d63f34fd196c9463937d956d8d6a6065a260b1e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/sc/firefox-114.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "2be13f4aa18045adbf754c90a9831e24f0ba8aebf8506d5858eab7321e1139c9"; + sha256 = "73c55ff4616312baf17d6ffe122c12eb8ed13a9589192cc206820844d56f6a65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sco/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/sco/firefox-114.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "4bd83c6eb8961e8bd01ad7be1a7b92332c85ca63e55605200f84188c93944194"; + sha256 = "72126656d3c73733c56c982bd14427b1ea43824c4ec1fcc5775ec137e317ae70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/si/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/si/firefox-114.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3fcba136823af21cce1f9202459b2bef5b59ef9a8b296d9f629a82b2c4de1ff1"; + sha256 = "9c296c9f332e7134fee5f39caed40e7214691a7ac8aac5f12407d152e369b351"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/sk/firefox-114.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c60e30874e70b5de14ea02e082849c9a052bef59144fd0fbe7ed63b1e8cfe4a8"; + sha256 = "c418e375a7ab77bb24ad76da81b69f46f2c8dd5494c3b5acbcde95b56498488b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/sl/firefox-114.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9e808e99b0e432f22b88a6546ad78e8563fe1d785526965dc2ed87d94619a7b0"; + sha256 = "34328d0d1325db1a123ceb315ddb0df0772ca55ecd7ab5be4530d780995eaf2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/son/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/son/firefox-114.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "14599ebbafc8009b9b969d4d5702a246c47a6f65c6c8148f26a208facf6a5d43"; + sha256 = "922d2098697da88f8d0c35ecfdc2ec938c04c2c5f14c5e3505b0ac7ce229cc38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sq/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/sq/firefox-114.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "84310939a31cf602fc7d6f82273c2b920ce8bf6b0ef8f903eb9c645be399e3c3"; + sha256 = "976ac6946f3770f6b4133aaa3d34e093fdbe62f22de8dfc92cf64ddd6411b0f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/sr/firefox-114.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9a2f954a761da871f6a7d682bebdcc7de2681dcbba131cda9d91314621b2e94e"; + sha256 = "a5a6f29d8f9b825b518fa3d8bb5f1f53daa163207dcde6a972789b1e51b8a2b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sv-SE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/sv-SE/firefox-114.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6779b71ff0fdbea59e17eb1aea8ce79d2d2c80e8590531e28b4f5ae28398d565"; + sha256 = "f3fc4d8fc77151e76c8d6dc5b978292f6a1ea48484ebb74a4df88635a587fa03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/szl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/szl/firefox-114.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "6addcfaed240205a7e2c16c6b6ada8c3c445bc2fcb28565c4478570c0f089888"; + sha256 = "778876dc6c923b2c33d7c688913a911725b5b77c3b14c8f0d016ce74aa9d2578"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ta/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ta/firefox-114.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "f9fff731b6db4d6acc8fc5d5ccdbb4c90159671663e80c8e554e184574015997"; + sha256 = "3eeddae6863482c5c1573730a18e359f88589ecc1f9f04c4c2516e3f667f794b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/te/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/te/firefox-114.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "6f6eff9dd081de53df633f7a401699cb9fd927a5030feeae11b6c0d2e270f9b8"; + sha256 = "3587e43da816973d1a03b6d92f389817d866f341c48c67c3c7233127048e533d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/tg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/tg/firefox-114.0b6.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "0f1ec7c79b3460bd7d25dcf8bfa74eae045f17f688e6e83a67280e6f92dabb56"; + sha256 = "41eb0382506a4de0c7c41140ae84b3f52aac0b338534bc755f919cb44b98802a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/th/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/th/firefox-114.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "498e9a15309a0fdbac652615540376a3ac9d70295af53adad3687b5b9009296c"; + sha256 = "6a902a3f5964ed297c1119b186bc86eba8b30c1282bf655ef9c7e49513ec309a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/tl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/tl/firefox-114.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9e437dff7b57715e79168608fd91ce7fc1d0e8d31122a4ab7d2a17e79057c018"; + sha256 = "c502e3e944acce8ea0b49a09fef3ab189603ace201337f8bd551b46aa5320bf5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/tr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/tr/firefox-114.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "973142b4a841da422afb6771e547262a331477751c4666aed148cb8f116c13ea"; + sha256 = "1136e5350c123d879f3a944aff1a46918965ba5e8c0946aaf40ab1181736b372"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/trs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/trs/firefox-114.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "5bd086122aaf39cc3ad5cf9ff41336c759d23983ea677c0e726113d1e86e2444"; + sha256 = "13f7a328e7bb01f932c41524ef9012ac05ed2728ed61977ac9e4a9dc8248dc04"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/uk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/uk/firefox-114.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d4cd3fd8e213cb6273d5f7cb42368248312f2e4134fde1ecde5f3a03ddc7fd76"; + sha256 = "2445540a10238383729871334d4cf05250ca05dbc6360f9b4034523bcd692808"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/ur/firefox-114.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "67f321fa03554b7631cd0c6a8eb25eb3166f0921f9b392b6cb8134c96d6b94c5"; + sha256 = "9ef3843d3e9345696bc7cf39788d612f427543ab3d082b1dea05c650058f8c75"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/uz/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/uz/firefox-114.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b8a3587e2f6f567fd4955ca151fcc853fea384595b789c2fdeb3e7bd431615ca"; + sha256 = "4f044a0268ae8c0b9bd295e1b9a8ad48855d46dd1b7637bbc76c80abc134ffae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/vi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/vi/firefox-114.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "04066efe6339f9cf2827d68ca1cb8911a1123139f3a8ec5f01f015b6b5c4b59d"; + sha256 = "270f6d734723a9ec506232ec408d174d25ebbd77e0d0c9913caaca8c4b6b3de5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/xh/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/xh/firefox-114.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "fec6211b12e25ee8bdec8535b3bac3190dacee8e6c584295f5fdedbbb9d8855b"; + sha256 = "2107725235e492173f75b559b31c1e0c5182c20f7e1b80642cb61d82a2b4d05b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/zh-CN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/zh-CN/firefox-114.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9f786ae66b71ce4d7c82d2095ffa616fe477b167fa852b539db07e048ccbfd03"; + sha256 = "bfe71942d6d69439bbd17060c70bae684da069413f5307dff903009fcb17664c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/zh-TW/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-x86_64/zh-TW/firefox-114.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6b6c68dea0abf84a6d20215fe790f7a4cfa07abb2d4f320f65c84e97bcbfa3fb"; + sha256 = "9545f7e96d4064eb330d38e7a0b1bf5b8cf6e4a6ee1a6b98d28a89a7215f6688"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ach/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ach/firefox-114.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "7b5db17cbb53b58c24abb3b4b1c94e580467a58aae4fee79816b142baac92d9a"; + sha256 = "d432bc8a1eef4c9ee80e0c5e35c52cd2c0cea55d75b1328d5e83ee847f7a9d31"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/af/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/af/firefox-114.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "fdd1b627624168a882086e1061c1bf0b424fc3b3673f61bf4c8b64728e1cbb36"; + sha256 = "7ff3d75a240d1874adacb40f4856b1c2dad418c2171ab50db50a8f5f7a8733dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/an/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/an/firefox-114.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "12f9fa21c13ee636712d2df268a7a030580b08485067f00aa8845d057aa25152"; + sha256 = "2b1bf4de1e96a1fbb06c673e55201da7b25167a46678f840d8de798058852497"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ar/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ar/firefox-114.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "aa4fa6630b0ec522181a75fc5fff4ebb97f8bd37ffd52f24ebc70b432410b214"; + sha256 = "6958de1be96c783c18622209c19e6a00524060ed98380dcb120b3e9bbb67d61b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ast/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ast/firefox-114.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6c4bc54870ddecbece5c372f2f6313051d0276fd230b4240507055c0fa936de9"; + sha256 = "fb51a66e9dc3466b3866ca1a2e9ca5dce70f675c306aa09b28552fd8db149cd2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/az/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/az/firefox-114.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4b28837661abe524048c51a9ee4c1a65fbb2288465755f54ba9437c8db7527c8"; + sha256 = "eb34847fd2e3b37f150d65d7ec4add09c50c846360b8f791e69713aa092bfb3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/be/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/be/firefox-114.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fb8ec0fa01c07540bf4dd6ac3c857c80e16ef6ee158aac2ae5b8dbca05ea63a5"; + sha256 = "ed4cfb7a500bfd8ad2eab255d4ec0bc186588d41b964f79eb1732bd960f78aea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/bg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/bg/firefox-114.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "36e1428e679831e577490fe0d6a40b614b31d4fd627a8d2b8b38fbc32b009547"; + sha256 = "ea72b0441a84e578118165cd468ffcd47ac63ce74530a59516c303be5ce13452"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/bn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/bn/firefox-114.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "1d53220a7c240cd1024b32f5e9c6df2565a3c900f7fa92527d7f4bae6c0970c5"; + sha256 = "a7d58f595d2e58b819133eb3ab73ad0fbabf80c4aab27a2837c6d6b33ff579eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/br/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/br/firefox-114.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8210d9cb63ce6d669ab562c732cc5d2a21d62492e6f0123b18dfef361c4d438a"; + sha256 = "9e7981d439d62dfd885e85d673a00b3fc6968f425dab9bbcb95b6e28614f9fb5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/bs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/bs/firefox-114.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "b677d30de8ff53525e47a874837c7a0c8077fd240f95b1b90753f892e731d0d1"; + sha256 = "9ab011f13be0d924c1d4c00ef6cd7360f16a51ec33d4be9c7fd57c534a3c62a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ca-valencia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ca-valencia/firefox-114.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "eebfb9d6d3329614f7d7cfe7d30fdf0421d2dc7595dfcc55a515ab48d42ee1e5"; + sha256 = "314c74832d2ed44b3324d38a84b272a47627ddf792de0929874f9f41e4150108"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ca/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ca/firefox-114.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "66f0d0358b4e3cdf434fe97271d2aedbba03fee352b2911fc4f8f4d54d2472dc"; + sha256 = "d92f0b7a232c80027fc783e2d4b3323665a74533e3b8c36d569fe5ca0db48e66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/cak/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/cak/firefox-114.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "7f6b556b02fe010949f6bc3e827e724f401eeb63d2dd81e5ce8ba1ab72b06027"; + sha256 = "901282a1e7533f2d18594170dab323d621bc5cc7742b5d05c748b88c273d048e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/cs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/cs/firefox-114.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3a514266732fd75bbd522dd95193beee7a40daabde018f7b6232241799139970"; + sha256 = "7c16cf93e8434ca0eed2724241e79daa505b78ff45829f2b1141f3630427f4e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/cy/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/cy/firefox-114.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "82a3320dca2cc26d287d183676e4357b0a4905f142177a5f72050f29bf1f2917"; + sha256 = "322b6163866f7114b13aa01fcc84f45c0bcccdc24c23182dbe6d79f7b28e294d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/da/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/da/firefox-114.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2f5547506cfd7f6816fe3dc6ca3c310681de9495c759dc19e6576e331b21c5f8"; + sha256 = "7d171bf3b30e641196c6a17b6ddede9a964cb0687f99b9b76c7b1bf98e55d7ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/de/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/de/firefox-114.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6ce75985d4f4786204cf0eaca8e37303baa608a71a09fc70da95e5338bfab274"; + sha256 = "0c97c968987bfdd17f9e80cdcf5e6524e626f22c68ffac9a7942d429d28b90ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/dsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/dsb/firefox-114.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "686d6f57cafe72915a92278c36af8fb7e3f170eeaa8f7349ae7efd0b748de4e0"; + sha256 = "32828ca1880c6c41d3e24bde144bd675895fb6a534443839a7b663bd9226305d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/el/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/el/firefox-114.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e71bc916cf8c26f52781b8ed7ff8075790578d068513921f9226067f3e62dcc5"; + sha256 = "d377fe02ecf909c135ab18bb11f7de2096d9a836e574f5f4cedbd00e3c81f13b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/en-CA/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/en-CA/firefox-114.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8cce0d2e65c6ada65c1c0bc1b4da1888b4929b7b245357be52c8572909906dd0"; + sha256 = "af19ae5fc3b946cb230fa6b999ad4baee4782c1f9ca7e1abd408dbbfaed94abe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/en-GB/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/en-GB/firefox-114.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "04f9c27cfb563157fe85f262f6e2143e3205121d68fc117816cf637f0ead6f00"; + sha256 = "c2af0a3fb66ae85ed391a1e5b20454adea901e23c8ae7443d412a056cc7f2941"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/en-US/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/en-US/firefox-114.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8129226d01e92011d3fd85f9be7de6d4b6bfb673e89af9cfb24e0e1a11d9a546"; + sha256 = "ce3336e57f5b0aa20a3cfefd53d2715dfca28f7ce5572b2fb456f02f7a4e2b18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/eo/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/eo/firefox-114.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8c04506ba46b6aaf4ce5ee56f6273b425c6ae42aacd47d777cfea14181d9abd3"; + sha256 = "98887546c9ecc9c05099763ade0b515e988be725dec5037a01d46f230eb5e105"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-AR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/es-AR/firefox-114.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8434b3870244befca3e8a2a79a3d291f7a0a5ea98351c13e89184b54274e8d69"; + sha256 = "ee26a237c43270b38b04e7ed1d40258062798ba3ef483c605c6ba98cb8cb0b73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-CL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/es-CL/firefox-114.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "542ead0257c78dae3caafd1d3715ba1a476193a4e57423913865ead964f3d07c"; + sha256 = "01c37d3f44f7059b33ea07e9572c0cb8f59970b6083ad55754cbe66be6955369"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-ES/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/es-ES/firefox-114.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0d9817bc6e056a3e4c52e28224ff92f953100198dd91a4936b99202a6313c32a"; + sha256 = "9de01daf699337883fff3a6542b50d2f90aa556e036893edd2596a29f3857d23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-MX/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/es-MX/firefox-114.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8262e88536cdfa5b7058da303dda68d9bc3058fcfefa28f298ce4f0057a934ed"; + sha256 = "405f4beafb8731dc248319371ee9d6ba690152c8f1b8d4d39d4104b423b9a095"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/et/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/et/firefox-114.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8c21a6aad42bda0a3de33d571817392cf26f8bcac573acd270d59e9dc9eaae79"; + sha256 = "f2517ee673ddda764b48ad201e3ee4a03d5836da6cb34745ee926d38fc8ff923"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/eu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/eu/firefox-114.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c904e284d97c92e94e0203bc044fbfdde515f83cabd97d54866f7311f141f571"; + sha256 = "2a168d55e71fd03597533276bfac78260338914d271888395f777c1e546531b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fa/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/fa/firefox-114.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b243e98eb51a73616696d77b398112a7ec2097b19dea4948108f9e3ed9f88f37"; + sha256 = "45123a1e8b6a8da0197c7d0017d12824a1b7f4fcb7a7d553251344940e2b8e92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ff/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ff/firefox-114.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "83ea6e05de01ad6e495bcca86301fdd739e786d8f66feb085f75b7d8f47f0f30"; + sha256 = "f41d2fae2f9a74b533df9bbcfdc57572f1764276895ec6539772bf36e86437df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/fi/firefox-114.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5e3d66c1e9a365eb6c53312d9bcf196825f11ff92f64e5484171f3e9de5fc0a4"; + sha256 = "59c874da4d17a2c30c7e9c0c28fd82df42fd97032c42b2833d36d7daa6375464"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/fr/firefox-114.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ad6fc8e8ed72f529ae1ede3e504e7451fbc6c691b89e3338b07d4675adfff2f0"; + sha256 = "0f301b983f2cc752fbb7e5c62608ebf39951b3795c21b8a457f8ab10f6a3eca0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/fur/firefox-114.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "447f80f773111c86ab51fc22dcd56304e713ddcb5da8a201d232388dd939372e"; + sha256 = "f6bda23da1ab04b77b63c8d4a9ffdbd067afd271750c23588727b9bd42baf556"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fy-NL/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/fy-NL/firefox-114.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "599ce63105ae0830c985238a87d5f19db0e6bed213c29a33bfd1ff26ffed70fc"; + sha256 = "bd131b7b144b41f260d7a1f42d1d973aef6d3dba3923b9ded99ab504aa03ac01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ga-IE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ga-IE/firefox-114.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fc42db04fed495d449e1b4ace47718f06177740f78add54a869ff7c82390d8d7"; + sha256 = "f88ec37aa2c333177dae15b8bf1b5ed0b87709d46a3fc5b783d44e870b180302"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gd/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/gd/firefox-114.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "01e4b85055e7ce74d2132cd68b9f8a17fc6b6ccb45631eddf3285cb24943a1f4"; + sha256 = "a3f6e7c3f360b066bcf40d643bfb8b59fea5c4a12305d936dbf833240b503902"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/gl/firefox-114.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "29e3bf59f47d56257eebdd0488c0eafe9f47c73612e6f5581fe0310581f5ec39"; + sha256 = "c3ee4c3c5cbe3da2f345c4299c901e25e8611d2a7774e3c893b44a8944387640"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/gn/firefox-114.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d5bde9c866b66c7b54607d57697c460083e33c03780fb5f671d1adff5664997e"; + sha256 = "213eb4442a667cab2bfc37e15497a4dca0c1800bbd841d9b138c17aaa3052231"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gu-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/gu-IN/firefox-114.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "4d5854c9644de2e61b9afae8b831d97ab230a699332a358681c534ba1bf65a25"; + sha256 = "f9d4128ea37c99a62bfdd3a8624b5fd5e5e47868109006507f5d5244d537d2d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/he/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/he/firefox-114.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a20626220f1efd62403bf2b30eacfb85d36525723f4d2fd02cb02376ce0281f0"; + sha256 = "bb81133ed941ed7d20a01a83c53680e0fb3b12e40d81fa54b7e7e9b4c1c0106b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hi-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/hi-IN/firefox-114.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "f3fcf05bc4743699dac9f69210e0fbdd35e3d3e56c5ffcc7dfd6a63ecfc6aa40"; + sha256 = "875e7ba9a7dfb91f0b69c2410b08152345a48118a0fed1bc1e83df082021096a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/hr/firefox-114.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ae3f2949ba7c9c98fef7c477ef08bd60c5371a9e91d60b2da0e4f4e83245f941"; + sha256 = "092c4de41d5246df7c29d79658b1febb825be6e18301a7db13a6caedc5b112e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hsb/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/hsb/firefox-114.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ae47ab089d4ed466099b4d5905e96e6d4c8936634923a56c9d2021ad13d94c93"; + sha256 = "e864334ba175c10a082037652033b01f82c6a933b9bd9b8788fd1a434c1d198d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hu/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/hu/firefox-114.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6dee753f61eb15fc86a88fe9d4d67a87e6f48903601ef728739165813ed623f6"; + sha256 = "fefabbb75f033c49e16ebfa498ec4c131d3cea22dc0fb68fcad808b7254a6a76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hy-AM/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/hy-AM/firefox-114.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7107634c0890878e4055e45a6b1d07097e25966cf9da44fdb50b07f44ef851e9"; + sha256 = "412218ebce6b63986ea7df2b7193d4324c2670393531456353604fc2469f5ecb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ia/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ia/firefox-114.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fb7e1907d9a58ef87d462dbe8eb5bf5a3fdbc570ae0ff05ae722731ff08f5195"; + sha256 = "df9c4aad0c5888b700c8ef1b93da82b3c4d377f865df40dc5ca13dcf94b0c5f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/id/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/id/firefox-114.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c13559a24705c182934711351e16149b97c81db28164c6c217496409f1e4a28e"; + sha256 = "d2274f810577b42d3eacd6002f7ab02fc7fa5749b350525940c5c8e4bf35f320"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/is/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/is/firefox-114.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "2e898672ec55afaa28eba126f77bac9a13daccd3e33c9b6165828b3dc8186240"; + sha256 = "d0b76b8bf979790740740f7e2713a5550e60f67eac3a6356e5201cb7ce444a1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/it/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/it/firefox-114.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2017923aa9a9a6a53aee09931f6b722618688278f9a68eb13a6cc3381d88a52b"; + sha256 = "e979093cb1bdf2d38e6aa4f996520606c22d6d0a4033e4535e2d9fb00935af3b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ja/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ja/firefox-114.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "fe551becc94d743082a2814fba234efe6ccf02f5fe2936134871e9265bc9e86a"; + sha256 = "810dd500f414159dfb957e7a93074966054ebbbd1ee3f0ddb878b074b72f34a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ka/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ka/firefox-114.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1e377de31bd73e509efa6cc4775451ddb6e226db76294dd48ebff8989511cdb8"; + sha256 = "45cda7f30d3748b16ff2243d4ca6ce61ac47f92842b8311420d5ac5876e7c107"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/kab/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/kab/firefox-114.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0442088461d88653a94325b4720e83afa96c2f7ce4939e9e8e680b38f030ed95"; + sha256 = "c9e1f4d000c1802be0ff648b97ccd25dcbcfbf2333f8f73207a0af0ea1566b8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/kk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/kk/firefox-114.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "14c587b7fff580a109efe0884563887ec7242356f34ba20067692730f2c7f161"; + sha256 = "f3e9297c486b865ae58911f21399838f26cfdf65ae7f365dd1abfd7bfc39a708"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/km/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/km/firefox-114.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "307fbd2d10e13d2d049dfb4818f0e0de2a32958658664e71d5161ab6a1d0765f"; + sha256 = "76dae43c84f1b806e8ac2fab9337352379d91044a27470a0c9bbb35547234170"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/kn/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/kn/firefox-114.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "b4d0d5317b3edfcb848269f568fb08ad761114138a61229cdba47f13d6e53620"; + sha256 = "4e5f02218786847d4a03b0b0f28c7a2b2d84913c370ce2f5156c653b1ba009fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ko/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ko/firefox-114.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7402f1cd7dbe48e805bd98783517f161621d06b041c9426a2acba02e6faceb34"; + sha256 = "762c533ec333142856bb54ba2680920b7f1fcb8e19f49b7780be8d8f95dacf4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/lij/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/lij/firefox-114.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "d2699cc175d3f607bd58c4625bdf33570a0f046623bf23940ac908f02159f414"; + sha256 = "17734685c8b1711efd8ecac7856a132c28dc600bb31920bd6f8875e3fc3b2ee5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/lt/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/lt/firefox-114.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "95e5876e01f7150da5189c1204ed64a7557d669b57f83db9b3f825186d186ff4"; + sha256 = "acfdf861f0fcddb5d5bf08e6677c3130e09c512b26eaf4c4d12a02b26839de77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/lv/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/lv/firefox-114.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d9ac6d6c0a016ef51c7a3d740a288eb66ea01a04744f56227acf0a030bb279ce"; + sha256 = "f0fb63fe0873fdf43d929a0d71b08ac3301c3cc50b3b6c3c59ea1cd6342d9a97"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/mk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/mk/firefox-114.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8aa4f4c677e3dac86d59a52c124f35ef654e2ceb40b3cac98dd6a0b37a64419c"; + sha256 = "dfcdc0ba5d78baf447ced1383fe8755b99709d234259ab3f9804fe6b06938913"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/mr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/mr/firefox-114.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "13b222f21c5888e7059bf3e64b425a94435678a72c1ea9bfaeb6f887a2eb7679"; + sha256 = "42d2a15e133683b9899c2f7318f720304ecad64bbe9f5b4f85e618bf4b486b64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ms/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ms/firefox-114.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "cfe53db3dc55ccf184dd40e277535c6b735c9a291806538c67a73abd7627c4b5"; + sha256 = "c047b53e9eb6f5cb6708181741375109556103cfbd8e9ccac32ac31cdd087f1f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/my/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/my/firefox-114.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "29381fde3bdb89bce3aee2a2df728d7e34860ebf25e50a2ebaad32e8bf32b7e8"; + sha256 = "c908e67d1e5f41531460e5fbfe03b8f863bbf23b71e9e08579ce5852ddf97f77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/nb-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/nb-NO/firefox-114.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "df532bb0d1336a8896e9510d15fc7083e8c596364f2b0792fe4b0c490e61d126"; + sha256 = "559d3580ce8479312f9c30974165d6b90f62ccc864febd06d693d4af88c987da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ne-NP/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ne-NP/firefox-114.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "aac7b8aad9ff10e5edd79e97cf8b0c5110bca31c0d37e8f06ea0cdde158efd1b"; + sha256 = "1a8b818caf99764d4f852af9dd9fbea745e93b0815c0cfb998e965aa15e96c3e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/nl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/nl/firefox-114.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0dca8ed34007c8cd4b06d85e3c57c8422eaacedbce18a7a7a51cf6bf4ecd63d8"; + sha256 = "5f416c22ffc3a0a74df18d5bd5c7bdf5961ae2c11ec0b1d968f271fb7d969fe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/nn-NO/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/nn-NO/firefox-114.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d19a24f25e67157e788f69b1a229c28c2a3d61f8295ec3ea58e4d1a8f7be2db0"; + sha256 = "c40c3add0017baa2321c22f4a90f5ff87a47db94a403f5635292c6bb2a83c885"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/oc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/oc/firefox-114.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c2469e7bb387ad0e1579b565d171a98fec8cd80844efbde05bc578bfa3302f05"; + sha256 = "d129c9164626625a9f4f188fba1fd69a460ee0d688d63826eb3a5f22b3e2f1cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pa-IN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/pa-IN/firefox-114.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "96f7014cf43ca4bb5557d80e75f88112cc047b700ab53bfb0f00377008f65e80"; + sha256 = "239f53c065d6612b9b09a53ac275628e4b76c2ace70ed03bb62b0fb2244c3d3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/pl/firefox-114.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1cf73f85f46dfbaaa118c4ab5ddb7460b7bbc6b2f80cb4aadeb035f6634d8925"; + sha256 = "1a71e2e57dab4be667b53853f4e93be32680ab05684b69a6eb2411e05768eaea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pt-BR/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/pt-BR/firefox-114.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "1589f4467c0c00939a197d77b48cca58fd2fd8fe07e6d440c4b815894ccc2342"; + sha256 = "8698c5b33f96b2da981ca42c2767b6f1daeab9cff52ef94203c4203e1310e2d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pt-PT/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/pt-PT/firefox-114.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1a5795b1e311d2d71c49d8a9749c5cbb7ebe021fc82c7d5ce50d1a3722fb9f04"; + sha256 = "e116043bbeacee9c53f01e46ac06fde61ef40c3de0ad6779b2df63fdd4621cc7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/rm/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/rm/firefox-114.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d428e26b8be57992a2cb6e1c5a9ec17736ed20d8acd6b3281e34ff13f4f04c6c"; + sha256 = "65628e9d4a1a917e39ea6beee3142b86201b1bff5acb73613e384bcc666521ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ro/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ro/firefox-114.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "ccd90382e8c454fa01964a11d9a1354d92607887e39489c744f4e16f94fc1a58"; + sha256 = "dede7077719e0609395a70c764a35e8df8b3dd83c6a3db2e44d62d933fa56d2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ru/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ru/firefox-114.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "047db6217ded736876724241712c992909020d8c5adedac092a901ddd6a3f4fa"; + sha256 = "30bb891771c6cae5d0193400e661a95ab0d4245cfccea0932125af0a153dca9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sc/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/sc/firefox-114.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "f59c735d303d0e3d029d1de4a00494f28886491d673cf40aa30454df1ac8901b"; + sha256 = "02c8c577af4abebaef25c1717a6c6a6efd296be2a919a7541b34173d70952592"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sco/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/sco/firefox-114.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "20402e2ebde765321d5e829ddaf4db6af5156a9ada0f810d2a32310f6422423c"; + sha256 = "77796654e4adf81746b83166faad91c1f90b66f39c8de7c08654732745de1e2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/si/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/si/firefox-114.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "fc7ba426dd13eef412bf0d5b84baa1697ae53f3ccdab11e4b176937cbf376949"; + sha256 = "40862b2cf7323ded868a5a89580ba4c2978363cbd2da137e68ece7c13b58598d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/sk/firefox-114.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6a73f131366f3fe20004d7e2160ecf06a6e43bb0cac33dec7d1cb45a87dd9392"; + sha256 = "15d43ee1c8ade230bb1adc22016c0743cd9347006635264085386f9697178f2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/sl/firefox-114.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6bcdad54f5173257a81f616a591d58c87402c02747e0fb2d945d9787b689dedc"; + sha256 = "7bcb1808fae70a7fa77c5a32ec6773f330095f2a10b19f4253210d5ffa8a1d27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/son/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/son/firefox-114.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "730699eed8e6c941b0115b4dcb404bc5f8295da7d2276c8f0f649620fb6f0cf5"; + sha256 = "28acb7f8f7d8048af29c66d9186c163ff8c5fbaadccc96d65cc859ecea4b80d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sq/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/sq/firefox-114.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "58c9b7a606aa8ce98eb2f3e9ffa752bcc663957d400ce420c10f4251f85662a0"; + sha256 = "cc44067edb0b54e7f0a0e886e1f181e802d40226632b5874f4a21db142fd880c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/sr/firefox-114.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "3179ab5f043bdd681d65aa32bd2d91078f1dc3b1ec0405cd4e1d59c2ffc3fb4c"; + sha256 = "1b54ae09473ca885910eff73aca8dd2ff2183ab6f1b1b7a931e933ef5301893b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sv-SE/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/sv-SE/firefox-114.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bfd4e60edc50645c4f7fffb6131d266c106bc6c5a067950845684e343b363a16"; + sha256 = "58bdb3465996b8b83c02c58741160ca8111cc6f655d4eca92eb388a49d83779d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/szl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/szl/firefox-114.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "662a229a383734d002fa73215f51b6e83f1aab3fddb1bdc5a1c76f63c670a347"; + sha256 = "4acf722cbfdc0a2705451471d70d5836e8be69161bafa4e3a7d75761bee77768"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ta/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ta/firefox-114.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "cebc08bfd6c96fa05f7e3afceeff49106830234ddfd951d87e3a7fb3787ff350"; + sha256 = "4479eff439d96b2ad36ac27ef868fae0b1dc91ab2349a966e98929ad59601d26"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/te/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/te/firefox-114.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "3c7c4dd5b2e17fdf835ab6347ab5575989d1ed24ea9abe67b14c3432a71f738a"; + sha256 = "ce24b3b02ff56c8a3b56ab32913323619753939b31adec29041e5c63d5ad5969"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/tg/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/tg/firefox-114.0b6.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "10d715b50ae52cdd244c3a216c595558ef6b795447ab34bb35926eeecdf750b7"; + sha256 = "e5e9c1b3ef7c50f90aa774812e1678fb9b33b93d944b7e26061cf48c6d9c949f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/th/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/th/firefox-114.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "58ad7a27a39761e7af5a772c61b76a8492a906cc03d6fb4197765c9843b720fe"; + sha256 = "a18a175a1c0bcd3f4dca146193eefdf624650559c92564e592aba76f3938e658"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/tl/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/tl/firefox-114.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a7804d3c8967e838b9935b3858b36899a9ff85f70bc443cba9d0b8b42c7cd778"; + sha256 = "5d32fa2cef041344ff0c87a8ae0f94ba52810e6996e0d19b749e094ab92e940a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/tr/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/tr/firefox-114.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5ee096c8f024dcdc55d62fc0c98bb712be9d74f7aec1ebaf2a76992d404b81e0"; + sha256 = "0ee5666860dbf8a635a1791c023193c53558dd412e158dba48fff13be5ff0b54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/trs/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/trs/firefox-114.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "020ce9d8b34813c65fc97a220c6080b6cf5396cfeaf33f696920e4b8a888e719"; + sha256 = "ad7a4eb9915ab87441d6792c36d6210799d2070a872d2cc2a5b399e972f7cbc3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/uk/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/uk/firefox-114.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a3703ab55464fa5cfd6ea2abde8aa34e0f88505a67175c8ccc7c9b6ff2c5f022"; + sha256 = "d116c972a72be42b6d9f411bb9cb8ac7e4627f19f81d851c5cf5dc12ccd6c77d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ur/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/ur/firefox-114.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1b2d6dd037573c13367a29708d6b503555dea4669b12d9682180dcba88767a0f"; + sha256 = "6d14fd859c91365d525d873bff840ae67da71471dca72a97c30df5e5e11bb28c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/uz/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/uz/firefox-114.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f5268e0288d914d32c7953ea2877739fa5eec249e0d58fabfc206f703d9a75a8"; + sha256 = "b2950f7afa961dc9dc8d1e2435f5f4f81c877ababc362cd5aa61cac2bdcde83b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/vi/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/vi/firefox-114.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f58b711c1cbc867c10b6cc86f3540c6bacdb6f0065d8a6e265c451d7a9bc471e"; + sha256 = "6e3205de354b8d6d09bdb241445a0e66ba4007a2385b13c07c5fc4804a1d892d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/xh/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/xh/firefox-114.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "639a24db66dc57df82e447e7bf4b3f66ee331465329962c70a5abefea8f00c53"; + sha256 = "a945428cfd40ed222cac630b17b6a57ed29fe4421b96e232a1fccf31d1f535e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/zh-CN/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/zh-CN/firefox-114.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c700678237a32c2855bededf63471c0d013ae468c1f191f02568a33ce94d2db8"; + sha256 = "2d1a77fd7a7b91a55ad2179091eca2270e7728f41c30ec7278bcfe5fa1d68782"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/zh-TW/firefox-113.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/114.0b6/linux-i686/zh-TW/firefox-114.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "df5078776ce3eefaec9d5a7d8b1a9564d527d43b84df299bfe994f553abba012"; + sha256 = "54651f97cf5073317f1a7e531b79d9c5bcc547b266dfeedd9444d793d14f49f4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index ad7435611b3..94f3a5615b2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,11 +29,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "113.0b9"; + version = "114.0b6"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "de052b3df75a0d0e00ff6548dc5a47ca543855e819187a5d630d7352548ae5082ddc29c68c36f8effc421fae13fdb7e67c9b0fb63470af4e31fc360bc319b7df"; + sha512 = "50127c640e0cb617ca031df022a09df8bba7dd44e9b88b034d9c9276d1adcec17a937d80ab3e540433290e8f78982a405b7281724713f43c36e5e266df721854"; }; meta = { @@ -56,12 +56,12 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "113.0b9"; + version = "114.0b6"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "193b4b96dd3dfe9d95dc11ddc089a433a6fa4aff5d55d8294ff638dccacdd141b0977f9d87b7cb6c4f4f64af22166a517f2e751fee7059cd7e77ddb8ea977466"; + sha512 = "cf5a6ab9b950af602c91d2c6ffc9c5efd96d83f580f3de16e03cbcf3ef5fa04e4d86536a82c1e2503ca09ae744991bc360e35a2e1c03c8b8408fa3f4c956823e"; }; meta = { diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index f0c5f88815c..559ca74e481 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -5,6 +5,7 @@ , copyDesktopItems , makeWrapper , writeText +, wrapGAppsHook # Common run-time dependencies , zlib @@ -104,7 +105,7 @@ stdenv.mkDerivation rec { src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index c8b9d85ead7..69eae1d73dd 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DhbXM/ntfywFZWAXxeojBC0wpjk0XLY3NZejE3f3Q10="; + sha256 = "sha256-vH+wQ3pPz70jc3QzD/0vbKMqQtYak8UGoQmEgeYbFbk="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index e533c8bafe1..6dc75038a43 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "civo"; - version = "1.0.53"; + version = "1.0.54"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-UE83fnP2cJuRWwyAkZhaF9N64q2Cw4oR/TTnvPbDSxc="; + sha256 = "sha256-oMVTHFTLYa984X/QOMYCXHYMqYQmmL4UgjexbbbAmVo="; }; vendorHash = "sha256-c6Bx/+zyhvV9B1nZ7dJdIsNRSoWeHc2eE81V7Mbkwds="; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 30a27294aae..f7c71318a3d 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "2.0.0-rc.2"; - sha256 = "0b7ls2amzmfjy6hw6kwcmhjj2wdara4igwk2wby6ah2yj5nipb45"; - manifestsSha256 = "1xj0g65czl20j8axi6n07sm9ijzmr7vhczfdpx4xqx6m3bl9vqxs"; + version = "2.0.0-rc.3"; + sha256 = "1ag3w97kzgqkpkw2lipv9x7wccr69zq47giffliya4sayj1y371y"; + manifestsSha256 = "0gg6n5d3a7sypms540k4ycnrbg6nqlwymphszwbcjahdsjcmi40p"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-HWKpaMHBX8wvG2aDX/U9lI9KNMcbBNxxG3yigYa+VX8="; + vendorSha256 = "sha256-PFutjxDYwe9C52L3MfjFz9CJHbh77ADICaKXlKCuwuo="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 91627366b6e..32384465313 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.14.2"; + version = "1.14.4"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-g/gn08Mpwocf5SBJu93bMNiAlg9osIWUy0skV3JzmMk="; + hash = "sha256-x9vF9JEx1NCc8g7QP1QxnzxTEyLHLoSFX9QUIy7St8o="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index b1fc971148c..8735ddb333e 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256:0ijqnlh234pqkx6yzz2kxdnj8hnqarp2scq7gfsp8wpq7s42ivg8"; + hash = "sha256-+eD+EHTZ0hCw4TzeZodXIsHg8dLUf7BFyw2Y0aEuSlA="; }; vendorHash = "sha256-IbqE0aI7utYuu1XpQijEFVu/IpUDK6CQLu7g8GUR4e8="; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 1bb13763d8d..d5c31a94bf8 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.4.3"; - sha256 = "1wyqqb2frxrid7ln0qq8x6y3sg0a6dnq464csryzsh00arycyfph"; - vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0="; + version = "23.5.1"; + sha256 = "0zb0vyvrx5fbr2ixqnm7qk7bivdljakjw25zgq19hv4bv6khilqv"; + vendorSha256 = "sha256-mcxG60HHgKRWgJLRO7q2O6PL4qxW6CD0qbqJ/fSrIlk="; } diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 4371331a3f2..809d234a8a7 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.16.1"; + version = "5.16.3"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-UCq+aMUffvDWmPtSSc/PNbrak1LGWQe8Oe340O5q6LM="; + sha256 = "sha256-TlXwjgk+sT5lvswbDKjun0PhkfqDfk1IzGZ9NCMdw9s="; }; - vendorHash = "sha256-0VFCZ+U0W21tF35148Valpc7fDXkC9dPpz1O0+4D30U="; + vendorHash = "sha256-ahneuZExefFKGYDxa+F8IhKPDjw8+kdZ5Hj+k1BDxcU="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index a36298588c7..a21473f2012 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.45.11"; + version = "0.45.13"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3CmaCNF8HM+vACbvjbFHZAxKnwDu1FKHJZ7YatT4bpc="; + hash = "sha256-cdf7Bon7cELXAgxnSUyhmSSNxigqEoMCpiWK08kU89s="; }; vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 8cf2e58cbe1..f291f465d3f 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fAfbnz8HK/CzA9VcWyXcTxIll1w70P9wVtG73fqn1Fc="; + sha256 = "sha256-1JSFhuH/YdWFckFxaky11R8eXl2xzYe5VCk0XGXwCp8="; }; - vendorHash = "sha256-N7KS48Kr9SipliZ9JhMo2u9pRoE8+pxhC8B/YcZlNyg="; + vendorHash = "sha256-oO/EMaVkcc054C6VOPjh6r4UhHifq2rQKtrYSg5frFQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 645bbad3ed9..eb8799e7663 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "5.2.0"; + version = "5.2.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-URBHQA3UU5F3VCyEpegNfpetc9KpmG/81s2FtMxxH78="; + sha256 = "sha256-4MJBV8yWpy5LvkyyipOZdDjU6FV7F8INc/zWddRGFcY="; }; strictDeps = true; @@ -54,13 +54,14 @@ stdenv.mkDerivation rec { spicy-parser-generator curl gperftools - libkqueue libmaxminddb libpcap ncurses openssl swig zlib + ] ++ lib.optionals stdenv.isLinux [ + libkqueue ] ++ lib.optionals stdenv.isDarwin [ gettext ]; @@ -75,13 +76,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBroker_ROOT=${broker}" "-DSPICY_ROOT_DIR=${spicy-parser-generator}" - "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" "-DZEEK_ETC_INSTALL_DIR=/etc/zeek" "-DZEEK_LOG_DIR=/var/log/zeek" "-DZEEK_STATE_DIR=/var/lib/zeek" "-DZEEK_SPOOL_DIR=/var/spool/zeek" + ] ++ lib.optionals stdenv.isLinux [ + "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" ]; postInstall = '' diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 34e2dd29282..e0d2cd3e0b7 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.1.7"; + version = "3.2.0"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "sha256-c0ejSivQbxpPUQ6P0YUya3q1EJ1yF4RFGur11BMwz3o="; + sha256 = "sha256-7lT69fU7tGujhbDTX0tYpkEquoswMCZOGAUhk2Nr+C0="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "sha256-4yqe4eIO4AxsZNYCn99KTBqjQURB+G+gpT0Q17pcEvU="; + sha256 = "sha256-a5qLK8WjrlmKF24U9SiEpY+SNWuHf6gHJBym5IM8HZ4="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 7ad60fed6cf..871138b7df5 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M8WTgZv3+8SRGNfxCv10GldjgRYBUVo1B3X4s+QAuYs="; + sha256 = "sha256-zvwvvwMPWnNT44L7g8fiY0N7H62Ot1lNCFCIkL8SxQw="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 9f037845def..e47a5349ed6 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -6,7 +6,7 @@ , glib , gtk3 , lib -, libappindicator +, libayatana-appindicator , libdrm , libgcrypt , libkrb5 @@ -22,15 +22,16 @@ }: let - version = "3.1.1-11223"; + version = "3.1.2-12912"; + _hash = "80d33f88"; srcs = { x86_64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_amd64.deb"; - sha256 = "sha256-TBgQ7zV+juB3KSgIIXuvxnYmvnnM/1/wU0EkiopIqvY="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_amd64.deb"; + hash = "sha256-F+zIHqYWKiCHYNJZ5hRw0rzltizjuqhVxbpzQGagoZ0="; }; aarch64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_arm64.deb"; - sha256 = "sha256-1ba/IA/+X/s7jUtIhh3OsBHU7MPggGrASsBPx8euBBs="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_arm64.deb"; + hash = "sha256-5n4T0mlfEh9/84wUYiH437R95Qz6/SKDq/AK6baiW24="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -39,8 +40,6 @@ stdenv.mkDerivation { pname = "qq"; inherit version src; - unpackCmd = "dpkg-deb -x $curSrc source"; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook @@ -63,7 +62,6 @@ stdenv.mkDerivation { ]; runtimeDependencies = map lib.getLib [ - libappindicator systemd ]; @@ -81,6 +79,10 @@ stdenv.mkDerivation { # Remove bundled libraries rm -r $out/opt/QQ/resources/app/sharp-lib + # https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e + ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \ + $out/opt/QQ/libappindicator3.so + runHook postInstall ''; diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index e4b86636322..2c270199f12 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.19.2"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.20.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-HPhlKAavINaN0SJHWmeJRx43jfeHeYDZb3/dZ55kMLI="; + hash = "sha256-3Oj/x3EkceNO8/Ik7+U43wi1aL0lYJi1FA0AjtdJRDI="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 6b505f41560..56842796e1e 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,11 +1,36 @@ -{ stdenv, lib, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa -, libGL, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator +{ stdenv +, lib +, fetchurl +, dpkg +, alsa-lib +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, pango +, nspr +, nss +, gtk3 +, mesa +, libGL +, wayland +, xorg +, autoPatchelfHook +, systemd +, libnotify +, libappindicator , makeWrapper +, coreutils +, gnugrep }: -let deps = [ +let + deps = [ alsa-lib atk cairo @@ -77,7 +102,9 @@ stdenv.mkDerivation rec { ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report - wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + wrapProgram $out/bin/mullvad-vpn \ + --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 \ + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} wrapProgram $out/bin/mullvad-daemon \ --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d0d679a9eea..fdc649bd0b2 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -22,6 +22,12 @@ let patches = [ ./0001-BUILD-crypto-Migrate-to-OpenSSL-3.0-compatible-API.patch + # fix crash caused by openssl3 thread unsafe evp implementation + # see https://github.com/mumble-voip/mumble/issues/5361#issuecomment-1173001440 + (fetchpatch { + url = "https://github.com/mumble-voip/mumble/commit/f8d47db318f302f5a7d343f15c9936c7030c49c4.patch"; + hash = "sha256-xk8vBrPwvQxHCY8I6WQJAyaBGHmlH9NCixweP6FyakU="; + }) ./0002-FIX-positional-audio-Force-8-bytes-alignment-for-CCa.patch ]; diff --git a/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch b/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch new file mode 100644 index 00000000000..e9aa64e2871 --- /dev/null +++ b/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch @@ -0,0 +1,12 @@ +diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc +index 8556b8198..d63699216 100644 +--- a/libretroshare/src/util/rsdir.cc ++++ b/libretroshare/src/util/rsdir.cc +@@ -47,6 +47,7 @@ + + #include + #include ++#include + + #if defined(WIN32) || defined(__CYGWIN__) + #include "util/rsstring.h" diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 7a213b88034..680905e42bc 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -19,6 +19,7 @@ mkDerivation rec { # The build normally tries to get git sub-modules during build # but we already have them checked out ./no-submodules.patch + ./cpp-filesystem.patch ]; nativeBuildInputs = [ pkg-config qmake cmake ]; diff --git a/pkgs/applications/office/espanso/Cargo.lock b/pkgs/applications/office/espanso/Cargo.lock new file mode 100644 index 00000000000..82f195f1b7b --- /dev/null +++ b/pkgs/applications/office/espanso/Cargo.lock @@ -0,0 +1,3532 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bitflags" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", +] + +[[package]] +name = "bumpalo" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "bzip2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "calloop" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" +dependencies = [ + "log", + "nix 0.22.3", +] + +[[package]] +name = "caps" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c088f2dddef283f86b023ab1ebe2301c653326834996458b2f48d29b804e9540" +dependencies = [ + "errno", + "libc", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "pure-rust-locales", + "time", + "winapi 0.3.9", +] + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term 0.11.0", + "atty", + "bitflags 1.2.1", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi 0.3.9", +] + +[[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", + "regex", + "terminal_size", + "unicode-width", + "winapi 0.3.9", +] + +[[package]] +name = "const-sha1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" + +[[package]] +name = "const_format" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ea7d6aeb2ebd1ee24f7b7e1b23242ef5a56b3a693733b99bfbe5ef31d0306" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c36c619c422113552db4eb28cddba8faa757e33f758cc3415bd2885977b591" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "unicode-xid 0.2.1", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + +[[package]] +name = "cpufeatures" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +dependencies = [ + "cfg-if 1.0.0", + "lazy_static", +] + +[[package]] +name = "cstr_core" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "644828c273c063ab0d39486ba42a5d1f3a499d35529c759e763a9c6cb8a0fb08" +dependencies = [ + "cty", + "memchr", +] + +[[package]] +name = "ctor" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +dependencies = [ + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "dbus" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1334c0161ddfccd239ac81b188d62015b049c986c5cd0b7f9447cf2c54f4a3" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[package]] +name = "dialoguer" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9dd058f8b65922819fabb4a41e7d1964e56344042c26efbccd465202c23fa0c" +dependencies = [ + "console", + "lazy_static", + "tempfile", + "zeroize", +] + +[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "dirs" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dirs" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dlib" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +dependencies = [ + "libloading", +] + +[[package]] +name = "downcast" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "dtoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" + +[[package]] +name = "dunce" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2641c4a7c0c4101df53ea572bffdc561c146f6c2eb09e4df02bc4811e3feeb4" + +[[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_rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "enum-as-inner" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" +dependencies = [ + "heck", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "errno" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" +dependencies = [ + "gcc", + "libc", +] + +[[package]] +name = "espanso" +version = "2.1.8" +dependencies = [ + "anyhow", + "caps", + "clap", + "colored", + "const_format", + "crossbeam", + "dialoguer", + "dirs 3.0.1", + "enum-as-inner", + "espanso-clipboard", + "espanso-config", + "espanso-detect", + "espanso-engine", + "espanso-info", + "espanso-inject", + "espanso-ipc", + "espanso-kvs", + "espanso-mac-utils", + "espanso-match", + "espanso-migrate", + "espanso-modulo", + "espanso-package", + "espanso-path", + "espanso-render", + "espanso-ui", + "fs2", + "fs_extra", + "lazy_static", + "libc", + "log", + "log-panics", + "maplit", + "named_pipe", + "notify", + "opener", + "regex", + "serde", + "serde_json", + "serde_yaml", + "simplelog", + "sysinfo", + "tempdir", + "thiserror", + "widestring", + "winapi 0.3.9", + "winreg 0.9.0", +] + +[[package]] +name = "espanso-clipboard" +version = "0.1.0" +dependencies = [ + "anyhow", + "cc", + "lazy_static", + "lazycell", + "log", + "thiserror", + "wait-timeout", + "widestring", +] + +[[package]] +name = "espanso-config" +version = "0.1.0" +dependencies = [ + "anyhow", + "dunce", + "enum-as-inner", + "glob", + "indoc", + "lazy_static", + "log", + "mockall", + "ordered-float", + "regex", + "serde", + "serde_yaml", + "tempdir", + "tempfile", + "thiserror", + "walkdir", +] + +[[package]] +name = "espanso-detect" +version = "0.1.0" +dependencies = [ + "anyhow", + "cc", + "enum-as-inner", + "lazy_static", + "lazycell", + "libc", + "log", + "regex", + "scopeguard", + "smithay-client-toolkit", + "thiserror", + "widestring", +] + +[[package]] +name = "espanso-engine" +version = "0.1.0" +dependencies = [ + "anyhow", + "crossbeam", + "html2text", + "log", + "markdown", + "tempdir", + "thiserror", +] + +[[package]] +name = "espanso-info" +version = "0.1.0" +dependencies = [ + "anyhow", + "cc", + "lazy_static", + "lazycell", + "log", + "thiserror", + "widestring", +] + +[[package]] +name = "espanso-inject" +version = "0.1.0" +dependencies = [ + "anyhow", + "cc", + "enum-as-inner", + "itertools", + "lazy_static", + "lazycell", + "libc", + "log", + "regex", + "scopeguard", + "thiserror", + "widestring", +] + +[[package]] +name = "espanso-ipc" +version = "0.1.0" +dependencies = [ + "anyhow", + "crossbeam", + "log", + "named_pipe", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "espanso-kvs" +version = "0.1.0" +dependencies = [ + "anyhow", + "log", + "serde", + "serde_json", + "tempdir", + "thiserror", +] + +[[package]] +name = "espanso-mac-utils" +version = "0.1.0" +dependencies = [ + "anyhow", + "cc", + "lazy_static", + "lazycell", + "log", + "regex", + "thiserror", +] + +[[package]] +name = "espanso-match" +version = "0.1.0" +dependencies = [ + "anyhow", + "log", + "regex", + "thiserror", + "unicase", +] + +[[package]] +name = "espanso-migrate" +version = "0.1.0" +dependencies = [ + "anyhow", + "dunce", + "fs_extra", + "glob", + "include_dir", + "lazy_static", + "log", + "path-slash", + "pretty_assertions", + "regex", + "tempdir", + "tempfile", + "test-case", + "thiserror", + "walkdir", + "yaml-rust 0.4.6", +] + +[[package]] +name = "espanso-modulo" +version = "0.1.0" +dependencies = [ + "anyhow", + "cc", + "glob", + "lazy_static", + "log", + "regex", + "serde", + "serde_json", + "thiserror", + "winres", + "zip", +] + +[[package]] +name = "espanso-package" +version = "0.1.0" +dependencies = [ + "anyhow", + "fs_extra", + "glob", + "hex", + "lazy_static", + "log", + "natord", + "regex", + "reqwest", + "scopeguard", + "serde", + "serde_json", + "serde_yaml", + "sha2", + "tempdir", + "thiserror", + "zip", +] + +[[package]] +name = "espanso-path" +version = "0.1.0" +dependencies = [ + "anyhow", + "dirs 3.0.1", + "log", + "thiserror", +] + +[[package]] +name = "espanso-render" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "enum-as-inner", + "lazy_static", + "log", + "rand 0.8.3", + "regex", + "sys-locale", + "thiserror", +] + +[[package]] +name = "espanso-ui" +version = "0.1.0" +dependencies = [ + "anyhow", + "cc", + "crossbeam", + "lazy_static", + "lazycell", + "log", + "notify-rust", + "serde", + "serde_json", + "thiserror", + "widestring", + "winrt-notification 0.3.1", +] + +[[package]] +name = "filetime" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.5", + "winapi 0.3.9", +] + +[[package]] +name = "flate2" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "fragile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags 1.2.1", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.2.1", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" + +[[package]] +name = "futures-io" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" + +[[package]] +name = "futures-macro" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +dependencies = [ + "autocfg", + "proc-macro-hack", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "futures-sink" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" + +[[package]] +name = "futures-task" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" + +[[package]] +name = "futures-util" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +dependencies = [ + "autocfg", + "futures-core", + "futures-io", + "futures-macro", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" + +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "h2" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html2text" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26379dcb715e237b96102a12b505c553e2bffa74bae2e54658748d298660ef1" +dependencies = [ + "html5ever", + "markup5ever_rcdom", + "unicode-width", +] + +[[package]] +name = "html5ever" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "http" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" + +[[package]] +name = "httpdate" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + +[[package]] +name = "hyper" +version = "0.14.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +dependencies = [ + "futures-util", + "hyper", + "log", + "rustls", + "tokio", + "tokio-rustls", + "webpki", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "include_dir" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d58bdeb22b1c4691106c084b1063781904c35d0f22eda2a283598968eac61a" +dependencies = [ + "glob", + "include_dir_impl", + "proc-macro-hack", +] + +[[package]] +name = "include_dir_impl" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327869970574819d24d1dca25c891856144d29159ab797fa9dc725c5c3f57215" +dependencies = [ + "anyhow", + "proc-macro-hack", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "indexmap" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136" +dependencies = [ + "unindent", +] + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags 1.2.1", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" + +[[package]] +name = "itertools" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "js-sys" +version = "0.3.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libdbus-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "log-panics" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef" +dependencies = [ + "log", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb6b71a9a89cd38b395d994214297447e8e63b1ba5708a9a2b0b1048ceda76" +dependencies = [ + "cc", + "chrono", + "dirs 1.0.5", + "objc-foundation", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markdown" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef3aab6a1d529b112695f72beec5ee80e729cb45af58663ec902c8fac764ecdd" +dependencies = [ + "lazy_static", + "pipeline", + "regex", +] + +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +dependencies = [ + "log", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever_rcdom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" +dependencies = [ + "html5ever", + "markup5ever", + "tendril", + "xml5ever", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap2" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow 0.2.2", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +dependencies = [ + "libc", + "log", + "miow 0.3.7", + "ntapi", + "winapi 0.3.9", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "mockall" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d614ad23f9bb59119b8b5670a85c7ba92c5e9adf4385c81ea00c51c8be33d5" +dependencies = [ + "cfg-if 1.0.0", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd4234635bca06fc96c7368d038061e0aae1b00a764dc817e900dc974e3deea" +dependencies = [ + "cfg-if 1.0.0", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "named_pipe" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "native-tls" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nix" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +dependencies = [ + "bitflags 1.2.1", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + +[[package]] +name = "nix" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +dependencies = [ + "bitflags 1.2.1", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags 1.2.1", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "notify-rust" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a3a5dd7b4b415b112ce0fae1988f3e6dee90a96918bf3950b5f2289b19a04b" +dependencies = [ + "dbus", + "mac-notification-sys", + "winrt-notification 0.2.2", +] + +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "opener" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" +dependencies = [ + "bstr", + "winapi 0.3.9", +] + +[[package]] +name = "openssl" +version = "0.10.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" +dependencies = [ + "bitflags 1.2.1", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-sys", +] + +[[package]] +name = "openssl-probe" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + +[[package]] +name = "openssl-sys" +version = "0.9.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-float" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "766f840da25490628d8e63e529cd21c014f6600c6b8517add12a6fa6167a6218" +dependencies = [ + "num-traits", +] + +[[package]] +name = "output_vt100" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "path-slash" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cacbb3c4ff353b534a67fb8d7524d00229da4cb1dc8c79f4db96e375ab5b619" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared", + "rand 0.7.3", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pipeline" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0" + +[[package]] +name = "pkg-config" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "predicates" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +dependencies = [ + "difference", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" + +[[package]] +name = "predicates-tree" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" +dependencies = [ + "predicates-core", + "treeline", +] + +[[package]] +name = "pretty_assertions" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b" +dependencies = [ + "ansi_term 0.12.1", + "ctor", + "diff", + "output_vt100", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid 0.2.1", +] + +[[package]] +name = "pure-rust-locales" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45c49fc4f91f35bae654f85ebb3a44d60ac64f11b3166ffa609def390c732d8" + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi 0.3.9", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha 0.3.0", + "rand_core 0.6.2", + "rand_hc 0.3.0", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.2", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom 0.2.2", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core 0.6.2", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rayon" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_syscall" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +dependencies = [ + "bitflags 1.2.1", +] + +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom 0.1.16", + "redox_syscall 0.1.57", + "rust-argon2", +] + +[[package]] +name = "regex" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "reqwest" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite", + "rustls", + "serde", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.7.0", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "rust-argon2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" +dependencies = [ + "base64", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64", + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +dependencies = [ + "bitflags 1.2.1", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "serde_json" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[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 0.4.5", +] + +[[package]] +name = "sha2" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3" +dependencies = [ + "block-buffer", + "cfg-if 1.0.0", + "cpufeatures", + "digest", + "opaque-debug", +] + +[[package]] +name = "simplelog" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bc0ffd69814a9b251d43afcabf96dad1b29f5028378056257be9e3fecc9f720" +dependencies = [ + "chrono", + "log", + "termcolor", +] + +[[package]] +name = "siphasher" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1" + +[[package]] +name = "slab" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "smithay-client-toolkit" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" +dependencies = [ + "bitflags 1.2.1", + "calloop", + "dlib", + "lazy_static", + "log", + "memmap2", + "nix 0.22.3", + "pkg-config", + "wayland-client", + "wayland-cursor", + "wayland-protocols", +] + +[[package]] +name = "socket2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "squote" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fccf17fd09e2455ea796d2ad267b64fa2c5cbd8701b2a93b555d2aa73449f7d" + +[[package]] +name = "string_cache" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" +dependencies = [ + "lazy_static", + "new_debug_unreachable", + "phf_shared", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote 1.0.9", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strum" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca6e4730f517e041e547ffe23d29daab8de6b73af4b6ae2a002108169f5e7da" + +[[package]] +name = "strum" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" +dependencies = [ + "strum_macros 0.20.1", +] + +[[package]] +name = "strum_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3384590878eb0cab3b128e844412e2d010821e7e091211b9d87324173ada7db8" +dependencies = [ + "quote 0.3.15", + "syn 0.11.11", +] + +[[package]] +name = "strum_macros" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" +dependencies = [ + "heck", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ + "quote 0.3.15", + "synom", + "unicode-xid 0.0.4", +] + +[[package]] +name = "syn" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "unicode-xid 0.2.1", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ + "unicode-xid 0.0.4", +] + +[[package]] +name = "sys-locale" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91f89ebb59fa30d4f65fafc2d68e94f6975256fd87e812dd99cb6e020c8563df" +dependencies = [ + "cc", + "cstr_core", + "libc", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "sysinfo" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d80929a3b477bce3a64360ca82bfb361eacce1dcb7b1fb31e8e5e181e37c212" +dependencies = [ + "cfg-if 1.0.0", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi 0.3.9", +] + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +dependencies = [ + "rand 0.4.6", + "remove_dir_all", +] + +[[package]] +name = "tempfile" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "rand 0.8.3", + "redox_syscall 0.2.5", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] +name = "tendril" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "test-case" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956044ef122917dde830c19dec5f76d0670329fde4104836d62ebcb14f4865f1" +dependencies = [ + "cfg-if 1.0.0", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", + "version_check", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "tinyvec" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio 0.7.13", + "num_cpus", + "pin-project-lite", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-util" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +dependencies = [ + "cfg-if 1.0.0", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "treeline" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "typenum" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" +dependencies = [ + "cfg-if 1.0.0", + "serde", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" +dependencies = [ + "quote 1.0.9", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.2.1", + "downcast-rs", + "libc", + "nix 0.24.2", + "scoped-tls", + "wayland-commons", + "wayland-scanner", + "wayland-sys", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.2", + "once_cell", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.2", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.2.1", + "wayland-client", + "wayland-commons", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "xml-rs 0.8.3", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +dependencies = [ + "webpki", +] + +[[package]] +name = "widestring" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426842497696b65fbfc575691d94ef65befb248ed1a8c4361e293c724e7ebe61" +dependencies = [ + "const-sha1", + "windows_gen", + "windows_macros", + "windows_winmd", +] + +[[package]] +name = "windows_gen" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac8f0f06b647f42ee5459a8e1ffe41795647582c5926ec3fa363a91aad7d77" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "squote", + "syn 1.0.67", + "windows_gen_macros", + "windows_winmd", +] + +[[package]] +name = "windows_gen_macros" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23eac2169a20173b890c496f9e0e1149a92ef29fe4ba96026b72eec363b993f9" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "windows_macros" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edc57c944eec106c7823b425ab0fd9f90163489e50a4df747f65fcf9030e1fb" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "squote", + "syn 1.0.67", + "windows_gen", + "windows_winmd", +] + +[[package]] +name = "windows_winmd" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d44527d04c9713312ed598f5d6ce3c453754dbfc03ddc376615be4415ffc88" +dependencies = [ + "windows_winmd_macros", +] + +[[package]] +name = "windows_winmd_macros" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2353f43f512938450614a176abf2b6cb31ac3b84fd71c88470fee571303e3f36" +dependencies = [ + "proc-macro2", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winreg" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cdb3898397cf7f624c294948669beafaeebc5577d5ec53d0afb76633593597" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winres" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc" +dependencies = [ + "toml", +] + +[[package]] +name = "winrt" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e30cba82e22b083dc5a422c2ee77e20dc7927271a0dc981360c57c1453cb48d" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winrt-notification" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c31a65da50d792c6f9bd2e3216249566c4fb1d2d34f9b7d2d66d2e93f62a242" +dependencies = [ + "strum 0.8.0", + "strum_macros 0.8.0", + "winapi 0.3.9", + "winrt", + "xml-rs 0.6.1", +] + +[[package]] +name = "winrt-notification" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ee9845acda665033013f93baec4f71ac0e60a391b530a5a83bdb966c1807ca" +dependencies = [ + "strum 0.20.0", + "windows", + "xml-rs 0.8.3", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "xcursor" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9a231574ae78801646617cefd13bfe94be907c0e4fa979cfd8b770aa3c5d08" +dependencies = [ + "nom", +] + +[[package]] +name = "xml-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1945e12e16b951721d7976520b0832496ef79c31602c7a29d950de79ba74621" +dependencies = [ + "bitflags 0.9.1", +] + +[[package]] +name = "xml-rs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" + +[[package]] +name = "xml5ever" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59" +dependencies = [ + "log", + "mac", + "markup5ever", + "time", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yaml-rust" +version = "0.4.6" +source = "git+https://github.com/federico-terzi/yaml-rust#454221bebabc93307bbf7aa7f556407dd3027363" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "zeroize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" + +[[package]] +name = "zip" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +dependencies = [ + "byteorder", + "bzip2", + "crc32fast", + "flate2", + "thiserror", + "time", +] diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 6b87afd54cf..30bea3e55bd 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -3,52 +3,106 @@ , rustPlatform , pkg-config , extra-cmake-modules +, dbus , libX11 , libXi , libXtst , libnotify +, libxkbcommon , openssl , xclip , xdotool +, setxkbmap +, wl-clipboard +, wxGTK32 , makeWrapper , stdenv , AppKit , Cocoa , Foundation +, IOKit +, Kernel +, AVFoundation +, Carbon +, QTKit +, AVKit +, WebKit +, waylandSupport ? false +, x11Support ? stdenv.isLinux +, testers +, espanso }: - +# espanso does not support building with both X11 and Wayland support at the same time +assert stdenv.isLinux -> x11Support != waylandSupport; +assert stdenv.isDarwin -> !x11Support; +assert stdenv.isDarwin -> !waylandSupport; rustPlatform.buildRustPackage rec { pname = "espanso"; - version = "0.7.3"; + version = "2.1.8"; src = fetchFromGitHub { - owner = "federico-terzi"; - repo = pname; + owner = "espanso"; + repo = "espanso"; rev = "v${version}"; - sha256 = "1q47r43midkq9574gl8gdv3ylvrnbhdc39rrw4y4yk6jbdf5wwkm"; + hash = "sha256-5TUo5B1UZZARgTHbK2+520e3mGZkZ5tTez1qvZvMnxs="; }; - cargoSha256 = "0ba5skn5s6qh0blf6bvivzvqc2l8v488l9n3x98pmf6nygrikfdb"; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU="; + }; + }; + + cargoPatches = lib.optionals stdenv.isDarwin [ + ./inject-wx-on-darwin.patch + ]; nativeBuildInputs = [ extra-cmake-modules pkg-config makeWrapper + wxGTK32 + ]; + + # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4 + buildNoDefaultFeatures = true; + buildFeatures = [ + "modulo" + ] ++ lib.optionals waylandSupport[ + "wayland" + ] ++ lib.optionals stdenv.isLinux [ + "vendored-tls" + ] ++ lib.optionals stdenv.isDarwin [ + "native-tls" ]; buildInputs = [ - libX11 - libXtst - libXi - libnotify - xclip - openssl + wxGTK32 ] ++ lib.optionals stdenv.isLinux [ - xdotool + openssl + dbus + libnotify + libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation + IOKit + Kernel + AVFoundation + Carbon + QTKit + AVKit + WebKit + ] ++ lib.optionals waylandSupport [ + wl-clipboard + ] ++ lib.optionals x11Support [ + libXi + libXtst + libX11 + xclip + xdotool ]; # Some tests require networking @@ -56,14 +110,27 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/espanso \ - --prefix PATH : ${lib.makeBinPath [ libnotify xclip ]} + --prefix PATH : ${lib.makeBinPath ( + lib.optionals stdenv.isLinux [ + libnotify + setxkbmap + ] ++ lib.optionals waylandSupport [ + wl-clipboard + ] ++ lib.optionals x11Support [ + xclip + ] + )} ''; + passthru.tests.version = testers.testVersion { + package = espanso; + }; + meta = with lib; { description = "Cross-platform Text Expander written in Rust"; homepage = "https://espanso.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kimat ]; + maintainers = with maintainers; [ kimat thehedgeh0g ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/applications/office/espanso/inject-wx-on-darwin.patch b/pkgs/applications/office/espanso/inject-wx-on-darwin.patch new file mode 100644 index 00000000000..34b71121192 --- /dev/null +++ b/pkgs/applications/office/espanso/inject-wx-on-darwin.patch @@ -0,0 +1,223 @@ +From 6a7400c20831c5ff502c7336d6db2be743f156be Mon Sep 17 00:00:00 2001 +From: Nikola Knezevic +Date: Tue, 16 Aug 2022 22:28:46 +0200 +Subject: [PATCH] Build using system wx on darwin + +--- + espanso-modulo/build.rs | 174 ++++------------------------------------ + 1 file changed, 17 insertions(+), 157 deletions(-) + +diff --git a/espanso-modulo/build.rs b/espanso-modulo/build.rs +index b8b889a..5d972ec 100644 +--- a/espanso-modulo/build.rs ++++ b/espanso-modulo/build.rs +@@ -156,161 +156,6 @@ fn build_native() { + ); + } + +-#[cfg(target_os = "macos")] +-fn build_native() { +- use std::process::Command; +- +- let project_dir = +- PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").expect("missing CARGO_MANIFEST_DIR")); +- let wx_archive = project_dir.join("vendor").join(WX_WIDGETS_ARCHIVE_NAME); +- if !wx_archive.is_file() { +- panic!("could not find wxWidgets archive!"); +- } +- +- let out_dir = if let Ok(out_path) = std::env::var(WX_WIDGETS_BUILD_OUT_DIR_ENV_NAME) { +- println!( +- "detected wxWidgets build output directory override: {}", +- out_path +- ); +- let path = PathBuf::from(out_path); +- std::fs::create_dir_all(&path).expect("unable to create wxWidgets out dir"); +- path +- } else { +- PathBuf::from(std::env::var("OUT_DIR").expect("missing OUT_DIR")) +- }; +- let out_wx_dir = out_dir.join("wx"); +- println!("wxWidgets will be compiled into: {}", out_wx_dir.display()); +- +- let target_arch = match std::env::var("CARGO_CFG_TARGET_ARCH") +- .expect("unable to read target arch") +- .as_str() +- { +- "x86_64" => "x86_64", +- "aarch64" => "arm64", +- arch => panic!("unsupported arch {}", arch), +- }; +- +- let should_use_ci_m1_workaround = +- std::env::var("CI").unwrap_or_default() == "true" && target_arch == "arm64"; +- +- if !out_wx_dir.is_dir() { +- // Extract the wxWidgets archive +- let wx_archive = +- std::fs::File::open(&wx_archive).expect("unable to open wxWidgets source archive"); +- let mut archive = zip::ZipArchive::new(wx_archive).expect("unable to read wxWidgets archive"); +- archive +- .extract(&out_wx_dir) +- .expect("unable to extract wxWidgets source dir"); +- +- // Compile wxWidgets +- let build_dir = out_wx_dir.join("build-cocoa"); +- std::fs::create_dir_all(&build_dir).expect("unable to create build-cocoa directory"); +- +- let mut handle = if should_use_ci_m1_workaround { +- // Because of a configuration problem on the GitHub CI pipeline, +- // we need to use a series of workarounds to build for M1 machines. +- // See: https://github.com/actions/virtual-environments/issues/3288#issuecomment-830207746 +- Command::new(out_wx_dir.join("configure")) +- .current_dir(build_dir.to_string_lossy().to_string()) +- .args(&[ +- "--disable-shared", +- "--without-libtiff", +- "--without-liblzma", +- "--with-libjpeg=builtin", +- "--with-libpng=builtin", +- "--enable-universal-binary=arm64,x86_64", +- ]) +- .spawn() +- .expect("failed to execute configure") +- } else { +- Command::new(out_wx_dir.join("configure")) +- .current_dir(build_dir.to_string_lossy().to_string()) +- .args(&[ +- "--disable-shared", +- "--without-libtiff", +- "--without-liblzma", +- "--with-libjpeg=builtin", +- "--with-libpng=builtin", +- &format!("--enable-macosx_arch={}", target_arch), +- ]) +- .spawn() +- .expect("failed to execute configure") +- }; +- +- if !handle +- .wait() +- .expect("unable to wait for configure command") +- .success() +- { +- panic!("configure returned non-zero exit code!"); +- } +- +- let mut handle = Command::new("make") +- .current_dir(build_dir.to_string_lossy().to_string()) +- .args(&["-j8"]) +- .spawn() +- .expect("failed to execute make"); +- if !handle +- .wait() +- .expect("unable to wait for make command") +- .success() +- { +- panic!("make returned non-zero exit code!"); +- } +- } +- +- // Make sure wxWidgets is compiled +- if !out_wx_dir.join("build-cocoa").is_dir() { +- panic!("wxWidgets is not compiled correctly, missing 'build-cocoa/' directory") +- } +- +- // If using the M1 CI workaround, convert all the universal libraries to arm64 ones +- // This is needed until https://github.com/rust-lang/rust/issues/55235 is fixed +- if should_use_ci_m1_workaround { +- convert_fat_libraries_to_arm(&out_wx_dir.join("build-cocoa").join("lib")); +- convert_fat_libraries_to_arm(&out_wx_dir.join("build-cocoa")); +- } +- +- let config_path = out_wx_dir.join("build-cocoa").join("wx-config"); +- let cpp_flags = get_cpp_flags(&config_path); +- +- let mut build = cc::Build::new(); +- build +- .cpp(true) +- .file("src/sys/form/form.cpp") +- .file("src/sys/common/common.cpp") +- .file("src/sys/search/search.cpp") +- .file("src/sys/wizard/wizard.cpp") +- .file("src/sys/wizard/wizard_gui.cpp") +- .file("src/sys/welcome/welcome.cpp") +- .file("src/sys/welcome/welcome_gui.cpp") +- .file("src/sys/textview/textview.cpp") +- .file("src/sys/textview/textview_gui.cpp") +- .file("src/sys/troubleshooting/troubleshooting.cpp") +- .file("src/sys/troubleshooting/troubleshooting_gui.cpp") +- .file("src/sys/common/mac.mm"); +- build.flag("-std=c++17"); +- +- for flag in cpp_flags { +- build.flag(&flag); +- } +- +- build.compile("espansomodulosys"); +- +- // Render linker flags +- +- generate_linker_flags(&config_path); +- +- // On (older) OSX we need to link against the clang runtime, +- // which is hidden in some non-default path. +- // +- // More details at https://github.com/alexcrichton/curl-rust/issues/279. +- if let Some(path) = macos_link_search_path() { +- println!("cargo:rustc-link-lib=clang_rt.osx"); +- println!("cargo:rustc-link-search={}", path); +- } +-} +- + #[cfg(target_os = "macos")] + fn convert_fat_libraries_to_arm(lib_dir: &Path) { + for entry in +@@ -440,12 +285,17 @@ fn macos_link_search_path() -> Option { + None + } + ++#[cfg(not(target_os = "macos"))] ++fn macos_link_search_path() -> Option { ++ return None ++} ++ + // TODO: add documentation for linux + // Install wxWidgets: + // sudo apt install libwxgtk3.0-0v5 libwxgtk3.0-dev + // + // cargo run +-#[cfg(target_os = "linux")] ++#[cfg(not(target_os = "windows"))] + fn build_native() { + // Make sure wxWidgets is installed + // Depending on the installation package, the 'wx-config' command might also be available as 'wx-config-gtk3', +@@ -483,7 +333,8 @@ fn build_native() { + .file("src/sys/textview/textview.cpp") + .file("src/sys/textview/textview_gui.cpp") + .file("src/sys/troubleshooting/troubleshooting.cpp") +- .file("src/sys/troubleshooting/troubleshooting_gui.cpp"); ++ .file("src/sys/troubleshooting/troubleshooting_gui.cpp") ++ .file("src/sys/common/mac.mm"); + build.flag("-std=c++17"); + + for flag in cpp_flags { +@@ -495,6 +346,15 @@ fn build_native() { + // Render linker flags + + generate_linker_flags(&config_path); ++ ++ // On (older) OSX we need to link against the clang runtime, ++ // which is hidden in some non-default path. ++ // ++ // More details at https://github.com/alexcrichton/curl-rust/issues/279. ++ if let Some(path) = macos_link_search_path() { ++ println!("cargo:rustc-link-lib=clang_rt.osx"); ++ println!("cargo:rustc-link-search={}", path); ++ } + } + + fn main() { +-- +2.37.1 + diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index f0d634b9141..298809903fb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -16,14 +16,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.5.0"; + version = "23.5.3"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - hash = "sha256-W1bu3isEe1j7XTj+deLNk6Ncssy2UKG+eF36fe1FFWs="; + hash = "sha256-keNR+RMFVlHMeyT1Ngtuu2jWMDwFyLbZAVUk7c0Ed38="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 26c35d50d21..9743197d832 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -22,6 +22,7 @@ , CoreGraphics , Cocoa , Foundation +, System , libiconv , UserNotifications , nixosTests @@ -81,11 +82,14 @@ rustPlatform.buildRustPackage rec { CoreGraphics Foundation libiconv + System UserNotifications ]; buildFeatures = [ "distro-defaults" ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework System"; + postInstall = '' mkdir -p $out/nix-support echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index e88f04dc208..d21097df07b 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -116,7 +116,7 @@ buildGoModule rec { homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ indeednotjames urandom ]; + maintainers = with maintainers; [ emilylange urandom ]; broken = stdenv.isDarwin; mainProgram = "gitea"; }; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 25fbc65d271..b0826a2482e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false # Pin openssl to match the version bundled with our supported Rubies. # See https://stdgems.org/openssl/#gem-version. -gem 'openssl', '2.2.2' +gem 'openssl', '3.0.2' gem 'ipaddr', '~> 1.2.5' # Responders respond_to and respond_with diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index cbc11b360a2..0b14f9032d1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1093,8 +1093,7 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (2.2.2) - ipaddr + openssl (3.0.2) openssl-signature_algorithm (1.3.0) openssl (> 2.0) opentracing (0.5.0) @@ -1855,7 +1854,7 @@ DEPENDENCIES omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) openid_connect (= 1.3.0) - openssl (= 2.2.2) + openssl (= 3.0.2) org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) @@ -1967,4 +1966,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.12 + 2.4.13 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 579dcd4242c..237c9ab5a53 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -4218,15 +4218,14 @@ src: version = "1.3.0"; }; openssl = { - dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; + sha256 = "0mcg47zz4w902cq6c8cdj62npawgwq68sfh7n7aqy7vm3pgvls9h"; type = "gem"; }; - version = "2.2.2"; + version = "3.0.2"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 1965ce78b7a..bfdf51d49b4 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -144,6 +144,9 @@ def update_rubyenv(): with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) + # patch for openssl 3.x support + subprocess.check_output(['sed', '-i', "s:'openssl', '2.*':'openssl', '3.0.2':g", 'Gemfile'], cwd=rubyenv_dir) + # Fetch vendored dependencies temporarily in order to build the gemset.nix subprocess.check_output(['mkdir', '-p', 'vendor/gems'], cwd=rubyenv_dir) subprocess.check_output(['sh', '-c', f'curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=vendor/gems | tar -xj --strip-components=3'], cwd=f'{rubyenv_dir}/vendor/gems') diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 46499b7d595..7837acedcf3 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -1,31 +1,27 @@ source 'https://rubygems.org' -ruby '>= 2.4.0', '< 2.8.0' -gem 'bundler', '>= 1.12.0' +ruby '>= 2.7.0', '< 3.3.0' -gem 'rails', '5.2.8.1' -gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' -gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') -gem 'rouge', '~> 3.26.0' +gem 'rails', '6.1.7.3' +gem 'rouge', '~> 4.1.0' gem 'request_store', '~> 1.5.0' -gem "mini_mime", "~> 1.0.1" +gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" -gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0') +gem 'roadie-rails', '~> 3.0.0' gem 'marcel' -gem "mail", "~> 2.7.1" -gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') -gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0') - '~> 1.10.10' - elsif Gem.ruby_version < Gem::Version.new('2.6.0') - '~> 1.12.5' - else - '~> 1.13.10' - end) -gem 'i18n', '~> 1.8.2' -gem 'rbpdf', '~> 1.21.0' +gem 'mail', '~> 2.8.1' +gem 'nokogiri', '~> 1.14.0' +gem 'i18n', '~> 1.13.0' +gem 'rbpdf', '~> 1.21.1' gem 'addressable' gem 'rubyzip', '~> 2.3.0' -gem 'psych', '~> 3.1' if Gem.ruby_version < Gem::Version.new('2.6.0') + +# Ruby Standard Gems +gem 'csv', '~> 3.2.6' +gem 'net-imap', '~> 0.3.4' +gem 'net-pop', '~> 0.1.2' +gem 'net-smtp', '~> 0.3.3' +gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0') # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] @@ -34,54 +30,63 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] gem 'rotp', '>= 5.0.0' gem 'rqrcode' +# HTML pipeline and sanitization +gem "html-pipeline", "~> 2.13.2" +gem "sanitize", "~> 6.0" + # Optional gem for LDAP authentication group :ldap do gem 'net-ldap', '~> 0.17.0' end -# Optional gem for OpenID authentication -group :openid do - gem "ruby-openid", "~> 2.9.2", :require => "openid" - gem "rack-openid" -end - # Optional gem for exporting the gantt to a PNG file group :minimagick do - gem 'mini_magick', '~> 4.11.0' + gem 'mini_magick', '~> 4.12.0' end -# Optional Markdown support, not for JRuby +# Optional Markdown support group :markdown do - gem 'redcarpet', '~> 3.5.1' + gem 'redcarpet', '~> 3.6.0' end +# Optional CommonMark support, not for JRuby +group :common_mark do + gem "commonmarker", '~> 0.23.8' + gem 'deckar01-task_list', '2.3.2' +end + +# webrick +gem 'webrick' + # Include database gems for the database adapters NixOS supports +require 'erb' +require 'yaml' gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] -gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw] +gem "pg", "~> 1.4.2", :platforms => [:mri, :mingw, :x64_mingw] group :development do + gem 'listen', '~> 3.3' gem "yard" end group :test do gem "rails-dom-testing" - gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0') - gem 'simplecov', '~> 0.18.5', :require => false - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] + gem 'mocha', '>= 1.4.0' + gem 'simplecov', '~> 0.22.0', :require => false + gem "ffi", platforms: [:mri, :mingw, :x64_mingw, :mswin] # For running system tests - # TODO: Remove version specification once Capybara supports Puma 6 - gem 'puma', '< 6.0.0' - gem 'capybara', '~> 3.31.0' + gem 'puma' + gem 'capybara', '~> 3.38.0' gem "selenium-webdriver", "~> 3.142.7" - gem 'webdrivers', '~> 4.4', require: false + gem 'webdrivers', '4.6.1', require: false # RuboCop - gem 'rubocop', '~> 1.12.0' - gem 'rubocop-performance', '~> 1.10.1' - gem 'rubocop-rails', '~> 2.9.0' + gem 'rubocop', '~> 1.51.0', require: false + gem 'rubocop-performance', '~> 1.17.1', require: false + gem 'rubocop-rails', '~> 2.19.1', require: false end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -if File.exists?(local_gemfile) +if File.exist?(local_gemfile) eval_gemfile local_gemfile end diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 949742e91b7..46b22b9436d 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,188 +1,238 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + mail (>= 2.7.1) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + nokogiri (>= 1.8.5) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.8.1) - activesupport (= 5.2.8.1) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) - arel (9.0.0) ast (2.4.2) builder (3.2.4) - capybara (3.31.0) + capybara (3.38.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) childprocess (3.0.0) chunky_png (1.4.0) + commonmarker (0.23.9) concurrent-ruby (1.2.2) crass (1.0.6) css_parser (1.14.0) addressable - csv (3.1.9) + csv (3.2.6) + date (3.3.3) + deckar01-task_list (2.3.2) + html-pipeline docile (1.4.0) erubi (1.12.0) + ffi (1.15.5) globalid (1.1.0) activesupport (>= 5.0) + html-pipeline (2.13.2) + activesupport (>= 2) + nokogiri (>= 1.4) htmlentities (4.3.4) - i18n (1.8.11) + i18n (1.13.0) concurrent-ruby (~> 1.0) - loofah (2.19.1) + json (2.6.3) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) + matrix (0.4.2) method_source (1.0.0) - mini_magick (4.11.0) - mini_mime (1.0.3) - mini_portile2 (2.8.1) + mini_magick (4.12.0) + mini_mime (1.1.2) + mini_portile2 (2.8.2) minitest (5.18.0) mocha (2.0.2) ruby2_keywords (>= 0.0.5) mysql2 (0.5.5) + net-imap (0.3.4) + date + net-protocol net-ldap (0.17.1) - nio4r (2.5.8) - nokogiri (1.13.10) + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nio4r (2.5.9) + nokogiri (1.14.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.10-x86_64-linux) + nokogiri (1.14.4-x86_64-linux) racc (~> 1.4) - parallel (1.22.1) - parser (3.2.1.1) + parallel (1.23.0) + parser (3.2.2.1) ast (~> 2.4.1) - pg (1.2.3) + pg (1.4.6) public_suffix (5.0.1) - puma (5.6.5) + puma (6.2.2) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.4) - rack-openid (1.4.2) - rack (>= 1.1.0) - ruby-openid (>= 2.1.8) + rack (2.2.7) rack-test (2.1.0) rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) - bundler (>= 1.3.0) - railties (= 5.2.8.1) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + bundler (>= 1.15.0) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) rbpdf (1.21.1) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - redcarpet (3.5.1) - regexp_parser (1.8.2) + redcarpet (3.6.0) + regexp_parser (2.8.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) - roadie (4.0.0) + roadie (5.1.0) css_parser (~> 1.4) nokogiri (~> 1.8) - roadie-rails (2.2.0) - railties (>= 5.1, < 6.2) - roadie (>= 3.1, < 5.0) + roadie-rails (3.0.0) + railties (>= 5.1, < 7.1) + roadie (~> 5.0) rotp (6.2.2) - rouge (3.26.1) - rqrcode (2.1.2) + rouge (4.1.1) + rqrcode (2.2.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rubocop (1.12.1) + rubocop (1.51.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.28.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.28.1) parser (>= 3.2.1.0) - rubocop-performance (1.10.2) - rubocop (>= 0.90.0, < 2.0) + rubocop-performance (1.17.1) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.9.1) + rubocop-rails (2.19.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - ruby-openid (2.9.2) + rubocop (>= 1.33.0, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) + sanitize (6.0.1) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - simplecov (0.18.5) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) sprockets (4.2.0) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -190,23 +240,23 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - thor (1.2.1) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) + thor (1.2.2) + timeout (0.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) - webdrivers (4.7.0) + webdrivers (4.6.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (> 3.141, < 5.0) - webrick (1.7.0) + selenium-webdriver (>= 3.0, < 4.0) + webrick (1.8.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.28) - webrick (~> 1.7.0) + yard (0.9.34) + zeitwerk (2.6.8) PLATFORMS ruby @@ -214,40 +264,46 @@ PLATFORMS DEPENDENCIES actionpack-xml_parser addressable - bundler (>= 1.12.0) - capybara (~> 3.31.0) - csv (~> 3.1.1) + capybara (~> 3.38.0) + commonmarker (~> 0.23.8) + csv (~> 3.2.6) + deckar01-task_list (= 2.3.2) ffi - i18n (~> 1.8.2) - mail (~> 2.7.1) + html-pipeline (~> 2.13.2) + i18n (~> 1.13.0) + listen (~> 3.3) + mail (~> 2.8.1) marcel - mini_magick (~> 4.11.0) - mini_mime (~> 1.0.1) + mini_magick (~> 4.12.0) + mini_mime (~> 1.1.0) mocha (>= 1.4.0) mysql2 (~> 0.5.0) + net-imap (~> 0.3.4) net-ldap (~> 0.17.0) - nokogiri (~> 1.13.10) - pg (~> 1.2.2) - puma (< 6.0.0) - rack-openid - rails (= 5.2.8.1) + net-pop (~> 0.1.2) + net-smtp (~> 0.3.3) + nokogiri (~> 1.14.0) + pg (~> 1.4.2) + puma + rails (= 6.1.7.3) rails-dom-testing - rbpdf (~> 1.21.0) - redcarpet (~> 3.5.1) + rbpdf (~> 1.21.1) + redcarpet (~> 3.6.0) request_store (~> 1.5.0) - roadie-rails (~> 2.2.0) + roadie-rails (~> 3.0.0) rotp (>= 5.0.0) - rouge (~> 3.26.0) + rouge (~> 4.1.0) rqrcode - rubocop (~> 1.12.0) - rubocop-performance (~> 1.10.1) - rubocop-rails (~> 2.9.0) - ruby-openid (~> 2.9.2) + rubocop (~> 1.51.0) + rubocop-performance (~> 1.17.1) + rubocop-rails (~> 2.19.1) rubyzip (~> 2.3.0) + sanitize (~> 6.0) selenium-webdriver (~> 3.142.7) - simplecov (~> 0.18.5) + simplecov (~> 0.22.0) tzinfo-data - webdrivers (~> 4.4) + webdrivers (= 4.6.1) + webrick yard RUBY VERSION diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 969d7d945f9..1bb442919cc 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: +{ lib, stdenv, fetchurl, bundlerEnv, ruby, defaultGemConfig, makeWrapper, nixosTests }: let - version = "4.2.10"; + version = "5.0.5"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; inherit ruby; gemdir = ./.; - groups = [ "development" "ldap" "markdown" "minimagick" "openid" "test" ]; + groups = [ "development" "ldap" "markdown" "common_mark" "minimagick" "test" ]; }; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-byY4jCOJKWJVLKSR1e/tq9QtrIiGHdnYC8M0WPZb4ek="; + sha256 = "sha256-qJrRxLub8CXmUnx3qxjI+vd0nJSpdcryz9u6AOsSpIE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -47,7 +47,7 @@ in meta = with lib; { homepage = "https://www.redmine.org/"; platforms = platforms.linux; - maintainers = with maintainers; [ aanderse felixsinger ]; + maintainers = with maintainers; [ aanderse felixsinger megheaiulian ]; license = licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 1f15616d876..ea19f1ef35c 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -1,25 +1,36 @@ { actioncable = { - dependencies = ["actionpack" "nio4r" "websocket-driver"]; + dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v5bihkn3cdf7s1cv04wqpk3l5snjgyav0jz9x5vhzzdqyknvndr"; + sha256 = "0bndmmby5qxq8rs42fbb2ax3hhbjj2ds8wja08s0iadkbrn7shvf"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; + }; + actionmailbox = { + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cx00kf0syq5gdhlrmw0q9v92ki55drbsk4gzy86ls2q8xkd792s"; + type = "gem"; + }; + version = "6.1.7.3"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x0qjs8v5z5wzk7vlg7pdr71hsm154d8d0gwhya573xpxfjzmjpx"; + sha256 = "0vbif021cyndq3v3m61dkmgdbbirqk9zcsszb9nisq24m3gx1aai"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqvz5dsg9zis34y8m4d2ackr3zs7h27mv6zx5yx00a58fifhyv3"; + sha256 = "0k6hc7klvn8m88b88vykl83jrpqhn4zz67l2zx9v266xga6fhala"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -43,16 +54,27 @@ }; version = "2.0.1"; }; + actiontext = { + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16ldxyxlxl9scggpmkww2fxzim7sl2b4js610pvddcsr74z9fjs7"; + type = "gem"; + }; + version = "6.1.7.3"; + }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06bk0hyv2sq386qc7r96qbhskg91apdj3mrdpzhry6p6nby2afml"; + sha256 = "0ck02cfc17s6g05qn0k7khwvvazwbf2rxbjcma8px2nw2j1ngvcn"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y07kvq9y30ycl4i45g9c2c9jv5a9vlxvrjaqfl79iim6gk1klz"; + sha256 = "05bkw9qgjgj2nxzjj2fh6jp1fcvgff0aa4r77k0gcfmnzc1g8wdl"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,43 +93,43 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vsyxbjpl47grlkzgh2rm0i9yksfwk11lsdi11jmqszc6lkj1b9g"; + sha256 = "03hy5bwghdklcxbdylmsq70y0qzslck5slb2zkvp7g6mmvk86kwd"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activerecord = { - dependencies = ["activemodel" "activesupport" "arel"]; + dependencies = ["activemodel" "activesupport"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk8qwdvq465nklxr7z0qzpiacxcqd72y6frimlalchhigl8ya0a"; + sha256 = "1alshkgbcxp9s4vqb2b0yrrnyg15kxhlp1slsb03a61w7h42pspw"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activestorage = { - dependencies = ["actionpack" "activerecord" "marcel"]; + dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qklddvw3v13dh79c7vljad8m25frlhnwcnw9xk510d676j3lr8a"; + sha256 = "06w4wlabqqr9bwdig44r5vdwkcbbivwgwn2fl775w7h05vrccgp8"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; - groups = ["default" "test"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r15sbhl4nrkh2g5ccbhmn3c2ngri71j0yfnarxkq90vdrhqqjgh"; + sha256 = "06mihpy83a5xmavvn7l8vbix472dsi0vh30xj6g594k0679m0ir6"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -115,20 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.1"; - }; - arel = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; - type = "gem"; - }; - version = "9.0.0"; + version = "2.8.4"; }; ast = { groups = ["default" "test"]; @@ -151,15 +163,15 @@ version = "3.2.4"; }; capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fhgnw6xgnphaka50b995mcmc2pjifmlr8ypz6dw2a6jkz3qqlcl"; + sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; type = "gem"; }; - version = "3.31.0"; + version = "3.38.0"; }; childprocess = { groups = ["default" "test"]; @@ -181,8 +193,18 @@ }; version = "1.4.0"; }; + commonmarker = { + groups = ["common_mark"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; + type = "gem"; + }; + version = "0.23.9"; + }; concurrent-ruby = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -217,10 +239,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mgyalwdxaxnff86j5p6n5szmhqz7nrlkb40826mzggrmva8v1m"; + sha256 = "0l5f5cq8ki3h4djh7pb8yqdkywqd08vjy3vd64yqh7qd6pdwky6w"; type = "gem"; }; - version = "3.1.9"; + version = "3.2.6"; + }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; + deckar01-task_list = { + dependencies = ["html-pipeline"]; + groups = ["common_mark"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; + type = "gem"; + }; + version = "2.3.2"; }; docile = { groups = ["default" "test"]; @@ -242,6 +285,26 @@ }; version = "1.12.0"; }; + ffi = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "ruby"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; globalid = { dependencies = ["activesupport"]; groups = ["default"]; @@ -253,6 +316,17 @@ }; version = "1.1.0"; }; + html-pipeline = { + dependencies = ["activesupport" "nokogiri"]; + groups = ["common_mark" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; + type = "gem"; + }; + version = "2.13.2"; + }; htmlentities = { groups = ["default"]; platforms = []; @@ -265,14 +339,35 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["common_mark" "default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; + type = "gem"; + }; + version = "1.13.0"; + }; + json = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "1.8.11"; + version = "2.6.3"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; + type = "gem"; + }; + version = "3.8.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -280,21 +375,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.19.1"; + version = "2.21.3"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.1"; }; marcel = { groups = ["default"]; @@ -306,6 +401,16 @@ }; version = "1.0.2"; }; + matrix = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; + }; method_source = { groups = ["default"]; platforms = []; @@ -321,33 +426,33 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; mini_mime = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np6srnyagghhh2w4nyv09sz47v0i6ri3q6blicj94vgxqp12c94"; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.2"; }; mini_portile2 = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minitest = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -385,6 +490,17 @@ }; version = "0.5.5"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; net-ldap = { groups = ["ldap"]; platforms = []; @@ -395,36 +511,69 @@ }; version = "0.17.1"; }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; nio4r = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "03g0hwp3z8m442nq8ag4lrbcgwcc7hhi8d1s0y7ipic0m50szl9b"; type = "gem"; }; - version = "1.13.10"; + version = "1.14.4"; }; parallel = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parser = { dependencies = ["ast"]; @@ -432,10 +581,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc"; + sha256 = "08f89nssj7ws7sjfvc2fcjpfm83sjgmniyh0npnmpqf5sfv44r8x"; type = "gem"; }; - version = "3.2.1.1"; + version = "3.2.2.1"; }; pg = { groups = ["default"]; @@ -450,10 +599,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; type = "gem"; }; - version = "1.2.3"; + version = "1.4.6"; }; public_suffix = { groups = ["default" "test"]; @@ -471,13 +620,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; + sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5"; type = "gem"; }; - version = "5.6.5"; + version = "6.2.2"; }; racc = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -487,25 +636,14 @@ version = "1.6.2"; }; rack = { - groups = ["default" "openid" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.4"; - }; - rack-openid = { - dependencies = ["rack" "ruby-openid"]; - groups = ["openid"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; - type = "gem"; - }; - version = "1.4.2"; + version = "2.2.7"; }; rack-test = { dependencies = ["rack"]; @@ -519,15 +657,15 @@ version = "2.1.0"; }; rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jy4jfkq0xpqp0d3ii9xhj69kacx8l4q3pincncw2g30bqd7a66g"; + sha256 = "07cs7qdkx6vwp66diwdy9g6mx52rsd8rxhbnsqf9bqam58g2aynj"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -557,10 +695,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9hm85jgbyar748z9nppsz8mgwywa2v9qqlbkzhpgirxhblifv2"; + sha256 = "1d2snjnx1j848axppj2napy3zjgbka3fnw2528rcamhm6dp694nd"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; rainbow = { groups = ["default" "test"]; @@ -582,6 +720,27 @@ }; version = "13.0.6"; }; + rb-fsevent = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; + type = "gem"; + }; + version = "0.11.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; groups = ["default"]; @@ -608,20 +767,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; regexp_parser = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; + sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950"; type = "gem"; }; - version = "1.8.2"; + version = "2.8.0"; }; request_store = { dependencies = ["rack"]; @@ -650,10 +809,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01kld3drqfiih5x8c13cvr6dpvdl7jml0v9bcw4fsy322lax3kn0"; + sha256 = "0728slgr2rxx6v1mrh1416k1waj29szfa1jqpbiw3xrvgfpzvcm7"; type = "gem"; }; - version = "4.0.0"; + version = "5.1.0"; }; roadie-rails = { dependencies = ["railties" "roadie"]; @@ -661,10 +820,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jjcqnp37z65dksykzwjiz149kx65nw70lyx8dkw1fm5x7yraqvh"; + sha256 = "16j1cjhq8xqr77vyf7m7ip2132619wdnpvlbig4cnn96yyi0cnan"; type = "gem"; }; - version = "2.2.0"; + version = "3.0.0"; }; rotp = { groups = ["default"]; @@ -681,10 +840,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0jzx6ni3bjdajc9y4w6mclq165jwiypbxkav2k0gbag7ip93xk21"; type = "gem"; }; - version = "3.26.1"; + version = "4.1.1"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -692,10 +851,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.0"; }; rqrcode_core = { groups = ["default"]; @@ -708,15 +867,15 @@ version = "1.2.0"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hi2c3a6alya9yx07nirnjzlc0mvmidnx67874njp6wf7d5xqqr9"; + sha256 = "0013mnzj6ql3v8nif7fm8n2832jnwa46azync6azsg9d4iblrfmy"; type = "gem"; }; - version = "1.12.1"; + version = "1.51.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -724,10 +883,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; + sha256 = "0gs8zjigzdqj0kcmmrhvd4zavwr6kz6h9qvrh9m7bhy56f4aqljs"; type = "gem"; }; - version = "1.28.0"; + version = "1.28.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -735,10 +894,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07c3kymvsid9aajwmmwr3n6apxgyjcbzbl2n6r5lpzkyz28jqn15"; + sha256 = "1z6i24r0485fxa5n4g3rhp88w589fifszhd1khbzya2iiknkjxkr"; type = "gem"; }; - version = "1.10.2"; + version = "1.17.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -746,20 +905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; + sha256 = "0j6dn8pz70bngx6van8yzsimpdd93gm7c8lr93wz1j4ahm6q4hn9"; type = "gem"; }; - version = "2.9.1"; - }; - ruby-openid = { - groups = ["openid"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz"; - type = "gem"; - }; - version = "2.9.2"; + version = "2.19.1"; }; ruby-progressbar = { groups = ["default" "test"]; @@ -791,6 +940,17 @@ }; version = "2.3.2"; }; + sanitize = { + dependencies = ["crass" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; + type = "gem"; + }; + version = "6.0.1"; + }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; groups = ["test"]; @@ -803,15 +963,15 @@ version = "3.142.7"; }; simplecov = { - dependencies = ["docile" "simplecov-html"]; + dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ycx5q699ycbjhp28sjbkrd62vwxlrb7fh4v2m7sjsp2qhi6cf6r"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.18.5"; + version = "0.22.0"; }; simplecov-html = { groups = ["default" "test"]; @@ -823,6 +983,16 @@ }; version = "0.12.3"; }; + simplecov_json_formatter = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; groups = ["default"]; @@ -850,31 +1020,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; - thread_safe = { - groups = ["default" "test"]; + timeout = { + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.2"; }; tzinfo = { - dependencies = ["thread_safe"]; - groups = ["default" "test"]; + dependencies = ["concurrent-ruby"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dk1cfnhgl14l580b650qyp8m5xpqb3zg0wb251h5jkm46hzc0b5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "1.2.11"; + version = "2.0.6"; }; unicode-display_width = { groups = ["default" "test"]; @@ -892,20 +1062,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fdb6z8541p912xanjbl9y15cyj6g44530y0nib6qhv6i90rkzp"; + sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp"; type = "gem"; }; - version = "4.7.0"; + version = "4.6.1"; }; webrick = { - groups = ["default" "development"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -940,14 +1110,23 @@ version = "3.2.0"; }; yard = { - dependencies = ["webrick"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; + sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; type = "gem"; }; - version = "0.9.28"; + version = "0.9.34"; + }; + zeitwerk = { + groups = ["common_mark" "default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + type = "gem"; + }; + version = "2.6.8"; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix new file mode 100644 index 00000000000..adb37bf770f --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-fishbmc"; + namespace = "visualization.fishbmc"; + version = "20.2.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-MgeSIKAy0N2NMGsU/15tKtDb34CROjcMaKjGyySl9Z0="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.fishbmc"; + description = "FishBMC visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-goom/default.nix b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix new file mode 100644 index 00000000000..34eb4c65606 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-goom"; + namespace = "visualization.goom"; + version = "20.1.1"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-TxXqJQdPT1+3DwAJv0F2Hfksh+ZV4QjfOnp4/k53GpQ="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.goom"; + description = "Goom visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-matrix/default.nix b/pkgs/applications/video/kodi/addons/visualization-matrix/default.nix new file mode 100644 index 00000000000..0839982ebb6 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-matrix/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-matrix"; + namespace = "visualization.matrix"; + version = "20.2.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-tojzPqt6VMccveqnhkl0yXS+/fLdxotmQO3jdtYlkFk="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.matrix"; + description = "Matrix visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix new file mode 100644 index 00000000000..121850542a9 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-pictureit"; + namespace = "visualization.pictureit"; + version = "20.2.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-mQDPjpsxStU01H2XJKnX183KAHG+O1CH8JOmApMmwMc="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.pictureit"; + description = "PictureIt visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix new file mode 100644 index 00000000000..8eaecd87fc4 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL, projectm }: + +buildKodiBinaryAddon rec { + pname = "visualization-projectm"; + namespace = "visualization.projectm"; + version = "20.2.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-Kcl1ep+RJlofFmxkrGT3T+XXdwiCofq1hggwU0PAd0E="; + }; + + extraBuildInputs = [ pkg-config libGL projectm ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.projectm"; + description = "Projectm visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix b/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix new file mode 100644 index 00000000000..2b0b1b5b6ee --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL, jsoncpp }: + +buildKodiBinaryAddon rec { + pname = "visualization-shadertoy"; + namespace = "visualization.shadertoy"; + version = "20.3.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-PaHbEcB4gCC8gUzc7T49msI8f0xa2iXqSaYW/eqD8yw="; + }; + + extraBuildInputs = [ pkg-config libGL jsoncpp ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.shadertoy"; + description = "Shadertoy visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix b/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix new file mode 100644 index 00000000000..e4d44dd12be --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-spectrum"; + namespace = "visualization.spectrum"; + version = "20.2.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-rl6eydHv0g646H7478UQboVp/OrKExQYJOiaVDeDRhE="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.spectrum"; + description = "Spectrum visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-starburst/default.nix b/pkgs/applications/video/kodi/addons/visualization-starburst/default.nix new file mode 100644 index 00000000000..5774c707397 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-starburst/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-starburst"; + namespace = "visualization.starburst"; + version = "20.2.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-FTGyQqzRywKjywtckkP56Fc8KwF07A8WUAe0LackxSM="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.starburst"; + description = "Starburst visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index 811b49e8714..a1713e24375 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -1,4 +1,4 @@ -{ lib , buildNpmPackage , fetchFromGitHub, nodejs }: +{ lib, buildNpmPackage, fetchFromGitHub, nodejs, python3 }: buildNpmPackage rec { pname = "webtorrent-mpv-hook"; @@ -21,6 +21,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-GpNUJ5ZCgMjSYLqsIE/RwkTSFT3uAhxrHPe7XvGDRHE="; makeCacheWritable = true; + nativeBuildInputs = [ + python3 # Fixes node-gyp on aarch64-linux + ]; + postInstall = '' mkdir -p $out/share/mpv/scripts/ ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/ diff --git a/pkgs/applications/window-managers/i3/kitti3-fix-build-system.patch b/pkgs/applications/window-managers/i3/kitti3-fix-build-system.patch new file mode 100644 index 00000000000..06a2ac60bb3 --- /dev/null +++ b/pkgs/applications/window-managers/i3/kitti3-fix-build-system.patch @@ -0,0 +1,21 @@ +commit 410e98569c87469672086d4144f7ca0f2ee08fb7 +Author: Michael Hoang +Date: Sun May 21 00:13:37 2023 +1000 + + Allow project to be built with just `pip` +--- + pyproject.toml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pyproject.toml b/pyproject.toml +index 10ed786..574e42a 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,3 +1,7 @@ ++[build-system] ++requires = ["poetry-core"] ++build-backend = "poetry.core.masonry.api" ++ + [tool.poetry] + name = "kitti3" + version = "0.5.1" diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/applications/window-managers/i3/kitti3.nix new file mode 100644 index 00000000000..63e1224a316 --- /dev/null +++ b/pkgs/applications/window-managers/i3/kitti3.nix @@ -0,0 +1,40 @@ +{ buildPythonApplication +, fetchFromGitHub +, poetry-core +, i3ipc +, lib +}: + +buildPythonApplication rec { + pname = "kitti3"; + version = "unstable-2021-09-11"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "LandingEllipse"; + repo = pname; + rev = "f9f94c8b9f8b61a9d085206ada470cfe755a2a92"; + hash = "sha256-bcIzbDpIe2GKS9EcVqpjwz0IG2ixNMn06OIQpZ7PeH0="; + }; + + patches = [ + # Fixes `build-system` not being specified in `pyproject.toml` + # https://github.com/LandingEllipse/kitti3/pull/25 + ./kitti3-fix-build-system.patch + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + i3ipc + ]; + + meta = with lib; { + homepage = "https://github.com/LandingEllipse/kitti3"; + description = "Kitty drop-down service for sway & i3wm"; + license = licenses.bsd3; + maintainers = with maintainers; [ Enzime ]; + }; +} diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 9c2048066ce..1a0b3bc5691 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -315,7 +315,7 @@ clone_user_rev() { tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" exit_handlers+=(remove_tmpHomePath) HOME="$tmpHomePath" - git lfs install + clean_git lfs install fi # Perform the checkout. diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index e5c93f1f778..c34709335ff 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -6,6 +6,7 @@ name = "npm-config-hook"; substitutions = { nodeSrc = srcOnly nodejs; + nodeGyp = "${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"; # Specify `diff`, `jq`, and `prefetch-npm-deps` by abspath to ensure that the user's build # inputs do not cause us to find the wrong binaries. diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index c1acdc3ac3f..0edc0e2b36a 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -3,10 +3,15 @@ npmConfigHook() { echo "Executing npmConfigHook" + # Use npm patches in the nodejs package + export NIX_NODEJS_BUILDNPMPACKAGE=1 + export prefetchNpmDeps="@prefetchNpmDeps@" + echo "Configuring npm" export HOME="$TMPDIR" export npm_config_nodedir="@nodeSrc@" + export npm_config_node_gyp="@nodeGyp@" if [ -z "${npmDeps-}" ]; then echo @@ -93,22 +98,7 @@ npmConfigHook() { patchShebangs node_modules - local -r lockfileVersion="$(@jq@ .lockfileVersion package-lock.json)" - - if (( lockfileVersion < 2 )); then - # This is required because npm consults a hidden lockfile in node_modules to figure out - # what to create bin links for. When using an old lockfile offline, this hidden lockfile - # contains insufficent data, making npm silently fail to create links. The hidden lockfile - # is bypassed when any file in node_modules is newer than it. Thus, we create a file when - # using an old lockfile, so bin links work as expected without having to downgrade Node or npm. - touch node_modules/.meow - fi - - npm rebuild "${npmRebuildFlags[@]}" "${npmFlags[@]}" - - if (( lockfileVersion < 2 )); then - rm node_modules/.meow - fi + npm rebuild $npmRebuildFlags "${npmRebuildFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}" patchShebangs node_modules diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index d10092f66af..fbe2f9533ba 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -20,12 +20,12 @@ let "comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No | "comfy-wide-motion-duo" # Slab | Wide | Duospaced | Yes | ]; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromSourcehut { owner = "~protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "sha256-gHDERf3eDsb59wz+kGa2wLY7RDRWs2woi5P2rZDYjL0="; + sha256 = "sha256-ajzUbobNf+Je8ls9htOCLPsB0OPSiqZzrc8bO6hQvio="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = set: @@ -39,11 +39,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - rev = "d3b461432137b36922e41322c2e45a2401e727a5"; - hash = "sha256-Sm+eG6ovVLmvKvQFEZblQV3jCLQRrc9Gga3pukwteLE="; + rev = "7ef24b8d87fe50793444f9f84b140767f7e47029"; + hash = "sha256-RVBgJVMNyxV1KeNniwySsJUOmLDh6sFZju8szvzKlH4="; }; - npmDepsHash = "sha256-pikpi9eyo1a+AFLr7BMl1kegy3PgYFjzmE3QJqPXpNM="; + npmDepsHash = "sha256-yogUBf+yfjfK8DE4gGgoGaTaYZagW8R1pCn7y0rEPt4="; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index ac798c8609c..4c954a61e27 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "22.1.0"; + version = "23.0.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-aq8IKWGOOYf83ed5Z10/B+42SsI7JY5ED3AwAlk/24k="; + hash = "sha256-j7JE9UHG4xho0a4TqG5rpCJkYyVxgoLxBuRtNMGfkrw="; }; - npmDepsHash = "sha256-6zt7q5aGb6jaa6YBr4HqawZjf2jqNnR9xQM/abKpT04="; + npmDepsHash = "sha256-/zutJ4kwGqBe3snMxyvReJdvlcsm+02ZZyFMdNN6gmc="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index c94e9aaca48..4d3f5155929 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -2,18 +2,18 @@ stdenvNoCC.mkDerivation rec { pname = "source-code-pro"; - version = "2.038"; + version = "2.042"; src = fetchzip { - url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; + url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-u%2F1.062R-i%2F1.026R-vf/OTF-source-code-pro-${version}R-u_1.062R-i.zip"; stripRoot = false; - hash = "sha256-ijeTLka131jf6B9xj/eNWK1T5r7r3aBXBgnVyRAxmuY="; + hash = "sha256-+BnfmD+AjObSoVxPvFAqbnMD2j5qf2YmbXGQtXoaiy0="; }; installPhase = '' runHook preInstall - install -Dm644 *.otf -t $out/share/fonts/opentype + install -Dm644 OTF/*.otf -t $out/share/fonts/opentype runHook postInstall ''; diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 1708a43b805..5c17ad653eb 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "victor-mono"; - version = "1.5.4"; + version = "1.5.5"; # Upstream prefers we download from the website, # but we really insist on a more versioned resource. @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; stripRoot = false; - hash = "sha256-E8j1bfYrM8yRtasiwgTvyE4EYx2LyAbmw3MXH1l+owk="; + hash = "sha256-l8XeKE9PtluiazZO0PXfkGCcnm5o+VZdL7NZ6w0tp80="; }; installPhase = '' diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 61bb5580d78..ecdb5b04094 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202305110042"; + version = "202305180042"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "d3e53c0849b499829dfb97af7e10552257277d2e"; - sha256 = "sha256-jCktxDGMkRiG8tiNx27V9s1LLqaitWDBAB063+eLwmg="; + rev = "1addec5dde6df338d37f43ddc7e760b03fd9f6a2"; + sha256 = "sha256-c1BCbqGMvzqz3NKs1J4qD5vhagz0BEnnBG5BmvEy9W0="; }; installPhase = '' diff --git a/pkgs/data/themes/catppuccin-plymouth/default.nix b/pkgs/data/themes/catppuccin-plymouth/default.nix new file mode 100644 index 00000000000..69a07f46d0d --- /dev/null +++ b/pkgs/data/themes/catppuccin-plymouth/default.nix @@ -0,0 +1,43 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, variant ? "macchiato" +}: + +let + pname = "catppuccin-plymouth"; + validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; +in +lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ] + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "unstable-2022-12-10"; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "plymouth"; + rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c"; + hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; + }; + + sourceRoot = "source/themes/catppuccin-${variant}"; + + installPhase = '' + runHook preInstall + + sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth + mkdir -p $out/share/plymouth/themes/catppuccin-${variant} + cp * $out/share/plymouth/themes/catppuccin-${variant} + + runHook postInstall + ''; + + meta = with lib; { + description = "Soothing pastel theme for Plymouth"; + homepage = "https://github.com/catppuccin/plymouth"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.spectre256 ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index b90a363581e..c3b41ca3cac 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extension-paperwm"; - version = "unstable-2023-04-20"; + version = "44.0.0-beta.1"; src = fetchFromGitHub { owner = "paperwm"; repo = "PaperWM"; - rev = "1130b663806d6daba1c8355c4b99c287d237e918"; - hash = "sha256-JlamW5DznVZ8G0REqXcxEt/IlHa3GMN184WFpeclhd4="; + rev = "v${finalAttrs.version}"; + hash = "sha256-YRIaSD22bvzXo/wla178GeXIhvIwW6xLacjAQDC2P40="; }; dontConfigure = true; @@ -19,18 +19,21 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall + mkdir -p "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" cp -r . "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/paperwm/PaperWM"; description = "Tiled scrollable window management for Gnome Shell"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hedning AndersonTorres ]; - platforms = platforms.all; + changelog = "https://github.com/paperwm/PaperWM/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ hedning AndersonTorres ]; + platforms = lib.platforms.all; }; passthru.extensionUuid = "paperwm@hedning:matrix.org"; -} +}) diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 8a558a605bf..a85a98d46cb 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -22,25 +22,30 @@ in CSC_OPTIONS = lib.concatStringsSep " " cscOptions; + buildPhase = '' + runHook preBuild + chicken-install -cached -no-install ${lib.escapeShellArgs chickenInstallFlags} + runHook postBuild + ''; + installPhase = '' runHook preInstall export CHICKEN_INSTALL_PREFIX=$out export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion} - chicken-install -cached ${lib.concatStringsSep " " chickenInstallFlags} + chicken-install -cached ${lib.escapeShellArgs chickenInstallFlags} for f in $out/bin/* do wrapProgram $f \ - --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}" \ - --suffix CHICKEN_INCLUDE_PATH : "$out/share" \ + --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}:$CHICKEN_REPOSITORY_PATH" \ + --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share" \ --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH" done runHook postInstall ''; - dontBuild = true; dontConfigure = true; meta = { diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 3cc44837f23..b471dab135b 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -1,5 +1,6 @@ { stdenv, pkgs, lib, chickenEggs }: let + inherit (lib) addMetaAttrs; addToBuildInputs = pkg: old: { buildInputs = (old.buildInputs or [ ]) ++ lib.toList pkg; }; @@ -14,8 +15,8 @@ let (addPkgConfig old) // (addToBuildInputs pkg old); addToPropagatedBuildInputsWithPkgConfig = pkg: old: (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); - broken = old: { meta = old.meta // { broken = true; }; }; - brokenOnDarwin = old: { meta = old.meta // { broken = stdenv.isDarwin; }; }; + broken = addMetaAttrs { broken = true; }; + brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; }; in { allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]); @@ -85,8 +86,8 @@ in { zstd = addToBuildInputs pkgs.zstd; # platform changes - pledge = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; }; - unveil = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; }; + pledge = addMetaAttrs { platforms = lib.platforms.openbsd; }; + unveil = addMetaAttrs { platforms = lib.platforms.openbsd; }; # mark broken "ephem-v1.1" = broken; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 6a720026b3c..55b55b931aa 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,10 +1,10 @@ -{ pkgs, lib, makeWrapper }: +{ pkgs +, lib +, makeWrapper +, nodejs ? pkgs.nodejs_18 +}: let - - # To control nodejs version we pass down - nodejs = pkgs.nodejs_18; - fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; # Haskell packages that require ghc 8.10 @@ -115,8 +115,7 @@ let }; nodePkgs = pkgs.callPackage ./packages/node-composition.nix { - inherit pkgs; - nodejs = pkgs.nodejs_14; + inherit pkgs nodejs; inherit (pkgs.stdenv.hostPlatform) system; }; @@ -152,7 +151,8 @@ in lib.makeScope pkgs.newScope (self: with self; { }; }; } // (hs810Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (with elmLib; with (hs810Pkgs self).elmPkgs; { - elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // { + elm-verify-examples = let + patched = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // { meta = with lib; nodePkgs.elm-verify-examples.meta // { description = "Verify examples in your docs"; homepage = "https://github.com/stoeffel/elm-verify-examples"; @@ -160,6 +160,14 @@ in lib.makeScope pkgs.newScope (self: with self; { maintainers = [ maintainers.turbomack ]; }; }; + in patched.override (old: { + preRebuild = (old.preRebuild or "") + '' + # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done + # in case of just this package + # TODO: investigate, same as for elm-coverage below + sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json + ''; + }); elm-coverage = let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage); diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 96d3b5f6fc4..6a06213e959 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,22 +10,17 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "sha256-wdTBSmyA2I+gaSV577NNKA2oY2fdVTGmvV7h15NY1tU="; + sha256 = "sha256-5g2Ikbfm5nQrsgGntZZ/VbjqSDOj0AP/mnH1nW2b4co="; }; patches = [ ./threads.patch - (fetchpatch { - name = "missing-override.patch"; - url = "https://github.com/souffle-lang/souffle/commit/da2d778f0cca94f206686546fa56b9ffc738ad75.patch"; - sha256 = "Oefm3vRRwOyom94oGSOK2w9m23gkbJ++9gcWrdLlkyk="; - }) ]; hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6732980273e..dff357eb4e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2663,4 +2663,12 @@ self: super: { parsec = lself.parsec_3_1_16_1; text = lself.text_2_0_2; })); + + # Merged upstream, but never released. Allows both intel and aarch64 darwin to build. + # https://github.com/vincenthz/hs-gauge/pull/106 + gauge = appendPatch (pkgs.fetchpatch { + name = "darwin-aarch64-fix.patch"; + url = "https://github.com/vincenthz/hs-gauge/commit/3d7776f41187c70c4f0b4517e6a7dde10dc02309.patch"; + hash = "sha256-4osUMo0cvTvyDTXF8lY9tQbFqLywRwsc3RkHIhqSriQ="; + }) super.gauge; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7b242e42c69..111c46d6216 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -708,6 +708,7 @@ supported-platforms: linux-mount: [ platforms.linux ] linux-namespaces: [ platforms.linux ] lxc: [ platforms.linux ] + memfd: [ platforms.linux ] midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index da4acb2278b..192ed288552 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -192841,6 +192841,7 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Open temporary anonymous Linux file handles"; license = lib.licenses.asl20; + platforms = lib.platforms.linux; }) {}; "meminfo" = callPackage diff --git a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix index 34768c1955e..d311f3d61eb 100644 --- a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix +++ b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "cbqn-bytecode"; - version = "unstable-2023-04-19"; + version = "unstable-2023-05-17"; src = fetchFromGitHub { owner = "dzaima"; repo = "cbqnBytecode"; - rev = "78ed4102f914eb5fa490d76d4dcd4f8be6e53417"; - hash = "sha256-IOhxcfGmpARiTdFMSpc+Rh8VXtasZdfP6vKJzULNxAg="; + rev = "32db4dfbfc753835bf112f3d8ae2991d8aebbe3d"; + hash = "sha256-9uBPrEESn/rB9u0xXwKaQ7ABveQWPc8LRMPlnI/79kg="; }; dontConfigure = true; @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - install -D $src/gen/{compiles,explain,formatter,runtime0,runtime1,src} -t $out/dev + install -D $src/gen/{compiles,explain,formatter,runtime0,runtime1,runtime1x,src} -t $out/dev runHook postInstall ''; diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index a6e8f4c9feb..bcc58315ebb 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -6,9 +6,8 @@ , fixDarwinDylibNames , genBytecode ? false , bqn-path ? null -, mbqn-source ? null +, mbqn-source , enableReplxx ? false -, enableSingeli ? stdenv.hostPlatform.avx2Support , enableLibcbqn ? ((stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) && !enableReplxx) , libffi , pkg-config @@ -24,13 +23,13 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; rev = "v${version}"; - hash = "sha256-M9GTsm65DySLcMk9QDEhImHnUvWtYGPwiG657wHg3KA="; + hash = "sha256-LoxwNxuadbYJgIkr1+bZoErTc9WllN2siAsKnxoom3Y="; }; nativeBuildInputs = [ @@ -42,6 +41,7 @@ stdenv.mkDerivation rec { ]; dontConfigure = true; + doInstallCheck = true; postPatch = '' sed -i '/SHELL =.*/ d' makefile @@ -54,8 +54,11 @@ stdenv.mkDerivation rec { buildFlags = [ # interpreter binary - (lib.flatten (if enableSingeli then ["o3n-singeli" "f='-mavx2'"] else ["o3"])) + "o3" + "notui=1" # display build progress in a plain-text format "REPLXX=${if enableReplxx then "1" else "0"}" + ] ++ lib.optionals stdenv.hostPlatform.avx2Support [ + "has=avx2" ] ++ lib.optionals enableLibcbqn [ # embeddable interpreter as a shared lib "shared-o3" @@ -64,6 +67,7 @@ stdenv.mkDerivation rec { preBuild = '' # Purity: avoids git downloading bytecode files mkdir -p build/bytecodeLocal/gen + cp -r ${singeli-submodule}/dev/* build/singeliLocal/ '' + (if genBytecode then '' ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ '' else '' @@ -71,10 +75,7 @@ stdenv.mkDerivation rec { '') + lib.optionalString enableReplxx '' cp -r ${replxx-submodule}/dev/* build/replxxLocal/ - '' - + lib.optionalString enableSingeli '' - cp -r ${singeli-submodule}/dev/* build/singeliLocal/ - ''; + ''; outputs = [ "out" @@ -100,6 +101,26 @@ stdenv.mkDerivation rec { runHook postInstall ''; + installCheckPhase = '' + runHook preInstallCheck + + # main test suite from mlochbaum/BQN + $out/bin/BQN ${mbqn-source}/test/this.bqn + + # CBQN tests that do not require compiling with test-only flags + $out/bin/BQN test/cmp.bqn + $out/bin/BQN test/equal.bqn + $out/bin/BQN test/copy.bqn + $out/bin/BQN test/bit.bqn + $out/bin/BQN test/hash.bqn + $out/bin/BQN test/squeezeValid.bqn + $out/bin/BQN test/squeezeExact.bqn + $out/bin/BQN test/various.bqn + $out/bin/BQN test/random.bqn + + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/dzaima/CBQN/"; description = "BQN implementation in C"; @@ -108,4 +129,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } -# TODO: test suite diff --git a/pkgs/development/interpreters/bqn/cbqn/singeli.nix b/pkgs/development/interpreters/bqn/cbqn/singeli.nix index 253f7549a6c..fafbc875a79 100644 --- a/pkgs/development/interpreters/bqn/cbqn/singeli.nix +++ b/pkgs/development/interpreters/bqn/cbqn/singeli.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "singeli"; - version = "unstable-2023-04-12"; + version = "unstable-2023-04-27"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "Singeli"; - rev = "3327956fedfdc6aef12954bc12120f20de2226d0"; - hash = "sha256-k25hk5zTn0m+2Nh9buTJYhtM98/VRlQ0guoRw9el3VE="; + rev = "853ab1a06ae8d8603f228d8e784fa319cc401459"; + hash = "sha256-X/NnufvakihJAE9H7geuuDS7Tv9l7tgLKdRgXC4ZX4A="; }; dontConfigure = true; diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix index 85a3be161ca..d217ec99ebe 100644 --- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix +++ b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "bqn"; - version = "0.pre+date=2023-05-09"; + version = "unstable-2023-05-17"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "BQN"; - rev = "656b176c5dc783b038b018f0ed17a5414ea62b4d"; - hash = "sha256-6r+N0eCvwvaoB84cw+Vtoqa6MXuI0NXLbOPblemY4M8="; + rev = "070bd07dc10c291695215265218ec0ff856ce457"; + hash = "sha256-GRIIzJwlJ+JTBHXZjoX/9vLFbAC7zyeuqVcrA/Jm/NA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/basu/default.nix b/pkgs/development/libraries/basu/default.nix new file mode 100644 index 00000000000..c9d005bf9d2 --- /dev/null +++ b/pkgs/development/libraries/basu/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromSourcehut +, audit +, pkg-config +, libcap +, gperf +, meson +, ninja +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "basu"; + version = "0.2.1"; + + src = fetchFromSourcehut { + owner = "~emersion"; + repo = "basu"; + rev = "v${finalAttrs.version}"; + hash = "sha256-zIaEIIo8lJeas2gVjMezO2hr8RnMIT7iiCBilZx5lRQ="; + }; + + outputs = [ "out" "dev" "lib" ]; + + buildInputs = [ + audit + gperf + libcap + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; + + preConfigure = '' + pushd src/basic + patchShebangs \ + generate-cap-list.sh generate-errno-list.sh generate-gperfs.py + popd + ''; + + meta = { + homepage = "https://sr.ht/~emersion/basu"; + description = "The sd-bus library, extracted from systemd"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/development/libraries/charls/default.nix index e7b8a54820e..150806c8c77 100644 --- a/pkgs/development/libraries/charls/default.nix +++ b/pkgs/development/libraries/charls/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "charls"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "team-charls"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-l0qcJeQfRqpwR7vNmYZx00kGlPkK7nEYuslydjxj7ss="; + hash = "sha256-c1wrk6JLcAH7TFPwjARlggaKXrAsLWyUQF/3WHlqoqg="; }; postPatch = '' diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 8b0ac955810..e00af9a9755 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -76,6 +76,9 @@ let passthru.updateScript = unstableGitUpdater { }; + # Times out otherwise + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "Performance portable programming model for machine learning tensor operators"; homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; @@ -89,7 +92,7 @@ let cp -a ${ck}/bin/ckProfiler $out ''; in stdenv.mkDerivation { - inherit (ck) pname version outputs src passthru meta; + inherit (ck) pname version outputs src passthru requiredSystemFeatures meta; dontUnpack = true; dontPatch = true; diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index a24127ab56d..e4d1df23b7e 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -9,18 +9,15 @@ stdenv.mkDerivation rec { pname = "cxxopts"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "jarro2783"; repo = "cxxopts"; rev = "v${version}"; - sha256 = "08x7j168l1xwj0r3rv89cgghmfhsx98lpq35r3vkh504m1pd55a6"; + sha256 = "sha256-lJPMaXBfrCeUhhXha5f7zmOGtyEDzU3oPTMirPTFZzQ="; }; - # CMake does not set CMAKE_LIBRARY_ARCHITECTURE variable in Nix, which breaks architecture-independent library path generation - patches = [ ./fix-install-path.patch ]; - buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ]; cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ] ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE"; diff --git a/pkgs/development/libraries/cxxopts/fix-install-path.patch b/pkgs/development/libraries/cxxopts/fix-install-path.patch deleted file mode 100644 index d91e3fb6dc1..00000000000 --- a/pkgs/development/libraries/cxxopts/fix-install-path.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/cxxopts.cmake b/cmake/cxxopts.cmake -index 46e87ba..0ead543 100644 ---- a/cmake/cxxopts.cmake -+++ b/cmake/cxxopts.cmake -@@ -87,7 +87,12 @@ endfunction() - - # Helper function to ecapsulate install logic - function(cxxopts_install_logic) -- string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") -+ if(CMAKE_LIBRARY_ARCHITECTURE) -+ string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ # On some systems (e.g. NixOS), `CMAKE_LIBRARY_ARCHITECTURE` can be empty -+ set(CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") -+ endif() - set(CXXOPTS_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/cxxopts" CACHE STRING "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.") - set(version_config "${PROJECT_BINARY_DIR}/cxxopts-config-version.cmake") - set(project_config "${PROJECT_BINARY_DIR}/cxxopts-config.cmake") diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 7e30b0593b2..4bbf6f77288 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pagmo2"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj"; + sha256 = "sha256-z5kg2xKZ666EPK844yp+hi4iGisaIPme9xNdzsAEEjw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index 6426beaeeae..a61df952f89 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "parson"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "kgabis"; repo = "parson"; - rev = "3c4ee26dbb3df177a2d7b9d80e154ec435ca8c01"; # upstream doesn't use tags - sha256 = "sha256-fz2yhxy6Q5uEPAbzMxMiaXqSYkQ9uB3A4sV2qYOekJ8="; + rev = "60c37844d7a1c97547812cac3423d458c73e60f9"; # upstream doesn't use tags + hash = "sha256-SbM0kqRtdcz1s+pUTW7VPMY1O6zdql3bao19Rk4t470="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index e354b3141a7..06650fce00a 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -2,9 +2,9 @@ , stdenv , fetchFromGitHub , cmake +, expat , pkg-config , systemd -, expat }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - sha256 = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao="; + hash = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao="; }; nativeBuildInputs = [ @@ -24,27 +24,30 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - systemd expat + systemd ]; cmakeFlags = [ "-DBUILD_CODE_GEN=ON" ]; - meta = with lib; { + meta = { homepage = "https://github.com/Kistler-Group/sdbus-cpp"; changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog"; description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API"; longDescription = '' - sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide expressive, easy-to-use API in modern C++. - It adds another layer of abstraction on top of sd-bus, a nice, fresh C D-Bus implementation by systemd. - It's been written primarily as a replacement of dbus-c++, which currently suffers from a number of (unresolved) bugs, - concurrency issues and inherent design complexities and limitations. + sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide + expressive, easy-to-use API in modern C++. + It adds another layer of abstraction on top of sd-bus, a nice, fresh C + D-Bus implementation by systemd. + It's been written primarily as a replacement of dbus-c++, which currently + suffers from a number of (unresolved) bugs, concurrency issues and + inherent design complexities and limitations. ''; + license = lib.licenses.lgpl2Only; + maintainers = [ lib.maintainers.ivar ]; + platforms = lib.platforms.linux; mainProgram = "sdbus-c++-xml2cpp"; - license = licenses.lgpl2Only; - platforms = platforms.linux; - maintainers = [ maintainers.ivar ]; }; } diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix index 85772c41cb2..5be16a16771 100644 --- a/pkgs/development/python-modules/archspec/default.nix +++ b/pkgs/development/python-modules/archspec/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archspec"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = pname; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-Zu7/zx3FTVJVGpAdRDdnLBokeodspZg6ou/GBaqz4XY="; + hash = "sha256-2rMsxSAnPIVqvsbAUtBbHLb3AvrZFjGzxYO6A/1qXnY="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for detecting, labeling, and reasoning about microarchitectures"; homepage = "https://archspec.readthedocs.io/"; - changelog = "https://github.com/archspec/archspec/releases/tag/v0.2.0"; + changelog = "https://github.com/archspec/archspec/releases/tag/v0.2.1"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ atila ]; }; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index d1a09cdc69e..b809249fbfe 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.13.5"; + version = "0.13.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-73wFWaOcf9/CQ7FgTmtg2ZiQ94W2wTDYZxWIRer2qWk="; + hash = "sha256-MQYS7EEBGgvIBjSQ80a49SQv1GNVgeriBtQn+O7hMtg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix new file mode 100644 index 00000000000..e7a0b017f40 --- /dev/null +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, packaging +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, scapy +}: + +buildPythonPackage rec { + pname = "boiboite-opener-framework"; + version = "1.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Orange-Cyberdefense"; + repo = "bof"; + rev = "refs/tags/${version}"; + hash = "sha256-atKqHRX24UjF/9Dy0aYXAN+80nBJKCd07FmaR5Vl1q4="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "scapy==2.5.0rc1" "scapy" + ''; + + propagatedBuildInputs = [ + packaging + scapy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bof" + ]; + + disabledTests = [ + # Tests are using netcat and cat to do UDP connections + "test_0101_knxnet_instantiate" + "test_0101_modbusnet_instantiate" + "test_0102_knxnet_connect" + "test_0102_modbusnet_connect" + "test_0201_knxnet_send_knxpacket" + "test_0201_modbus_send_modbuspacket" + "test_0201_udp_send_str_bytes" + "test_0202_knxnet_send_knxpacket" + "test_0202_modbus_send_modbuspacket" + "test_0202_udp_send_receive" + "test_0203_knxnet_send_raw" + "test_0203_modbus_send_raw" + "test_0203_send_receive_timeout" + "test_0204_knxnet_receive" + "test_0204_modbus_receive" + "test_0204_multicast_error_handling" + "test_0205_broadcast_error_handling" + "test_0301_pndcp_device_raise" + "test_0301_tcp_instantiate" + "test_0302_tcp_connect" + "test_0303_tcp_connect_bad_addr" + "test_0304_tcp_connect_bad_port" + "test_0401_tcp_send_str_bytes" + "test_0402_tcp_send_receive" + "test_0802_search_valid" + ]; + + meta = with lib; { + description = "Testing framework for industrial protocols implementations and devices"; + homepage = "https://github.com/Orange-Cyberdefense/bof"; + changelog = "https://github.com/Orange-Cyberdefense/bof/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/bqplot/default.nix b/pkgs/development/python-modules/bqplot/default.nix new file mode 100644 index 00000000000..967b0a15fcf --- /dev/null +++ b/pkgs/development/python-modules/bqplot/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, jupyter-packaging +, bqscales +, ipywidgets +, numpy +, pandas +, traitlets +, traittypes +}: + +buildPythonPackage rec { + pname = "bqplot"; + version = "0.12.36"; + + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-alU+Vf28xPYuBWeb10slSdHvvkPhIK07C8sDplx5Ia8="; + }; + + nativeBuildInputs = [ + jupyter-packaging + ]; + + propagatedBuildInputs = [ + bqscales + ipywidgets + numpy + pandas + traitlets + traittypes + ]; + + # no tests in PyPI dist, and not obvious to me how to build the js files from GitHub + doCheck = false; + + pythonImportsCheck = [ + "bqplot" + "bqplot.pyplot" + ]; + + meta = { + description = "2D plotting library for Jupyter based on Grammar of Graphics"; + homepage = "https://bqplot.github.io/bqplot"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/bqscales/default.nix b/pkgs/development/python-modules/bqscales/default.nix new file mode 100644 index 00000000000..3bd015a58f6 --- /dev/null +++ b/pkgs/development/python-modules/bqscales/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, hatchling +, jupyter-packaging +, ipywidgets +, numpy +, traitlets +, traittypes +}: + +buildPythonPackage rec { + pname = "bqscales"; + version = "0.3.1"; + + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-C+/GLpqYpePngbn5W0MwvpdmVgFZF7aGHyKMgO5XM90="; + }; + + nativeBuildInputs = [ + hatchling + jupyter-packaging + ]; + + propagatedBuildInputs = [ + ipywidgets + numpy + traitlets + traittypes + ]; + + # no tests in PyPI dist + doCheck = false; + + pythonImportsCheck = [ "bqscales" ]; + + meta = { + description = "Grammar of Graphics scales for bqplot and other Jupyter widgets libraries"; + homepage = "https://github.com/bqplot/bqscales"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index ea7aa3b0ff5..501a8f543b2 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -43,6 +43,11 @@ buildPythonPackage rec { pytestCheckHook ]; + # A fix for cxxopts >=3.1 + postPatch = '' + substituteInPlace src/cli.cpp \ + --replace "cxxopts::OptionException" "cxxopts::exceptions::exception" + ''; # CMake needs to be run by setuptools rather than by its hook dontConfigure = true; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 33758514a88..7cc986e34b8 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -17,13 +17,13 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "11.5.0"; + version = "12.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S8hWW97SLMibIQ/Z+0il1TFvMHAeErsjhSpgMU4fn24="; + hash = "sha256-Yd2773PVDWBr1Qh1cGRfPJHskXbCVmeEwdSG1qNARUU="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/pkgs/development/python-modules/dashing/default.nix b/pkgs/development/python-modules/dashing/default.nix new file mode 100644 index 00000000000..e4c57679966 --- /dev/null +++ b/pkgs/development/python-modules/dashing/default.nix @@ -0,0 +1,27 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonPackage rec { + pname = "dashing"; + version = "0.1.0"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.7"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + blessed + ]; + + meta = with lib; { + homepage = "https://github.com/FedericoCeratto/dashing"; + description = "Terminal dashboards for Python"; + license = licenses.gpl3; + maintainers = with maintainers; [ juliusrickert ]; + }; +} diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 8a781295b1f..d088850fc58 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.17.6"; + version = "0.17.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "databricks"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K20fhfdJuABqpbm8O8PSA9pIW8Uu1MdlP3r5E49pt6Q="; + hash = "sha256-Eg6qpoEvWlbOJbMIkbJiHfHVrglVfVNq/TCOhQxukl0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix new file mode 100644 index 00000000000..0525f4d8611 --- /dev/null +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -0,0 +1,69 @@ +{ lib +, aws-sam-cli +, boto3 +, buildPythonPackage +, cfn-lint +, fetchFromGitHub +, mock +, moto +, mypy-boto3-ebs +, poetry-core +, pytestCheckHook +, pythonOlder +, typer +, urllib3 +}: + +buildPythonPackage rec { + pname = "dsnap"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RhinoSecurityLabs"; + repo = "dsnap"; + rev = "refs/tags/v${version}"; + hash = "sha256-yKch+tKjFhvZfzloazMH378dkERF8gnZEX1Som+d670="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + boto3 + urllib3 + ]; + + passthru.optional-dependencies = { + cli = [ + typer + ]; + scannerd = [ + aws-sam-cli + cfn-lint + ]; + }; + + nativeCheckInputs = [ + mock + moto + mypy-boto3-ebs + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "dsnap" + ]; + + meta = with lib; { + description = "Utility for downloading and mounting EBS snapshots using the EBS Direct API's"; + homepage = "https://github.com/RhinoSecurityLabs/dsnap"; + changelog = "https://github.com/RhinoSecurityLabs/dsnap/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix index 7b6150e46ec..21a14e2fff5 100644 --- a/pkgs/development/python-modules/energyzero/default.nix +++ b/pkgs/development/python-modules/energyzero/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "energyzero"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-energyzero"; rev = "refs/tags/v${version}"; - hash = "sha256-qBtsNqmGLCUGTYJ8iPL/Ie3yGX7Ocs4e+yp0tRAhK8g="; + hash = "sha256-sqkpbvsMd/8y6QSrMZHJeHl9GTes8TUoZ7RKePJsREs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix new file mode 100644 index 00000000000..f9758e38c2d --- /dev/null +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "gitignore-parser"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mherrmann"; + repo = "gitignore_parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-F1ZQQ33naOO7KNuSdlo0JN8i50lLty+eGSJAzVJL730="; + }; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "gitignore_parser" + ]; + + meta = with lib; { + description = "A spec-compliant gitignore parser"; + homepage = "https://github.com/mherrmann/gitignore_parser"; + changelog = "https://github.com/mherrmann/gitignore_parser/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bc9b3895c1c..c57cee073f7 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; - rev = version; - hash = "sha256-IBEy19iouYAHIZwc/bnMgmHLrbfZjLni0Ne4o0I6FNg="; + rev = "refs/tags/${version}"; + hash = "sha256-fcQgwOYGhpwxSXfa1PYFOe2UDTEu+2YGIQmuSa5J0g4="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with Glances"; homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"; + changelog = "https://github.com/home-assistant-ecosystem/python-glances-api/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 660dd96cfe8..69be7cdf735 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.17.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wysLs0seCRDadYj9aRowebq6+kMi7RZp/DITC4lqsVY="; + hash = "sha256-Qdb3AnwHS2nho3ld0oehVkORAy+F3xzEqHuSJQb18OI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 8097cc3b46b..a7c673c38ca 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , numpy , scikit-learn @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.8"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchurl { - url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - hash = "sha256-aWkx49zmgBzJt4xin1QwYd1+tnpxFVsD0bOeoXKipfk="; + src = fetchPypi { + inherit pname version; + hash = "sha256-0TqR6jaV34gUZePTYTLX7vToTUg/S6U4pLRuJLXqEA8="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix new file mode 100644 index 00000000000..7ddaf432d12 --- /dev/null +++ b/pkgs/development/python-modules/ipyxact/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pyyaml +, six +, lxml +}: + +buildPythonPackage rec { + pname = "ipyxact"; + version = "0.3.2"; + + propagatedBuildInputs = [ pyyaml ]; + checkInputs = [ six lxml ]; + + src = fetchFromGitHub { + owner = "olofk"; + repo = pname; + rev = "v${version}"; + hash = "sha256-myD+NnqcxxaSAV7qZa8xqeciaiFqFePqIzd7sb/2GXA="; + }; + + pythonImportsCheck = [ "ipyxact" ]; + + meta = with lib; { + homepage = "https://github.com/olofk/ipyxact"; + description = "IP-XACT parser"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index 164b46dd4f7..86a8c63e19a 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -26,6 +26,7 @@ , importlib-resources , pyparsing , requests-mock +, nettools }: buildPythonPackage rec { @@ -78,6 +79,8 @@ buildPythonPackage rec { importlib-resources pyparsing requests-mock + ] ++ lib.optionals stdenv.isDarwin [ + nettools ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 513bf89cfc0..299a526dfdd 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , rustPlatform , cargo +, darwin , rustc , setuptools-rust , json-stream-rs-tokenizer @@ -38,6 +40,10 @@ buildPythonPackage rec { rustc ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.libiconv + ]; + # Tests depend on json-stream, which depends on this package. # To avoid infinite recursion, we only enable tests when building passthru.tests. doCheck = false; diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix deleted file mode 100644 index 99358e4f95d..00000000000 --- a/pkgs/development/python-modules/markerlib/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, nose -}: - -buildPythonPackage rec { - version = "0.6.0"; - pname = "markerlib"; - - src = fetchPypi { - inherit pname version; - sha256 = "2fdb3939441f5bf4f090b1979a34f84a11d33eed6c0e3995de88ae5c06b6e3ae"; - }; - - buildInputs = [ setuptools ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; - - meta = with lib; { - homepage = "https://bitbucket.org/dholth/markerlib/"; - description = "A compiler for PEP 345 environment markers"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index fc88d76113f..96b922ed474 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.17"; + version = "0.6.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-rCPwOhhv1hDwJqs8g3JfXcSgvrLf6UhNm0JPtRGW5S0="; + hash = "sha256-EkHrBhlPlavF6qbTF9myDBYh5eHxiZ4OoDzvlSs/LYM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix new file mode 100644 index 00000000000..228ceab3134 --- /dev/null +++ b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -0,0 +1,39 @@ +{ lib +, boto3 +, buildPythonPackage +, fetchPypi +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "mypy-boto3-ebs"; + version = "1.26.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-w15SM5F1IFtX4qDrMv5B7PItaTnXOOABg0aUU24onBk="; + }; + + propagatedBuildInputs = [ + boto3 + typing-extensions + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "mypy_boto3_ebs" + ]; + + meta = with lib; { + description = "Type annotations for boto3.s3"; + homepage = "https://github.com/youtype/mypy_boto3_builder"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index ae0259788fd..92d3bbb5d4c 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nodeenv"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ekalinin"; repo = pname; - rev = version; - hash = "sha256-X30PUiOMT/vXqmdSJKHTNNA8aLWavCUaKa7LzqkdLrk="; + rev = "refs/tags/${version}"; + hash = "sha256-aW/aNZbFXfP4bF/Nlvv419IDfaJRA1pJYM7awj+6Hz0="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Node.js virtual environment builder"; homepage = "https://github.com/ekalinin/nodeenv"; + changelog = "https://github.com/ekalinin/nodeenv/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix new file mode 100644 index 00000000000..f1699e20966 --- /dev/null +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -0,0 +1,47 @@ +{ buildPythonPackage +, stdenv +, fetchFromGitHub +, lib +, attrs +, distro +, jsonschema +, six +, zipfile2 +, hypothesis +, mock +, packaging +, testfixtures +}: + +buildPythonPackage rec { + pname = "okonomiyaki"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "enthought"; + repo = pname; + rev = version; + hash = "sha256-eWCOuGtdjBGThAyu15aerclkSWC593VGDPHJ98l30iY="; + }; + + propagatedBuildInputs = [ distro attrs jsonschema six zipfile2 ]; + + preCheck = '' + substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \ + --replace 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \ + --replace 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' + ''; + + checkInputs = [ hypothesis mock packaging testfixtures ]; + + pythonImportsCheck = [ "okonomiyaki" ]; + + meta = with lib; { + homepage = "https://github.com/enthought/okonomiyaki"; + description = "An experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 2b9bce88015..52e0984f5aa 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,55 +1,50 @@ { lib +, stdenv , buildPythonPackage -, python3 -, bash , cmake , fetchFromGitHub , gtest -, isPy27 , nbval , numpy +, parameterized , protobuf , pybind11 , pytestCheckHook -, six +, pythonOlder , tabulate , typing-extensions -, pythonRelaxDepsHook }: let gtestStatic = gtest.override { static = true; }; in buildPythonPackage rec { pname = "onnx"; - version = "1.13.1"; + version = "1.14.0"; format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-10MH23XpAv/uDW/2tRFGS2lKU8hnaNBwbIBIgVc7Jpk="; + hash = "sha256-f+s25Y/jGosaSdoZY6PE3j6pENkfDcD+IQndrbtuzWg="; }; nativeBuildInputs = [ cmake - pythonRelaxDepsHook pybind11 ]; - pythonRelaxDeps = [ "protobuf" ]; - propagatedBuildInputs = [ protobuf numpy - six typing-extensions ]; nativeCheckInputs = [ nbval + parameterized pytestCheckHook tabulate ]; @@ -72,7 +67,6 @@ in buildPythonPackage rec { # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set # to lib64 and cmake incorrectly looks for the protobuf library in lib64 export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" - '' + lib.optionalString doCheck '' export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" export ONNX_BUILD_TESTS=1 ''; @@ -89,14 +83,18 @@ in buildPythonPackage rec { # The setup.py does all the configuration dontUseCmakeConfigure = true; - doCheck = true; preCheck = '' export HOME=$(mktemp -d) # detecting source dir as a python package confuses pytest mv onnx/__init__.py onnx/__init__.py.hidden ''; - pytestFlagsArray = [ "onnx/test" "onnx/examples" ]; + + pytestFlagsArray = [ + "onnx/test" + "onnx/examples" + ]; + disabledTests = [ # attempts to fetch data from web "test_bvlc_alexnet_cpu" @@ -108,11 +106,25 @@ in buildPythonPackage rec { "test_squeezenet_cpu" "test_vgg19_cpu" "test_zfnet512_cpu" + ] ++ lib.optionals stdenv.isAarch64 [ + # AssertionError: Output 0 of test 0 in folder + "test__pytorch_converted_Conv2d_depthwise_padded" + "test__pytorch_converted_Conv2d_dilated" + "test_dft" + "test_dft_axis" + # AssertionError: Mismatch in test 'test_Conv2d_depthwise_padded' + "test_xor_bcast4v4d" + # AssertionError: assert 1 == 0 + "test_ops_tested" ]; + disabledTestPaths = [ # Unexpected output fields from running code: {'stderr'} "onnx/examples/np_array_tensorproto.ipynb" ]; + + __darwinAllowLocalNetworking = true; + postCheck = '' # run "cpp" tests .setuptools-cmake-build/onnx_gtests diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 42cd7035cb7..8e3df0360de 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -28,20 +28,15 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.9.0"; pname = "pwntools"; + version = "4.10.0"; src = fetchPypi { inherit pname version; - hash = "sha256-7qZ9GC+RcEiDkpmNmy8d67dYiTgFBVAfB3B2RfrH5xI="; + hash = "sha256-WI6J6meFJ8C1tsru7n524xNS544vHPPdp7yaz1JuRG0="; }; postPatch = '' - # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538, - # but since that is a niche use case and it requires extra work to get unicorn 1.0.2rc3 to work we relax - # the bound here. Check if this is still necessary when updating! - sed -i 's/unicorn>=1.0.2rc1,<1.0.2rc4/unicorn>=1.0.2rc1/' setup.py - # Upstream hardcoded the check for the command `gdb-multiarch`; # Forcefully use the provided debugger, as `gdb` (hence `pwndbg`) is built with multiarch in `nixpkgs`. sed -i 's/gdb-multiarch/${debuggerName}/' pwnlib/gdb.py @@ -84,8 +79,9 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://pwntools.com"; description = "CTF framework and exploit development library"; + homepage = "https://pwntools.com"; + changelog = "https://github.com/Gallopsled/pwntools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bennofs kristoff3r pamplemousse ]; }; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 95e892d2151..6d9ea5ddf2e 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.11.0"; + version = "4.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-K81B8cNQ5Vvu8nH8kiroeffwRaUIKpwnpX2Jq7xPjB0="; + hash = "sha256-cW9IQy4D2iaoQ6oHQ07f27YQR7q9DBv2JkoukUtPBRQ="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 2c7ba46d0ab..29d3bab48ab 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "2.0.6"; + version = "2.0.7"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b5PyvebfgYCH4bXZEDMIbLL7aJwSILYyxG0fxKZoWgA="; + hash = "sha256-koL5SXwcDNyyzDnYwFCQz2ht7bnrvvSo3kmvIqCuDo8="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix new file mode 100644 index 00000000000..a6acf665ee8 --- /dev/null +++ b/pkgs/development/python-modules/python-libnmap/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, defusedxml +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-libnmap"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "savon-noir"; + repo = "python-libnmap"; + rev = "refs/tags/v${version}"; + hash = "sha256-cI8wdOvTmRy2cxLBkJn7vXRBRvewDMNl/tkIiRGhZJ8="; + }; + + passthru.optional-dependencies = { + defusedxml = [ + defusedxml + ]; + }; + + # We don't want the nmap binary being present + doCheck = false; + + pythonImportsCheck = [ + "libnmap" + ]; + + meta = with lib; { + description = "Library to run nmap scans, parse and diff scan results"; + homepage = "https://github.com/savon-noir/python-libnmap"; + changelog = "https://github.com/savon-noir/python-libnmap/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-mystrom/default.nix b/pkgs/development/python-modules/python-mystrom/default.nix index e269ccc121d..16b634999c8 100644 --- a/pkgs/development/python-modules/python-mystrom/default.nix +++ b/pkgs/development/python-modules/python-mystrom/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-mystrom"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-Kqv5rUdwkynOzssID77gVYyzs0CDR/bUWh6zpt5zOP8="; + hash = "sha256-VFsTA/isBw0H7qXQhOX6K2p1QcVxO7q5TIzf8YivVgc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 4dc74dcbf6a..bc25094c3d7 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,13 +61,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.2.4"; + version = "31.2.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-08C3T4CoQm/6s8ERbq/m1t513zYuzVJoexlRkCvv3UY="; + hash = "sha256-VvhgXZpV58DHeY5+7nPbrbTTVuHkawFw5akbm4hPnBY="; }; dontConfigure = true; @@ -169,7 +169,8 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to scan code for license, copyright, package and their documented dependencies and other interesting facts"; homepage = "https://github.com/nexB/scancode-toolkit"; + changelog = "https://github.com/nexB/scancode-toolkit/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 cc-by-40 ]; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix new file mode 100644 index 00000000000..406283fc8b0 --- /dev/null +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, fetchFromGitHub +, writeText +, lib +, attrs +, six +, okonomiyaki +}: + +let + version = "0.8.2"; + + versionFile = writeText "simplesat_ver" '' + version = '${version}' + full_version = '${version}' + git_revision = '0000000000000000000000000000000000000000' + is_released = True + msi_version = '${version}.000' + version_info = (${lib.versions.major version}, ${lib.versions.minor version}, ${lib.versions.patch version}, 'final', 0) + ''; + +in buildPythonPackage rec { + pname = "simplesat"; + inherit version; + + propagatedBuildInputs = [ attrs six okonomiyaki ]; + + src = fetchFromGitHub { + owner = "enthought"; + repo = "sat-solver"; + rev = "v${version}"; + hash = "sha256-6BQn1W2JGrMmNqgxi+sXx06XzNMcvwqYGMkpD0SSpT8="; + }; + + preConfigure = '' + cp ${versionFile} simplesat/_version.py + ''; + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "simplesat" ]; + + meta = with lib; { + homepage = "https://github.com/enthought/sat-solver"; + description = "Prototype for SAT-based dependency handling"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix new file mode 100644 index 00000000000..3bf2ff810d5 --- /dev/null +++ b/pkgs/development/python-modules/single-source/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, importlib-metadata +, poetry-core +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "single-source"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rabbit72"; + repo = "single-source"; + rev = "refs/tags/v${version}"; + hash = "sha256-bhfMRIeJUd5JhN2tPww7fdbmHQ7ypcsZrYSa55v0+W8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + importlib-metadata + ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "single_source" + ]; + + meta = with lib; { + description = "Access to the project version in Python code for PEP 621-style projects"; + homepage = "https://github.com/rabbit72/single-source"; + changelog = "https://github.com/rabbit72/single-source/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 08897adcc1d..72ddbef10b7 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -8,18 +8,19 @@ , xmltodict , pytestCheckHook , pythonOlder +, uritools }: buildPythonPackage rec { pname = "spdx-tools"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QqKMKBedWOFYF1av9IgQuyJ6b5mNhhMpIZVJdEDcAK8="; + hash = "sha256-l15tu6iPEFqKyyKr9T/pDw6dVjWiubH+SHeB6WliOxc="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { ply pyyaml rdflib + uritools xmltodict ]; diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 9e2d5bfae2a..1d7c80e4dd0 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "taxi"; - version = "6.1.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "sephii"; repo = "taxi"; rev = version; - hash = "sha256-iIy3odDX3QzVG80AFp81m8AYKES4JjlDp49GGpuIHLI="; + hash = "sha256-wtLlO/W+39kTPjb2U6c54bxWxAQB7CxGxBh8gur+RCQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index e1b16707a88..58df025b19b 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.5.4.1"; + version = "4.5.5.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vwQZL0FbK0Ls79cLtLkesDUuSPJxaiE+A441wJamOcI="; + hash = "sha256-L+gvN02d3fAH3q8j2B/dz9lSPZUivxFSPFxDvFsnCZ4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 4528bad359d..9f5d40248c7 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchpatch , pytestCheckHook +, pythonAtLeast , pythonOlder , six }: @@ -13,7 +14,8 @@ buildPythonPackage rec { version = "6.0.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + # No support for Python 3.11, https://github.com/rocky/python-xdis/issues/98 + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "rocky"; @@ -25,7 +27,7 @@ buildPythonPackage rec { postPatch = '' # Our Python release is not in the test matrix substituteInPlace xdis/magics.py \ - --replace "3.10.4" "3.10.5 3.10.6" + --replace "3.10.4" "3.10.5 3.10.6 3.10.7 3.10.8 3.10.10 3.10.11 3.10.12 3.10.13 3.10.14" ''; propagatedBuildInputs = [ @@ -60,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = "https://github.com/rocky/python-xdis"; + changelog = "https://github.com/rocky/python-xdis/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 22fe3f178b2..bdb5888f352 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sXmwLXbFNckw9lCZ4V5hyZyDnStTp2x4InmoBz3c++w="; + hash = "sha256-CioXmv5VJBiJx97k69Sp5kaeD59p+OSL14RVse/gYUA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix new file mode 100644 index 00000000000..fc733e6cdbd --- /dev/null +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: + +buildPythonPackage rec { + pname = "zipfile2"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "cournape"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BwcEgW4XrQqz0Jmtbyxf8q0mWTJXv2dL3Tk7N/IYuMI="; + }; + + patches = [ ./no-setuid.patch ]; + + pythonImportsCheck = [ "zipfile2" ]; + + meta = with lib; { + homepage = "https://github.com/cournape/zipfile2"; + description = "A backwards-compatible improved zipfile class"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/zipfile2/no-setuid.patch b/pkgs/development/python-modules/zipfile2/no-setuid.patch new file mode 100644 index 00000000000..951358585a7 --- /dev/null +++ b/pkgs/development/python-modules/zipfile2/no-setuid.patch @@ -0,0 +1,15 @@ +diff --git a/zipfile2/tests/test__zipfile.py b/zipfile2/tests/test__zipfile.py +index 60f2ed2..db6e5bc 100644 +--- a/zipfile2/tests/test__zipfile.py ++++ b/zipfile2/tests/test__zipfile.py +@@ -585,8 +585,8 @@ class TestsPermissionExtraction(unittest.TestCase): + if index & 1 << order: + mode |= permissions[permgroup][order] + for order in range(3): +- if specialindex & 1 << order: +- mode |= permissions['special'][order] ++ if specialindex & 1 << order and order == 0: ++ raise unittest.SkipTest("The nix build process doesn't allow you to use the setuid bit") + os.chmod(path, mode) + real_permission = os.stat(path).st_mode & 0xFFF + self.files.append((path, real_permission)) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 105b463f827..4e9f663d9ac 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -516,7 +516,7 @@ in openssl = attrs: { # https://github.com/ruby/openssl/issues/369 - buildInputs = [ openssl_1_1 ]; + buildInputs = [ (if (lib.versionAtLeast attrs.version "3.0.0") then openssl else openssl_1_1) ]; }; opus-ruby = attrs: { diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index d8e7c0ffb74..d87863a79b9 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -1,20 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, rust +, stdenv +}: rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-lZtAhsEfMzj8Irl7LQPzjBNiKKy8091p2XoB5wSPhKM="; + hash = "sha256-db75OoFmsR03lK99vGg8+fHJENOyoDFo+uqQJNYmI9M="; }; - cargoHash = "sha256-L0FX4RuJ5n76CCWVpGQryX7usXGBN55W9+y83s9JJug="; + cargoHash = "sha256-6TC4RWDcg4el+jkq8Jal0k+2sdNsjMkMYqP/b9wP5mU="; nativeBuildInputs = [ installShellFiles ]; + preCheck = '' + export PATH=target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH + ''; + postInstall = '' installShellCompletion --cmd argc \ --bash <($out/bin/argc --argc-completions bash) \ @@ -23,7 +33,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A tool to handle sh/bash cli parameters"; + description = "A command-line options, arguments and sub-commands parser for bash"; homepage = "https://github.com/sigoden/argc"; changelog = "https://github.com/sigoden/argc/releases/tag/v${version}"; license = with licenses; [ mit /* or */ asl20 ]; diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix new file mode 100644 index 00000000000..b7bae702a29 --- /dev/null +++ b/pkgs/development/tools/bearer/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "bearer"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "bearer"; + repo = "bearer"; + rev = "refs/tags/v${version}"; + hash = "sha256-ecLJvV2gUY6uUeCUsVtDSVOQnZnsThGtguWWzb4vsoE="; + }; + + vendorHash = "sha256-EHj7tpQoiwu9pocFg5chNpuekxM3bHE2+V2srD4bInQ="; + + subPackages = [ + "cmd/bearer" + ]; + + ldflags = [ + "-s" + "-w" + ]; + +# doCheck = false; + + meta = with lib; { + description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks"; + homepage = "https://github.com/bearer/bearer"; + changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}"; + license = with licenses; [ elastic ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 8a0ff951b9d..6104b7779e8 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.20.0"; + version = "3.21.0"; owner = "erlang"; deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "1mh5cd3cpnvfv2cwm5bs64ldd2d7iqvikn47v9bpfd76nck3h8nh"; + sha256 = "QRQlqzYxRD4W63CawXBQ9ysPHzHQ5JrfjPqAivFyJAM="; }; buildInputs = [ erlang ]; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index fa4e8b04f8b..7f6be584098 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -4,106 +4,6 @@ in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y let self = packages // (overrides self packages); packages = with self; { - ssl_verify_fun = builder { - name = "ssl_verify_fun"; - version = "1.1.6"; - src = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.6"; - sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; - }; - beamDeps = [ ]; - }; - relx = builder { - name = "relx"; - version = "4.7.0"; - src = fetchHex { - pkg = "relx"; - version = "4.7.0"; - sha256 = "sha256-oqv6+nC846C5im5RQKyYQpuZgPg1/7RzV/BkVCL8L6M="; - }; - beamDeps = [ bbmustache ]; - }; - providers = builder { - name = "providers"; - version = "1.9.0"; - src = fetchHex { - pkg = "providers"; - version = "1.9.0"; - sha256 = "sha256-0ofodEBqFQVghkKwo9tbaNato/KrABrsh+f018efwBc="; - }; - beamDeps = [ erlware_commons getopt ]; - }; - getopt = builder { - name = "getopt"; - version = "1.0.1"; - src = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; - }; - beamDeps = [ ]; - }; - eunit_formatters = builder { - name = "eunit_formatters"; - version = "0.5.0"; - src = fetchHex { - pkg = "eunit_formatters"; - version = "0.5.0"; - sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; - }; - beamDeps = [ ]; - }; - erlware_commons = builder { - name = "erlware_commons"; - version = "1.5.0"; - src = fetchHex { - pkg = "erlware_commons"; - version = "1.5.0"; - sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns="; - }; - beamDeps = [ cf ]; - }; - cth_readable = builder { - name = "cth_readable"; - version = "1.5.1"; - src = fetchHex { - pkg = "cth_readable"; - version = "1.5.1"; - sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; - }; - beamDeps = [ cf ]; - }; - cf = builder { - name = "cf"; - version = "0.3.1"; - src = fetchHex { - pkg = "cf"; - version = "0.3.1"; - sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; - }; - beamDeps = [ ]; - }; - certifi = builder { - name = "certifi"; - version = "2.9.0"; - src = fetchHex { - pkg = "certifi"; - version = "2.9.0"; - sha256 = "sha256-Jm2ka9sG1sbTX955m8so022YXUJK18CLW7SPW1zdRkE"; - }; - beamDeps = [ ]; - }; - bbmustache = builder { - name = "bbmustache"; - version = "1.12.2"; - src = fetchHex { - pkg = "bbmustache"; - version = "1.12.2"; - sha256 = "sha256-aIszpNXMLVH1da3ws2g/xAo4MUovFQkG7c/Hf1tXezs="; - }; - beamDeps = [ ]; - }; meck = builder { name = "meck"; version = "0.8.13"; diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index 784486f49ce..f7106818804 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; meta = with lib; { - maintainers = with maintainers; [ endocrimes indeednotjames ]; + maintainers = with maintainers; [ endocrimes emilylange ]; license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; diff --git a/pkgs/development/tools/darklua/default.nix b/pkgs/development/tools/darklua/default.nix new file mode 100644 index 00000000000..9258e1e1065 --- /dev/null +++ b/pkgs/development/tools/darklua/default.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "darklua"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "seaofvoices"; + repo = "darklua"; + rev = "v${version}"; + hash = "sha256-ABzhtAbWv2oM4VqxRUWC+xh2fwUw1s2iU1IWb5EEhiE="; + }; + + cargoHash = "sha256-36YN/7aI69xsnwGz8oQG5RZu8XjQ9vwQtRNMWQ7pT0Q="; + + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; + + meta = with lib; { + description = "A command line tool that transforms Lua code"; + homepage = "https://darklua.com"; + changelog = "https://github.com/seaofvoices/darklua/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ tomodachi94 ]; + }; +} diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 7f28528cd48..d50a37b9eef 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sy5R2QSVkxFmfRMiD5KDzkFCol7MpOnfz0/JR++zIX4="; + sha256 = "sha256-oFGaNxK8cVrs+rkmJR9wSYB4+i3B8BGYhsuHbUTK3es="; }; vendorHash = "sha256-UY/8fWPoO3d0g1/CN215Q4z744S2cCT7fB4ctpridAI="; diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix index 2ce2b0251e3..5b7530c965e 100644 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "416"; + version = "418"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-0jIOGFPlWgF/vaXTff0hiOWDA7ayiMmzo54eUZp4rsU="; + sha256 = "sha256-IVLQG+y2Uvph+0WE+BE2beDSCGzfgkOdclESi+szcZM="; }; dontUnpack = true; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index c492d313cb8..379a292ff9b 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.94.0"; + version = "1.95.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-R/dy//e+DfyANoNtiPoAI9CF7k8ZviFgsnMrWryf0LY="; + sha256 = "sha256-gRkReaRDbFGDty8AjuXwoBPEF2wnXMcWVSFaUDideQs="; }; meta = with lib; { diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index fc4b4291045..8e153cd1d40 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-Fg5J/iLxGUwb2QRZJMHLqK9dBECW9VsiZGX+LyUtyhw="; + hash = "sha256-j7s9oluNtYi6MmTKCendTIjc/zvynY6fWvXH47XkwOI="; }; - vendorHash = "sha256-sjzGtSBgRybcJvOXM4wKN5pTgihNrjUCMPsc62n3tLk="; + vendorHash = "sha256-XobOcG5s2ggTk3RmJPM14OWv45PMyKs0w0BOvozUobw="; ldflags = [ "-s" diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index 2cfe32cd434..55a331b38e4 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in buildGoModule rec { pname = "go-containerregistry"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yXIFPLuqyWaWgbGbGOuBwWg/KWM9vuMnXnTBcgluzhI="; + sha256 = "sha256-Bva962laaHJAHwiQAMPtOBkwqce1ww+sBGkjV1TjrwQ="; }; vendorHash = null; diff --git a/pkgs/development/tools/gotemplate/default.nix b/pkgs/development/tools/gotemplate/default.nix new file mode 100644 index 00000000000..1186bd64e3e --- /dev/null +++ b/pkgs/development/tools/gotemplate/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gotemplate"; + version = "3.7.2"; + + src = fetchFromGitHub { + owner = "coveooss"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-1jyTZBkt+nN52jgs5XZN22zw33i0yENDc4cW/Y1Lidc="; + }; + + vendorHash = "sha256-WW7X3rURdvmSjbtRkeLoicsiqxsMED5el+Jl5yYk7hA="; + + meta = with lib; { + description = "CLI for go text/template"; + changelog = "https://github.com/coveooss/gotemplate/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ giorgiga ]; + }; +} diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 33ef240f281..c1fd6d60421 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.106.3"; + version = "0.107.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-54yXQ3E10dlU/UqHyl3fxzQsawBTgNpIaq6XPmwXmD8="; + sha256 = "sha256-ca5/pgp2io4TYA8DtUUJZe/9d1KPgX3DV5pTyTKBe5M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 8d7201e5b72..32f23fa4a7e 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jwOyOGSnUgk9+cD+cGj1/ZzQ84HAdAn0HMy3CLPs1U0="; + sha256 = "sha256-ZIYg6ITGHXJZ0YySwSN8mlSmiFiWsWUeGwIo8vRLw3Y="; }; vendorHash = "sha256-tNYPgXFDJuNRlrVE0ywg77goNzfoWHFVzOG9mHqK3q8="; diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index dd9c44cbe0d..5296e561a86 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -10,18 +10,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arrayref" @@ -29,12 +29,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.2" @@ -49,14 +43,14 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "auto_impl" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33" +checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", "proc-macro2", @@ -71,10 +65,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "base64" -version = "0.13.1" +name = "az" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "biblatex" @@ -120,6 +120,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +dependencies = [ + "serde", +] + [[package]] name = "bytemuck" version = "1.13.1" @@ -138,6 +147,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + [[package]] name = "cfg-if" version = "1.0.0" @@ -146,9 +161,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chinese-number" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9a8cffacecd7f477f8395021158af07c8a3f74523e9b90e4e4bb0105deaa74" +checksum = "bb8659add27dbba7575c058a3265d81cc078dc2693848445bf3788a883ec82c8" dependencies = [ "chinese-variant", "enum-ordinalize", @@ -180,9 +195,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "comemo" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b396e6f0a1a7d2c1d588fd8a255a8c30a8edeef65bc96b4afb3fdb8a8bf281" +checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" dependencies = [ "comemo-macros", "siphasher", @@ -190,9 +205,9 @@ dependencies = [ [[package]] name = "comemo-macros" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421c3e125e48959f3b6a18c0d266f3c228f6e28464c73cc44cff24e808fcda2d" +checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" dependencies = [ "proc-macro2", "quote", @@ -244,49 +259,47 @@ dependencies = [ [[package]] name = "data-url" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" -dependencies = [ - "matches", -] +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "dirs" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "ecow" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60e2840fbfc397c7972b11a6e6bd99a0248921cc1e31f293c5f6c5ac24831da" +checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" [[package]] name = "either" @@ -304,16 +317,15 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "3.1.12" +version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" +checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "rustc_version", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -337,12 +349,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -357,6 +369,18 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "fontdb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "237ff9f0813bbfc9de836016472e0c9ae7802f174a51594607e5f4ff334cb2f5" +dependencies = [ + "log", + "memmap2", + "slotmap", + "ttf-parser", +] + [[package]] name = "form_urlencoded" version = "1.1.0" @@ -422,7 +446,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -466,16 +490,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.12.0" @@ -565,13 +579,19 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "gif 0.12.0", - "jpeg-decoder 0.3.0", + "gif", + "jpeg-decoder", "num-rational", "num-traits", "png", ] +[[package]] +name = "imagesize" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" + [[package]] name = "indexmap" version = "1.9.3" @@ -584,9 +604,9 @@ dependencies = [ [[package]] name = "isolang" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64fd6448ee8a45ce6e4365c58e4fa7d8740cba2ed70db3e9ab4879ebd93eaaa" +checksum = "f80f221db1bc708b71128757b9396727c04de86968081e18e89b0575e03be071" dependencies = [ "phf", ] @@ -606,12 +626,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -[[package]] -name = "jpeg-decoder" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" - [[package]] name = "jpeg-decoder" version = "0.3.0" @@ -620,11 +634,11 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "kurbo" -version = "0.8.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", ] [[package]] @@ -635,9 +649,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.141" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "linked-hash-map" @@ -680,19 +694,13 @@ version = "0.94.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", "url", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" version = "2.5.0" @@ -708,24 +716,6 @@ dependencies = [ "libc", ] -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -799,6 +789,12 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "parking_lot" version = "0.12.1" @@ -819,7 +815,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -830,11 +826,11 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pdf-writer" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249f9b33a3192626f2cd9f4b0cd66c1ec32d65968d58cf4d8239977feddddead" +checksum = "30900f178ea696fc5d9637171f98aaa93d5aae54f0726726df68fc3e32810db6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "itoa", "ryu", ] @@ -847,46 +843,46 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "phf" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ "phf_shared", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" dependencies = [ "siphasher", ] [[package]] name = "pico-args" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -907,7 +903,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eefadd393715fe315c8cdcd587f893b818a6dfe4f6f9faeb44b764c7c38fd8b" dependencies = [ - "ttf-parser 0.18.1", + "ttf-parser", ] [[package]] @@ -916,11 +912,11 @@ version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -955,18 +951,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] [[package]] -name = "quote" -version = "1.0.26" +name = "psm" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -998,9 +1003,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rctree" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae028b272a6e99d9f8260ceefa3caa09300a8d6c8d2b2001316474bc52122e9" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "redox_syscall" @@ -1008,7 +1013,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1024,13 +1029,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -1040,16 +1045,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "resvg" -version = "0.22.0" +name = "regex-syntax" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e702d1e8e00a3a0717b96244cba840f34f542d8f23097c8903266c4e2975658" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + +[[package]] +name = "resvg" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf" dependencies = [ - "gif 0.11.4", - "jpeg-decoder 0.2.6", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", @@ -1066,21 +1074,25 @@ dependencies = [ ] [[package]] -name = "roxmltree" -version = "0.14.1" +name = "rosvgtree" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" +checksum = "ad747e7384940e7bf33b15ba433b7bad9f44c0c6d5287a67c2cb22cd1743d497" dependencies = [ - "xmlparser", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", ] [[package]] -name = "rustc_version" -version = "0.4.0" +name = "roxmltree" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" dependencies = [ - "semver", + "xmlparser", ] [[package]] @@ -1091,14 +1103,14 @@ checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "rustybuzz" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a617c811f5c9a7060fe511d35d13bf5b9f0463ce36d63ce666d05779df2b4eba" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser 0.15.2", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", "unicode-general-category", @@ -1111,15 +1123,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "same-file" version = "1.0.6" @@ -1135,30 +1138,24 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1180,7 +1177,16 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", +] + +[[package]] +name = "serde_spanned" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +dependencies = [ + "serde", ] [[package]] @@ -1225,6 +1231,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + [[package]] name = "smallvec" version = "1.10.0" @@ -1237,6 +1252,28 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "strict-num" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1" +dependencies = [ + "float-cmp", +] + [[package]] name = "strum" version = "0.24.1" @@ -1268,21 +1305,21 @@ checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" [[package]] name = "svg2pdf" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd5736713f3850a24060c3cdd7ac9efdc0c5138779386c6c8975b46d54d2d3d5" +source = "git+https://github.com/typst/svg2pdf#35f4bb87fb677473661c6d12919e01a6d64a716d" dependencies = [ "image", - "miniz_oxide 0.5.4", + "miniz_oxide", "pdf-writer", "usvg", ] [[package]] name = "svgtypes" -version = "0.8.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ + "kurbo", "siphasher", ] @@ -1299,9 +1336,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -1315,13 +1352,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8" dependencies = [ "bincode", - "bitflags", + "bitflags 1.3.2", "fancy-regex", "flate2", "fnv", "lazy_static", "once_cell", - "regex-syntax", + "regex-syntax 0.6.29", "serde", "serde_derive", "serde_json", @@ -1329,12 +1366,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "thin-vec" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81b6fd6beb5884b0cf3321b8117e6e5d47ecb6fc89f414cfdcca8b2fe2dd8" - [[package]] name = "thiserror" version = "1.0.40" @@ -1352,21 +1383,33 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "tiny-skia" -version = "0.6.6" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d049bfef0eaa2521e75d9ffb5ce86ad54480932ae19b85f78bec6f52c4d30d78" +checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "bytemuck", "cfg-if", + "log", "png", - "safe_arch", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", ] [[package]] @@ -1395,33 +1438,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "num_cpus", "pin-project-lite", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -1431,6 +1474,40 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -1505,30 +1582,24 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - [[package]] name = "ttf-parser" version = "0.18.1" @@ -1543,19 +1614,20 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.2.0" -source = "git+https://github.com/typst/typst.git?tag=v0.2.0#fe2640c55268f167d8749f77b37e52b7b17f21dd" +version = "0.4.0" +source = "git+https://github.com/typst/typst.git?tag=v0.4.0#f692a5efc62bf95f57d123895b7dce55d2eb9741" dependencies = [ - "bitflags", + "bitflags 2.3.1", "bytemuck", "comemo", "ecow", "flate2", + "fontdb", "if_chain", "image", "indexmap", "log", - "miniz_oxide 0.5.4", + "miniz_oxide", "once_cell", "pdf-writer", "pixglyph", @@ -1565,15 +1637,17 @@ dependencies = [ "rustybuzz", "serde", "siphasher", + "stacker", "subsetter", "svg2pdf", - "thin-vec", "tiny-skia", - "ttf-parser 0.18.1", + "tracing", + "ttf-parser", "typst-macros", + "unicode-general-category", + "unicode-ident", "unicode-math-class", "unicode-segmentation", - "unicode-xid", "unscanny", "usvg", "xmp-writer", @@ -1581,9 +1655,10 @@ dependencies = [ [[package]] name = "typst-library" -version = "0.2.0" -source = "git+https://github.com/typst/typst.git?tag=v0.2.0#fe2640c55268f167d8749f77b37e52b7b17f21dd" +version = "0.4.0" +source = "git+https://github.com/typst/typst.git?tag=v0.4.0#f692a5efc62bf95f57d123895b7dce55d2eb9741" dependencies = [ + "az", "chinese-number", "comemo", "csv", @@ -1600,7 +1675,9 @@ dependencies = [ "serde_yaml", "smallvec", "syntect", - "ttf-parser 0.18.1", + "toml", + "tracing", + "ttf-parser", "typed-arena", "typst", "unicode-bidi", @@ -1612,7 +1689,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.4.1" +version = "0.5.0" dependencies = [ "anyhow", "comemo", @@ -1639,14 +1716,13 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.2.0" -source = "git+https://github.com/typst/typst.git?tag=v0.2.0#fe2640c55268f167d8749f77b37e52b7b17f21dd" +version = "0.4.0" +source = "git+https://github.com/typst/typst.git?tag=v0.4.0#f692a5efc62bf95f57d123895b7dce55d2eb9741" dependencies = [ "heck", "proc-macro2", "quote", "syn 1.0.109", - "unscanny", ] [[package]] @@ -1687,9 +1763,9 @@ checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] name = "unicode-general-category" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07547e3ee45e28326cc23faac56d44f58f16ab23e413db526debce3b0bfd2742" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" @@ -1725,10 +1801,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "unicode-xid" -version = "0.2.4" +name = "unicode-vo" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unscanny" @@ -1750,21 +1826,61 @@ dependencies = [ [[package]] name = "usvg" -version = "0.22.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a261d60a7215fa339482047cc3dafd4e22e2bf34396aaebef2b707355bbb39c0" +checksum = "4b44e14b7678bcc5947b397991432d0c4e02a103958a0ed5e1b9b961ddd08b21" dependencies = [ "base64", - "data-url", - "flate2", - "float-cmp", - "kurbo", "log", "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90c8251d965c2882a636ffcc054340b1f13a6bce68779cb5b2084d8ffc2535be" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "rosvgtree", + "strict-num", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c4fed019d1af07bfe0f3bac13d120d7b51bc65b38cb24809cf4ed0b8b631138" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7371265c467cdae0ccc3655e2e3f310c695fb9f717c0d25187bf3b333f7b5159" +dependencies = [ + "kurbo", "rctree", - "roxmltree", - "simplecss", - "siphasher", + "strict-num", "svgtypes", ] @@ -1833,7 +1949,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -1842,13 +1967,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -1857,42 +1997,93 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] + [[package]] name = "xi-unicode" version = "0.3.0" @@ -1905,6 +2096,12 @@ version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + [[package]] name = "xmp-writer" version = "0.1.0" diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index 919fa268baa..20451ca6d82 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -5,20 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "nvarner"; repo = pname; rev = "v${version}"; - hash = "sha256-bjgGJxAHc3D0j+ZIPPzBw9vJJgchW9hy5E/qCmFjDUw="; + hash = "sha256-UY7HfUNssOgEuBBPpUFJZs1TM4IT0/kRcjqrXPFoShI="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "elsa-1.8.1" = "sha256-/85IriplPxx24TE/CsvjIsve100QUZiVqS0TWgPFRbw="; - "typst-0.2.0" = "sha256-3vNJmLmbskAzXVXjiSVDLhRcX1j3ksOgPd53W31YZ0c="; + "svg2pdf-0.4.1" = "sha256-WeVP+yhqizpTdRfyoj2AUxFKhGvVJIIiRV0GTXkgLtQ="; + "typst-0.4.0" = "sha256-S8J2D87Zvyh501d8LG69in9om/nTS6Y+IDhJvjm/H0w="; }; }; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 5b34d250652..9437db2ffc3 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg="; + sha256 = "sha256-+ng4+wrJW/fl1DJMbycLymFgiviTwjlxNApE2Q8PesQ="; }; - vendorSha256 = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs="; + vendorHash = "sha256-JOP7hcCOwVZ0hb2UXHHdxpKxpZqs6a8AjOFbrs711ps="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index 1c68dcd041b..b690408b3cd 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-tYdWXioiPF1S5lpAipm3UN9NUjXo1/8nx22q28UQFDY="; + sha256 = "sha256-VXGsSlqVScqyScOsYoXcVfXFvH73GFc+4qPRETqbre0="; }; vendorHash = "sha256-OOjVlRHaOLIJVg3r97qZ3lPv8ANYY2HSn7hUJhg3Cfs="; diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 1932590162b..4c1ea48e4a5 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "sha256-LYoyMEALxeUQQI2pBL1u0Q9rrwyy6N6Dg5bNxhJiVrM="; + sha256 = "sha256-npPE9dB7yxIfCxq3NGgI1J6OkDI7qfsusY/dD9w3bp4="; }; - cargoSha256 = "sha256-t8+bjTRQMuXTYhgW1NuC3MXsRh2SMeycyyq4x1nb9MU="; + cargoSha256 = "sha256-m92PT89uTuJWlGAAL/wopHYv7vXaRd3woEW70S7kVUI="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index b6d7d4bc15d..17c73422842 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.55.1"; + version = "1.62.3"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-bgbQw59AxroHMJJI8YQq38tyv/uvv513ekXzG7MVEP0="; + sha256 = "sha256-5MORYOBEyKcSdiZQI+xbi8GVQr8/e2dJCA9AiS1tm8U="; }; - vendorSha256 = "sha256-FYQbMnBtHlW0jdIyVkmbf+b3VETfcwGhGM0yYkNMGH4="; + vendorSha256 = "sha256-4ig9tkXNMiZa2HbwRPXlIsTiaYo8Tb3zxXUEfU8mFUA="; ldflags = [ "-s" diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 4f483182be2..e0b5c93ee81 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-V4eNHs+g4uumdRTSMMAKFVcJGHUF/WdT0SScyfUPnC8="; + hash = "sha256-OWvWi3mIgcWTnRMsnKgYqB9qzICBOmCcWenTfqhaz+k="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-MxsYJPt7/4UmC5qSbGHyhK1pEDC6yKw189pHnP9BaXM="; + cargoHash = "sha256-WwhoKHWZSOcocpqPqmSFYzNKxxXtpKpRreaPHqc+/40="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix index 633eda1371c..7fc1b297922 100644 --- a/pkgs/development/tools/vsce/default.nix +++ b/pkgs/development/tools/vsce/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildNpmPackage , fetchFromGitHub , pkg-config , libsecret +, darwin , python3 , testers , vsce @@ -27,7 +29,8 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ libsecret ]; + buildInputs = [ libsecret ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Security ]); makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; @@ -43,4 +46,3 @@ buildNpmPackage rec { license = licenses.mit; }; } - diff --git a/pkgs/development/web/newman/default.nix b/pkgs/development/web/newman/default.nix index 6aa2413677c..b36b61d0e94 100644 --- a/pkgs/development/web/newman/default.nix +++ b/pkgs/development/web/newman/default.nix @@ -1,18 +1,27 @@ -{ pkgs, nodejs, stdenv, lib, ... }: +{ lib +, buildNpmPackage +, fetchFromGitHub +}: -let +buildNpmPackage rec { + pname = "newman"; + version = "5.3.2"; - packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); - - nodePackages = import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; + src = fetchFromGitHub { + owner = "postmanlabs"; + repo = "newman"; + rev = "refs/tags/v${version}"; + hash = "sha256-j5YS9Zbk9b3K4+0sGzqtCgEsR+S5nGPf/rebeGzsscA="; }; -in -nodePackages.newman.override { + + npmDepsHash = "sha256-FwVmesHtzTZKsTCIfZiRPb1zf7q5LqABAZOh8gXB9qw="; + + dontNpmBuild = true; + meta = with lib; { homepage = "https://www.getpostman.com"; description = "A command-line collection runner for Postman"; + changelog = "https://github.com/postmanlabs/newman/releases/tag/v${version}"; maintainers = with maintainers; [ freezeboy ]; license = licenses.asl20; }; diff --git a/pkgs/development/web/newman/generate-dependencies.sh b/pkgs/development/web/newman/generate-dependencies.sh deleted file mode 100755 index 7111289d290..00000000000 --- a/pkgs/development/web/newman/generate-dependencies.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -node2nix \ - --node-env node-env.nix \ - --development \ - --input package.json \ - --output node-packages.nix \ - --composition node-composition.nix diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix deleted file mode 100644 index b795f708f18..00000000000 --- a/pkgs/development/web/newman/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/development/web/newman/node-env.nix b/pkgs/development/web/newman/node-env.nix deleted file mode 100644 index 5dad9ec63d4..00000000000 --- a/pkgs/development/web/newman/node-env.nix +++ /dev/null @@ -1,686 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Patch the shebang lines of all the executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - patchShebangs "$file" - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <