From 4ef1e5b8de3831c566806312f74a38e82306eb07 Mon Sep 17 00:00:00 2001 From: Adam Avramov Date: Sat, 24 Oct 2020 03:34:00 +0200 Subject: [PATCH 001/797] yarn2nix: expose yarnPostBuild The way I see it, there's no point in the argument being there if it can't be used. Right now its lack currently prevents a workaround for an issue I can't wrap my head around - first encountered [here](https://logs.nix.samueldr.com/nixos-dev/2019-08-28#2532857;). --- pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 89bc169d503..3372ddce3aa 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -228,6 +228,7 @@ in rec { yarnNix ? mkYarnNix { inherit yarnLock; }, yarnFlags ? defaultYarnFlags, yarnPreBuild ? "", + yarnPostBuild ? "", pkgConfig ? {}, extraBuildInputs ? [], publishBinsFor ? null, @@ -249,6 +250,7 @@ in rec { deps = mkYarnModules { name = "${safeName}-modules-${version}"; preBuild = yarnPreBuild; + postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; inherit packageJSON pname version yarnLock yarnNix yarnFlags pkgConfig; }; From 7e41999280a80efda49947d54600de7b5fbef7b4 Mon Sep 17 00:00:00 2001 From: birlorg Date: Sat, 8 May 2021 20:22:39 +0000 Subject: [PATCH 002/797] spiped: 1.5.0 -> 1.6.1 upgrade spiped from 1.5.0 to 1.6.1 --- pkgs/tools/networking/spiped/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 67ee51d6610..04fc1129a25 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { pname = "spiped"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; - sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; + sha256 = "8d7089979db79a531a0ecc507b113ac6f2cf5f19305571eff1d3413e0ab33713"; }; buildInputs = [ openssl ]; patchPhase = '' substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \ + --replace "dirname" "${coreutils}/bin/dirname" \ --replace "2>/dev/null" "2>stderr.log" - substituteInPlace POSIX/posix-l.sh \ + substituteInPlace libcperciva/POSIX/posix-l.sh \ --replace "rm" "${coreutils}/bin/rm" \ - --replace ">/dev/stderr" ">stderr.log" \ --replace "2>/dev/null" "2>stderr.log" substituteInPlace POSIX/posix-cflags.sh \ From a3f27b548233e75d5ee2a6dded2c84fd72dff74b Mon Sep 17 00:00:00 2001 From: birlorg Date: Sat, 8 May 2021 20:51:32 +0000 Subject: [PATCH 003/797] spiped: 1.5.0 -> 1.6.1 fix changes per @r-rmcgibbo --- pkgs/tools/networking/spiped/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 04fc1129a25..d534f00ad40 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - patchPhase = '' + postPatch = '' substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \ --replace "dirname" "${coreutils}/bin/dirname" \ --replace "2>/dev/null" "2>stderr.log" @@ -27,8 +27,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out/bin $out/share/man/man1 make install BINDIR=$out/bin MAN1DIR=$out/share/man/man1 + runHook postInstall ''; meta = { From e6ed1aca78e73315d565656080af2827b5147710 Mon Sep 17 00:00:00 2001 From: birlorg Date: Sat, 8 May 2021 20:53:17 +0000 Subject: [PATCH 004/797] spiped: 1.5.0 -> 1.6.1 oops, I'm editing using the web UI and I forgot to delete this patch as it's no longer needed. --- pkgs/tools/networking/spiped/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index d534f00ad40..315d3b0c247 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { --replace "rm" "${coreutils}/bin/rm" \ --replace "2>/dev/null" "2>stderr.log" - substituteInPlace POSIX/posix-cflags.sh \ - --replace "rm" "${coreutils}/bin/rm" \ - --replace ">/dev/stderr" ">stderr.log" \ - --replace "2>/dev/null" "2>stderr.log" - ''; installPhase = '' runHook preInstall From 1a5f2a4e259032c53f63c314dc1b0c4a8fd3ad83 Mon Sep 17 00:00:00 2001 From: birlorg Date: Sat, 8 May 2021 22:22:52 +0000 Subject: [PATCH 005/797] spipe: 1.5.0 -> 1.6.1 fix by re-adding ''; --- pkgs/tools/networking/spiped/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 315d3b0c247..8b9d4c9e7b8 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace libcperciva/POSIX/posix-l.sh \ --replace "rm" "${coreutils}/bin/rm" \ --replace "2>/dev/null" "2>stderr.log" - + ''; installPhase = '' runHook preInstall From 7e794a1da27d116792931d96c3837e1c5485a2d0 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 10 May 2021 15:54:52 +0200 Subject: [PATCH 006/797] nixos/davfs2: wrap {,u}mount.davfs with setuid=true --- .../services/network-filesystems/davfs2.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 4b6f85e4a2c..8cf314fe63a 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -70,6 +70,24 @@ in }; }; + security.wrappers."mount.davfs" = { + program = "mount.davfs"; + source = "${pkgs.davfs2}/bin/mount.davfs"; + owner = "root"; + group = cfg.davGroup; + setuid = true; + permissions = "u+rx,g+x"; + }; + + security.wrappers."umount.davfs" = { + program = "umount.davfs"; + source = "${pkgs.davfs2}/bin/umount.davfs"; + owner = "root"; + group = cfg.davGroup; + setuid = true; + permissions = "u+rx,g+x"; + }; + }; } From a385ec5238cded4525e9e027b5f654908a71e8d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 08:50:05 +0000 Subject: [PATCH 007/797] gnomeExtensions.unite: 53 -> 54 --- pkgs/desktops/gnome/extensions/unite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 1fbd31ec10a..228cb706150 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "53"; + version = "54"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "0fw9wqf362h2yd67fhgbhqx0b2fwcl25wxmb92dqwigxjcj0dnw6"; + sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8="; }; uuid = "unite@hardpixel.eu"; From a6a55a780778a4c248c9ba0076a6bb0e8f88f533 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 25 May 2021 11:59:51 +0200 Subject: [PATCH 008/797] python3Modules.imread: 0.7.0 -> 0.7.4 --- pkgs/development/python-modules/imread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 3d09e6a4397..9d5ea1bebd2 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "python-imread"; - version = "0.7.0"; + version = "0.7.4"; src = fetchPypi { inherit version; pname = "imread"; - sha256 = "0yb0fmy6ilh5fvbk69wl2bzqgss2g0951668mx8z9yyj4jhr1z2y"; + sha256 = "0kvlpy62vc16i0mysv1b2gv746in41q75hb815q6h8d227psv1q4"; }; From e23a9584fc34e7c542d5a7090c52605a4ef12fe3 Mon Sep 17 00:00:00 2001 From: Joakim Holm Date: Thu, 27 May 2021 09:50:22 +0200 Subject: [PATCH 009/797] maintainers: add jo1gi --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e9d5e811149..3253a017ff7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4735,6 +4735,12 @@ githubId = 587870; name = "Jonathan Mettes"; }; + jo1gi = { + email = "joakimholm@protonmail.com"; + github = "jo1gi"; + githubId = 26695750; + name = "Joakim Holm"; + }; joachifm = { email = "joachifm@fastmail.fm"; github = "joachifm"; From dab5fdee817180e15b71d711a8484c02da111f34 Mon Sep 17 00:00:00 2001 From: Joakim Holm Date: Thu, 27 May 2021 09:50:52 +0200 Subject: [PATCH 010/797] base16-universal-manager: init at 1.0 --- .../misc/base16-universal-manager/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/base16-universal-manager/default.nix diff --git a/pkgs/applications/misc/base16-universal-manager/default.nix b/pkgs/applications/misc/base16-universal-manager/default.nix new file mode 100644 index 00000000000..3d43a287094 --- /dev/null +++ b/pkgs/applications/misc/base16-universal-manager/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "base16-universal-manager"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "pinpox"; + repo = "base16-universal-manager"; + rev = "v${version}"; + sha256 = "11kal7x0lajzydbc2cvbsix9ympinsiqzfib7dg4b3xprqkyb9zl"; + }; + + vendorSha256 = "19rba689319w3wf0b10yafydyz01kqg8b051vnijcyjyk0khwvsk"; + + meta = with lib; { + description = "A universal manager to set base16 themes for any supported application"; + homepage = "https://github.com/pinpox/base16-universal-manager"; + license = licenses.mit; + maintainers = with maintainers; [ jo1gi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdfc0329e6c..f1994eb7c60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1189,6 +1189,8 @@ in barman = python3Packages.callPackage ../tools/misc/barman { }; + base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { }; + bashate = python3Packages.callPackage ../development/tools/bashate { }; bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; From 16817d94f3381538e2ec8d7d39c3dd9c30aa0524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 13:51:59 +0200 Subject: [PATCH 011/797] libadwaita: unstable-2021-05-01 -> 1.0.0-alpha.1 --- .../libraries/libadwaita/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index f3b9cad0720..d6cffcab7fe 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -2,35 +2,40 @@ , stdenv , fetchFromGitLab , docbook-xsl-nons +, gi-docgen , gtk-doc +, libxml2 , meson , ninja , pkg-config , sassc , vala , gobject-introspection +, fribidi , gtk4 , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "unstable-2021-05-01"; + version = "1.0.0-alpha.1"; outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; + outputBin = "devdoc"; # demo app src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; - rev = "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe"; - sha256 = "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"; + rev = version; + sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p"; }; nativeBuildInputs = [ docbook-xsl-nons + gi-docgen gtk-doc + libxml2 # for xmllint meson ninja pkg-config @@ -43,6 +48,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + fribidi gobject-introspection gtk4 ]; @@ -57,6 +63,10 @@ stdenv.mkDerivation rec { xvfb-run meson test ''; + postInstall = '' + mv $out/share/{doc,gtk-doc} + ''; + meta = with lib; { description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; From 575123a08a1b4783f3c22040a549adba54756201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 15:50:03 +0200 Subject: [PATCH 012/797] mousai: fix with libadwaita 1.0.0-alpha.1 --- pkgs/applications/audio/mousai/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 687546624b0..2f45a3fea92 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchpatch , appstream-glib , desktop-file-utils , gettext @@ -29,6 +30,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; }; + patches = [ + (fetchpatch { + name = "fix-ABI-breakage-from-libadwaita.patch"; + url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch"; + sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs"; + }) + ]; + postPatch = '' patchShebangs build-aux/meson ''; From cdadef2a1c6f5e43dbc8700fe950cbbd3f09776f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 02:57:33 +0000 Subject: [PATCH 013/797] earthly: 0.5.14 -> 0.5.15 --- pkgs/development/tools/earthly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 588716b9f30..541662ec042 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.14"; + version = "0.5.15"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-XB3zfbcuEgkqQ7DGnyUJj3K+qUH2DNv3n1/0mlocqfM="; + sha256 = "sha256-3hiiCcCgbWxSfG8XCcoKdNJsQoP2L2G4g4zFQkFtzQI="; }; vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; From 5699d027eccea705b25bf84da147708f2021eb01 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 19 Mar 2021 17:16:10 +0100 Subject: [PATCH 014/797] nixos/metricbeat: init --- nixos/modules/module-list.nix | 1 + .../services/monitoring/metricbeat.nix | 152 ++++++++++++++++++ nixos/tests/elk.nix | 38 +++++ pkgs/misc/logging/beats/6.x.nix | 13 +- pkgs/misc/logging/beats/7.x.nix | 13 +- 5 files changed, 211 insertions(+), 6 deletions(-) create mode 100644 nixos/modules/services/monitoring/metricbeat.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c45f3268b97..bbbd9362d0b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -591,6 +591,7 @@ ./services/monitoring/loki.nix ./services/monitoring/longview.nix ./services/monitoring/mackerel-agent.nix + ./services/monitoring/metricbeat.nix ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix diff --git a/nixos/modules/services/monitoring/metricbeat.nix b/nixos/modules/services/monitoring/metricbeat.nix new file mode 100644 index 00000000000..b285559eaa9 --- /dev/null +++ b/nixos/modules/services/monitoring/metricbeat.nix @@ -0,0 +1,152 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) + attrValues + literalExample + mkEnableOption + mkIf + mkOption + types + ; + cfg = config.services.metricbeat; + + settingsFormat = pkgs.formats.yaml {}; + +in +{ + options = { + + services.metricbeat = { + + enable = mkEnableOption "metricbeat"; + + package = mkOption { + type = types.package; + default = pkgs.metricbeat; + defaultText = literalExample "pkgs.metricbeat"; + example = literalExample "pkgs.metricbeat7"; + description = '' + The metricbeat package to use + ''; + }; + + modules = mkOption { + description = '' + Metricbeat modules are responsible for reading metrics from the various sources. + + This is like services.metricbeat.settings.metricbeat.modules, + but structured as an attribute set. This has the benefit that multiple + NixOS modules can contribute settings to a single metricbeat module. + + A module can be specified multiple times by choosing a different <name> + for each, but setting to the same value. + + See . + ''; + default = {}; + type = types.attrsOf (types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + options = { + module = mkOption { + type = types.str; + default = name; + defaultText = literalExample ''''; + description = '' + The name of the module. + + Look for the value after module: on the individual + module pages linked from . + ''; + }; + }; + })); + example = { + system = { + metricsets = ["cpu" "load" "memory" "network" "process" "process_summary" "uptime" "socket_summary"]; + enabled = true; + period = "10s"; + processes = [".*"]; + cpu.metrics = ["percentages" "normalized_percentages"]; + core.metrics = ["percentages"]; + }; + }; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + options = { + + name = mkOption { + type = types.str; + default = ""; + description = '' + Name of the beat. Defaults to the hostname. + See . + ''; + }; + + tags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Tags to place on the shipped metrics. + See . + ''; + }; + + metricbeat.modules = mkOption { + type = types.listOf settingsFormat.type; + default = []; + internal = true; + description = '' + The metric collecting modules. Use instead. + + See . + ''; + }; + }; + }; + default = {}; + description = '' + Configuration for metricbeat. See for supported values. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + assertions = [ + { + # empty modules would cause a failure at runtime + assertion = cfg.settings.metricbeat.modules != []; + message = "services.metricbeat: You must configure one or more modules."; + } + ]; + + services.metricbeat.settings.metricbeat.modules = attrValues cfg.modules; + + systemd.services.metricbeat = { + description = "metricbeat metrics shipper"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/metricbeat \ + -c ${settingsFormat.generate "metricbeat.yml" cfg.settings} \ + --path.data $STATE_DIRECTORY \ + --path.logs $LOGS_DIRECTORY \ + ; + ''; + Restart = "always"; + DynamicUser = true; + ProtectSystem = "strict"; + ProtectHome = "tmpfs"; + StateDirectory = "metricbeat"; + LogsDirectory = "metricbeat"; + }; + }; + }; +} diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index fee350de65b..db51aede0de 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -56,6 +56,24 @@ let ''); }; + metricbeat = { + enable = true; + package = elk.metricbeat; + modules.system = { + metricsets = ["cpu" "load" "memory" "network" "process" "process_summary" "uptime" "socket_summary"]; + enabled = true; + period = "5s"; + processes = [".*"]; + cpu.metrics = ["percentages" "normalized_percentages"]; + core.metrics = ["percentages"]; + }; + settings = { + output.elasticsearch = { + hosts = ["127.0.0.1:9200"]; + }; + }; + }; + logstash = { enable = true; package = elk.logstash; @@ -135,6 +153,16 @@ let ) + def has_metricbeat(): + dictionary = {"query": {"match": {"event.dataset": {"query": "system.cpu"}}}} + return ( + "curl --silent --show-error '${esUrl}/_search' " + + "-H 'Content-Type: application/json' " + + "-d '{}' ".format(json.dumps(dictionary)) + + "| jq '.hits.total > 0'" + ) + + start_all() one.wait_for_unit("elasticsearch.service") @@ -161,6 +189,12 @@ let "curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green" ) + with subtest("Metricbeat is running"): + one.wait_for_unit("metricbeat.service") + + with subtest("Metricbeat metrics arrive in elasticsearch"): + one.wait_until_succeeds(has_metricbeat() + " | tee /dev/console | grep 'true'") + with subtest("Logstash messages arive in elasticsearch"): one.wait_until_succeeds(total_hits("flowers") + " | grep -v 0") one.wait_until_succeeds(total_hits("dragons") + " | grep 0") @@ -190,12 +224,14 @@ in pkgs.lib.mapAttrs mkElkTest { logstash = pkgs.logstash6; kibana = pkgs.kibana6; journalbeat = pkgs.journalbeat6; + metricbeat = pkgs.metricbeat6; } else { elasticsearch = pkgs.elasticsearch6-oss; logstash = pkgs.logstash6-oss; kibana = pkgs.kibana6-oss; journalbeat = pkgs.journalbeat6; + metricbeat = pkgs.metricbeat6; }; ELK-7 = if enableUnfree @@ -204,11 +240,13 @@ in pkgs.lib.mapAttrs mkElkTest { logstash = pkgs.logstash7; kibana = pkgs.kibana7; journalbeat = pkgs.journalbeat7; + metricbeat = pkgs.metricbeat7; } else { elasticsearch = pkgs.elasticsearch7-oss; logstash = pkgs.logstash7-oss; kibana = pkgs.kibana7-oss; journalbeat = pkgs.journalbeat7; + metricbeat = pkgs.metricbeat7; }; } diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index ce80b174d32..81b8ba0ab5b 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -22,10 +22,17 @@ let beat = package : extraArgs : buildGoPackage (rec { platforms = platforms.linux; }; } // extraArgs); -in { +in rec { filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + metricbeat6 = beat "metricbeat" { + meta.description = "Lightweight shipper for metrics"; + passthru.tests = + assert metricbeat6.drvPath == nixosTests.elk.ELK-6.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.ELK-6; + }; + }; packetbeat6 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.broken = true; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 43ea85508c6..77e14e96c54 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -22,10 +22,17 @@ let beat = package : extraArgs : buildGoPackage (rec { platforms = platforms.linux; }; } // extraArgs); -in { +in rec { filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat7 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + metricbeat7 = beat "metricbeat" { + meta.description = "Lightweight shipper for metrics"; + passthru.tests = + assert metricbeat7.drvPath == nixosTests.elk.ELK-7.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.ELK-7; + }; + }; packetbeat7 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.description = "Network packet analyzer that ships data to Elasticsearch"; From 008bbde5e7a6eccbda3c0a0a6508fdfec6c3352e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 1 Jun 2021 12:47:03 +0200 Subject: [PATCH 015/797] igraph: 0.9.3 -> 0.9.4 https://github.com/igraph/igraph/releases/tag/0.9.4 --- pkgs/development/libraries/igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 0c668525e92..03573716fa3 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-StRXtP2PelPcS+l5O1AOVFkza3hiKFwCdp8XLal4grE="; + sha256 = "sha256-tF+cnJRv125bSpZIpABTIHAfJO4TNfSBHjnzpNTbFgk="; }; # Normally, igraph wants us to call bootstrap.sh, which will call From a0d900b81629c504863c7ef1e26f638b4dab65bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 1 Jun 2021 12:48:35 +0200 Subject: [PATCH 016/797] python3Packages.python-igraph: 0.9.1 -> 0.9.4 https://github.com/igraph/python-igraph/releases/tag/0.9.4 --- pkgs/development/python-modules/python-igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 8e90ce5190f..d196cf6e747 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.9.1"; + version = "0.9.4"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "1ldyzza25zvwh144lw8x856z76s8gfvnbdm56fcmwkvm7aj81npw"; + sha256 = "sha256-0iqYzeqVJwBqDL7AllrNaI5c7fmtrVwWpinCnO+ACzo="; }; nativeBuildInputs = [ From d155b8c438412eee763a204ac3a6230a8465cc6f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 1 Jun 2021 15:10:10 +0200 Subject: [PATCH 017/797] nixosTests.docker-tools: Fix nixFromDockerHub example sha For https://github.com/NixOS/nixpkgs/pull/125211 I tried to test the fetcher with nix-build -A dockerTools.examples.nixFromDockerHub --option substitute false But it failed. I haven't figured out the cause, but the outputs match, so it's probably the hashing method (flat/recursive) that changed at some point. (The names did match.) --- pkgs/build-support/docker/examples.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index de90eab3ea1..f890d0a77a2 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -91,7 +91,7 @@ rec { nixFromDockerHub = pullImage { imageName = "nixos/nix"; imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357"; - sha256 = "07q9y9r7fsd18sy95ybrvclpkhlal12d30ybnf089hq7v1hgxbi7"; + sha256 = "19fw0n3wmddahzr20mhdqv6jkjn1kanh6n2mrr08ai53dr8ph5n7"; finalImageTag = "2.2.1"; finalImageName = "nix"; }; From b4f26c949a6c3324abf9a9302800e108311a5c3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 16:16:47 +0000 Subject: [PATCH 018/797] clojure: 1.10.3.849 -> 1.10.3.855 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 80f9fac63ce..9ae94f0a248 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.849"; + version = "1.10.3.855"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-0bHb6FsCZP1LdxY21+hz6lF+ka9N0yoIHUWVd+zc7wg="; + sha256 = "sha256-y2PuOBRq5kZlTpPV8NwkWhspQKlNxwjl+k/Drwixk4Q="; }; nativeBuildInputs = [ From e6d63982d9069a02213bea7c5936cc52222463ba Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 8 May 2021 12:18:22 -0400 Subject: [PATCH 019/797] pgbadger: init at 11.5 --- pkgs/tools/misc/pgbadger/default.nix | 31 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/pgbadger/default.nix diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix new file mode 100644 index 00000000000..d6e3588f6bb --- /dev/null +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -0,0 +1,31 @@ +{ buildPerlPackage, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS +, TextCSV }: +buildPerlPackage rec { + pname = "pgbadger"; + version = "11.5"; + src = fetchFromGitHub { + owner = "darold"; + repo = "pgbadger"; + rev = "98b38161ba99faae77c81d5fa47bd769c1dd750b"; + sha256 = "0r01mx1922g1m56x4958cihk491zjlaijvap0i32grjmnv4s5v88"; + }; + + postPatch = '' + patchShebangs ./pgbadger + ''; + + outputs = [ "out" ]; + + PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}"; + + buildInputs = [ PodMarkdown JSONXS TextCSV ]; + + checkInputs = [ which bzip2 ]; + + meta = { + homepage = "https://github.com/darold/pgbadger"; + description = "A fast PostgreSQL Log Analyzer"; + license = lib.licenses.postgresql; + maintainers = lib.teams.determinatesystems.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 372daa630cc..962fcab61a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7185,6 +7185,8 @@ in pcmsolver = callPackage ../development/libraries/pcmsolver { }; + pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; + phash = callPackage ../development/libraries/phash { }; pnmixer = callPackage ../tools/audio/pnmixer { }; From 2377c7ea61867bc3e49860650786e14914e7b8ca Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Tue, 1 Jun 2021 13:08:54 -0700 Subject: [PATCH 020/797] racket: 8.0 -> 8.1 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 48be64aa0b8..0b5084d4358 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.0"; # always change at once with ./minimal.nix + version = "8.1"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0lqqpa88v0br93qw7450a4blyi3pwn7sq2k04h0ikbsqrdnfj7lj"; + sha256 = "0wlgp9dlibhv1d181arz309fszz31l5gb5gl94bqzfcav014g3k8"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index c954b4f05ea..4cfb178d42d 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0qvfi6rg9cwzh716q5j7m30rqq9xysi6zsalqlpdqrzhnx8y54k0"; + sha256 = "1q54n16s0hmnry8q381wd7zfpyjndfjswn97vsbd4isngwz3w12k"; }; meta = oldAttrs.meta // { From 030a521adc9510207dd9f06b8d8b552ff7d999f9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 1 Jun 2021 23:19:40 +0200 Subject: [PATCH 021/797] nixos/wireless: make wireless.interfaces mandatory This is the only way to solve issue #101963, for now. --- nixos/doc/manual/release-notes/rl-2105.xml | 9 +++++++ .../services/networking/wpa_supplicant.nix | 27 +++++++------------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 07b28147d69..d04a690caf3 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -192,6 +192,15 @@ + + + Enabling wireless networking now requires specifying at least one network + interface using . + This is to avoid a race condition with the card initialisation (see + issue + #101963 for more information). + + If you are using to assign diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 8a0685c3d96..d9308b37064 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -40,8 +40,7 @@ in { default = []; example = [ "wlan0" "wlan1" ]; description = '' - The interfaces wpa_supplicant will use. If empty, it will - automatically use all wireless interfaces. + The interfaces wpa_supplicant will use. ''; }; @@ -220,7 +219,14 @@ in { }; config = mkIf cfg.enable { - assertions = flip mapAttrsToList cfg.networks (name: cfg: { + assertions = [ + { assertion = cfg.interfaces != []; + message = '' + No network interfaces for wpa_supplicant have been configured. + Please, specify at least one using networking.wireless.interfaces. + ''; + } + ] ++ flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); @@ -255,20 +261,7 @@ in { then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi iface_args="-s -u -D${cfg.driver} ${configStr}" - ${if ifaces == [] then '' - for i in $(cd /sys/class/net && echo *); do - DEVTYPE= - UEVENT_PATH=/sys/class/net/$i/uevent - if [ -e "$UEVENT_PATH" ]; then - source "$UEVENT_PATH" - if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then - args+="''${args:+ -N} -i$i $iface_args" - fi - fi - done - '' else '' - args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" - ''} + args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" exec wpa_supplicant $args ''; }; From 27ecd47c5b6a77443bc55819b303c75137e835cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 00:01:59 +0200 Subject: [PATCH 022/797] sqlfluff: init at 0.6.0a2 --- .../tools/database/sqlfluff/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/tools/database/sqlfluff/default.nix diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix new file mode 100644 index 00000000000..01f4941c8e4 --- /dev/null +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sqlfluff"; + version = "0.6.0a2"; + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "13hzr0jialzi2nlvqwvff3w0h6jikqvcg0p2p4irwlisg4db8w7w"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + cached-property + click + colorama + configparser + diff_cover + jinja2 + oyaml + pathspec + pytest + tblib + toml + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + checkInputs = with python3.pkgs; [ + hypothesis + pytestCheckHook + ]; + + disabledTestPaths = [ + # dbt is not available yet + "test/core/templaters/dbt_test.py" + # Don't run the plugin related tests + "test/core/plugin_test.py" + "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" + ]; + + disabledTests = [ + # dbt is not available yet + "test__linter__skip_dbt_model_disabled" + "test_rules__test_helper_has_variable_introspection" + "test__rules__std_file_dbt" + ]; + + pythonImportsCheck = [ "sqlfluff" ]; + + meta = with lib; { + description = "SQL linter and auto-formatter"; + homepage = "https://www.sqlfluff.com/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f060afa922..3c9c1e874cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11880,6 +11880,8 @@ in jdk = oraclejdk; }; + sqlfluff = callPackage ../development/tools/database/sqlfluff { }; + sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; }; From 285fa468b19d8280fa0b46c9003daec9d5c6bb32 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Jun 2021 04:20:00 +0000 Subject: [PATCH 023/797] postgresql_14: init at beta1 https://www.postgresql.org/docs/14/release-14.html --- pkgs/servers/sql/postgresql/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 63446a684b2..933ff6292e8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -240,4 +240,13 @@ in self: { thisAttr = "postgresql_13"; inherit self; }; + + postgresql_14 = self.callPackage generic { + version = "14beta1"; + psqlSchema = "14"; + sha256 = "0lih2iykychhvis3mxqyp087m1hld3lyi48n3qwd2js44prxv464"; + this = self.postgresql_14; + thisAttr = "postgresql_14"; + inherit self; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043d7634741..2019050b66a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19636,6 +19636,7 @@ in postgresql_11 postgresql_12 postgresql_13 + postgresql_14 ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; From 82dadfba46aed57fd68320fbef2326fe60b72a96 Mon Sep 17 00:00:00 2001 From: V Date: Wed, 2 Jun 2021 15:20:37 +0200 Subject: [PATCH 024/797] vsce/MS-vsliveshare.vsliveshare: 1.0.4272 -> 1.0.4360 --- .../vscode-extensions/ms-vsliveshare-vsliveshare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index eb215d0fd22..4ba984e102c 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4272"; - sha256 = "kH8ZiNzpAfR1BnKjYc+hcNMEmhBNyHlnOlj8fCdNGjY="; + version = "1.0.4360"; + sha256 = "0d39b94nxp5brr8ljb5flfn49zms083vp5i7xlrqhz7pskb9dpz8"; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ From 8d49cec11caa2d3d39540577e452f05a92206640 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 15:15:04 +0000 Subject: [PATCH 025/797] horizon-eda: 1.4.0 -> 2.0.0 --- pkgs/applications/science/electronics/horizon-eda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index dee0a851bf8..c1ff99a2c3a 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "0mra6kf1c2qixfzqva6r01qms5kdabbhhblhk5is6h6nq78i8640"; + sha256 = "sha256-FS24B/ySKeF8r7Tro+mf5P0ALtlPwwJCU3YdDNYLe6o="; }; buildInputs = [ From 21c2b85ec1fbb8fe799555975413cbb9f63f76af Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 19:09:14 +0200 Subject: [PATCH 026/797] all-cabal-hashes: 2021-05-19T07:17:55Z -> 2021-06-02T14:32:36Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index f53ef94c47d..7c4e3b9a869 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "0fb7f9edea05a2b464b5667debe1e3ece585c185", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fb7f9edea05a2b464b5667debe1e3ece585c185.tar.gz", - "sha256": "01rzbda8g62gj2x3if46lglis9gqw3qfpqyiv2lrnm7alsg36ld9", - "msg": "Update from Hackage at 2021-05-19T07:17:55Z" + "commit": "9be76e8f01853e5a2f0600107c9b50d12a17581b", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9be76e8f01853e5a2f0600107c9b50d12a17581b.tar.gz", + "sha256": "0sy8lx04yb9lk9liscqr44z7lzzq67w3zmkq78a0yv37jadb557k", + "msg": "Update from Hackage at 2021-06-02T14:32:36Z" } From 3317a7460bd6b951c1e69c03e2fef95b96548e7b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 19:10:16 +0200 Subject: [PATCH 027/797] Stackage Nightly: 2021-05-19 -> 2021-06-01 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 122 ++++++++++-------- 1 file changed, 68 insertions(+), 54 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a8c353cd6a7..bfe0b93b3e4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage Nightly 2021-05-19 +# Stackage Nightly 2021-06-01 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,6 +11,8 @@ default-package-overrides: - ad ==4.4.1 - adjunctions ==4.4 - adler32 ==0.1.2.0 + - aern2-mp ==0.2.6.0 + - aern2-real ==0.2.6.0 - aeson ==1.5.6.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 @@ -27,7 +29,7 @@ default-package-overrides: - aeson-pretty ==0.8.8 - aeson-qq ==0.8.3 - aeson-schemas ==1.3.3 - - aeson-typescript ==0.3.0.0 + - aeson-typescript ==0.3.0.1 - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 @@ -148,10 +150,10 @@ default-package-overrides: - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - api-maker ==0.1.0.0 - - ap-normalize ==0.1.0.0 + - ap-normalize ==0.1.0.1 - appar ==0.1.8 - appendmap ==0.1.5 - - apply-refact ==0.9.2.0 + - apply-refact ==0.9.3.0 - apportionment ==0.0.0.3 - approximate ==0.3.4 - approximate-equality ==1.1.0.2 @@ -176,7 +178,7 @@ default-package-overrides: - asn1-types ==0.3.4 - assert-failure ==0.1.2.5 - assoc ==1.0.2 - - astro ==0.4.2.1 + - astro ==0.4.3.0 - async ==2.2.3 - async-extra ==0.2.0.0 - async-pool ==0.9.1 @@ -201,6 +203,8 @@ default-package-overrides: - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 + - aws-xray-client ==0.1.0.0 + - aws-xray-client-wai ==0.1.0.0 - backprop ==0.2.6.4 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 @@ -356,7 +360,7 @@ default-package-overrides: - cayley-client ==0.4.15 - cborg ==0.2.5.0 - cborg-json ==0.2.2.0 - - cdar-mBound ==0.1.0.1 + - cdar-mBound ==0.1.0.2 - c-enum ==0.1.0.1 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -391,9 +395,9 @@ default-package-overrides: - circle-packing ==0.1.0.6 - circular ==0.3.1.1 - citeproc ==0.3.0.9 - - clash-ghc ==1.4.1 - - clash-lib ==1.4.1 - - clash-prelude ==1.4.1 + - clash-ghc ==1.4.2 + - clash-lib ==1.4.2 + - clash-prelude ==1.4.2 - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - clay ==0.13.3 @@ -519,6 +523,7 @@ default-package-overrides: - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 + - c-struct ==0.1.0.1 - csv ==0.1.2 - ctrie ==0.2 - cubicbezier ==0.6.0.6 @@ -573,6 +578,7 @@ default-package-overrides: - data-textual ==0.3.0.3 - dataurl ==0.1.0.0 - DAV ==1.3.4 + - DBFunctor ==0.1.2.1 - dbus ==1.2.17 - dbus-hslogger ==0.1.0.1 - debian ==4.0.2 @@ -708,7 +714,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.4.1.1 + - esqueleto ==3.5.0.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -734,7 +740,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==0.1.10 + - express ==0.1.12 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -747,18 +753,18 @@ default-package-overrides: - fakedata-parser ==0.1.0.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.0.2.3 + - faktory ==1.0.3.0 - fast-digits ==0.3.0.0 - fast-logger ==3.0.5 - fast-math ==1.0.2 - fb ==2.1.1 - - fclabels ==2.0.5 + - fclabels ==2.0.5.1 - feature-flags ==0.1.0.1 - fedora-dists ==1.1.2 - fedora-haskell-tools ==0.9 - feed ==1.3.2.0 - FenwickTree ==0.1.2.1 - - fft ==0.1.8.6 + - fft ==0.1.8.7 - fgl ==5.7.0.3 - file-embed ==0.0.14.0 - file-embed-lzma ==0 @@ -938,7 +944,7 @@ default-package-overrides: - gitrev ==1.3.1 - gi-xlib ==2.0.9 - gl ==0.9 - - glabrous ==2.0.3 + - glabrous ==2.0.4 - GLFW-b ==3.3.0.0 - Glob ==0.10.1 - gloss ==1.13.2.1 @@ -947,6 +953,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gluturtle ==0.0.58.1 - gnuplot ==0.5.6.1 + - goldplate ==0.2.0 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.2 - gothic ==0.1.6 @@ -974,16 +981,17 @@ default-package-overrides: - haddock-library ==1.9.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.4 + - hal ==0.4.8 - half ==0.3.1 - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.1.3 - - happstack-server ==7.7.0 + - happstack-server ==7.7.1 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 - - hasbolt ==0.1.4.5 + - hasbolt ==0.1.5.0 - hashable ==1.3.0.0 - hashable-time ==0.2.1 - hashids ==1.0.2.4 @@ -1240,7 +1248,7 @@ default-package-overrides: - inline-r ==0.10.4 - inliterate ==0.1.0 - input-parsers ==0.2.2 - - insert-ordered-containers ==0.2.4 + - insert-ordered-containers ==0.2.5 - inspection-testing ==0.4.5.0 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 @@ -1289,7 +1297,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.2 - jalaali ==1.0.0.0 - - jira-wiki-markup ==1.3.4 + - jira-wiki-markup ==1.3.5 - jose ==0.8.4 - jose-jwt ==0.9.2 - js-chart ==2.9.4.1 @@ -1355,7 +1363,7 @@ default-package-overrides: - lazyio ==0.1.0.4 - lazysmallcheck ==0.6 - lca ==0.4 - - leancheck ==0.9.4 + - leancheck ==0.9.6 - leancheck-instances ==0.0.4 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 @@ -1402,6 +1410,7 @@ default-package-overrides: - list-t ==1.0.4 - list-transformer ==1.0.7 - ListTree ==0.2.3 + - literatex ==0.1.0.0 - little-rio ==0.2.2 - llvm-hs ==9.0.1 - llvm-hs-pure ==9.0.0 @@ -1501,7 +1510,7 @@ default-package-overrides: - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - - mixed-types-num ==0.5.3.1 + - mixed-types-num ==0.5.7.0 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1519,7 +1528,7 @@ default-package-overrides: - monad-chronicle ==1.0.0.1 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 - - monad-coroutine ==0.9.1 + - monad-coroutine ==0.9.1.2 - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 @@ -1597,6 +1606,8 @@ default-package-overrides: - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 + - net-mqtt ==0.7.1.0 + - net-mqtt-lens ==0.1.0.0 - netpbm ==1.0.4 - nettle ==0.3.0 - netwire ==5.0.3 @@ -1699,7 +1710,7 @@ default-package-overrides: - pagure-cli ==0.2 - pandoc ==2.13 - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-plot ==1.2.1 + - pandoc-plot ==1.2.2 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - pantry ==0.5.2.1 @@ -1716,7 +1727,7 @@ default-package-overrides: - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.1.8 + - partial-semigroup ==0.5.1.12 - password ==3.0.0.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 @@ -1733,7 +1744,7 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.1 - pcg-random ==0.1.3.7 - - pcre2 ==1.1.4 + - pcre2 ==1.1.5 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 @@ -1747,17 +1758,16 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.11.0.4 - - persistent-documentation ==0.1.0.2 + - persistent ==2.13.0.2 - persistent-mtl ==0.2.1.0 - - persistent-mysql ==2.10.3.1 + - persistent-mysql ==2.13.0.1 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.11.0.1 - - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.11.1.0 - - persistent-template ==2.9.1.0 - - persistent-test ==2.0.3.5 - - persistent-typed-db ==0.1.0.2 + - persistent-postgresql ==2.13.0.1 + - persistent-qq ==2.12.0.1 + - persistent-sqlite ==2.13.0.3 + - persistent-template ==2.12.0.0 + - persistent-test ==2.13.0.3 + - persistent-typed-db ==0.1.0.4 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.1.1 @@ -1917,7 +1927,7 @@ default-package-overrides: - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - - Rasterific ==0.7.5.3 + - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.15 - rate-limit ==1.4.2 @@ -1936,7 +1946,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.10 + - record-dot-preprocessor ==0.2.11 - record-hasfield ==1.0 - records-sop ==0.1.1.0 - record-wrangler ==0.1.1.0 @@ -2005,8 +2015,8 @@ default-package-overrides: - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.4 - - rp-tree ==0.3.5 + - rpmbuild-order ==0.4.5 + - rp-tree ==0.3.6 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 @@ -2034,13 +2044,13 @@ default-package-overrides: - sandwich-webdriver ==0.1.0.4 - say ==0.1.0.1 - sbp ==2.6.3 - - sbv ==8.14 + - sbv ==8.15 - scalpel ==0.6.2 - scalpel-core ==0.6.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==1.5.0 - - scientific ==0.3.6.2 + - scientific ==0.3.7.0 - scotty ==0.12 - scrypt ==0.5.0 - sdl2 ==2.5.3.0 @@ -2081,6 +2091,7 @@ default-package-overrides: - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.6.0 - servant-auth-swagger ==0.2.10.1 + - servant-auth-wordpress ==1.0.0.2 - servant-blaze ==0.9.1 - servant-client ==0.18.2 - servant-client-core ==0.18.2 @@ -2191,7 +2202,7 @@ default-package-overrides: - splint ==1.0.1.4 - split ==0.2.3.4 - splitmix ==0.1.0.3 - - splitmix-distributions ==0.8.0.0 + - splitmix-distributions ==0.9.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlcli ==0.2.2.0 @@ -2237,6 +2248,7 @@ default-package-overrides: - streaming-commons ==0.2.2.1 - streamly ==0.7.3 - streams ==3.3 + - streamt ==0.5.0.0 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.5 @@ -2247,7 +2259,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.1.0 + - string-interpolate ==0.3.1.1 - string-qq ==0.0.4 - string-random ==0.1.4.1 - stringsearch ==0.3.6.6 @@ -2322,7 +2334,7 @@ default-package-overrides: - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 - tasty-wai ==0.1.1.1 - - Taxonomy ==2.1.0 + - Taxonomy ==2.2.0 - TCache ==0.12.1 - tce-conf ==1.3 - tdigest ==0.2.1.1 @@ -2348,7 +2360,7 @@ default-package-overrides: - text-builder ==0.6.6.2 - text-conversions ==0.3.1 - text-format ==0.3.2 - - text-icu ==0.7.0.1 + - text-icu ==0.7.1.0 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 - textlocal ==0.1.0.5 @@ -2505,12 +2517,12 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.16 + - unliftio ==0.2.17 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - - unordered-containers ==0.2.13.0 + - unordered-containers ==0.2.14.0 - unsafe ==0.0 - urbit-hob ==0.3.3 - uri-bytestring ==0.3.3.0 @@ -2542,6 +2554,7 @@ default-package-overrides: - validity-vector ==0.2.0.3 - valor ==0.1.0.0 - vault ==0.3.1.5 + - vcs-ignore ==0.0.1.0 - vec ==0.4 - vector ==0.12.3.0 - vector-algorithms ==0.8.0.4 @@ -2563,7 +2576,7 @@ default-package-overrides: - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 - - vinyl ==0.13.2 + - vinyl ==0.13.3 - void ==0.7.3 - vty ==5.33 - wai ==3.2.3 @@ -2588,8 +2601,8 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.15 - - warp-tls ==3.3.0 + - warp ==3.3.16 + - warp-tls ==3.3.1 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2610,7 +2623,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.3.1.0 + - witch ==0.3.3.0 - witherable ==0.4.1 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2621,6 +2634,7 @@ default-package-overrides: - wl-pprint-text ==1.2.0.1 - word24 ==2.0.1 - word8 ==0.1.3 + - wordpress-auth ==1.0.0.1 - word-trie ==0.3.0 - word-wrap ==0.4.1 - world-peace ==1.0.2.0 @@ -2664,19 +2678,19 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - - yamlparse-applicative ==0.1.0.3 + - yamlparse-applicative ==0.1.0.4 - yesod ==1.6.1.1 - yesod-auth ==1.6.10.3 - - yesod-auth-hashdb ==1.7.1.6 + - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - yesod-bin ==1.6.1 - - yesod-core ==1.6.20 + - yesod-core ==1.6.20.1 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.11 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.7 + - yesod-page-cursor ==2.0.0.8 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.7 - yesod-sitemap ==1.6.0 From 7d89be36a863df10e6c926f4ec19b7616c852354 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 19:12:37 +0200 Subject: [PATCH 028/797] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 2533 +++++++++++------ 1 file changed, 1601 insertions(+), 932 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9ec6640f3d9..1acb41a9f74 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3898,26 +3898,26 @@ self: { "DBFunctor" = callPackage ({ mkDerivation, base, bytestring, cassava, cereal, containers - , deepseq, either, MissingH, text, time, transformers - , unordered-containers, vector + , deepseq, either, text, time, transformers, unordered-containers + , vector }: mkDerivation { pname = "DBFunctor"; - version = "0.1.1.1"; - sha256 = "0n3qmgjf9ly5vpnsvh8rhwbd94l157d1asy95n8yqpmrb6xqc1k4"; + version = "0.1.2.1"; + sha256 = "0ikb4s9g1mrp4pdz1119dq1vci7mfcvcw92xs47rcin26a3ysdcz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector + base bytestring cassava cereal containers deepseq either text time + transformers unordered-containers vector ]; executableHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector + base bytestring cassava cereal containers deepseq either text time + transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector + base bytestring cassava cereal containers deepseq either text time + transformers unordered-containers vector ]; description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; license = lib.licenses.bsd3; @@ -6347,8 +6347,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.7.1"; - sha256 = "10js8xhp1v6gk6aagrzkn5c2c2gg4xml9vavpvhjfvj2jz77rfkm"; + version = "0.7.2"; + sha256 = "08q3zfhb6wf4b8020d63v6zpmb3834ba50hnb478vvjqd8rrp1mh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14097,6 +14097,24 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "NanoID" = callPackage + ({ mkDerivation, base, bytestring, extra, mwc-random + , optparse-applicative + }: + mkDerivation { + pname = "NanoID"; + version = "1.2.0"; + sha256 = "1fwbzdj7cn96fbq4vsp4582p317qw3piy237vxf79d0wmdp006zn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring extra mwc-random ]; + executableHaskellDepends = [ + base bytestring mwc-random optparse-applicative + ]; + description = "NanoID generator"; + license = lib.licenses.bsd3; + }) {}; + "NanoProlog" = callPackage ({ mkDerivation, base, containers, ListLike, uu-parsinglib }: mkDerivation { @@ -15934,32 +15952,34 @@ self: { "PrimitiveArray" = callPackage ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector - , containers, criterion, deepseq, DPutils, hashable, lens - , log-domain, mtl, OrderedBits, primitive, QuickCheck, smallcheck - , tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector + , containers, criterion, deepseq, DPutils, hashable, hashtables + , lens, log-domain, mtl, OrderedBits, primitive, QuickCheck + , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck, tasty-th + , text, unordered-containers, vector, vector-algorithms , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "PrimitiveArray"; - version = "0.10.0.0"; - sha256 = "0g9shj3zqk8rdp905di9i5g5bhga5msc7cs609fk3nkjm16ms0vi"; + version = "0.10.1.0"; + sha256 = "1qjld82q0fdaav6y9ky0bkmqjxvv48502zd3s9i1b72wn436zhib"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq - DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck text vector vector-binary-instances - vector-th-unbox + DPutils hashable hashtables lens log-domain mtl OrderedBits + primitive QuickCheck smallcheck text unordered-containers vector + vector-algorithms vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq - DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck - tasty-th text vector vector-binary-instances vector-th-unbox + DPutils hashable hashtables lens log-domain mtl OrderedBits + primitive QuickCheck smallcheck tasty tasty-quickcheck + tasty-smallcheck tasty-th text unordered-containers vector + vector-algorithms vector-binary-instances vector-th-unbox ]; benchmarkHaskellDepends = [ aeson base binary bits cereal cereal-vector containers criterion - deepseq DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck text vector vector-binary-instances - vector-th-unbox + deepseq DPutils hashable hashtables lens log-domain mtl OrderedBits + primitive QuickCheck smallcheck text unordered-containers vector + vector-algorithms vector-binary-instances vector-th-unbox ]; description = "Efficient multidimensional arrays"; license = lib.licenses.bsd3; @@ -16029,8 +16049,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Probnet"; - version = "0.1.0.2"; - sha256 = "1jk1y51rda8j4lan2az906fwb5hgqb8s50p0xrhchnf654scm851"; + version = "0.1.0.4"; + sha256 = "02q4c7mp268r8f3p2f37yksssginjrs89ldqljpn80aj53ylcqyf"; libraryHaskellDepends = [ base ]; description = "Geometric Extrapolation of Integer Sequences with error prediction"; license = lib.licenses.mit; @@ -16877,8 +16897,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.5.3"; - sha256 = "164ivzwrla90baqz6gapmcmi1yg5bk0sczqv4xawx3l7dzkz8ghv"; + version = "0.7.5.4"; + sha256 = "07silf2b85kxq7wvl5mnwrg5p0gwzlapipj9hi224i9ix1knn5f1"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -19631,14 +19651,14 @@ self: { "Taxonomy" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl - , parsec, text, vector + , graphviz, parsec, text, vector }: mkDerivation { pname = "Taxonomy"; - version = "2.1.0"; - sha256 = "1l64ma631q1gh57gwg09mpxz66hkhqbc9f9dn2bhy681p8ia7j50"; + version = "2.2.0"; + sha256 = "0rwm3p510k5nmzbdy8bxdviv37mba0bvygxq92f24wqb5gry8w9w"; libraryHaskellDepends = [ - aeson base bytestring either-unwrap fgl parsec text vector + aeson base bytestring either-unwrap fgl graphviz parsec text vector ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = lib.licenses.gpl3Only; @@ -21330,6 +21350,25 @@ self: { inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_10" = callPackage + ({ mkDerivation, base, data-default-class, libX11, libXext + , libXinerama, libXrandr, libXrender, libXScrnSaver + }: + mkDerivation { + pname = "X11"; + version = "1.10"; + sha256 = "1zrdqryx99izjvsrsalb65ihpmikm9r6cjlci7cfp6wlwa3i585n"; + libraryHaskellDepends = [ base data-default-class ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver + ]; + description = "A binding to the X11 graphics library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -21808,8 +21847,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.2.0"; - sha256 = "0xjy5689ck23fyas52qrfrl716fpgmnahp7pln54yyz106hxqj4p"; + version = "0.8.3.0"; + sha256 = "1y8vgz3jps2vsg5ay9s792knfyk5cvc6549q5li51jaqibsrw99m"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -21836,8 +21875,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.8.0.0"; - sha256 = "000ziih2c33v5mbf9sljkrr0x9hxv31cq77blva6xy32zzh12yz3"; + version = "0.8.1.0"; + sha256 = "08nw9jxg2n8yls5p1dhyy976qbcj5kwv468fq1dijn91f7ylhfix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23692,10 +23731,8 @@ self: { }: mkDerivation { pname = "active"; - version = "0.2.0.14"; - sha256 = "0x3b4ln6csa554qls28wbxvclkbdz3yi60i1m0q5ing0cs16fifz"; - revision = "1"; - editedCabalFile = "01j431dkl3ax98g974v6mgxv9xha4c0hlpjqq5fvh7l8lyjan676"; + version = "0.2.0.15"; + sha256 = "019xr66pahsssqr2hybs88mga4qshv1vmd22j7624wqafqm57d74"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -24160,8 +24197,31 @@ self: { }: mkDerivation { pname = "aern2-mp"; - version = "0.2.1.1"; - sha256 = "1fsdvjancc2mi9i7l1gaqqvhnafchvw37hrn9ksd20djy43gzwyw"; + version = "0.2.6.0"; + sha256 = "0vfjgcf2pnspaixgxg8av7k0cqv5cqmy161zkgjr822n118an1ch"; + libraryHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + testHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + description = "Multi-precision ball (interval) arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "aern2-mp_0_2_7_0" = callPackage + ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec + , integer-logarithms, mixed-types-num, QuickCheck, reflection + , regex-tdfa, template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.2.7.0"; + sha256 = "1gsqaggg6mpcpl9s3z566gmbynj4l6n1fhni5b0p8pf5hj8n93gg"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -24182,12 +24242,37 @@ self: { }: mkDerivation { pname = "aern2-real"; - version = "0.2.1.0"; - sha256 = "06nz820p5gillvyjnx7bhmadpc0mrkvg8wiz9zmpcj6d23f28vzg"; + version = "0.2.6.0"; + sha256 = "182vjrbdzjcpbbhmpsmv6i685jrnw94vda37646d1gph5v3hvfw6"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + description = "Real numbers as sequences of MPBalls"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "aern2-real_0_2_7_0" = callPackage + ({ mkDerivation, aern2-mp, base, collect-errors, hspec + , integer-logarithms, mixed-types-num, QuickCheck + }: + mkDerivation { + pname = "aern2-real"; + version = "0.2.7.0"; + sha256 = "0dsph1775rifr9vvx4w7v55bryqmh04fhk6nyk7d91yhn1sf6wc9"; + libraryHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; description = "Real numbers as sequences of MPBalls"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -25054,20 +25139,21 @@ self: { "aeson-typescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, interpolate, mtl, process, template-haskell - , temporary, text, th-abstraction, unordered-containers + , filepath, hspec, mtl, process, string-interpolate + , template-haskell, temporary, text, th-abstraction + , unordered-containers }: mkDerivation { pname = "aeson-typescript"; - version = "0.3.0.0"; - sha256 = "054mhzsywbprccvp5pqscj9f92dvkrxgzpxz16bfadxn98wa1j7h"; + version = "0.3.0.1"; + sha256 = "0xbj6m1lxpv4qclz5msrdplpy3mdxq5icjl3fq4bwbqy5rs6vczv"; libraryHaskellDepends = [ - aeson base containers interpolate mtl template-haskell text + aeson base containers mtl string-interpolate template-haskell text th-abstraction unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers directory filepath hspec - interpolate mtl process template-haskell temporary text + aeson base bytestring containers directory filepath hspec mtl + process string-interpolate template-haskell temporary text th-abstraction unordered-containers ]; description = "Generate TypeScript definition files from your ADTs"; @@ -25425,6 +25511,26 @@ self: { license = lib.licenses.publicDomain; }) {}; + "agda2lagda_0_2021_6_1" = callPackage + ({ mkDerivation, base, directory, filepath, goldplate + , optparse-applicative, process + }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2021.6.1"; + sha256 = "1108xzl4fv86qpasg1wbc26bypd06s41kmgzybrggc76pv15hbis"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + testHaskellDepends = [ base process ]; + testToolDepends = [ goldplate ]; + description = "Translate .agda files into .lagda.tex files."; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -30697,8 +30803,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "aop-prelude"; - version = "0.4.0.0"; - sha256 = "0jg572zz9lbhpp4bxldrc0gs0ac0f4hfcrxds77gr51xizxfa7cn"; + version = "0.4.1.0"; + sha256 = "1ha39yfmiw61g907h83wsjw9zyvvkzi7zbr3y9dcciv2cgnb5h6a"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; @@ -30755,8 +30861,8 @@ self: { ({ mkDerivation, base, inspection-testing, transformers }: mkDerivation { pname = "ap-normalize"; - version = "0.1.0.0"; - sha256 = "0iqfilamnp0k170af7sw0ydn0cmba7ab06yinkl8vfppf583a4la"; + version = "0.1.0.1"; + sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base inspection-testing transformers ]; description = "Self-normalizing applicative expressions"; @@ -31673,8 +31779,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.9.2.0"; - sha256 = "1j0afdl6g51wyb3g47wss15v0yl50n23k3icbyla8h89rxh74lcx"; + version = "0.9.3.0"; + sha256 = "1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32134,21 +32240,21 @@ self: { , bytestring, Cabal, conduit, conduit-extra, containers, deepseq , Diff, directory, filepath, hackage-db, http-client , http-client-tls, megaparsec, microlens, microlens-th - , neat-interpolation, optparse-applicative, polysemy, prettyprinter + , neat-interpolation, optparse-simple, polysemy, prettyprinter , prettyprinter-ansi-terminal, servant-client, split, tar-conduit , template-haskell, text }: mkDerivation { pname = "arch-hs"; - version = "0.8.0.0"; - sha256 = "1g33ss6jvvpdgpcl0kwmbvnkawq8cngphjmsbv0jcpnh17brgf8x"; + version = "0.9.0.0"; + sha256 = "09i5b4pdbc1x7977icq0m7amk59iy0822ki5dlhd7y74m2dmdf9z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson algebraic-graphs arch-web base bytestring Cabal conduit conduit-extra containers deepseq Diff directory filepath hackage-db http-client http-client-tls megaparsec microlens microlens-th - neat-interpolation optparse-applicative polysemy prettyprinter + neat-interpolation optparse-simple polysemy prettyprinter prettyprinter-ansi-terminal servant-client split tar-conduit template-haskell text ]; @@ -32156,7 +32262,7 @@ self: { aeson algebraic-graphs arch-web base bytestring Cabal conduit conduit-extra containers deepseq Diff directory filepath hackage-db http-client http-client-tls megaparsec microlens microlens-th - neat-interpolation optparse-applicative polysemy prettyprinter + neat-interpolation optparse-simple polysemy prettyprinter prettyprinter-ansi-terminal servant-client split tar-conduit template-haskell text ]; @@ -32753,8 +32859,8 @@ self: { }: mkDerivation { pname = "armor"; - version = "0.2"; - sha256 = "1flidqihfgb1vwikm3q4dyjdjzrc5z2955ph6h30q0dyv4707s94"; + version = "0.2.0.1"; + sha256 = "1pp9y7y9i01mbnkrx4870m4a4crpyzikpi4w8znn3avjbl5c1bxx"; libraryHaskellDepends = [ base bytestring containers directory filepath hashable HUnit lens ]; @@ -33996,8 +34102,8 @@ self: { }: mkDerivation { pname = "astro"; - version = "0.4.2.1"; - sha256 = "0agy9a91n1sy6rgdgwvdz354x452j2lg7nr3by7z9r22rwdxwpfs"; + version = "0.4.3.0"; + sha256 = "1zbraw0l40r190vw9dc7bwwcrac4p6yqwng5qa8n277v6cwy5kv5"; libraryHaskellDepends = [ base matrix time ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -36449,8 +36555,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "4.1.0"; - sha256 = "1zb426bj1k3b3sp5hlg0ajx19mf0vwvr39zdg6p9l9i830qfdjfw"; + version = "4.1.1"; + sha256 = "0w4pdyagcs7m05kccdq0x3s1d4vbr2ihqjrbill0p0gn25q9h6cc"; libraryHaskellDepends = [ aeson base bytestring case-insensitive exceptions hashable http-client http-types mtl path path-io safe-exceptions-checked @@ -36780,8 +36886,8 @@ self: { }: mkDerivation { pname = "aws-xray-client-persistent"; - version = "0.1.0.0"; - sha256 = "02aig9j9asbkxni7bmyay1vhs7flf0gz401yldcq4n824c9q8h6f"; + version = "0.1.0.1"; + sha256 = "1b45g9gswr2c16xphprqkrpyh2q29kgnr10hm29zjw5pcahgc8mg"; libraryHaskellDepends = [ aws-xray-client base conduit containers lens persistent random resourcet text time @@ -42056,8 +42162,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "birds-of-paradise"; - version = "0.2.0.0"; - sha256 = "1jkj8li8yxl9kk5i8p63p9jkdcvdznmh473n12dxzimxnh15sf1y"; + version = "0.2.1.0"; + sha256 = "0kjwylhya86zqsmc5q6iqrbq4kp3hqxgx3kwam2pv1ls01qdsvvy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Birds of Paradise"; @@ -44012,8 +44118,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.3.0.1"; - sha256 = "06hmk4pg5qfcj6smzpn549d1jcsvcbgi2pxgvgvn9k7lab9cb5kg"; + version = "0.3.1.0"; + sha256 = "035lrn1j6hrvl5vs5k0q1hb3zwbqh5bvxmfxvjvv9lncv8iy2nd9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47922,6 +48028,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "c-struct" = callPackage + ({ mkDerivation, array, base, primitive, template-haskell }: + mkDerivation { + pname = "c-struct"; + version = "0.1.0.1"; + sha256 = "0932b00zhhss86baj6cqhvn4f66l6z8dax58l4gbaif81w9281zw"; + libraryHaskellDepends = [ array base primitive template-haskell ]; + testHaskellDepends = [ array base primitive template-haskell ]; + description = "To make a wrapper for struct of C language"; + license = lib.licenses.bsd3; + }) {}; + "c0check" = callPackage ({ mkDerivation, base, c0parser }: mkDerivation { @@ -49893,25 +50011,25 @@ self: { ({ mkDerivation, aeson, async, base, bytestring, calamity-commands , colour, concurrent-extra, connection, containers , data-default-class, data-flags, deepseq, deque, df1, di-core - , di-polysemy, exceptions, fmt, focus, generic-lens, hashable + , di-polysemy, exceptions, focus, generic-lens, hashable , http-api-data, http-client, http-date, http-types, lens , lens-aeson, megaparsec, mime-types, mtl, polysemy - , polysemy-plugin, reflection, req, safe-exceptions, scientific - , stm, stm-chans, stm-containers, text, text-show, time, tls - , typerep-map, unagi-chan, unboxing-vector, unordered-containers - , vector, websockets, x509-system + , polysemy-plugin, PyF, reflection, req, safe-exceptions + , scientific, stm, stm-chans, stm-containers, text, text-show, time + , tls, typerep-map, unagi-chan, unboxing-vector + , unordered-containers, vector, websockets, x509-system }: mkDerivation { pname = "calamity"; - version = "0.1.30.1"; - sha256 = "1qxag4vdxn2s3ijkr9lz5djafnwi7c6vj4q9b5z5p41ldvsil3l7"; + version = "0.1.30.2"; + sha256 = "0i0v8cb0a3mbkrb3liw60gb7zflnps5w04a6nx5aynini7mpwanj"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class - data-flags deepseq deque df1 di-core di-polysemy exceptions fmt - focus generic-lens hashable http-api-data http-client http-date + data-flags deepseq deque df1 di-core di-polysemy exceptions focus + generic-lens hashable http-api-data http-client http-date http-types lens lens-aeson megaparsec mime-types mtl polysemy - polysemy-plugin reflection req safe-exceptions scientific stm + polysemy-plugin PyF reflection req safe-exceptions scientific stm stm-chans stm-containers text text-show time tls typerep-map unagi-chan unboxing-vector unordered-containers vector websockets x509-system @@ -49928,8 +50046,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.1.2.0"; - sha256 = "1qm55aikpc1645bzks90r88f317rz5mzwv7grrs9dr37hmy3sl65"; + version = "0.1.3.0"; + sha256 = "0vhv63vapjc51hx6g9mjr5vgxlsfkss828wxcfjf5jd98qdv96dj"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -52120,8 +52238,8 @@ self: { }: mkDerivation { pname = "cdar-mBound"; - version = "0.1.0.1"; - sha256 = "1a31rjs1if69987xi15qpyl2m21qscsxpyrq4jhfk3j87ilpx5zg"; + version = "0.1.0.2"; + sha256 = "1qzpb9kwswln7vbj0v0qm6fsi6v3v9xx701hyfg12y3f9hz096zf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers deepseq integer-gmp ]; @@ -53445,6 +53563,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "check-cfg-ambiguity" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "check-cfg-ambiguity"; + version = "0.0.0.1"; + sha256 = "1qdg707a8yq61s5rs677yc8wp00sxdrf4vpr2r3c98q2psbkxl1n"; + libraryHaskellDepends = [ base containers ]; + description = "Checks context free grammar for ambiguity using brute force up to given limit"; + license = lib.licenses.bsd3; + }) {}; + "check-email" = callPackage ({ mkDerivation, base, bytestring, email-validate, resolv }: mkDerivation { @@ -55141,37 +55270,6 @@ self: { }) {}; "clash-ghc" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, Cabal - , clash-lib, clash-prelude, concurrent-supply, containers, deepseq - , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim - , ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp - , lens, mtl, primitive, process, reflection, split - , template-haskell, text, time, transformers, uniplate, unix - , unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "clash-ghc"; - version = "1.4.1"; - sha256 = "0brfhgdb5ilrm4rxx8hsjsrzrj0lxppsd1g1k7m4jrdk7xp1mnlk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bifunctors bytestring Cabal clash-lib clash-prelude - concurrent-supply containers deepseq directory exceptions extra - filepath ghc ghc-boot ghc-prim ghc-typelits-extra - ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable - haskeline integer-gmp lens mtl primitive process reflection split - template-haskell text time transformers uniplate unix - unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ base ]; - description = "Clash: a functional hardware description language - GHC frontend"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - }) {}; - - "clash-ghc_1_4_2" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, Cabal , clash-lib, clash-prelude, concurrent-supply, containers, deepseq , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim @@ -55203,49 +55301,6 @@ self: { }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array - , attoparsec, base, base16-bytestring, binary, bytestring - , clash-prelude, concurrent-supply, containers, cryptohash-sha256 - , data-binary-ieee754, data-default, deepseq, directory, dlist - , errors, exceptions, extra, filepath, ghc, ghc-boot-th - , ghc-typelits-knownnat, hashable, haskell-src-exts - , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl - , ordered-containers, parsers, pretty-show, prettyprinter - , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, terminal-size - , text, text-show, time, transformers, trifecta - , unordered-containers, utf8-string, vector - , vector-binary-instances - }: - mkDerivation { - pname = "clash-lib"; - version = "1.4.1"; - sha256 = "1gg2snjfhhclfmyz07l5hddn8pfh9k4l4xjba1bx5php76kyiz0v"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal array attoparsec base - base16-bytestring binary bytestring clash-prelude concurrent-supply - containers cryptohash-sha256 data-binary-ieee754 data-default - deepseq directory dlist errors exceptions extra filepath ghc - ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate - lens mtl ordered-containers parsers pretty-show prettyprinter - primitive process reducers template-haskell temporary terminal-size - text text-show time transformers trifecta unordered-containers - utf8-string vector vector-binary-instances - ]; - testHaskellDepends = [ - aeson aeson-pretty base base16-bytestring bytestring clash-prelude - concurrent-supply containers data-default deepseq ghc - ghc-typelits-knownnat haskell-src-exts lens pretty-show - quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell - text transformers unordered-containers - ]; - description = "Clash: a functional hardware description language - As a library"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - }) {}; - - "clash-lib_1_4_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring , clash-prelude, concurrent-supply, containers, cryptohash-sha256 @@ -55304,48 +55359,6 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, arrows, base, bifunctors, binary - , bytestring, Cabal, cabal-doctest, constraints, containers - , criterion, data-binary-ieee754, data-default-class, deepseq - , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, half, hashable, hedgehog, hint - , integer-gmp, interpolate, lens, QuickCheck - , quickcheck-classes-base, recursion-schemes, reflection - , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, text, text-show, th-abstraction - , th-lift, th-orphans, time, transformers, type-errors, uniplate - , vector - }: - mkDerivation { - pname = "clash-prelude"; - version = "1.4.1"; - sha256 = "12f3nlg6820grkjkljhyqgq43qc1x58akiy51gbxf6qp8k55akka"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array arrows base bifunctors binary bytestring constraints - containers data-binary-ieee754 data-default-class deepseq ghc-prim - ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - half hashable integer-gmp interpolate lens QuickCheck - recursion-schemes reflection singletons template-haskell text - text-show th-abstraction th-lift th-orphans time transformers - type-errors uniplate vector - ]; - testHaskellDepends = [ - base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base - tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th - template-haskell - ]; - benchmarkHaskellDepends = [ - base criterion deepseq template-haskell - ]; - description = "Clash: a functional hardware description language - Prelude library"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "clash-prelude_1_4_2" = callPackage ({ mkDerivation, array, arrows, base, bifunctors, binary , bytestring, Cabal, cabal-doctest, constraints, containers , criterion, data-binary-ieee754, data-default-class, deepseq @@ -56648,8 +56661,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "2.0.1"; - sha256 = "0s01582a2iyibwhlkmmf4n9h0fs3w0sjip65j78c4hldc91ylvqd"; + version = "2.0.2"; + sha256 = "19m07hh2vrzgj6nalcm3fbrlxcv5c8ci6d9c9pihv82d444n37j6"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -57579,8 +57592,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.2.6"; - sha256 = "1nvzyxmgn2wwa3j3rf38jz1nhhldv9jgbb91r7v2m822rxhr5pwp"; + version = "0.3.2"; + sha256 = "1mmsbs9n04vcrhaizxv6z6mkd0w5gvhvrffwyfxpfg995vf19gz9"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -58994,21 +59007,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers + , unicode-transforms + }: + mkDerivation { + pname = "commonmark"; + version = "0.2"; + sha256 = "083xrmyxsgn6ivrxqgmjbqvv4k64n7a330pbf1n7xbsjqh78cg28"; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers + unicode-transforms + ]; + testHaskellDepends = [ + base parsec tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-cli" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark , commonmark-extensions, commonmark-pandoc, containers, mtl - , pandoc-types, pretty-simple, text + , pandoc-types, text }: mkDerivation { pname = "commonmark-cli"; - version = "0.1.0.1"; - sha256 = "1k7s7wzphllfydki1ifzab6b4x865vwxg50xldqdar141425s84l"; + version = "0.2"; + sha256 = "1g3i01acaqfqiqkl5xyxvzrh0alfx3il4r4rcjs4ii1nwaljdg6j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal base bytestring commonmark commonmark-extensions commonmark-pandoc containers mtl pandoc-types - pretty-simple text + text ]; description = "Command-line commonmark converter and highlighter"; license = lib.licenses.bsd3; @@ -59038,6 +59074,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_1_2" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.1.2"; + sha256 = "1ky0j7086a8mqpg26j2nkrc5wfwiw5cd3h3jqncpy59vmj1prkx4"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , containers, pandoc-types, text @@ -59053,6 +59111,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-pandoc_0_2_1" = callPackage + ({ mkDerivation, base, commonmark, commonmark-extensions + , pandoc-types, text + }: + mkDerivation { + pname = "commonmark-pandoc"; + version = "0.2.1"; + sha256 = "0i5qavci8j63d15i2c6cbm0b53kcjh7s4vxadfgf4vkp2sy1ybvw"; + libraryHaskellDepends = [ + base commonmark commonmark-extensions pandoc-types text + ]; + description = "Bridge between commonmark and pandoc AST"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commsec" = callPackage ({ mkDerivation, base, bytestring, cipher-aes128, crypto-api , network @@ -62112,16 +62186,18 @@ self: { }) {}; "connections" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog }: + ({ mkDerivation, base, containers, doctest, extended-reals + , hedgehog, time + }: mkDerivation { pname = "connections"; - version = "0.3.0"; - sha256 = "0ias6f5nzd83i2x6823ypzp598d8rgp74wmhd4gk7slcyszgpj6l"; + version = "0.3.1"; + sha256 = "0candwv3sv6qk76a4dn3m64957462da1pyvixl8jazf0gvq1pp23"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; + libraryHaskellDepends = [ base containers extended-reals time ]; executableHaskellDepends = [ base doctest ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ base hedgehog time ]; description = "Orders, Galois connections, and lattices"; license = lib.licenses.bsd3; }) {}; @@ -62579,10 +62655,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.2"; - sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; - revision = "2"; - editedCabalFile = "0fa67waf0af62kpljdksm00lvh29vm1rddfpjvy5c7lcy2a9ll97"; + version = "2.2.0.3"; + sha256 = "0jvh3mf7jmrv3zjplc5cjmpyj7h15573l6dlyzn3c2jhj61zjwkk"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -62784,19 +62858,20 @@ self: { }) {}; "context-free-grammar" = callPackage - ({ mkDerivation, array, base, containers, control-monad-omega - , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, alex, array, base, containers, control-monad-omega + , dlist, happy, HUnit, mtl, pretty, QuickCheck + , quickcheck-properties, semigroups, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "context-free-grammar"; - version = "0.1.0"; - sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1"; + version = "0.1.1"; + sha256 = "15xsm8v157jpz2v98lry7sr77nwk0785mmj3zdb21ajqnkccyb14"; libraryHaskellDepends = [ array base containers control-monad-omega dlist mtl pretty - template-haskell + semigroups template-haskell ]; + libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base containers HUnit pretty QuickCheck quickcheck-properties template-haskell test-framework test-framework-hunit @@ -66666,8 +66741,8 @@ self: { }: mkDerivation { pname = "css-selectors"; - version = "0.4.0.2"; - sha256 = "1299xqp1ssxarz2i9wgzcyj4zmjry6cq02jb2a9n0vw61gw6z5g4"; + version = "0.4.0.3"; + sha256 = "1jz7s5lpfgs6axzkmwp2is1mhsn8jsb52ahxv8my07lx0yvy1g7v"; libraryHaskellDepends = [ aeson array base binary blaze-markup bytestring data-default Decimal hashable QuickCheck shakespeare template-haskell text zlib @@ -67991,8 +68066,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.16.3"; - sha256 = "1bf11ndz6k7fx9bb31l4l6dqfkrld3gxsrrqggcg7d57wa3yw9c9"; + version = "2.16.4"; + sha256 = "07dygwh6p4fsrlgxmq6r7yvxmf4n2y04izzd30jzqgs0pi9645p4"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -73682,6 +73757,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.14"; sha256 = "1jy80w3lr6c0hvn0525h5kn6fh9rj6ir942hdkilrzd9farg6qj9"; + revision = "1"; + editedCabalFile = "10947mmbwy5fg52s63cs7lqa6hydrg3w8ka7rfkpdiqn2q9f146r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74359,10 +74436,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.3"; - sha256 = "0gqrcyjyp3p78vmfxvhfjbkkl2xvwcv3qyyinbdcmalb5zb8vyy6"; - revision = "1"; - editedCabalFile = "0cqhqm2nz2ls00pfhx8hz6z6g17qhl380h24wp4d6l5msiw7gxq4"; + version = "1.4.4"; + sha256 = "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -74489,10 +74564,8 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "1.4.2"; - sha256 = "161rsy3g59n3sfrbfyvd4i4hszl0zm59w21b7pk6w88n0bk8gf2l"; - revision = "1"; - editedCabalFile = "0q2nzcdv7j654bk8c5fjz3whiz1l6cdy21n6ah53f1s7rlsbiz0g"; + version = "1.4.2.1"; + sha256 = "09a1jnpc4kplg1yhv5kxhi0ph22m5xyr0vmnjv2c5wlz72c72z2z"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -75725,14 +75798,12 @@ self: { broken = true; }) {}; - "directory_1_3_6_1" = callPackage + "directory_1_3_6_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.6.1"; - sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi"; - revision = "2"; - editedCabalFile = "14kwmqa1pf1bij7qang5aihw38ch7m5prsics0p0y72jkxx98y48"; + version = "1.3.6.2"; + sha256 = "0zgwx7bwhw0s5xc17hfn1ps3fxn9ihv174b2s7rz63flm8lsm0y3"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -75970,8 +76041,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.6"; - sha256 = "0mmppadd1hmmdgbfjwzhy28kibzssbsnr5dxjiqf3hahmll74qjl"; + version = "1.8.7"; + sha256 = "0nby3267nhdgc8692k5c28yy0a2bzvl84dn54sg25j6nchzs991g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76003,31 +76074,29 @@ self: { }) {}; "discord-register" = callPackage - ({ mkDerivation, base, calamity, dhall, di, di-polysemy - , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy - , polysemy-plugin, text, text-show, unboxing-vector - , unordered-containers, vector + ({ mkDerivation, aeson, base, binary, bytestring, calamity + , calamity-commands, data-flags, di, di-polysemy, generic-lens + , hashable, hedis, lens, megaparsec, polysemy, polysemy-plugin + , regex-tdfa, text, text-show, unboxing-vector + , unordered-containers }: mkDerivation { pname = "discord-register"; - version = "0.0.1"; - sha256 = "1crwbdkyg6k4777lcc7yi5n47xpsnvl3s1652n896k1hck7ckrr8"; + version = "0.0.2"; + sha256 = "01imq7m41g26x7prm223y6bagjwyzb3glwy41fg4kdd244pz02wf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base calamity dhall di di-polysemy generic-lens hspec - hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show - unboxing-vector unordered-containers vector + aeson base binary bytestring calamity calamity-commands data-flags + di di-polysemy generic-lens hashable hedis lens megaparsec polysemy + polysemy-plugin regex-tdfa text text-show unboxing-vector + unordered-containers ]; executableHaskellDepends = [ - base calamity dhall di di-polysemy generic-lens hspec - hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show - unboxing-vector unordered-containers vector - ]; - testHaskellDepends = [ - base calamity dhall di di-polysemy generic-lens hspec - hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show - unboxing-vector unordered-containers vector + aeson base binary bytestring calamity calamity-commands data-flags + di di-polysemy generic-lens hashable hedis lens megaparsec polysemy + polysemy-plugin regex-tdfa text text-show unboxing-vector + unordered-containers ]; description = "Discord verification bot"; license = lib.licenses.mpl20; @@ -78376,8 +78445,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1"; - sha256 = "1lr97k14wc35myckknsv3vyximqfv5vq04f5kpd8167lk3vjahm2"; + version = "0.1.1"; + sha256 = "0ykf1bxd0xmgdhkvd8rp14p4zccpwp5ywj2yiyh6mpp4sp03qwiw"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -79143,8 +79212,8 @@ self: { ({ mkDerivation, base, ki, transformers, unagi-chan }: mkDerivation { pname = "drama"; - version = "0.3.0.0"; - sha256 = "17smzrvpaah2lcc2467dd61lns53q4n0bf0pl9glsv04j9kv2nl9"; + version = "0.4.0.0"; + sha256 = "15p8pac1xcl5iifv1g0bs09l99x6q8skid71wlyxh4g9j7hrgpdr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ki transformers unagi-chan ]; @@ -85028,36 +85097,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql - , mysql-simple, persistent, persistent-mysql, persistent-postgresql - , persistent-sqlite, persistent-template, postgresql-libpq - , postgresql-simple, resourcet, tagged, text, time, transformers - , unliftio, unordered-containers, vector - }: - mkDerivation { - pname = "esqueleto"; - version = "3.4.1.1"; - sha256 = "15355vc3ysqr4yd149xz7zm7iba7pb04p3yxgp1n6dxczwldjf43"; - revision = "1"; - editedCabalFile = "0rwj2cg7pkn4nwapyk9syb64f0qycq7kqwbpciwwq9xdviwcvqzk"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec monad-logger mtl mysql mysql-simple persistent - persistent-mysql persistent-postgresql persistent-sqlite - persistent-template postgresql-libpq postgresql-simple resourcet - tagged text time transformers unliftio unordered-containers vector - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_4_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -85067,10 +85106,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.2.1"; - sha256 = "0yh2fgk5rjphszn2prww190nsvw84j68js7wnd6p5iwynrw6ahxh"; - revision = "1"; - editedCabalFile = "0nsm17spkhsykizmpr29x8zq16ha6j0325r08ms675jn574ni2g1"; + version = "3.5.0.0"; + sha256 = "00mamdsm4yc8gdvb5zfnhnp7iqkg7h9fd5jgzrbdh9q7isyc6kiy"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85085,7 +85122,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ess" = callPackage @@ -86346,8 +86382,8 @@ self: { }: mkDerivation { pname = "exact-real"; - version = "0.12.4.1"; - sha256 = "194qx4dq8c9w1nbr4vyalmvp0m1a0q1pxjckg59m7c3fsz9r88jg"; + version = "0.12.5"; + sha256 = "1xjj17h8a4sbja7f29xvasgzxzn58i2276ysqqkw8d5dsd5913lb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base integer-gmp random ]; testHaskellDepends = [ @@ -87384,8 +87420,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.10"; - sha256 = "09ajf8ibcwxqbyrrz7yb84fpzfb7g54b1mz5q8w3dvk8rrdxaak1"; + version = "0.1.12"; + sha256 = "1055qj5ymlzshva94i1gfr6sfmjgv1rhxpx5h76fdq5ia6hkd68z"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -88320,20 +88356,20 @@ self: { "faktory" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring - , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory - , mtl, network, random, safe-exceptions, scanner, semigroups, text - , time, unix, unordered-containers + , connection, cryptonite, errors, hspec, markdown-unlit, megaparsec + , memory, mtl, network, random, safe-exceptions, scanner + , semigroups, text, time, unix, unordered-containers }: mkDerivation { pname = "faktory"; - version = "1.0.2.3"; - sha256 = "1ppyj7avp7y5n0qgql1j73yc62szykhxm1j8nxv93hsijzi6p4a5"; + version = "1.0.3.0"; + sha256 = "1igarcl4cvipndg9rhg4lpcrl09mbfkpqcp3prr14izclcldr47y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing base bytestring connection cryptonite megaparsec - memory mtl network random safe-exceptions scanner semigroups text - time unix unordered-containers + aeson aeson-casing base bytestring connection cryptonite errors + megaparsec memory mtl network random safe-exceptions scanner + semigroups text time unix unordered-containers ]; executableHaskellDepends = [ aeson base safe-exceptions ]; testHaskellDepends = [ @@ -89076,16 +89112,16 @@ self: { "fbrnch" = callPackage ({ mkDerivation, aeson, async, base, bugzilla-redhat, bytestring - , config-ini, directory, email-validate, extra, filepath, haxr - , http-conduit, http-directory, http-query, lens, lens-aeson, mtl + , config-ini, directory, email-validate, extra, filepath + , http-conduit, http-directory, http-query, koji, lens, lens-aeson , network-uri, optparse-applicative, pretty-terminal, process , rpmbuild-order, simple-cmd, simple-cmd-args, text, time , typed-process, unordered-containers, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "0.8.0"; - sha256 = "113mpna3crycw2kxsbniah5m71wvswy7v6j2p76ybl1qg50bq075"; + version = "0.9"; + sha256 = "1basamg578nyyjl677q3fax31pxcckxvdpw4f48gdmnmlnd9f6vm"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -89093,8 +89129,8 @@ self: { ]; executableHaskellDepends = [ aeson async base bugzilla-redhat bytestring config-ini directory - email-validate extra filepath haxr http-conduit http-directory - http-query mtl network-uri optparse-applicative pretty-terminal + email-validate extra filepath http-conduit http-directory + http-query koji network-uri optparse-applicative pretty-terminal process rpmbuild-order simple-cmd simple-cmd-args text time typed-process unordered-containers utf8-string xdg-basedir ]; @@ -89208,8 +89244,8 @@ self: { }: mkDerivation { pname = "fclabels"; - version = "2.0.5"; - sha256 = "0ppvc1s5bvx38y6yd6ib1wxi3y2j438xzl9iqhpr4hc1zwvsi6rx"; + version = "2.0.5.1"; + sha256 = "0g4ca5pm2bafsnpari7wqhy79i5qs8njb3kdknk0xsrazdsl174k"; libraryHaskellDepends = [ base base-orphans mtl template-haskell transformers ]; @@ -90110,8 +90146,8 @@ self: { }: mkDerivation { pname = "fft"; - version = "0.1.8.6"; - sha256 = "0hjv3r09imb2ypgbz3qj9hf4f36v977z38gdcad3qa0334qdin1f"; + version = "0.1.8.7"; + sha256 = "1kkdw08qzsgjgg9z7pf5876cn2hlq22cgvc3k2amidn317n2d6vz"; libraryHaskellDepends = [ array base carray ix-shapable storable-complex syb transformers ]; @@ -91422,6 +91458,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "fitspec_0_4_10" = callPackage + ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell + }: + mkDerivation { + pname = "fitspec"; + version = "0.4.10"; + sha256 = "1jq4brkwq59hj8fpyfq60hywj9hx82qp0yjvyl0bmwy8jpc6j91k"; + libraryHaskellDepends = [ + base cmdargs leancheck template-haskell + ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base pretty ]; + description = "refining property sets for testing Haskell programs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fix-imports" = callPackage ({ mkDerivation, base, containers, cpphs, deepseq, directory , filepath, haskell-src-exts, mtl, pretty, process, split @@ -94127,8 +94180,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.4.2"; - sha256 = "03x1pxkpl41r4cf034qj5ls946azbzwdyxkp2nxxymjx0nm2lsv6"; + version = "0.4.3"; + sha256 = "0wmyx0zlz2hmbrag8wgm8k33z9p0c2ylf3490hf9nz9b2303wflq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96943,7 +96996,7 @@ self: { license = lib.licenses.isc; }) {}; - "futhark_0_19_5" = callPackage + "futhark_0_19_6" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm , containers, directory, directory-tree, dlist, file-embed @@ -96958,8 +97011,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.19.5"; - sha256 = "1x922g3iq50an8jv75370qr0qslmxnrrqbwr7adca30ljaa7nfvh"; + version = "0.19.6"; + sha256 = "1wpg2ad2xv60xsdvnq3246nps3ldc00n58k7jxmh8lrx5bjzg263"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97303,8 +97356,8 @@ self: { ({ mkDerivation, base, bytestring, serialport }: mkDerivation { pname = "fxpak"; - version = "0.1.1"; - sha256 = "1nnb47i17b4rc2ayzq5qaydx0ss3m8yw02pjwfmipk8398qr8ss5"; + version = "0.1.2"; + sha256 = "1mrpbz32aczrh5aw550p1vzvj8zqhcnmj574sc012r3z1c0g1cin"; libraryHaskellDepends = [ base bytestring serialport ]; description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; @@ -98853,12 +98906,13 @@ self: { }) {}; "generic-override" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "generic-override"; - version = "0.0.0.0"; - sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5"; + version = "0.2.0.0"; + sha256 = "0hrya5rqdrgl66hm818v6jf11hfrvra242n1sdjypkv13zxzsk6x"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; description = "Provides functionality for overriding instances for generic derivation"; license = lib.licenses.bsd3; }) {}; @@ -98867,8 +98921,8 @@ self: { ({ mkDerivation, aeson, base, generic-override, hspec, text }: mkDerivation { pname = "generic-override-aeson"; - version = "0.0.0.0"; - sha256 = "02xwssk7158k7hhh170knxn7f2s7slcp4sy7a4b3w4cn1r016bhz"; + version = "0.0.0.2"; + sha256 = "1hgrxhfssxm4l0c98ffgc20lbzy34bbhzr4vg06vqg51m4620b25"; libraryHaskellDepends = [ aeson base generic-override ]; testHaskellDepends = [ aeson base generic-override hspec text ]; description = "Provides orphan instances necessary for integrating generic-override and aeson"; @@ -100156,6 +100210,24 @@ self: { broken = true; }) {inherit (pkgs) geos;}; + "gerrit" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , http-client, http-client-tls, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "gerrit"; + version = "0.1.0.0"; + sha256 = "03lcf9xvyhypzkrs6lv7dnwsxnn52vnnl6mhsbbhmpv2bf59whq2"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls text + ]; + testHaskellDepends = [ + aeson base bytestring directory tasty tasty-hunit + ]; + description = "A gerrit client library"; + license = lib.licenses.asl20; + }) {}; + "getemx" = callPackage ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt , mtl, old-locale, process, time @@ -101405,8 +101477,8 @@ self: { }: mkDerivation { pname = "ghc-tags"; - version = "1.1"; - sha256 = "0dk80lss2iq2yi7cnx78nk7pfnc3khwm3xincj3ybaiy60c94x8x"; + version = "1.3"; + sha256 = "1fshj5zdnhr879c9q48mb89f1fidc2skgmgi385sa5r8wxn1ili0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102012,33 +102084,16 @@ self: { license = lib.licenses.mit; }) {}; - "ghcjs-base_0_2_0_0" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim - , hashable, HUnit, integer-gmp, primitive, QuickCheck - , quickcheck-unicode, random, scientific, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unordered-containers, vector - }: + "ghcjs-base_0_2_0_3" = callPackage + ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.2.0.0"; - sha256 = "0wvmxr33a3bsv1mh8lb10haapvcykp9200ppbdpjiz2wihnb4mk8"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring containers deepseq dlist - ghc-prim ghcjs-prim hashable integer-gmp primitive scientific text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit - primitive QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; + version = "0.2.0.3"; + sha256 = "09sv5p57l8jczbycasbb06h4qsifi5fagxwsr665yil1gickfxyg"; description = "base library for GHCJS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {ghcjs-prim = null;}; + }) {}; "ghcjs-base-stub" = callPackage ({ mkDerivation, aeson, attoparsec, base, containers, deepseq @@ -105462,8 +105517,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "2.0.3"; - sha256 = "06bpazshc07rg1w06sl171k12mry708512hrdckqw7winwfrwwkh"; + version = "2.0.4"; + sha256 = "0rzfs09njlll144l05s77hs9pm9mmnb8h705xlyr5yavllkv1ypk"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -108992,19 +109047,17 @@ self: { "goldplate" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process - , regex-pcre-builtin, text, time, unordered-containers + , regex-pcre-builtin, text, unordered-containers }: mkDerivation { pname = "goldplate"; - version = "0.1.3"; - sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610"; - revision = "1"; - editedCabalFile = "1chrg7mfs4w4hbc0i1pdsj1350c4h3dhcv7xswn2ygq78337xxqk"; + version = "0.2.0"; + sha256 = "1f2n981676ykrv08fgdj87mj5r4841a18ywvgpc2hgapsgwbgma1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson aeson-pretty async base bytestring Diff directory filepath - Glob optparse-applicative process regex-pcre-builtin text time + Glob optparse-applicative process regex-pcre-builtin text unordered-containers ]; description = "A lightweight golden test runner"; @@ -109776,8 +109829,8 @@ self: { ({ mkDerivation, base, criterion, hedgehog }: mkDerivation { pname = "grab"; - version = "0.0.0.4"; - sha256 = "0yanm9ak2sw266wn9lllz086g53sra7xfncpql6403d2lj3j1jj4"; + version = "0.0.0.6"; + sha256 = "0fhindbl5ygfncbww0wqbq4bkjr9q6v0f12f0rzblz71wapshnni"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog ]; benchmarkHaskellDepends = [ base criterion ]; @@ -109791,8 +109844,8 @@ self: { ({ mkDerivation, base, containers, grab, hedgehog, text }: mkDerivation { pname = "grab-form"; - version = "0.0.0.4"; - sha256 = "0ch8c0kfjky9s1ilrxyr27jhmvynrp61imb188rc3fv7yfr0b5n5"; + version = "0.0.0.6"; + sha256 = "18gk6p6fxvsiihlr6amvlqf9s7i4v0wi7vzpfjkc580zzvxd9c8n"; libraryHaskellDepends = [ base containers grab text ]; testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; @@ -116095,6 +116148,38 @@ self: { broken = true; }) {}; + "hapistrano_0_4_1_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, directory + , filepath, formatting, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, process, QuickCheck + , silently, stm, temporary, time, transformers, typed-process, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.4.1.4"; + sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base filepath gitrev mtl path process stm time + transformers typed-process yaml + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process QuickCheck + silently temporary yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A deployment library for Haskell applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -116663,8 +116748,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.7.0"; - sha256 = "0jyjnksgwvasnhwwn8scqms1kja4hzlbpn0lmyr6yng5n4989d0x"; + version = "7.7.1"; + sha256 = "1zxdv7nihw3kjq2fvw5cl3s27pwm5gkli3sl15iqxfm7mdxz8rm0"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -117231,8 +117316,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.4.5"; - sha256 = "185qh24n6j3b5awwmm92hxravb3sq40l5q8vyng74296mjc65nkw"; + version = "0.1.5.0"; + sha256 = "0q0nd8d22knf6b1xwqz3gxmpymbvlx1p20hyahd5qr1yhjgpch0b"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default mtl network text @@ -117529,15 +117614,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_3_1_0" = callPackage + "hashable_1_3_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit , integer-gmp, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.3.1.0"; - sha256 = "1i57iibad5gjk88yq1svi35mjcbgjmms7jzd28wva8f598x84qc0"; + version = "1.3.2.0"; + sha256 = "0dyn343wdwbm1facpcjiyd8w0s0hk23jqh7mbj108az5dx5rdgar"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp text ]; @@ -117624,11 +117709,26 @@ self: { pname = "hashable-time"; version = "0.2.1"; sha256 = "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh"; + revision = "1"; + editedCabalFile = "151gxiprdlj3masa95vvrxal9nwa72n3p1y15xyj4hp7mvvl4s2l"; libraryHaskellDepends = [ base hashable time time-compat ]; description = "Hashable instances for Data.Time"; license = lib.licenses.bsd3; }) {}; + "hashable-time_0_3" = callPackage + ({ mkDerivation, base, hashable, time-compat }: + mkDerivation { + pname = "hashable-time"; + version = "0.3"; + sha256 = "15zv0pgxp7rgd6v7skhyxgyf2sd8gr1br12bpd17r650yscw9fij"; + libraryHaskellDepends = [ base time-compat ]; + testHaskellDepends = [ base hashable time-compat ]; + description = "Hashable instances for Data.Time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashabler" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp , primitive, template-haskell, text @@ -119620,8 +119720,8 @@ self: { }: mkDerivation { pname = "haskell-stack-trace-plugin"; - version = "0.1.1.1"; - sha256 = "0mm1nyhlia00vawpwcq6dda0j9d8sgd1ls4xin0s84jplw5z9hwz"; + version = "0.1.3.0"; + sha256 = "1vlqf0j88qshqkc1j688x38h4sqdkww5ya4ihaz3fy8l86wwmnvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc ]; @@ -120847,6 +120947,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasklepias" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, flow, hspec + , interval-algebra, QuickCheck, safe, text, time + , unordered-containers, vector, witherable + }: + mkDerivation { + pname = "hasklepias"; + version = "0.7.1"; + sha256 = "1w6gs3n1g12sw2w72l04l27na3kgmyqsip8d53wpmslqwccr6blc"; + libraryHaskellDepends = [ + aeson base bytestring containers flow interval-algebra QuickCheck + safe text time unordered-containers vector witherable + ]; + testHaskellDepends = [ + aeson base bytestring containers flow hspec interval-algebra + QuickCheck text time unordered-containers vector + ]; + description = "Define features from events"; + license = lib.licenses.bsd3; + }) {}; + "haskmon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-streams , io-streams, time, vector @@ -121058,8 +121179,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.13"; - sha256 = "1ms07ka51j20xb86b3i4gca9svh2wxa4i0wb6qxbwq7n2138ck0h"; + version = "0.53.2"; + sha256 = "04wm92b7687qivwjia69gahd9y2dasirmyxcbv8liqfp5xfmjbmz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121104,8 +121225,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.13"; - sha256 = "08c95grxg11kf96di27z7d72c2l7h2qzb8p5446fd91pidzgz3zb"; + version = "0.53.2"; + sha256 = "1i949izj89g797zp07qxjx16sd2591gsxbpq94v52vzgd6rl9h7n"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -122346,6 +122467,24 @@ self: { license = lib.licenses.mit; }) {}; + "hasqlator-mysql" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers, dlist + , io-streams, megaparsec, mtl, mysql-haskell, pretty-simple + , prettyprinter, scientific, template-haskell, text, time + }: + mkDerivation { + pname = "hasqlator-mysql"; + version = "0.0.3"; + sha256 = "1b1nw3l96gvf2laxw7w72w8ya8aazdhv4w7c5ly47n09hx9q77zp"; + libraryHaskellDepends = [ + aeson base binary bytestring containers dlist io-streams megaparsec + mtl mysql-haskell pretty-simple prettyprinter scientific + template-haskell text time + ]; + description = "composable SQL generation"; + license = lib.licenses.bsd3; + }) {}; + "hasqly-mysql" = callPackage ({ mkDerivation, base, binary, bytestring, dlist, mtl , mysql-haskell, scientific, text, time @@ -125697,8 +125836,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.2.0.0"; - sha256 = "1649vhzymizmmi3ggmqxyq4b0fhrpipj4ljy1w7hca2wyh4jm1yw"; + version = "0.2.1.0"; + sha256 = "0wjj5sy4mpd4ahavdmi67j70xs1wrga8dnzr5jv8cjnqjj2p8f59"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -126061,8 +126200,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.44.1"; - sha256 = "1ygrksnqav1cw9pq1x2xi0na5fxy0phyc0v48nkzpis868gy0b97"; + version = "0.46.0"; + sha256 = "1pqs4hcjy1gipdp63d8jcy035n96rfx14x0s67ihmh16s11i85bz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -129551,20 +129690,24 @@ self: { "hledger-stockquotes" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers - , hedgehog, hledger-lib, req, safe, scientific, split, tasty - , tasty-hedgehog, tasty-hunit, text, time, unordered-containers + , directory, hedgehog, hledger-lib, raw-strings-qq, req, safe + , safe-exceptions, scientific, split, tasty, tasty-hedgehog + , tasty-hunit, text, time, unordered-containers, xdg-basedir, yaml }: mkDerivation { pname = "hledger-stockquotes"; - version = "0.1.1.0"; - sha256 = "1srgl70zsixbfgmh22psg7q4wqfiay2jiybyvml42iv712n7z8xx"; + version = "0.1.2.0"; + sha256 = "064q6qz6rrahk9ri5hr1y6n17nmd4l124xb3l8q5rvm81x3hzp3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers hledger-lib req safe scientific split text time unordered-containers ]; - executableHaskellDepends = [ base bytestring cmdargs text time ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs directory raw-strings-qq + safe-exceptions text time xdg-basedir yaml + ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit ]; @@ -131053,10 +131196,10 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.13.0.1"; - sha256 = "1c01ns9h7va6ri568c0hzcdkmr0jdiay5z1vwwva7cv7dlvn6wl7"; - revision = "2"; - editedCabalFile = "148w8jbn4hrhp8zk90vr5grc4fsnsq4him6ii21imikril4ib7ya"; + version = "0.13.1"; + sha256 = "12mqwhvxk0w0fjbdl3ignayp08nm31qi028wq5qrkcyxw29ff1k7"; + revision = "1"; + editedCabalFile = "01dmzpcqav7p764dpicih8jm0g6yiiqgww8b5m6c0bfvvgfqyx2h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131095,16 +131238,16 @@ self: { ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 - , cryptohash-sha512, directory, filepath, hashable, lifted-base - , monad-control, mtl, nix-derivation, process, saltine, tasty - , tasty-discover, tasty-golden, tasty-hspec, tasty-hunit + , cryptohash-sha512, directory, filepath, hashable, hspec + , lifted-base, monad-control, mtl, nix-derivation, process, saltine + , tasty, tasty-discover, tasty-golden, tasty-hspec, tasty-hunit , tasty-quickcheck, temporary, text, time, unix , unordered-containers, vector }: mkDerivation { pname = "hnix-store-core"; - version = "0.4.2.0"; - sha256 = "02i7vxhpaqwyjvd6w2raxjz7r0xxs37x5b6pq9rw6l1l0k18nx5i"; + version = "0.4.3.0"; + sha256 = "17l7198s3dzjx416nplinyghbqgignvpvxkww241gjv4p23izf77"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring base64-bytestring bytestring cereal containers cryptohash-md5 @@ -131114,8 +131257,9 @@ self: { ]; testHaskellDepends = [ attoparsec base base16-bytestring base64-bytestring binary - bytestring containers directory filepath process tasty tasty-golden - tasty-hspec tasty-hunit tasty-quickcheck temporary text unix + bytestring containers directory filepath hspec process tasty + tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary + text unix ]; testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; @@ -131129,8 +131273,8 @@ self: { }: mkDerivation { pname = "hnix-store-remote"; - version = "0.4.2.0"; - sha256 = "17v785dql4rl2yn1qdagvnyx8y9r3bd02npg51mfqhl49knd92fr"; + version = "0.4.3.1"; + sha256 = "1wp6z5f13fkgh3mdzr1zcqdvsx1j90l5isf671gsg43brsv4c2vl"; libraryHaskellDepends = [ attoparsec base binary bytestring containers hnix-store-core mtl network nix-derivation text time unordered-containers @@ -133538,8 +133682,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.9.1.0"; - sha256 = "13q20ak0zakwvlc05y187iq2vpvdjx9dlmvmgvv2gjd263sqcgm2"; + version = "1.9.1.1"; + sha256 = "0s5dyia6v59vz7xk8m6gj0shdygk39pmks5yr7dlzksb8gqfgral"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -133570,6 +133714,8 @@ self: { pname = "hpqtypes-extras"; version = "1.11.0.0"; sha256 = "0574ma8b149rhpdk9mdg5sawhl3db4d0qxs5az31g83i93hf4mwq"; + revision = "2"; + editedCabalFile = "1n98wpppwd0gwchwfis525qac3808j1vnvb3vxziq1d9x088gqf6"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl @@ -140003,14 +140149,14 @@ self: { "http-client-websockets" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client - , http-client-tls, network-uri, utf8-string, websockets + , http-client-tls, network-uri, text, websockets }: mkDerivation { pname = "http-client-websockets"; - version = "0.1.1.1"; - sha256 = "0b5kvyrfhhj7c5ys8ccxwv6prhb6sj0ycinzbk1yrwnd3wrmzk78"; + version = "0.1.1.2"; + sha256 = "0g2zhj0fzhynyls5rxpzh50hxjsygx7037rw2h79ihca10crsqgm"; libraryHaskellDepends = [ - base bytestring http-client network-uri utf8-string websockets + base bytestring http-client network-uri text websockets ]; testHaskellDepends = [ base bytestring hspec http-client-tls network-uri websockets @@ -147345,17 +147491,17 @@ self: { }) {aether = null;}; "insert-ordered-containers" = callPackage - ({ mkDerivation, aeson, base, base-compat, hashable + ({ mkDerivation, aeson, base, base-compat, deepseq, hashable , indexed-traversable, lens, optics-core, optics-extra, QuickCheck , semigroupoids, semigroups, tasty, tasty-quickcheck, text , transformers, unordered-containers }: mkDerivation { pname = "insert-ordered-containers"; - version = "0.2.4"; - sha256 = "174maygil2mffjz2ssqawlmv36413m65zp3ng67hzij4dh8piz7x"; + version = "0.2.5"; + sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y"; libraryHaskellDepends = [ - aeson base base-compat hashable indexed-traversable lens + aeson base base-compat deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids semigroups text transformers unordered-containers ]; @@ -147673,8 +147819,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "3"; - editedCabalFile = "1b99lqxwbhg96iykfr2l7qd388cbx9sf8bln728505qgj6kgsvj7"; + revision = "4"; + editedCabalFile = "1l5n3hsa8gr0wzc3cb32ha2j8kcf976i84z04580q41macf0r0h6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -148297,8 +148443,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.8.0"; - sha256 = "1mayv7rqpbx09y82vyzdvbdjrqgk4vpsbz7qx9cy2h09q355zs7d"; + version = "0.8.2"; + sha256 = "1xa9rlb9klf0bnig0ccryjxcbz023hwy1wnxp4vwn5ggb0fbmzys"; libraryHaskellDepends = [ base containers QuickCheck safe time witherable ]; @@ -148550,17 +148696,15 @@ self: { }: mkDerivation { pname = "invert"; - version = "1.0"; - sha256 = "18q070bawfnyi4wl6rxb6l5ihda0xzmlb8g1z0sg46vghvbs985v"; - revision = "2"; - editedCabalFile = "1829iy3jg0zwms16cqd4rdg5khl348ih44b3mz7l7cy9wlci3cli"; + version = "1.0.0.1"; + sha256 = "07p7vcc3mc4zq0j2qlm4yp0cfsashb32ndx5i9ib0x6lk6rb9djp"; libraryHaskellDepends = [ base containers generic-deriving hashable unordered-containers vector ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; - description = "Automatically generate a function's inverse"; + description = "Automatically generate a function’s inverse"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; @@ -148781,6 +148925,8 @@ self: { pname = "io-streams"; version = "1.5.2.1"; sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny"; + revision = "1"; + editedCabalFile = "0zgrhvafnk9ds29n6x93cifw4993mgvvx3p2d3922frkjvd6xa5v"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -151384,8 +151530,8 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.4"; - sha256 = "0rrqaibgafbynrlcsp7f7hkzgkp2gix7ji2hkpgpby6fvp6965fh"; + version = "1.3.5"; + sha256 = "0k5z2lxj5xp9hpr3mmdbzkd0yn718477pqjvymyz361h938rqnz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -151395,6 +151541,22 @@ self: { license = lib.licenses.mit; }) {}; + "jira-wiki-markup_1_4_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "1.4.0"; + sha256 = "0p6axj6km4440ss5naw68r3r85si4qxqgrklp6ssfyapawy0s88w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -151858,8 +152020,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.7.1"; - sha256 = "1igkv5lvlbq0xl2dp6d8fp4ybwnwmgrc3r4sfjsric0bj8sq2k86"; + version = "0.9.8.0"; + sha256 = "0g3jdh4x80fsbrcj5kd81inv8hcx662v5dsn9d6q1dla0cz8w8i9"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -151876,8 +152038,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.7.1"; - sha256 = "07s2iy136dm526mr7q43mxqq9qndg8jbi9kz1652qgl0ivn8lapc"; + version = "0.9.8.0"; + sha256 = "0axgfkxgvm4awvklss2pqa8a4112m3q7k38h71anxs6i199lgkyq"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -151925,8 +152087,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.7.1"; - sha256 = "1piyxxmik1bwdzkz46vgdhdp0gw4p01fww591zqbxzjk6rmrpby0"; + version = "0.9.8.0"; + sha256 = "06bf071xnfx7mjzf7jdyjspjw28s2z3br5gmx9vcs7paji20c8np"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -151950,8 +152112,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.9.7.1"; - sha256 = "0f2siaid0b03zrjzpb3lr9k9w5np2vml6apd961zd97dghvvhiix"; + version = "0.9.8.0"; + sha256 = "01iav691d3h6l9x7vw0spb68n4y5m9pb8d02iyp5lvkqr2y4h9kv"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading @@ -151984,17 +152146,11 @@ self: { }) {}; "jsaddle-wkwebview" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, jsaddle, text - }: + ({ mkDerivation }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.7.1"; - sha256 = "0dfaysw7fzmv2b62wi5id45f4i0x2vbjp9irbdkmv1h2z3ydwy20"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory jsaddle - text - ]; + version = "0.9.8.0"; + sha256 = "1cjncl2jqnx4j83pmcnnvcc0rswhwwb5grwh636b11yyp4vv58dw"; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -153011,26 +153167,26 @@ self: { }) {}; "jsonnet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , containers, data-fix, deriving-compat, directory, exceptions - , filepath, hashable, megaparsec, mtl, optparse-applicative - , parser-combinators, scientific, semigroupoids, tasty + , filepath, hashable, lens, megaparsec, mtl, optparse-applicative + , parser-combinators, scientific, semigroupoids, tasty, tasty-bench , tasty-golden, tasty-hunit, template-haskell, text - , transformers-compat, unbound-generics, unordered-containers - , vector + , th-lift-instances, th-utilities, transformers-compat + , unbound-generics, unordered-containers, vector }: mkDerivation { pname = "jsonnet"; - version = "0.2.0.0"; - sha256 = "0ns2yij8yl555n5rb0pahxpqrwxgzfvdr4ajp0dy5amqsv13hhmh"; + version = "0.3.1.1"; + sha256 = "021kklj3ycpm5n2r6bjqc0vicn9vdv5a56sd1la6pf430i1fd7z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers data-fix - deriving-compat directory exceptions filepath hashable megaparsec - mtl optparse-applicative parser-combinators scientific - semigroupoids template-haskell text transformers-compat - unbound-generics unordered-containers vector + aeson ansi-wl-pprint base binary bytestring containers data-fix + deriving-compat directory exceptions filepath hashable lens + megaparsec mtl parser-combinators scientific semigroupoids + template-haskell text th-lift-instances th-utilities + transformers-compat unbound-generics unordered-containers vector ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring mtl optparse-applicative text @@ -153039,6 +153195,9 @@ self: { ansi-wl-pprint base bytestring filepath mtl tasty tasty-golden tasty-hunit text ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base bytestring tasty-bench text + ]; description = "Jsonnet implementaton in pure Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -154995,8 +155154,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.3"; - sha256 = "0bki6h5qk78d3qgprn8k1av2xxlb43bxb07qqk4x1x5diy92mc5x"; + version = "0.2.0.4"; + sha256 = "0rzpid5lnjnjgsip3fvm5d313hh8wb7gqla3dyf56l9q7y4r20js"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -159739,8 +159898,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.9.4"; - sha256 = "0w17ymj7k4sr9jwp9yrgh3l94l3kgjyxxnpxwj2sdqk8fvmjpkny"; + version = "0.9.6"; + sha256 = "0nw7hm9aawv6xljii3cjy9qbdbb5p05k5rmc9qv4dkajjjyhyna9"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; @@ -162189,15 +162348,18 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, process }: + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , http-client, http-client-tls, process, tar, temporary, zlib + }: mkDerivation { pname = "licensor"; - version = "0.4.3"; - sha256 = "19ydisxc5yzm0ccj76p7sg39cpjg5c57wd3gaybc5k7bqrlv14c6"; + version = "0.5.0"; + sha256 = "0i49l4d5dvvj4s6fbdhg38dmdclxr4ld69lzm1s5xx9m7aqy3al9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal containers directory process + base bytestring Cabal containers directory http-client + http-client-tls process tar temporary zlib ]; executableHaskellDepends = [ base Cabal containers directory ]; description = "A license compatibility helper"; @@ -163063,18 +163225,24 @@ self: { "linearmap-category" = callPackage ({ mkDerivation, base, call-stack, constrained-categories - , containers, free-vector-spaces, ieee754, lens, linear - , manifolds-core, QuickCheck, semigroups, tagged, transformers - , vector, vector-space + , containers, data-default-class, free-vector-spaces, hashable + , ieee754, lens, linear, manifolds-core, MemoTrie, QuickCheck + , semigroups, tagged, tasty, tasty-quickcheck, template-haskell + , transformers, vector, vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.4.0.1"; - sha256 = "1zc7zns49d832wm22dsbv5xvh5x6s4zg6ky1vr941rs1z9jskmyj"; + version = "0.4.1.0"; + sha256 = "01cpl44wg5kyx9lxv23hcsxd8dw90psqj9sgaklhxklbdvn77bvr"; libraryHaskellDepends = [ base call-stack constrained-categories containers - free-vector-spaces ieee754 lens linear manifolds-core QuickCheck - semigroups tagged transformers vector vector-space + data-default-class free-vector-spaces hashable ieee754 lens linear + manifolds-core MemoTrie QuickCheck semigroups tagged + template-haskell transformers vector vector-space + ]; + testHaskellDepends = [ + base constrained-categories linear manifolds-core QuickCheck tasty + tasty-quickcheck vector-space ]; description = "Native, complete, matrix-free linear algebra"; license = lib.licenses.gpl3Only; @@ -164500,6 +164668,42 @@ self: { broken = true; }) {}; + "literatex" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit + , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc + , unliftio + }: + mkDerivation { + pname = "literatex"; + version = "0.1.0.0"; + sha256 = "0nfmvblm3a370a59hyd28wv8xnq1wlxcm5xz4n6b3n5cprj4h99z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit text ttc unliftio + ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative ttc + ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit text ttc unliftio + ]; + description = "transform literate source code to Markdown"; + license = lib.licenses.mit; + }) {}; + + "little-earley" = callPackage + ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "little-earley"; + version = "0.2.0.0"; + sha256 = "0zqlnaj1w6m2h7g55xg9cjl978ij66lw69x4v5b9vi7x7maa44ms"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers mtl tasty tasty-hunit ]; + description = "Simple implementation of Earley parsing"; + license = lib.licenses.mit; + }) {}; + "little-logger" = callPackage ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, tasty , tasty-hunit, text, unliftio-core @@ -165539,8 +165743,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.9.1.0"; - sha256 = "0p0zb805a8zlxdnii6r0gmf0zic4g4zxkvcq84j6g8973qx1fch9"; + version = "0.9.1.1"; + sha256 = "0b69q4vhayqg0n8kzqb4lma289av39zm5qbinnam4hh9inqhayfk"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -165632,10 +165836,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.4"; - sha256 = "1m96d5486xadypm5iby8rkb979k82md394j5iaik6xk5aavcn6xx"; - revision = "1"; - editedCabalFile = "0yyaxibkq8c9bwhaday8ijmfbm8k3i14wd9zsgfby99b6rxra351"; + version = "0.7.1.5"; + sha256 = "0g89403ijgp2xznd497xhvifh2jlgph4raz4l5fh5ajxvcf33hvn"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -174839,8 +175041,8 @@ self: { }: mkDerivation { pname = "mixed-types-num"; - version = "0.5.3.1"; - sha256 = "1g19y0kkksx87i8azqndikpwans7061fj7z255vssl1x46vh843h"; + version = "0.5.7.0"; + sha256 = "0fnf165ff6c4vbc2hlfrydb7w8csk1hjxd86lvnh4y9w6sc9g6hp"; libraryHaskellDepends = [ base collect-errors hspec hspec-smallcheck mtl QuickCheck smallcheck template-haskell @@ -174852,6 +175054,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_5_8_0" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.5.8.0"; + sha256 = "1i40g6kf4my91i7xg54wfi6n2s8ivmx5k08ccqz3iycn6gha8pr7"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -176163,8 +176385,8 @@ self: { }: mkDerivation { pname = "monad-coroutine"; - version = "0.9.1"; - sha256 = "1d85jyfwf4h60cfp3dyrkmf7kw7ya37z2vqmv6rdbpqc1pslmb1i"; + version = "0.9.1.2"; + sha256 = "1s4975q1k23b2skyq9mwkkda08f2zxkv96x0yplzhz9n64kchhf3"; libraryHaskellDepends = [ base monad-parallel transformers transformers-compat ]; @@ -177267,8 +177489,8 @@ self: { }: mkDerivation { pname = "monadic-recursion-schemes"; - version = "0.1.12.0"; - sha256 = "0h5syc9p4imlf03qfb1rjsk4rq2kqry522zvw67x122q1xzdnwnw"; + version = "0.1.13.0"; + sha256 = "04n81zx1h68w9v8fihwhfbkyv7lb84p3nzppqf7zc55znbn67lym"; libraryHaskellDepends = [ base comonad containers free mtl recursion-schemes transformers ]; @@ -178098,6 +178320,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "moo-nad" = callPackage + ({ mkDerivation, base, dep-t, mtl, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "moo-nad"; + version = "0.1.0.2"; + sha256 = "017yl4vy7apa6p91y4mhk4p36b4dgvwqdjplc38gijvk9zqd3rbm"; + libraryHaskellDepends = [ base dep-t mtl transformers ]; + testHaskellDepends = [ base dep-t mtl tasty tasty-hunit ]; + doHaddock = false; + description = "Invocation helpers for the ReaderT-record-of-functions style"; + license = lib.licenses.bsd3; + }) {}; + "moonshine" = callPackage ({ mkDerivation, aeson, base, bytestring, canteven-config, ekg , ekg-core, hslogger, snap, text, time, transformers, yaml @@ -180143,12 +180379,13 @@ self: { }) {}; "multi-except" = callPackage - ({ mkDerivation, base, dlist, semigroupoids }: + ({ mkDerivation, base, dlist, hspec, semigroupoids }: mkDerivation { pname = "multi-except"; - version = "0.1.1.0"; - sha256 = "18zs66sn31wjngi7iibf1wc3jz15c6rz6sx424n6j88nzwd3wzq7"; + version = "0.2.1.0"; + sha256 = "0ai19lk32wbpsmwxig5wzc7iqi81h0mxpykrmfw05vv4zwjqiqfz"; libraryHaskellDepends = [ base dlist semigroupoids ]; + testHaskellDepends = [ base hspec semigroupoids ]; description = "Multiple Exceptions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -186253,6 +186490,28 @@ self: { broken = true; }) {}; + "nix-graph" = callPackage + ({ mkDerivation, algebraic-graphs, attoparsec, base, containers + , hashable, nix-derivation, optparse-applicative, stm, text, ttrie + , unliftio + }: + mkDerivation { + pname = "nix-graph"; + version = "1.0.0.0"; + sha256 = "1hxby1xpzld55whpb1kzzdl3gi250svpl1lw5xw9qg10a3md29zh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs attoparsec base containers hashable nix-derivation + stm text ttrie unliftio + ]; + executableHaskellDepends = [ + algebraic-graphs base optparse-applicative + ]; + description = "Reify the Nix build graph into a Haskell graph data structure"; + license = lib.licenses.bsd3; + }) {}; + "nix-narinfo" = callPackage ({ mkDerivation, attoparsec, base, containers, filepath, hspec , QuickCheck, text @@ -187645,6 +187904,73 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_6_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base + , bytestring, containers, directory, exceptions, filepath, ghc + , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text + , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text + , time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.6.0.1"; + sha256 = "10gfw6vs2vc1jll80lirzjplwx3p3l9yssddqjklnd67rnvm95r4"; + libraryHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time vector + ]; + testHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "nri-redis" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis + , nri-env-parser, nri-observability, nri-prelude, resourcet + , safe-exceptions, text, unordered-containers, uuid + }: + mkDerivation { + pname = "nri-redis"; + version = "0.1.0.0"; + sha256 = "00im3rnb7w45xm60l42kzrj3sc9dg3098w988fdhdschwk34zqpc"; + libraryHaskellDepends = [ + aeson async base bytestring conduit hedis nri-env-parser + nri-observability nri-prelude resourcet safe-exceptions text + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson async base bytestring conduit hedis nri-env-parser + nri-observability nri-prelude resourcet safe-exceptions text + unordered-containers uuid + ]; + description = "An intuitive hedis wrapper library"; + license = lib.licenses.bsd3; + }) {}; + + "nri-test-encoding" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, filepath + , nri-prelude, servant, servant-auth-server, servant-server, text + }: + mkDerivation { + pname = "nri-test-encoding"; + version = "0.1.0.0"; + sha256 = "11vk1f99xbqs678rxldxh9qfwailinxpjl6q6pvikb8f32rrb74y"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring filepath nri-prelude servant + servant-auth-server servant-server text + ]; + description = "A library to simplify writing golden tests for encoding types"; + license = lib.licenses.bsd3; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -188161,18 +188487,32 @@ self: { broken = true; }) {}; + "numhask_0_8_0_0" = callPackage + ({ mkDerivation, base, doctest, QuickCheck }: + mkDerivation { + pname = "numhask"; + version = "0.8.0.0"; + sha256 = "104vc3b43lbck6r39kv5rscvqx3hxxf8nyvzsw8shb9xifmnijkh"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "A numeric class hierarchy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest - , numhask, vector + ({ mkDerivation, adjunctions, base, distributive, doctest, numhask + , vector }: mkDerivation { pname = "numhask-array"; - version = "0.8.0"; - sha256 = "03c12d34s20f01vc9kpgrm3n4xi8h4kqzlndj1ncpqb69xx3fhc5"; + version = "0.9.0"; + sha256 = "09l0cm2f66c5bagrwby8bj22b6lklbi8mbsgxxh0gw5zvb9bhgmr"; libraryHaskellDepends = [ - adjunctions base deepseq distributive numhask vector + adjunctions base distributive numhask vector ]; - testHaskellDepends = [ base doctest numhask ]; + testHaskellDepends = [ base doctest ]; description = "Multi-dimensional array interface for numhask"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -188273,13 +188613,13 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.7.1.0"; - sha256 = "1wn4fi2778dxmqfimwx9favwd6v507vzpwms04w2bk5gn1fxgcdg"; + version = "0.8.0.0"; + sha256 = "1ya4fcr0mxj4blijl2k2sdfkkywjmr616qcaddl7zqphjvrc4gd0"; libraryHaskellDepends = [ adjunctions base containers distributive numhask random semigroupoids tdigest text time vector ]; - testHaskellDepends = [ base doctest numhask ]; + testHaskellDepends = [ base doctest ]; description = "Numerical spaces"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -188389,23 +188729,25 @@ self: { }) {}; "nvfetcher" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, extra, free - , neat-interpolation, shake, text, tomland, transformers - , unordered-containers, validation-selective + ({ mkDerivation, aeson, base, binary, bytestring, containers, extra + , free, microlens, microlens-th, neat-interpolation + , optparse-simple, shake, text, tomland, transformers + , validation-selective }: mkDerivation { pname = "nvfetcher"; - version = "0.1.0.0"; - sha256 = "1flzivh84fxik5zw3n8j4b65lh8cxd15mjh72y4622rnlnfn2xvv"; + version = "0.2.0.0"; + sha256 = "04gslnmamy79i563ma7kj2b36mqr2c1wlcivqs70akr7s4my3g7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring extra free neat-interpolation shake - text transformers unordered-containers + aeson base binary bytestring containers extra free microlens + microlens-th neat-interpolation shake text transformers ]; executableHaskellDepends = [ - aeson base binary bytestring extra free neat-interpolation shake - text tomland transformers unordered-containers validation-selective + aeson base binary bytestring containers extra free microlens + microlens-th neat-interpolation optparse-simple shake text tomland + transformers validation-selective ]; description = "Generate nix sources expr for the latest version of packages"; license = lib.licenses.mit; @@ -190585,8 +190927,8 @@ self: { }: mkDerivation { pname = "openid-connect"; - version = "0.1.0.0"; - sha256 = "12qp155dazycypv0fvw8mbh3rl5j5ybd2vyfga8wi55n16v1w8mv"; + version = "0.1.1"; + sha256 = "16qqndcvbs30nraik0ida1dw40hk3k9mi318dnqnjx64x6wvcgmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192174,8 +192516,8 @@ self: { }: mkDerivation { pname = "ordinal"; - version = "0.4.0.3"; - sha256 = "1ar7l68cx9zci7mi6qx7a6ja7vp9axxjczyzxrbnjrvd2k3zxg51"; + version = "0.4.0.5"; + sha256 = "0m073n6yln9rfdzlkwd10fl04b725h3hpybz01r0wiyw4bfv2n3b"; libraryHaskellDepends = [ base containers data-default QuickCheck regex template-haskell text time vector @@ -193120,6 +193462,25 @@ self: { broken = true; }) {}; + "packstream" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, hspec, mtl, text + }: + mkDerivation { + pname = "packstream"; + version = "0.1.0.2"; + sha256 = "0skp7n6y9wzsa4mr456cpmqw0fzyb5613hqw7fs0qyzwb5swna2c"; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 mtl text + ]; + testHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 hspec mtl + text + ]; + description = "PackStream converter for Neo4j BOLT protocol"; + license = lib.licenses.bsd3; + }) {}; + "packunused" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, haskell-src-exts , optparse-applicative, process, split @@ -193537,6 +193898,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_14_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix + , unordered-containers, xml, xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.14.0.1"; + sha256 = "0fyhmdd1qnf9z4k1m8mm4m1p4lvpirlxx78plglch5h4xqidibr3"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix unordered-containers xml + xml-conduit zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -193592,7 +194012,7 @@ self: { }) {}; "pandoc-crossref" = callPackage - ({ mkDerivation, base, containers, data-accessor + ({ mkDerivation, base, containers, criterion, data-accessor , data-accessor-template, data-accessor-transformers, data-default , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb @@ -193600,10 +194020,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.10.0"; - sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; - revision = "1"; - editedCabalFile = "0grjcp8r5fh41qnn3miw6bms3ml9v6n1rjb2yvimf1v69w61nlgq"; + version = "0.3.11.0"; + sha256 = "1czz54px5pv5a5ijxllz3nrq5s5k4rb05xb8r29drrnz13j45chk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193614,17 +194032,17 @@ self: { utility-ht ]; executableHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default deepseq directory filepath - gitrev mtl open-browser optparse-applicative pandoc pandoc-types - roman-numerals syb template-haskell temporary text utility-ht + base deepseq gitrev open-browser optparse-applicative pandoc + pandoc-types template-haskell temporary text ]; testHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default directory filepath hspec - mtl pandoc pandoc-types roman-numerals syb template-haskell text - utility-ht + base containers data-accessor data-default directory filepath hspec + mtl pandoc pandoc-types text ]; + benchmarkHaskellDepends = [ + base criterion pandoc pandoc-types text + ]; + doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; }) {}; @@ -193916,25 +194334,25 @@ self: { "pandoc-plot" = callPackage ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, filepath, githash, hashable, hspec + , data-default, directory, filepath, gitrev, hashable, hspec , hspec-expectations, lifted-async, lifted-base, mtl , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup , tasty, tasty-hspec, tasty-hunit, template-haskell, text - , typed-process, yaml + , typed-process, unix, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "1.2.1"; - sha256 = "1jz8q3qv9m837zwl2lhrcqfjmfs08gcv7qfxiw3w21nfl8gxbgqx"; + version = "1.2.2"; + sha256 = "0lj4a1nn78zsv7rms3irk0fy390k2yfd6ck687x9h1xqmsdhd3kd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hashable lifted-async lifted-base mtl pandoc pandoc-types shakespeare - tagsoup template-haskell text typed-process yaml + tagsoup template-haskell text typed-process unix yaml ]; executableHaskellDepends = [ - base containers directory filepath githash optparse-applicative + base containers directory filepath gitrev optparse-applicative pandoc pandoc-types template-haskell text typed-process ]; testHaskellDepends = [ @@ -194872,10 +195290,8 @@ self: { ({ mkDerivation, base, containers, extensible-exceptions, random }: mkDerivation { pname = "parallel-io"; - version = "0.3.3"; - sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; - revision = "2"; - editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym"; + version = "0.3.4"; + sha256 = "10bglxm685pljh0i896zrgs6g3iz0n7gl1qslvfn63pjxgvz5v2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195736,6 +196152,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "parsley" = callPackage + ({ mkDerivation, array, base, bytestring, containers, cpphs + , dependent-map, dependent-sum, ghc-prim, hashable, mtl + , pretty-terminal, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "parsley"; + version = "0.1.0.1"; + sha256 = "01rslkkisbrgdn2d8hzrag2z6hh9gjilp2bg0j87n8awzm1i2n19"; + revision = "1"; + editedCabalFile = "16rpf1l3ph3yil2jnyp9z0j46afb38bii52bwkl4blk2f781k97z"; + libraryHaskellDepends = [ + array base bytestring containers dependent-map dependent-sum + ghc-prim hashable mtl pretty-terminal template-haskell text + unordered-containers + ]; + libraryToolDepends = [ cpphs ]; + description = "A fast parser combinator library backed by Typed Template Haskell"; + license = lib.licenses.bsd3; + }) {}; + "parsnip" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default, ghc-prim, primitive @@ -195857,8 +196294,8 @@ self: { ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.5.1.8"; - sha256 = "1lxvgz0z04fkd67lnva902j8y5qxp6naga7gfnnazwafsb0s9kww"; + version = "0.5.1.12"; + sha256 = "0dkbw136cgqqhgckcn7wj39gd8ng8jmbdbq99qan5l2h5090k30h"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; @@ -195869,8 +196306,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.6"; - sha256 = "0n0j8xlrz66mzkvrsa083b9057n3rgbir7pwqxqycwzgj18g68s6"; + version = "0.6.0.8"; + sha256 = "0gldqqrfc87x1ff33qgan3pp62siqgal3imkf81b9rynws0saxh7"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = lib.licenses.asl20; @@ -197042,8 +197479,8 @@ self: { }: mkDerivation { pname = "pcre2"; - version = "1.1.4"; - sha256 = "0wrw2slmkxxmw3zx85f9xv8374fsvhxsyf1l149fvkaqnvf19bs2"; + version = "1.1.5"; + sha256 = "0kwlcv2rh8hyx93i3q3xv8ijxccl02n5nbkv4g74dr12d41ggc1h"; libraryHaskellDepends = [ base containers mtl template-haskell text ]; @@ -198268,47 +198705,18 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, fast-logger, hspec - , http-api-data, monad-logger, mtl, path-pieces, resource-pool - , resourcet, scientific, shakespeare, silently, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , vector - }: - mkDerivation { - pname = "persistent"; - version = "2.11.0.4"; - sha256 = "1n5wkhfvyqq6p57nkf9yx73kap6spyzam5w12ni8pmd1m6pk77xn"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data monad-logger mtl - path-pieces resource-pool resourcet scientific silently text time - transformers unliftio unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - containers hspec http-api-data path-pieces scientific shakespeare - text time transformers unordered-containers vector - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_13_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq - , deepseq-generics, fast-logger, file-embed, hspec, http-api-data - , lift-type, monad-logger, mtl, path-pieces, QuickCheck - , quickcheck-instances, resource-pool, resourcet, scientific - , shakespeare, silently, template-haskell, text, th-lift-instances - , time, transformers, unliftio, unliftio-core, unordered-containers - , vector + , fast-logger, file-embed, hspec, http-api-data, lift-type + , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances + , resource-pool, resourcet, scientific, shakespeare, silently + , template-haskell, text, th-lift-instances, time, transformers + , unliftio, unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent"; - version = "2.13.0.1"; - sha256 = "0yvipx9y33pr1vz7818w2ylr5zf9bmng8ka70mdb4f563l4ynp96"; + version = "2.13.0.2"; + sha256 = "1fn3hjn3pxxnawvdif691vmxahnmal5ivr5rll0f26ia7rjqrnn2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -198325,12 +198733,10 @@ self: { unordered-containers vector ]; benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics file-embed template-haskell - text + base criterion deepseq file-embed template-haskell text ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -198435,6 +198841,8 @@ self: { pname = "persistent-documentation"; version = "0.1.0.2"; sha256 = "0ys864vjzl97c9qv0gg5q9zviammrfvm0schvh7ckr9pdg062z17"; + revision = "1"; + editedCabalFile = "0pzgmwqjyzpql7d6bk9xkzkjvm21giq7f420y4fqq4wli3g2cwmx"; libraryHaskellDepends = [ base containers mtl persistent template-haskell text ]; @@ -198613,34 +199021,6 @@ self: { }) {}; "persistent-mysql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, fast-logger, hspec, HUnit, monad-logger, mysql - , mysql-simple, persistent, persistent-qq, persistent-template - , persistent-test, QuickCheck, quickcheck-instances, resource-pool - , resourcet, text, time, transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.10.3.1"; - sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7"; - revision = "1"; - editedCabalFile = "1nd3l499kpv2rfhqqjw1b3qsn558rwz3794cy2x493l98rsspszp"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers monad-logger - mysql mysql-simple persistent resource-pool resourcet text - transformers unliftio-core - ]; - testHaskellDepends = [ - base bytestring containers fast-logger hspec HUnit monad-logger - mysql persistent persistent-qq persistent-template persistent-test - QuickCheck quickcheck-instances resourcet text time transformers - unliftio-core - ]; - description = "Backend for the persistent library using MySQL database server"; - license = lib.licenses.mit; - }) {}; - - "persistent-mysql_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, http-api-data, HUnit , monad-logger, mysql, mysql-simple, path-pieces, persistent @@ -198649,8 +199029,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.13.0.0"; - sha256 = "1lqd1j9r973081yzvvz9c65csqjd8bzapb4dayzwbhwjq2p0sxiz"; + version = "2.13.0.1"; + sha256 = "1gl48xcsczpzipg9v107x970rzi66vr26772ml9z8szxygamgsdb"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -198664,7 +199044,6 @@ self: { ]; description = "Backend for the persistent library using MySQL database server"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-mysql-haskell" = callPackage @@ -198759,16 +199138,19 @@ self: { "persistent-postgresql" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations - , HUnit, monad-logger, mtl, persistent, persistent-qq - , persistent-template, persistent-test, postgresql-libpq - , postgresql-simple, QuickCheck, quickcheck-instances - , resource-pool, resourcet, string-conversions, text, time - , transformers, unliftio-core, unordered-containers, vector + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent-postgresql"; - version = "2.11.0.1"; - sha256 = "08bmf52fqjwzyw4dnvh2ql4q3ai05fzzicgd5z6bim13b9s4ggmk"; + version = "2.13.0.1"; + sha256 = "186anbb0sgml094pw1nb529pddi4q1af0mcv3xa8bshr1xywpnd8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring conduit containers monad-logger mtl persistent postgresql-libpq postgresql-simple @@ -198777,16 +199159,16 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers fast-logger hspec - hspec-expectations HUnit monad-logger persistent persistent-qq - persistent-template persistent-test QuickCheck quickcheck-instances - resourcet text time transformers unliftio-core unordered-containers - vector + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; }) {}; - "persistent-postgresql_2_13_0_0" = callPackage + "persistent-postgresql_2_13_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations , hspec-expectations-lifted, http-api-data, HUnit, monad-logger @@ -198798,8 +199180,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.0.0"; - sha256 = "0a18h7ib01if2dspq8f3vwb02cwi74c12i0n3ax4aq6819qy12gb"; + version = "2.13.0.2"; + sha256 = "1cbrwzk2s3xrdxpas64slk1habn38xspdg09xj2yazszkmr31hrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198839,36 +199221,14 @@ self: { }) {}; "persistent-qq" = callPackage - ({ mkDerivation, aeson, base, bytestring, fast-logger - , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent - , persistent-sqlite, persistent-template, resourcet - , template-haskell, text, unliftio - }: - mkDerivation { - pname = "persistent-qq"; - version = "2.9.2.1"; - sha256 = "0gnwkrjyh9fkli35qp0mvivbsycz58ng26z6rfqv377hgrjsvjiq"; - libraryHaskellDepends = [ - base haskell-src-meta mtl persistent template-haskell text - ]; - testHaskellDepends = [ - aeson base bytestring fast-logger haskell-src-meta hspec HUnit - monad-logger mtl persistent persistent-sqlite persistent-template - resourcet template-haskell text unliftio - ]; - description = "Provides a quasi-quoter for raw SQL for persistent"; - license = lib.licenses.mit; - }) {}; - - "persistent-qq_2_12_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, fast-logger , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent , persistent-sqlite, resourcet, template-haskell, text, unliftio }: mkDerivation { pname = "persistent-qq"; - version = "2.12.0.0"; - sha256 = "1mw565rwnzdsw0vc0gs31z4l4pw8qxb70l898invj7dfnq5vj62f"; + version = "2.12.0.1"; + sha256 = "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p"; libraryHaskellDepends = [ base haskell-src-meta mtl persistent template-haskell text ]; @@ -198879,7 +199239,6 @@ self: { ]; description = "Provides a quasi-quoter for raw SQL for persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-ratelimit" = callPackage @@ -198978,38 +199337,6 @@ self: { }) {}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th - , monad-logger, mtl, persistent, persistent-template - , persistent-test, QuickCheck, resource-pool, resourcet, sqlite - , system-fileio, system-filepath, temporary, text, time - , transformers, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.11.1.0"; - sha256 = "04rdzcckdkvs8nisx0hh96sdfyly82yr8c0mx6nsxpyi7m52by9j"; - configureFlags = [ "-fsystemlib" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers microlens-th monad-logger - mtl persistent resource-pool resourcet text time transformers - unliftio-core unordered-containers - ]; - librarySystemDepends = [ sqlite ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions fast-logger hspec - HUnit microlens monad-logger mtl persistent persistent-template - persistent-test QuickCheck resourcet system-fileio system-filepath - temporary text time transformers unliftio-core - ]; - description = "Backend for the persistent library using sqlite3"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {inherit (pkgs) sqlite;}; - - "persistent-sqlite_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th , monad-logger, mtl, persistent, persistent-test, QuickCheck @@ -199019,10 +199346,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.0.0"; - sha256 = "1xbf22cnvhjs59wqml0n5flk1fhrhjw3flm3lnhh1nik3scfny0w"; - revision = "1"; - editedCabalFile = "0y21azb1cvaxwlypprh3wqxr0w0hchf3r509vqxvywqymckqc71i"; + version = "2.13.0.3"; + sha256 = "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -199040,41 +199365,10 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; "persistent-template" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, deepseq-generics, file-embed, hspec, http-api-data - , monad-control, monad-logger, path-pieces, persistent, QuickCheck - , template-haskell, text, th-lift-instances, transformers - , unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.9.1.0"; - sha256 = "19ilgz8r6p5wy111rb4v0d6cnrj8jfiv2pnzdynpxd9ay66vgbca"; - revision = "2"; - editedCabalFile = "1lyrnh2lskkbvpjhbjiyh2ibndldsr8zgaiws7n37pa3vnmfx0qw"; - libraryHaskellDepends = [ - aeson base bytestring containers http-api-data monad-control - monad-logger path-pieces persistent template-haskell text - th-lift-instances transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text - ]; - benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics file-embed persistent - template-haskell text - ]; - description = "Type-safe, non-relational, multi-backend persistence"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_12_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "persistent-template"; @@ -199084,7 +199378,6 @@ self: { doHaddock = false; description = "Type-safe, non-relational, multi-backend persistence"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -199094,8 +199387,8 @@ self: { }: mkDerivation { pname = "persistent-template-classy"; - version = "0.1.0.1"; - sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a"; + version = "0.2.0"; + sha256 = "0grfr7bb0c9m4fhg27g4qch43mgjqfrzw2c0gi0arq5ibm3n17kk"; libraryHaskellDepends = [ base lens persistent persistent-sqlite persistent-template template-haskell text @@ -199111,29 +199404,6 @@ self: { }) {}; "persistent-test" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit - , containers, exceptions, hspec, hspec-expectations, HUnit - , monad-control, monad-logger, mtl, path-pieces, persistent - , persistent-template, QuickCheck, quickcheck-instances, random - , resourcet, text, time, transformers, transformers-base, unliftio - , unliftio-core, unordered-containers - }: - mkDerivation { - pname = "persistent-test"; - version = "2.0.3.5"; - sha256 = "16m3nlmpwxibfhgrfl3xqh3a518bkrd7qaa8hklfq2qwlvjbb31v"; - libraryHaskellDepends = [ - aeson base blaze-html bytestring conduit containers exceptions - hspec hspec-expectations HUnit monad-control monad-logger mtl - path-pieces persistent persistent-template QuickCheck - quickcheck-instances random resourcet text time transformers - transformers-base unliftio unliftio-core unordered-containers - ]; - description = "Tests for Persistent"; - license = lib.licenses.mit; - }) {}; - - "persistent-test_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit , containers, exceptions, hspec, hspec-expectations, http-api-data , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent @@ -199143,10 +199413,8 @@ self: { }: mkDerivation { pname = "persistent-test"; - version = "2.13.0.0"; - sha256 = "1fyahnnx9f3dg36kqviah5l9410d0x819dz3afxapcq27myccdw7"; - revision = "1"; - editedCabalFile = "16yzpsy11bcglipgcy0x8mcxlx7w00gfvnw5fhjkbj99lxdwwgm0"; + version = "2.13.0.3"; + sha256 = "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions hspec hspec-expectations http-api-data HUnit monad-control @@ -199156,43 +199424,18 @@ self: { ]; description = "Tests for Persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-typed-db" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec - , http-api-data, monad-logger, path-pieces, persistent - , persistent-template, resource-pool, resourcet, template-haskell - , text, transformers + , hspec-discover, http-api-data, monad-logger, path-pieces + , persistent, resource-pool, resourcet, template-haskell, text + , transformers }: mkDerivation { pname = "persistent-typed-db"; - version = "0.1.0.2"; - sha256 = "1pdhdb29b7gyaw3kh1vr76dyr7gvwpx9ymib17fzfsxks6s76dxc"; - libraryHaskellDepends = [ - aeson base bytestring conduit http-api-data monad-logger - path-pieces persistent persistent-template resource-pool resourcet - template-haskell text transformers - ]; - testHaskellDepends = [ - aeson base bytestring conduit esqueleto hspec http-api-data - monad-logger path-pieces persistent persistent-template - resource-pool resourcet template-haskell text transformers - ]; - description = "Type safe access to multiple database schemata"; - license = lib.licenses.bsd3; - }) {}; - - "persistent-typed-db_0_1_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec - , http-api-data, monad-logger, path-pieces, persistent - , persistent-template, resource-pool, resourcet, template-haskell - , text, transformers - }: - mkDerivation { - pname = "persistent-typed-db"; - version = "0.1.0.3"; - sha256 = "15x4qfk4bwafqa495y8dsywa5mrcfnmqm7pyn419p20yngnyhzn8"; + version = "0.1.0.4"; + sha256 = "1dd5kig6zkiq5qkqv63icz9z8mn0b56b06w6z980hi7a2bmp6pk8"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent resource-pool resourcet template-haskell @@ -199200,12 +199443,12 @@ self: { ]; testHaskellDepends = [ aeson base bytestring conduit esqueleto hspec http-api-data - monad-logger path-pieces persistent persistent-template - resource-pool resourcet template-haskell text transformers + monad-logger path-pieces persistent resource-pool resourcet + template-haskell text transformers ]; + testToolDepends = [ hspec-discover ]; description = "Type safe access to multiple database schemata"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-vector" = callPackage @@ -199953,8 +200196,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.6.2.0"; - sha256 = "1vzx21pp9hkksbw5vpl8rarxpnbhmj04xys3qx0xk0zqf2p1f86q"; + version = "0.6.3.0"; + sha256 = "1hc1wmq2syvi0xsbkrm52hd5k8j2kk80n45695zd85fqwbayhj2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200059,8 +200302,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.4.1.0"; - sha256 = "02z7c3ngcj4dz473j0ha05qh5wviiy4qp1mk3p4gidxrhkgbxhyc"; + version = "0.4.2.0"; + sha256 = "02lv4w9v8jf7v6dkrwwmy79h7yphmk37n54r9whii6kicns80ff2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200120,8 +200363,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.1.1.0"; - sha256 = "04b65k6jjrlfx93m7625f991vll136y0lbh82f9qgxlmwv1vwmm8"; + version = "0.2.1.0"; + sha256 = "0bz5lyl75i143crva3piz4005k81ia26rj455cgbgz3yknj3qpaf"; libraryHaskellDepends = [ base heaps mmsyn2-array parallel phonetic-languages-constraints-array @@ -200142,8 +200385,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.1.1.0"; - sha256 = "0yhpw7bpfag5d6cbm385dy5jxll2vn8104ypqngdv0qlxqx25m9l"; + version = "0.1.2.0"; + sha256 = "1k65ynaz2mh35nqsf3izqq0lxqbkyj24i1g3r3gbfpbkajdhqz0v"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics subG ]; @@ -200158,8 +200401,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.1.1.0"; - sha256 = "04jg2b2qzm3yhbckbpn7zarfdy921lryx8d5r3cx9vcp55xvain0"; + version = "0.1.2.0"; + sha256 = "1vlzgcq8pv22m9pxwx0p1xss9zzlvwap11gn88pdgn0zgkhcsm0b"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -200839,8 +201082,8 @@ self: { }: mkDerivation { pname = "pinch-gen"; - version = "0.4.1.0"; - sha256 = "11sk0lmzsxw0k8i8airpv7p461z25n6y2fygx0l7gv0zadaici2v"; + version = "0.4.2.0"; + sha256 = "0saacr8q2varfqcq386dk9k04caijm90yi106wyl88pn3f5piaq3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203045,8 +203288,8 @@ self: { }: mkDerivation { pname = "ploterific"; - version = "0.2.0.0"; - sha256 = "1x49b7js161bhdr8v631qr1r4cjnxg9kdvnlc55b5g5kajwf714w"; + version = "0.2.1.1"; + sha256 = "1i5rgbnvi7s5rq13kj4fnanzmalzh53rim0r3nxxa82i25nb1sfq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206565,6 +206808,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "powerdns" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, http-client, servant + , servant-client, servant-client-core, tasty, tasty-hunit, text + , time + }: + mkDerivation { + pname = "powerdns"; + version = "0.1"; + sha256 = "1fg698m3qmm5f0g0fl394hx593pwg7ai730imwahv00fr846lqm1"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + deepseq servant servant-client servant-client-core text time + ]; + testHaskellDepends = [ + base http-client servant-client servant-client-core tasty + tasty-hunit + ]; + description = "PowerDNS API bindings for api/v1"; + license = lib.licenses.bsd3; + }) {}; + "powermate" = callPackage ({ mkDerivation, base, directory, unix }: mkDerivation { @@ -209094,8 +209359,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.5.1"; - sha256 = "0mq2fal93v42rkgiq0xwqzqc413dgkiawa09bxgv0sgajzslqx80"; + version = "0.4.6.0"; + sha256 = "0jkrx34hymx70aqxjcnw2a7pdiw1hy4nc6m2larjrgxjczshpfqx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -210516,8 +210781,8 @@ self: { }: mkDerivation { pname = "proton"; - version = "0.0.3"; - sha256 = "0w68v8sglyg99jni1p1cz6x87cm6x1ayll08wlijaiwpqc2pma2n"; + version = "0.0.4"; + sha256 = "1z8w3ymn893jgzanxp89x6kga9d79kggvcgkm9mhwd9q88h97v91"; libraryHaskellDepends = [ adjunctions async base bifunctors comonad compactable containers contravariant distributive folds linear mtl profunctors tagged @@ -210588,8 +210853,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.1.0"; - sha256 = "020kfw1laishiqy8npg2f2llq7dv1djii0d0khjfw7f1scy4x10n"; + version = "0.1.2.0"; + sha256 = "0irhlscjq3anfhzn2qs28w4k6z48p557a060iqpimjw2kjkyrr4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210976,8 +211241,10 @@ self: { }: mkDerivation { pname = "publish"; - version = "2.1.6"; - sha256 = "1clb9sxrsskklzany9q5600v77qywdszgzxjxrvsihrirf0akry2"; + version = "2.2.2"; + sha256 = "19bvdldggklzq6wqgcbvnf4jjlbdbh1l80dm92aj0405a9rhsa28"; + revision = "2"; + editedCabalFile = "19ajwrsd1l9p4cm9ckii5i6nb5w28sxl7kr129xz8kwkpj4z6lfq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -214212,29 +214479,35 @@ self: { }) {}; "raaz" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, criterion + ({ mkDerivation, attoparsec, base, bytestring , criterion-measurement, deepseq, hspec, hspec-discover, HUnit - , optparse-applicative, pretty, QuickCheck, transformers, vector + , optparse-applicative, pretty, QuickCheck, vector }: mkDerivation { pname = "raaz"; - version = "0.2.2"; - sha256 = "1v7zyk61vk4d6xniqq4fglwccgpx9clx7hxp1xr531spshadq99p"; + version = "0.3.0"; + sha256 = "0a322ji29s537kz1mazbl7grbg0s1wkz2cxg74zlvqa47xbk20k1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring deepseq vector ]; - executableHaskellDepends = [ base optparse-applicative ]; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring criterion-measurement deepseq hspec HUnit pretty + QuickCheck vector + ]; + executableHaskellDepends = [ + base bytestring deepseq optparse-applicative vector + ]; testHaskellDepends = [ - base bytestring hspec hspec-discover HUnit QuickCheck transformers - vector + attoparsec base bytestring deepseq hspec hspec-discover HUnit + QuickCheck vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion criterion-measurement - pretty + base bytestring criterion-measurement deepseq pretty vector ]; - description = "The raaz cryptographic library"; - license = lib.licenses.bsd3; + doHaddock = false; + description = "Fast and type safe cryptography"; + license = "(Apache-2.0 OR BSD-3-Clause)"; }) {}; "rabocsv2qif" = callPackage @@ -216961,7 +217234,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_12_0_1" = callPackage + "rebase_1_13" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, hashable, hashable-time , mtl, profunctors, scientific, selective, semigroupoids, stm, text @@ -216970,8 +217243,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.12.0.1"; - sha256 = "1yl09702psialskvm39i9rl3sag853qr1237jhs79yk7nhvdlaqx"; + version = "1.13"; + sha256 = "0cqpp2cn3yi9d825qzavs52ky77b628fm8p7w51zy9qjx1p7650v"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either hashable hashable-time mtl profunctors scientific @@ -217060,8 +217333,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.10"; - sha256 = "1zwkc5mqcxlv4cm7qd75sdmvjckvpchcrqphsq82val41mp27nk5"; + version = "0.2.11"; + sha256 = "1hsk7n8hrskj30wcil4rvjhng3zcj7f9a0dn69371iay4x8d75md"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -218075,6 +218348,22 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "reflex-dom-ace" = callPackage + ({ mkDerivation, base, containers, data-default, ghcjs-dom, jsaddle + , lens, mtl, reflex-dom-core, text + }: + mkDerivation { + pname = "reflex-dom-ace"; + version = "0.3.0.3"; + sha256 = "024xwgqasf2sciz0paq7p1ry1njcz46pz2l1cyjxm562hjqvsb0h"; + libraryHaskellDepends = [ + base containers data-default ghcjs-dom jsaddle lens mtl + reflex-dom-core text + ]; + description = "Basic support for using the Ace editor with Reflex"; + license = lib.licenses.bsd3; + }) {}; + "reflex-dom-colonnade" = callPackage ({ mkDerivation, base, colonnade, containers, contravariant, reflex , reflex-dom, semigroups, text, vector @@ -221270,12 +221559,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_12_0_1" = callPackage + "rerebase_1_13" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.12.0.1"; - sha256 = "0kh0022hfviywa4rkwnrqygc7s3vg8qvr9znh66v5c1i3gaibzq5"; + version = "1.13"; + sha256 = "1ng16dnlrxcy76mpw21mwf2sk70q4i0kmqhxikjhc2h06zdpkqfr"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -223788,15 +224077,16 @@ self: { "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit - , lifted-base, monad-control, network, resourcet, text, vector + , lifted-base, monad-control, network, network-bsd, resourcet, text + , vector }: mkDerivation { pname = "rollbar"; - version = "1.1.2"; - sha256 = "1ip4bsnav2bwbbasz0mmfkq7cvi72jfdbz00r1ql4kpgwwkdhysz"; + version = "1.1.3"; + sha256 = "0mj8s2kfv8fw8mpb3xz8fvlyvdx46nsh1waw7jvw4cxphywfq9b8"; libraryHaskellDepends = [ aeson base basic-prelude http-conduit lifted-base monad-control - network resourcet text vector + network network-bsd resourcet text vector ]; description = "error tracking through rollbar.com"; license = lib.licenses.mit; @@ -224595,8 +224885,8 @@ self: { }: mkDerivation { pname = "rp-tree"; - version = "0.3.5"; - sha256 = "06av43wbyy68flcfdbz20dd3vmh4na44mh041z7h7rh6hzilzr1j"; + version = "0.3.6"; + sha256 = "0dz2xkgmk3lfr0pnc7xzfz756bzdkbmb2m96zdpw7vgyz59h9i64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224697,8 +224987,10 @@ self: { }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.4"; - sha256 = "17zqnjn6zib0rvzj8gzpaj87b79v8fx5qlc6ifidi6rmykjqnx42"; + version = "0.4.5"; + sha256 = "1lz6w2nd8yq0arfpp6vnv7lazr9289wan00b6layfdhlql9f21vl"; + revision = "1"; + editedCabalFile = "05arkmpbh5fdqbqhkwl76isbigrsc0f54zkbdl21jap6k4g9kzsk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224709,7 +225001,7 @@ self: { base directory extra fgl optparse-applicative simple-cmd-args ]; testHaskellDepends = [ base extra hspec simple-cmd unix ]; - description = "Order RPM packages by dependencies"; + description = "Sort RPM packages in dependency order"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -225491,6 +225783,90 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, text, validity + , validity-bytestring, validity-text + }: + mkDerivation { + pname = "safe-coloured-text"; + version = "0.1.0.0"; + sha256 = "1fcqwllpbp9x1r1bvyry6bmp2s9rp8rlr3i94hdiydc71hpl7a0w"; + libraryHaskellDepends = [ + base bytestring text validity validity-bytestring validity-text + ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "safe-coloured-text-gen" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-bytestring + , genvalidity-sydtest, genvalidity-text, safe-coloured-text + , sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "safe-coloured-text-gen"; + version = "0.0.0.0"; + sha256 = "1z5livjv0n1i05i3fi58hi7vqwvycapnr5rp1m8rpgj8lhsbi9qx"; + libraryHaskellDepends = [ + base genvalidity genvalidity-bytestring genvalidity-text + safe-coloured-text + ]; + testHaskellDepends = [ + base genvalidity-sydtest safe-coloured-text sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + }) {}; + + "safe-coloured-text-layout" = callPackage + ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest + , sydtest-discover, text, validity + }: + mkDerivation { + pname = "safe-coloured-text-layout"; + version = "0.0.0.0"; + sha256 = "11fbfqs96dlhyywkmy97b2fsws0fdsv3illdd61w3fckbxbdw6bw"; + libraryHaskellDepends = [ base safe-coloured-text text validity ]; + testHaskellDepends = [ + base bytestring safe-coloured-text sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + description = "Safely layout output coloured text"; + license = lib.licenses.mit; + }) {}; + + "safe-coloured-text-layout-gen" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest + , safe-coloured-text, safe-coloured-text-gen + , safe-coloured-text-layout, sydtest, sydtest-discover + }: + mkDerivation { + pname = "safe-coloured-text-layout-gen"; + version = "0.0.0.0"; + sha256 = "1v4in8zl689j47jwac0z1k3rnnsc54qdclrbzja9aa364bmczzv8"; + libraryHaskellDepends = [ + base genvalidity safe-coloured-text-gen safe-coloured-text-layout + ]; + testHaskellDepends = [ + base genvalidity-sydtest safe-coloured-text safe-coloured-text-gen + safe-coloured-text-layout sydtest + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + }) {}; + + "safe-coloured-text-terminfo" = callPackage + ({ mkDerivation, base, safe-coloured-text, terminfo }: + mkDerivation { + pname = "safe-coloured-text-terminfo"; + version = "0.0.0.0"; + sha256 = "0f94zzmanmxplkcg1s954rq00ppv69icyjpzr5s0g6c14zp1k85b"; + libraryHaskellDepends = [ base safe-coloured-text terminfo ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + }) {}; + "safe-decimal" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest , exceptions, hspec, hspec-discover, QuickCheck, scientific @@ -225834,6 +226210,18 @@ self: { license = lib.licenses.mit; }) {}; + "safe-wild-cards" = callPackage + ({ mkDerivation, base, template-haskell, th-abstraction }: + mkDerivation { + pname = "safe-wild-cards"; + version = "1.0.0"; + sha256 = "1cgs7v30jamk2i8xbis7gc5n0f3c9rykxq7s81mxafyyj33ac36d"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + testHaskellDepends = [ base ]; + description = "Use RecordWildCards safely"; + license = lib.licenses.bsd3; + }) {}; + "safecopy" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , generic-data, HUnit, lens, lens-action, old-time, QuickCheck @@ -226194,6 +226582,32 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsodium;}; + "saltine_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , libsodium, profunctors, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "saltine"; + version = "0.2.0.0"; + sha256 = "1xgrnm6qmm0mymq3dh4mdvzi8sfssnpz06xsrw8zdpa1vl0a0gm6"; + libraryHaskellDepends = [ + base bytestring deepseq hashable profunctors text + ]; + libraryPkgconfigDepends = [ libsodium ]; + testHaskellDepends = [ + base bytestring QuickCheck semigroups test-framework + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + benchmarkSystemDepends = [ libsodium ]; + description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libsodium;}; + "saltine-quickcheck" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex , libsodium, QuickCheck, saltine, tasty, tasty-quickcheck @@ -226550,6 +226964,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_1_0_7" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, directory, exceptions, filepath + , free, haskell-src-exts, lens, lifted-async, microlens + , microlens-th, monad-control, monad-logger, mtl + , optparse-applicative, pretty-show, process, safe, safe-exceptions + , stm, string-interpolate, template-haskell, text, time + , transformers, transformers-base, unix, unliftio-core, vector, vty + }: + mkDerivation { + pname = "sandwich"; + version = "0.1.0.7"; + sha256 = "1ndw054vp2ygxd86whqbsdvrbv49khh1a6ia9zlqzx3gjbhqpxxi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-quickcheck" = callPackage ({ mkDerivation, base, brick, free, monad-control, QuickCheck , safe-exceptions, sandwich, string-interpolate, text, time @@ -226643,6 +227101,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich-webdriver_0_1_0_5" = callPackage + ({ mkDerivation, aeson, base, containers, convertible, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-conduit, lifted-base, microlens, microlens-aeson + , monad-control, monad-logger, mtl, network, process, random, retry + , safe, safe-exceptions, sandwich, string-interpolate, temporary + , text, time, transformers, unix, unordered-containers, vector + , webdriver, X11 + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.1.0.5"; + sha256 = "113as1i4f3hghbwrf4ii8lnxxb8nih177ffjbx3shsddnhx0fa8y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + executableHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + testHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -226990,8 +227492,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "8.14"; - sha256 = "1yf350daksxwz084j81ngamr53jpz7y2fi4cnpni6vy16mb0sxz1"; + version = "8.15"; + sha256 = "11qzh2gfq9v8cxz6jjbipnfiwjs0hw34ghg5gdpr0h7bj77in30p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -227818,20 +228320,20 @@ self: { "scientific" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , deepseq, hashable, integer-gmp, integer-logarithms, primitive - , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, template-haskell, text }: mkDerivation { pname = "scientific"; - version = "0.3.6.2"; - sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397"; + version = "0.3.7.0"; + sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp - integer-logarithms primitive text + integer-logarithms primitive template-haskell text ]; testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text + base binary bytestring QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck text ]; benchmarkHaskellDepends = [ base criterion ]; description = "Numbers represented using scientific notation"; @@ -230261,13 +230763,13 @@ self: { , cassava, containers, data-default, directory, doctest , doctest-discover, file-embed, filepath, hlint, hspec , hspec-discover, html-charset, http-client, http-types - , optparse-applicative, QuickCheck, temporary, text, text-trie - , unicode-show, wai, warp, zip + , interpolatedstring-perl6, optparse-applicative, QuickCheck + , random, temporary, text, text-trie, unicode-show, wai, warp, zip }: mkDerivation { pname = "seonbi"; - version = "0.1.1"; - sha256 = "1jsikmlr647c51zmd471wnff6wzxybmp7bvidvyx5fkzb3nlhrqb"; + version = "0.2.0"; + sha256 = "1bj428ds0lw6vg0927mn9ss63zrrzfi9jn7fy1hpr583vywc8pba"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -230284,8 +230786,9 @@ self: { optparse-applicative text wai warp ]; testHaskellDepends = [ - aeson base bytestring containers doctest doctest-discover hlint - hspec hspec-discover QuickCheck text unicode-show + aeson base bytestring containers directory doctest doctest-discover + filepath hlint hspec hspec-discover interpolatedstring-perl6 + QuickCheck random text unicode-show ]; testToolDepends = [ hspec-discover ]; description = "SmartyPants for Korean language"; @@ -231153,8 +231656,8 @@ self: { }: mkDerivation { pname = "servant-auth-wordpress"; - version = "1.0.0.1"; - sha256 = "08ngbgmzksp27n8znigrj5i2nvsqjansn4vv3my38vdqqgzm09w8"; + version = "1.0.0.2"; + sha256 = "0j4n5anlw3a2cgclmyblg01dcls91hzlmxgc2jkcdpwd49i0pv5n"; libraryHaskellDepends = [ base mtl servant-server text time wai wordpress-auth ]; @@ -237457,12 +237960,12 @@ self: { , hspec, hspec-core, HUnit, ini, iso8601-time, memory, mtl, network , network-transport, optparse-applicative, QuickCheck, random , simple-logger, sqlite-simple, stm, template-haskell, text, time - , timeit, transformers, unliftio, unliftio-core, x509 + , timeit, transformers, unliftio, unliftio-core, websockets, x509 }: mkDerivation { pname = "simplexmq"; - version = "0.3.1"; - sha256 = "0rc443nq4m1ghi5wbsaj6ravqs488lb2si0xmisg9h5ghsh204bf"; + version = "0.3.2"; + sha256 = "1bxg91ycmpa8762v5vdviqvyzkfap4iv9plnr7gcibf8vsd39qxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237470,7 +237973,8 @@ self: { base64-bytestring bytestring containers cryptonite directory filepath generic-random iso8601-time memory mtl network network-transport QuickCheck random simple-logger sqlite-simple stm - template-haskell text time transformers unliftio unliftio-core x509 + template-haskell text time transformers unliftio unliftio-core + websockets x509 ]; executableHaskellDepends = [ ansi-terminal asn1-encoding asn1-types async attoparsec base @@ -237478,7 +237982,7 @@ self: { directory filepath generic-random ini iso8601-time memory mtl network network-transport optparse-applicative QuickCheck random simple-logger sqlite-simple stm template-haskell text time - transformers unliftio unliftio-core x509 + transformers unliftio unliftio-core websockets x509 ]; testHaskellDepends = [ ansi-terminal asn1-encoding asn1-types async attoparsec base @@ -237486,7 +237990,7 @@ self: { filepath generic-random hspec hspec-core HUnit iso8601-time memory mtl network network-transport QuickCheck random simple-logger sqlite-simple stm template-haskell text time timeit transformers - unliftio unliftio-core x509 + unliftio unliftio-core websockets x509 ]; description = "SimpleXMQ message broker"; license = lib.licenses.agpl3Only; @@ -237574,15 +238078,15 @@ self: { }) {inherit (pkgs.xorg) libXft;}; "single-tuple" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, OneTuple, Only }: + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, OneTuple + , Only + }: mkDerivation { pname = "single-tuple"; - version = "0.1.1.0"; - sha256 = "1cviix5did4pm4bimg12v2qa9ms5icf19k3iz13g07d5q9jyiwji"; - revision = "1"; - editedCabalFile = "0gmki1bz7sn1lw5f1f1zp3rfphwba03fv6825djlidybln8snld0"; - libraryHaskellDepends = [ base OneTuple Only ]; - testHaskellDepends = [ base hspec OneTuple Only ]; + version = "0.1.2.0"; + sha256 = "1dxrdddfdvs69icv6ixjv5crfznllxvg8sjiw9xwyn26f36g2mw8"; + libraryHaskellDepends = [ base ghc-prim OneTuple Only ]; + testHaskellDepends = [ base ghc-prim hspec OneTuple Only ]; testToolDepends = [ hspec-discover ]; description = "a class for single tuple implementations"; license = lib.licenses.asl20; @@ -238650,8 +239154,8 @@ self: { }: mkDerivation { pname = "slave-thread"; - version = "1.1"; - sha256 = "02b64s0m7k81s187wj81yzr7l73p79iyh7a59dqf7r72l4r7akbd"; + version = "1.1.0.1"; + sha256 = "05hz0qglxg889l3b0sw9f79xqssw70fd62a766xcvj7aalmrc32i"; libraryHaskellDepends = [ base deferred-folds focus foldl stm-containers ]; @@ -242883,6 +243387,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "speculate_0_4_8" = callPackage + ({ mkDerivation, base, cmdargs, containers, express, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.4.8"; + sha256 = "1xrrd1r4sbhvahdd3k9xnh8w9mmk4zh738q9blrjnvnd560wybp4"; + libraryHaskellDepends = [ + base cmdargs containers express leancheck + ]; + testHaskellDepends = [ base express leancheck ]; + benchmarkHaskellDepends = [ base express leancheck ]; + description = "discovery of properties about Haskell functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -243347,8 +243867,8 @@ self: { }: mkDerivation { pname = "splitmix-distributions"; - version = "0.8.0.0"; - sha256 = "1l7fh6nycsxy15m2w60pq6zp4iq811wzbklkyrc7z3wlghskqrmk"; + version = "0.9.0.0"; + sha256 = "0y6v93kgbldkf9pznrfy8848njy7cln7bd3nrx2b7dmrz6yd4rpz"; libraryHaskellDepends = [ base containers erf exceptions mtl splitmix transformers ]; @@ -244345,8 +244865,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.2.0.0"; - sha256 = "1qxns33mmr1nxw6gabi5s1i70ksp0ls54q7cf95fy7vs1nwngz0n"; + version = "0.2.1.0"; + sha256 = "1dv4333an20mlhmsxhaldjcj54pnkjvp7zpiasd6shii5d4cn0z1"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; @@ -245675,6 +246195,8 @@ self: { pname = "statestack"; version = "0.3"; sha256 = "1b8yd314h8a97ggjv82cy4mr0f4scb5pjvslxq7hwxxq7cw7mgns"; + revision = "1"; + editedCabalFile = "03kk2zab7mcr5m89mxxl0zivag2hb024ijfdi0mp794hswncwhxy"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -246476,14 +246998,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_0_0" = callPackage + "stm_2_5_0_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.0.0"; - sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr"; - revision = "1"; - editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62"; + version = "2.5.0.1"; + sha256 = "1fipf3bbk34mbld1apwnq6kbjxbrz2nc9cxxmhkk2bdcc2z4y7j5"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -248156,6 +248676,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "streamt" = callPackage + ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty + , tasty-hunit + }: + mkDerivation { + pname = "streamt"; + version = "0.5.0.0"; + sha256 = "0r2r6ribk85hwmzdn2imgajb28q5d5gbhysr62bw2jhmd5xy7985"; + libraryHaskellDepends = [ base logict mtl ]; + testHaskellDepends = [ + async base criterion hspec mtl tasty tasty-hunit + ]; + description = "Simple, Fair and Terminating Backtracking Monad Transformer"; + license = lib.licenses.bsd3; + }) {}; + "strelka" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude , base64-bytestring, bifunctors, bytestring @@ -248615,8 +249151,8 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.1.0"; - sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d"; + version = "0.3.1.1"; + sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -253003,8 +253539,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "3.2.4"; - sha256 = "1hv0s9kp0ixha9qjgrp1l52w48z68ngk17a0c6364qc95qsd2ycp"; + version = "3.2.5"; + sha256 = "1gfdlqgdqq2ivvzj7cgqahpm2bmwg90ri5ss7ah38alrp5rvda1v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -253610,6 +254146,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "talash" = callPackage + ({ mkDerivation, alfred-margaret, base, brick, bytestring + , colorful-monoids, containers, directory, ghc-compact, intro + , microlens, microlens-th, text, unix, unordered-containers, vector + , vector-algorithms, vector-sized, vty + }: + mkDerivation { + pname = "talash"; + version = "0.1.0.1"; + sha256 = "1j28i5aipldjknfx22dil0xi1gwlv89frl1fn606yl1g84q1kr5n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alfred-margaret base brick bytestring colorful-monoids containers + directory ghc-compact intro microlens microlens-th text unix + unordered-containers vector vector-algorithms vector-sized vty + ]; + executableHaskellDepends = [ base ]; + description = "Line oriented fast enough text search"; + license = lib.licenses.gpl3Only; + }) {}; + "tamarin-prover" = callPackage ({ mkDerivation, aeson, array, base, binary, blaze-builder , blaze-html, bytestring, cmdargs, conduit, containers, deepseq @@ -254386,14 +254944,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tasty-hspec_1_1_7" = callPackage + "tasty-hspec_1_2" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.7"; - sha256 = "05738x9hvnwqlp91x2da3b3fpn84hbsha7850xphnh2bpbx3lbx1"; + version = "1.2"; + sha256 = "0hnq6q4mk2avirb8cgibaxj5m2c4rf5xsqry04zx4nc15la5xniw"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -257740,8 +258298,8 @@ self: { }: mkDerivation { pname = "text-icu"; - version = "0.7.0.1"; - sha256 = "0y3z5jda7v2iyll2148ivxfd2yhp27d3ryxrspp0cdq394klqxp2"; + version = "0.7.1.0"; + sha256 = "0s9gcd9lcrhk92ydhizyk0vbpf542ipc4hj60fa02b2g2x9q93ij"; libraryHaskellDepends = [ base bytestring deepseq text ]; librarySystemDepends = [ icu ]; testHaskellDepends = [ @@ -258120,12 +258678,14 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.0.0.6"; - sha256 = "05hr2185q4rcn1hvrrkqy2sbl8xzk7ij00x61vhvmyk29dbbk2cf"; + version = "0.1"; + sha256 = "0jzqq709r4jpbvgkix9ybi6asvhshl0ayz5a4gddrccli5k430n6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base optparse-applicative parsec ]; + libraryHaskellDepends = [ base containers text ]; + executableHaskellDepends = [ + base optparse-applicative parsec text + ]; testHaskellDepends = [ base hedgehog neat-interpolation text ]; description = "Simple text replacements from a list of search/replace pairs"; license = lib.licenses.asl20; @@ -259865,8 +260425,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "5"; - editedCabalFile = "1fdy2wyczl2jncy9gg0asasb8bybcnif8aqnw9fq73sr1778kjpf"; + revision = "6"; + editedCabalFile = "12mqlm77g0fymx3xwlkf6s9nqivcf78szhrzkvssi7lq1lqq9lbc"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; description = "Convert textual types through Text without needing O(n^2) instances"; license = lib.licenses.bsd3; @@ -260379,6 +260939,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "time-compat_1_9_6" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, hashable + , HUnit, QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck + , time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.6"; + sha256 = "0k466nyn7v8g3lx0gjfq6hzs4gmm4ws2wcm7xqyw48fmn55pb5rx"; + libraryHaskellDepends = [ + base base-orphans deepseq hashable time + ]; + testHaskellDepends = [ + base base-compat deepseq hashable HUnit QuickCheck tagged tasty + tasty-hunit tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -262654,6 +263235,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "tophat" = callPackage + ({ mkDerivation, base, filepath, hspec, profunctors, text }: + mkDerivation { + pname = "tophat"; + version = "1.0.0.0"; + sha256 = "0zwhik8x2z1kbyv873kvdbnzyyg4f6qky1gw03icarxan9553s7m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base profunctors text ]; + executableHaskellDepends = [ base filepath text ]; + testHaskellDepends = [ base hspec profunctors text ]; + description = "Template-to-Haskell preprocessor, and templating language"; + license = lib.licenses.gpl3Only; + }) {}; + "topkata" = callPackage ({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL , OpenGL, parseargs, random @@ -267281,6 +267877,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "typed-time" = callPackage + ({ mkDerivation, base, hspec, hspec-core, time }: + mkDerivation { + pname = "typed-time"; + version = "0.1.0.0"; + sha256 = "0fk8zb198i5xfwrc820br8hh1nfcqcrzyzkyf0srijjf88m92y27"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base hspec hspec-core time ]; + description = "A strongly typed way to handle time and date formats"; + license = lib.licenses.isc; + }) {}; + "typed-uuid" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable , http-api-data, random, text, uuid, validity, validity-uuid @@ -268999,17 +269607,17 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, containers, data-default, hspec + ({ mkDerivation, base, containers, data-default, hashable, hspec , hspec-discover, QuickCheck, text }: mkDerivation { pname = "unicode-tricks"; - version = "0.9.1.0"; - sha256 = "1jqljawh6xvavp9g8mjlw4pkiagd59yybbizr9vcg70dd8pnanv2"; + version = "0.10.1.0"; + sha256 = "0f9giqhd4jjqdd0wcbrrd8f01bhqv25m13ss3f1jfaaacaiylpam"; libraryHaskellDepends = [ - base containers data-default QuickCheck text + base containers data-default hashable QuickCheck text ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base hashable hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; license = lib.licenses.bsd3; @@ -270144,8 +270752,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.16"; - sha256 = "1zawfyjr8immg5sqvwknwqp3xym0acjhlqm0y6xs63wjvp72wb3r"; + version = "0.2.17"; + sha256 = "1z37bqnrzhqhg7dfmsqz31lq8ng3qnkknc9d4pxbjbbmf1g21hfv"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -270162,6 +270770,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_18" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.18"; + sha256 = "0yg5x2v3p4pdw7892l1mkihmdbak14qvmni1vk2a0y2gdmxfvx1y"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -270300,8 +270934,8 @@ self: { }: mkDerivation { pname = "unordered-containers"; - version = "0.2.13.0"; - sha256 = "0mbvld5dym17jc13ycl862k73kg26y9khb8578w13cwfmdli7c46"; + version = "0.2.14.0"; + sha256 = "0rw8kmg7xjlacmr1hcpin95abkd387awf154s9ran7zg9jllh3x1"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck random @@ -270576,6 +271210,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "unsatisfiable" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "unsatisfiable"; + version = "0"; + sha256 = "0cvlqrrr31dn2agd7cz2s5gnf2m1yy21kwmymcpdg5zk34dc19wh"; + libraryHaskellDepends = [ base ghc ]; + description = "Unsatisfiable type class"; + license = lib.licenses.bsd3; + }) {}; + "unscramble" = callPackage ({ mkDerivation, array, base, optparse-applicative, stream-fusion , unordered-containers @@ -270740,8 +271385,8 @@ self: { }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.2.5"; - sha256 = "0lga69cnzysayvsflbcf43i7ncnib9mq62azi30kpm860s0h5lfb"; + version = "0.2.7"; + sha256 = "0knwn11c3kdh1xbpa8l6kgskis9fcsjr06hxay3rl4yiqprf80xn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274476,8 +275121,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.13.2"; - sha256 = "1ymrh8ra54a2x3kmw87gfcrv413rbr4msy0ppppi6lh2lvq5zk09"; + version = "0.13.3"; + sha256 = "0mlk94n3s4ah8y9w9vcrk1n7gnsm19d1iijk9da4219dwrkaax2l"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ aeson base hspec lens lens-aeson microlens mtl should-not-typecheck @@ -277471,30 +278116,30 @@ self: { ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , http2, HUnit, iproute, network, process, QuickCheck , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, vault, wai, word8, x509 + , unix, unix-compat, unliftio, vault, wai, word8, x509 }: mkDerivation { pname = "warp"; - version = "3.3.15"; - sha256 = "0nj4xxzjcy33hyfdagpc2ij6ga71r1fmc248rjgwsyfflial63bz"; + version = "3.3.16"; + sha256 = "1qnngw7afh448hv7fzp4l36j7hz6f8a8f1qga976j8l53qhmgcf1"; libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - time-manager unix unix-compat vault wai word8 x509 + array auto-update base bsb-http-chunked bytestring case-insensitive + containers ghc-prim hashable http-date http-types http2 iproute + network simple-sendfile stm streaming-commons text time-manager + unix unix-compat unliftio vault wai word8 x509 ]; testHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute lifted-base - network process QuickCheck simple-sendfile stm streaming-commons - text time time-manager unix unix-compat vault wai word8 x509 + http-client http-date http-types http2 HUnit iproute network + process QuickCheck simple-sendfile stm streaming-commons text time + time-manager unix unix-compat unliftio vault wai word8 x509 ]; benchmarkHaskellDepends = [ auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat x509 + http-types network time-manager unix unix-compat unliftio x509 ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; @@ -277574,15 +278219,16 @@ self: { "warp-tls" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, wai, warp + , network, streaming-commons, tls, tls-session-manager, unliftio + , wai, warp }: mkDerivation { pname = "warp-tls"; - version = "3.3.0"; - sha256 = "03fwwggl6lhxs7swwylgpk9j8g5szq2h871nfbgs6xzr1b5hpas1"; + version = "3.3.1"; + sha256 = "1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager wai warp + streaming-commons tls tls-session-manager unliftio wai warp ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; @@ -279920,18 +280566,18 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec + ({ mkDerivation, base, bytestring, containers, HUnit , template-haskell, text, time }: mkDerivation { pname = "witch"; - version = "0.3.1.0"; - sha256 = "1jk0p1w5a3nr12nn6afwagpgkv1i6pyn83idkbps6kq3kb3l15w4"; + version = "0.3.3.0"; + sha256 = "0wckjjy7yxq899f515xhwl2izqmrr9zck0kjlgz6qfa1fsl6lbvx"; libraryHaskellDepends = [ base bytestring containers template-haskell text time ]; testHaskellDepends = [ - base bytestring containers hspec text time + base bytestring containers HUnit text time ]; description = "Convert values from one type into another"; license = lib.licenses.isc; @@ -280665,8 +281311,8 @@ self: { }: mkDerivation { pname = "wordpress-auth"; - version = "1.0.0.0"; - sha256 = "150rri8lrl6j3f9q7wc34ajg06rakgk8a5npzz7vdap64994wy5c"; + version = "1.0.0.1"; + sha256 = "10drplm0bg72ph87apbdmm4ar7gh09x6w6sgwgvdkz4zpkc48s0j"; libraryHaskellDepends = [ base base16-bytestring bytestring cookie cryptohash-md5 cryptohash-sha256 hs-php-session http-types mtl text time @@ -283499,6 +284145,8 @@ self: { pname = "xmonad"; version = "0.15"; sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa"; + revision = "1"; + editedCabalFile = "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283549,6 +284197,8 @@ self: { pname = "xmonad-contrib"; version = "0.16"; sha256 = "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd"; + revision = "1"; + editedCabalFile = "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011"; libraryHaskellDepends = [ base bytestring containers directory extensible-exceptions filepath mtl old-locale old-time process random semigroups unix utf8-string @@ -284832,8 +285482,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.1"; - sha256 = "05z892g8c9alwmjwjm1405s43s8cdbj42ymqc9jlb27qc8ikc4n7"; + version = "0.1.0.2"; + sha256 = "03wvb5skx41kdmdc6zhydr7zddzyshy2cgk8zmwy26q70z3g01zf"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64 bytestring conduit containers foldl hashable libyaml mtl scientific @@ -284893,8 +285543,8 @@ self: { }: mkDerivation { pname = "yamlparse-applicative"; - version = "0.1.0.3"; - sha256 = "14fp7qyfh9ax2cqp5amvj2hi8fl9imdq25j8bx5mil8f2jxqr6bi"; + version = "0.1.0.4"; + sha256 = "19z6bg8pvhaccc4pc89a2hc1f1g9x66ma179gfx36pjgqdkp0fg1"; libraryHaskellDepends = [ aeson base bytestring containers optparse-applicative path path-io prettyprinter safe-coloured-text scientific text @@ -285794,8 +286444,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.7.1.6"; - sha256 = "062f2fv4ixr5bd5xcs208xfg2i18z25g3imf86qrziv0yxxg5qpc"; + version = "1.7.1.7"; + sha256 = "1daibkn5qhw131pp0sfyahyicwlgpin90zkcrwr2qk05ms5j3hj5"; libraryHaskellDepends = [ aeson base bytestring persistent text yesod-auth yesod-core yesod-form yesod-persistent @@ -286036,6 +286686,25 @@ self: { broken = true; }) {}; + "yesod-autoreload" = callPackage + ({ mkDerivation, base, shakespeare, text, yesod-core + , yesod-websockets + }: + mkDerivation { + pname = "yesod-autoreload"; + version = "0.0.0.0"; + sha256 = "1dzig02l00hw9xz974pf923yr6045x45sw8nnhnqw8rd67r2l7d3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base shakespeare text yesod-core yesod-websockets + ]; + executableHaskellDepends = [ base yesod-core ]; + testHaskellDepends = [ base ]; + description = "Auto-reload a yesod app during development"; + license = lib.licenses.mit; + }) {}; + "yesod-bin" = callPackage ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, directory, file-embed, filepath @@ -286175,8 +286844,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.20"; - sha256 = "1f3imbd22i9vl30760063p308byddwxafpl5hdric2z7vmnxayqy"; + version = "1.6.20.1"; + sha256 = "1y24sn30fm7bjq9rfv4lclz3vraaac9qbd2xgz949agm2irjwg4p"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -286818,8 +287487,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.7"; - sha256 = "1jkisnlbg5p5fd28r37xp844mjdpdz13s9dfpzbr30pxbyy57kf8"; + version = "2.0.0.8"; + sha256 = "1azd2kv5b36kryz3l587mn329a46m8mp4z8knzx5va24bmhca9jy"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core From 0b93c12bd43fed427bc1830c9094ab5450520076 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 00:53:44 +0200 Subject: [PATCH 029/797] haskell.packages: remove obsolete source overrides Both taffybar and ap-normalize where bumped to a version newer than the last hackage pin which we have caught up with now, so we can clean up those. --- .../haskell-modules/configuration-common.nix | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5cc0a3e79cd..45a45b3c939 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1967,30 +1967,4 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; - # 2021-05-23: Override for a quite recent Hackage release. - taffybar = - if pkgs.lib.versionAtLeast super.taffybar.version "3.2.5" - then throw "Drop src override for taffybar >= 3.2.5" - else overrideCabal super.taffybar (drv: { - src = pkgs.fetchFromGitHub { - owner = "taffybar"; - repo = "taffybar"; - rev = "91c83e01e131d560e704b12f0d798905e4289a3d"; - sha256 = "1kkpkjdyd1yv8z1qlzr3jrzyk9lxac5m4f9py8igyars2nwnhhzr"; - }; - version = "3.2.5"; - editedCabalFile = null; - }); - - # 2021-05-25: Fixes darwin build: https://gitlab.com/lysxia/ap-normalize/-/issues/1 - ap-normalize = - assert pkgs.lib.versionOlder super.ap-normalize.version "0.1.0.1"; - overrideSrc super.ap-normalize rec { - version = "0.1.0.1"; - src = pkgs.fetchurl { - url = "https://hackage.haskell.org/package/ap-normalize-${version}/ap-normalize-${version}.tar.gz"; - sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2"; - }; - }; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From f0db03628345a9c3dc3ec9a4fe7ea2a0552b4600 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 01:16:35 +0200 Subject: [PATCH 030/797] haskellPackages.parallel-io: update override comment --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 45a45b3c939..15bfc1b24a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1943,8 +1943,8 @@ EOT # https://github.com/haskell-hvr/missingh/issues/56 MissingH = doJailbreak super.MissingH; - # Too strict bound on random - # https://github.com/batterseapower/parallel-io/issues/14 + # Too strict bound on containers + # https://github.com/batterseapower/parallel-io/issues/14#issuecomment-853441933 parallel-io = doJailbreak super.parallel-io; # Disable flaky tests From 5ccfe3400ea34aa87f5ca368aac9d16d4a68d4ab Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 23 May 2021 12:45:27 +0800 Subject: [PATCH 031/797] haskellPackages.update-nix-fetchgit: Remove patches now present on Hackage --- .../haskell-modules/configuration-common.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 15bfc1b24a0..d8d6d0aec72 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1398,22 +1398,6 @@ self: super: { pkgs.lib.makeBinPath deps }" ''; - - # These can both be removed upon the release of update-nix-fetchgit-0.2.7 - patches = [ - # 2021-05-17 compile with hnix >= 0.13 - # https://github.com/expipiplus1/update-nix-fetchgit/pull/64 - (pkgs.fetchpatch { - url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch"; - sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg"; - }) - # Fix test failure - # https://github.com/expipiplus1/update-nix-fetchgit/pull/60 - (pkgs.fetchpatch { - url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/4a43e1ea4e7e1c18de81e3f9fe0b86faa70865f5.patch"; - sha256 = "1z74c1blgwr4q37m1rhlj7534qbnp3nnxf63m8j2b7iz0ljgm0m9"; - }) - ] ++ (drv.patches or []); })); # Our quickcheck-instances is too old for the newer binary-instances, but From c5b75e96d9b9582ce0e2483911110ca9527ff5e7 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 23 May 2021 12:45:45 +0800 Subject: [PATCH 032/797] haskellPackages.hnix: Remove patches now present on Hackage --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d8d6d0aec72..4a85a2205f2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -203,13 +203,6 @@ self: super: { sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; revert = true; }) - # fix broken location annotations (necessary for update-nix-fetchgit). - # Can be removed on the next hnix release after - # https://github.com/haskell-nix/hnix/pull/936 is merged. - (pkgs.fetchpatch { - url = "https://github.com/expipiplus1/hnix/commit/7cd998426ab7d930d288a1d6e266dc4e85cece3d.patch"; - sha256 = "19ay6vxa90ykgdd0fis2djvki2kpgfsq7z55iyqg965m583vsfr6"; - }) ] ++ (drv.patches or []); # make sure patches are not broken by cabal file revisions revision = null; From 67c5d844e1ad4289823ea0d771b9ea9d1bc51314 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 01:35:28 +0200 Subject: [PATCH 033/797] haskellPackages.hnix: make build with relude < 1.0 The commits we revert still do the trick, but we need to revert one additional commit now which increases the lower version bound for relude. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a85a2205f2..96be9da9a20 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -203,6 +203,12 @@ self: super: { sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; revert = true; }) + # allow relude < 1.0 again + (pkgs.fetchpatch { + url = "https://github.com/haskell-nix/hnix/commit/f4ea5dcb344369916586498ba33c00d0fc605a79.patch"; + sha256 = "1ajl7d49d658xhalgf3pc5svmbq73dsysy6z434n75vb1357mx86"; + revert = true; + }) ] ++ (drv.patches or []); # make sure patches are not broken by cabal file revisions revision = null; From 1be4cb6748318e7a6e0f96908b095ea6fef5ac6c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 02:15:59 +0200 Subject: [PATCH 034/797] haskell-ci: no longer mark as broken haskell-ci just builds (again?) without any necessary changes --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index da10af5b53d..1f3ac79cc92 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1832,7 +1832,6 @@ broken-packages: - haskell-awk - haskell-bitmex-rest - haskell-brainfuck - - haskell-ci - haskell-cnc - haskell-coffee - haskell-compression diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1acb41a9f74..f9ab52ff613 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -118430,8 +118430,6 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-cnc" = callPackage From cf4e1b9e62ab987552eb676f7618ea085f12a751 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 3 Jun 2021 03:08:10 -0400 Subject: [PATCH 035/797] llvmPackages_12.compiler-rt: fix build on darwin ``` /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:7: error: use of undeclared identifier 'TARGET_OS_IOS' if (TARGET_OS_IOS || TARGET_OS_TV) return 6; ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:24: error: use of undeclared identifier 'TARGET_OS_TV' if (TARGET_OS_IOS || TARGET_OS_TV) return 6; ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:618:7: error: use of undeclared identifier 'TARGET_OS_WATCH' if (TARGET_OS_WATCH) return 13; ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:7: error: use of undeclared identifier 'TARGET_OS_IOS' if (TARGET_OS_IOS || TARGET_OS_TV) ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:24: error: use of undeclared identifier 'TARGET_OS_TV' if (TARGET_OS_IOS || TARGET_OS_TV) ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:689:12: error: use of undeclared identifier 'TARGET_OS_WATCH' else if (TARGET_OS_WATCH) ^ 6 errors generated. ``` --- .../darwin-targetconditionals.patch | 71 +++++++++++++++++++ .../compilers/llvm/12/compiler-rt/default.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 00000000000..425dc2af01e --- /dev/null +++ b/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 895af8f2f02..cde1317ca35 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation { # extra `/`. ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + # Prevent a compilation error on darwin + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks From 6c9f648f7572f54668f3a3b8f1a6259384d187c8 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Thu, 3 Jun 2021 11:51:26 +0800 Subject: [PATCH 036/797] haskellPackages.uusi: add to top-level --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 86edacf144b..3680c044682 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -126,6 +126,7 @@ package-maintainers: berberman: - nvfetcher - arch-web + - uusi bdesham: - pinboard-notes-backup cdepillabout: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f9ab52ff613..0005cf86205 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -272815,6 +272815,7 @@ self: { ]; description = "Tweak .cabal files"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ berberman ]; }) {}; "uvector" = callPackage diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043d7634741..934341194f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4318,6 +4318,8 @@ in uudeview = callPackage ../tools/misc/uudeview { }; + uusi = haskell.lib.justStaticExecutables haskellPackages.uusi; + uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { inherit (python3Packages) sphinx; inherit (darwin.apple_sdk.frameworks) Security; From da993f42ee4fae6fbafa92db56b295aedeb92d21 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 11:51:34 +0200 Subject: [PATCH 037/797] top-level/release-haskell.nix: add missing top-level packages Inherit nvfetcher and uusi jobs from top-level for extra visibility. --- pkgs/top-level/release-haskell.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7a3eb608389..36a5835c9cd 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -175,6 +175,7 @@ let nix-tree nixfmt nota + nvfetcher ormolu pandoc pakcs @@ -199,6 +200,7 @@ let tldr-hs tweet-hs update-nix-fetchgit + uusi uqm uuagc vaultenv From 52d69816b0f86c67844bfa34c22e86cdc187d074 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 12:25:50 +0200 Subject: [PATCH 038/797] haskell.packages: remove constraint on monoid-extras Seems like the monoid-extras situation wasn't as bad as I thought and some new releases in the meantime make every diagrams package we had working previously work again. * haskellPackages.monoid-extras: 0.5.1 -> 0.6 * haskellPackages.diagrams-lib: remove now unnecessary patch * haskellPackages.namespace: jailbreak to build with new monoid-extras --- .../haskell-modules/configuration-common.nix | 18 ++++------ .../configuration-hackage2nix/main.yaml | 7 ---- .../haskell-modules/hackage-packages.nix | 36 ------------------- 3 files changed, 7 insertions(+), 54 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 96be9da9a20..6363ab1ff0e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -703,22 +703,18 @@ self: super: { # 2021-03-12: All of this libraries have to restrictive upper bounds # https://github.com/diagrams/diagrams-core/issues/112 + # https://github.com/diagrams/diagrams-cairo/issues/77 active = doJailbreak super.active; statestack = doJailbreak super.statestack; force-layout = doJailbreak super.force-layout; size-based = doJailbreak super.size-based; dual-tree = doJailbreak super.dual-tree; + diagrams-cairo = doJailbreak super.diagrams-cairo; diagrams-core = doJailbreak super.diagrams-core; diagrams-postscript = doJailbreak super.diagrams-postscript; diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; - # apply patch from master to add compat with optparse-applicative >= 0.16 - diagrams-lib = doJailbreak (appendPatch super.diagrams-lib - (pkgs.fetchpatch { - url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch"; - sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa"; - includes = [ "*/CmdLine.hs" ]; - })); + diagrams-lib = doJailbreak super.diagrams-lib; # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; @@ -1804,10 +1800,6 @@ self: super: { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; - # Too strict version bounds on base and optparse-applicative - # https://github.com/diagrams/diagrams-cairo/issues/77 - diagrams-cairo = doJailbreak super.diagrams-cairo; - # Too strict version bounds on base # https://github.com/gibiansky/IHaskell/issues/1217 ihaskell-display = doJailbreak super.ihaskell-display; @@ -1950,4 +1942,8 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; + # 2021-06-03: Too strict bounds on monoid-extras + # https://github.com/xu-hao/namespace/issues/1 + namespace = doJailbreak super.namespace; + } // 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 3680c044682..dbf356292e9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,13 +77,6 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # - # 2021-05-11: not all diagrams libraries have adjusted to - # monoid-extras 0.6 yet, keep them pinned to lower versions - # until we can do a full migration, see - # https://github.com/diagrams/diagrams-core/issues/115 - # We can keep this pin at most until base 4.15 - - monoid-extras < 0.6 - - diagrams-core < 1.5.0 # 2021-05-11: Pin for hls 1.1.0 - ghcide == 1.2.* - hls-plugin-api == 1.1.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0005cf86205..4b0c4f4edc1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74287,25 +74287,6 @@ self: { }) {}; "diagrams-core" = callPackage - ({ mkDerivation, adjunctions, base, containers, distributive - , dual-tree, lens, linear, monoid-extras, mtl, profunctors - , semigroups, unordered-containers - }: - mkDerivation { - pname = "diagrams-core"; - version = "1.4.2"; - sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43"; - revision = "1"; - editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7"; - libraryHaskellDepends = [ - adjunctions base containers distributive dual-tree lens linear - monoid-extras mtl profunctors semigroups unordered-containers - ]; - description = "Core libraries for diagrams EDSL"; - license = lib.licenses.bsd3; - }) {}; - - "diagrams-core_1_5_0" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors , semigroups, unordered-containers @@ -74320,7 +74301,6 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage @@ -177965,21 +177945,6 @@ self: { }) {}; "monoid-extras" = callPackage - ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups - }: - mkDerivation { - pname = "monoid-extras"; - version = "0.5.1"; - sha256 = "0xfrkgqn9d31z54l617m3w3kkd5m9vjb4yl247r3zzql3mpb1f37"; - revision = "2"; - editedCabalFile = "0gbrwpr7rzh9mmf59yhs74hixgclmxngaxx51j7pvr6wnkbvz3a3"; - libraryHaskellDepends = [ base groups semigroupoids semigroups ]; - benchmarkHaskellDepends = [ base criterion semigroups ]; - description = "Various extra monoid-related definitions and utilities"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-extras_0_6" = callPackage ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups }: mkDerivation { @@ -177990,7 +177955,6 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-owns" = callPackage From 6e9760124b11e5ea7ddd1607d873319910fa4baa Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 12:31:24 +0200 Subject: [PATCH 039/797] haskellPackages.diagrams-rasterific: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6363ab1ff0e..bbc5df3c696 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -704,6 +704,7 @@ self: super: { # 2021-03-12: All of this libraries have to restrictive upper bounds # https://github.com/diagrams/diagrams-core/issues/112 # https://github.com/diagrams/diagrams-cairo/issues/77 + # https://github.com/diagrams/diagrams-rasterific/issues/63 active = doJailbreak super.active; statestack = doJailbreak super.statestack; force-layout = doJailbreak super.force-layout; @@ -715,6 +716,7 @@ self: super: { diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; diagrams-lib = doJailbreak super.diagrams-lib; + diagrams-rasterific = doJailbreak super.diagrams-rasterific; # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1f3ac79cc92..ae5e77644b1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1005,7 +1005,6 @@ broken-packages: - diagrams-gtk - diagrams-pdf - diagrams-qrcode - - diagrams-rasterific - diagrams-tikz - dib - dice2tex diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4b0c4f4edc1..258ef9fea7b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74554,8 +74554,6 @@ self: { testHaskellDepends = [ base diagrams-core diagrams-lib ]; description = "Rasterific backend for diagrams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-reflex" = callPackage From 5f394e5ef55627f619e641263154950ad5a5953d Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 4 Jun 2021 00:14:00 +0800 Subject: [PATCH 040/797] openafs_1_9, linuxPackages.openafs_1_9: 1.9.0 -> 1.9.1 --- pkgs/servers/openafs/1.9/srcs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openafs/1.9/srcs.nix b/pkgs/servers/openafs/1.9/srcs.nix index 8c5f63cac11..853cd2aabad 100644 --- a/pkgs/servers/openafs/1.9/srcs.nix +++ b/pkgs/servers/openafs/1.9/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "1jw99zwisq25l0smdm8f0gfwhynk532s2ch44blrvxyd7all8kcd"; + sha256 = "sha256-7rHihVR4VobHAzt0ZALFOLJnlfd1Qwsa5ohpRFWBPbw="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "03x1pv8l4bv2fdns1l4sfy200nggy0a4b1f7qd0mnggdaj12c4jp"; + sha256 = "sha256-pvF8CdTl+5DNuymNvhb3UrGW05LcXRv8cZp2QQlXF+E="; })]; } From 3fac09bbe0acf60a08d97fb9f06e9568464b8f5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 16:51:56 +0000 Subject: [PATCH 041/797] fswatch: 1.15.0 -> 1.16.0 --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 47716b5ea9e..5eb252a9c0e 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk"; + sha256 = "sha256-EKbo5gkrWuijLJgYsNBDtxy0ioXu/yHxnPPeOpk620g="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; From 804dc91a4e9b9222db7473b76638139e3babf145 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 21:24:03 +0000 Subject: [PATCH 042/797] acme-sh: 2.8.9 -> 2.9.0 --- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index a7e1d02cb30..0417e3079ce 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.9"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk="; + sha256 = "sha256-BSKqfj8idpE4OV8/EJkCFo5i1vq/aEde/moqJcwuDvk="; }; nativeBuildInputs = [ makeWrapper ]; From 5058f9a5dfc5aece634d6f2a23df86b944603aa9 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 3 Jun 2021 20:12:16 -0700 Subject: [PATCH 043/797] nixos/doc: convert assertions and warnings section to CommonMark --- .../manual/development/assertions.section.md | 40 ++++++++++ nixos/doc/manual/development/assertions.xml | 74 ------------------- .../manual/development/writing-modules.xml | 2 +- .../development/assertions.section.xml | 58 +++++++++++++++ 4 files changed, 99 insertions(+), 75 deletions(-) create mode 100644 nixos/doc/manual/development/assertions.section.md delete mode 100644 nixos/doc/manual/development/assertions.xml create mode 100644 nixos/doc/manual/from_md/development/assertions.section.xml diff --git a/nixos/doc/manual/development/assertions.section.md b/nixos/doc/manual/development/assertions.section.md new file mode 100644 index 00000000000..cc6d81e5699 --- /dev/null +++ b/nixos/doc/manual/development/assertions.section.md @@ -0,0 +1,40 @@ +# Warnings and Assertions {#sec-assertions} + +When configuration problems are detectable in a module, it is a good idea to write an assertion or warning. Doing so provides clear feedback to the user and prevents errors after the build. + +Although Nix has the `abort` and `builtins.trace` [functions](https://nixos.org/nix/manual/#ssec-builtins) to perform such tasks, they are not ideally suited for NixOS modules. Instead of these functions, you can declare your warnings and assertions using the NixOS module system. + +## Warnings {#sec-assertions-warnings} + +This is an example of using `warnings`. + +```nix +{ config, lib, ... }: +{ + config = lib.mkIf config.services.foo.enable { + warnings = + if config.services.foo.bar + then [ ''You have enabled the bar feature of the foo service. + This is known to cause some specific problems in certain situations. + '' ] + else []; + } +} +``` + +## Assertions {#sec-assertions-assetions} + +This example, extracted from the [`syslogd` module](https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix) shows how to use `assertions`. Since there can only be one active syslog daemon at a time, an assertion is useful to prevent such a broken system from being built. + +```nix +{ config, lib, ... }: +{ + config = lib.mkIf config.services.syslogd.enable { + assertions = + [ { assertion = !config.services.rsyslogd.enable; + message = "rsyslogd conflicts with syslogd"; + } + ]; + } +} +``` diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml deleted file mode 100644 index 32f90cf2e7c..00000000000 --- a/nixos/doc/manual/development/assertions.xml +++ /dev/null @@ -1,74 +0,0 @@ -
- Warnings and Assertions - - - When configuration problems are detectable in a module, it is a good idea to - write an assertion or warning. Doing so provides clear feedback to the user - and prevents errors after the build. - - - - Although Nix has the abort and - builtins.trace - functions - to perform such tasks, they are not ideally suited for NixOS modules. Instead - of these functions, you can declare your warnings and assertions using the - NixOS module system. - - -
- Warnings - - - This is an example of using warnings. - - - - - -
- -
- Assertions - - - This example, extracted from the - - syslogd module shows how to use - assertions. Since there can only be one active syslog - daemon at a time, an assertion is useful to prevent such a broken system - from being built. - - - - - -
-
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index fad4637f51f..04497db77b8 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -182,7 +182,7 @@ in { - + diff --git a/nixos/doc/manual/from_md/development/assertions.section.xml b/nixos/doc/manual/from_md/development/assertions.section.xml new file mode 100644 index 00000000000..0844d484d60 --- /dev/null +++ b/nixos/doc/manual/from_md/development/assertions.section.xml @@ -0,0 +1,58 @@ +
+ Warnings and Assertions + + When configuration problems are detectable in a module, it is a good + idea to write an assertion or warning. Doing so provides clear + feedback to the user and prevents errors after the build. + + + Although Nix has the abort and + builtins.trace + functions + to perform such tasks, they are not ideally suited for NixOS + modules. Instead of these functions, you can declare your warnings + and assertions using the NixOS module system. + +
+ Warnings + + This is an example of using warnings. + + +{ config, lib, ... }: +{ + config = lib.mkIf config.services.foo.enable { + warnings = + if config.services.foo.bar + then [ ''You have enabled the bar feature of the foo service. + This is known to cause some specific problems in certain situations. + '' ] + else []; + } +} + +
+
+ Assertions + + This example, extracted from the + syslogd + module shows how to use assertions. + Since there can only be one active syslog daemon at a time, an + assertion is useful to prevent such a broken system from being + built. + + +{ config, lib, ... }: +{ + config = lib.mkIf config.services.syslogd.enable { + assertions = + [ { assertion = !config.services.rsyslogd.enable; + message = "rsyslogd conflicts with syslogd"; + } + ]; + } +} + +
+
From 591105e8383cfdc5c47cc82fc2eed9551bd83eb5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 3 Jun 2021 20:26:57 -0700 Subject: [PATCH 044/797] nixos/doc: convert abstractions section to CommonMark --- .../configuration/abstractions.section.md | 80 ++++++++++++++ .../doc/manual/configuration/abstractions.xml | 101 ------------------ .../manual/configuration/config-syntax.xml | 2 +- .../configuration/abstractions.section.xml | 101 ++++++++++++++++++ 4 files changed, 182 insertions(+), 102 deletions(-) create mode 100644 nixos/doc/manual/configuration/abstractions.section.md delete mode 100644 nixos/doc/manual/configuration/abstractions.xml create mode 100644 nixos/doc/manual/from_md/configuration/abstractions.section.xml diff --git a/nixos/doc/manual/configuration/abstractions.section.md b/nixos/doc/manual/configuration/abstractions.section.md new file mode 100644 index 00000000000..bf26e4c51ed --- /dev/null +++ b/nixos/doc/manual/configuration/abstractions.section.md @@ -0,0 +1,80 @@ +# Abstractions {#sec-module-abstractions} + +If you find yourself repeating yourself over and over, it’s time to abstract. Take, for instance, this Apache HTTP Server configuration: + +```nix +{ + services.httpd.virtualHosts = + { "blog.example.org" = { + documentRoot = "/webroot/blog.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + "wiki.example.org" = { + documentRoot = "/webroot/wiki.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + }; +} +``` + +It defines two virtual hosts with nearly identical configuration; the only difference is the document root directories. To prevent this duplication, we can use a `let`: +```nix +let + commonConfig = + { adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; +in +{ + services.httpd.virtualHosts = + { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); + "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); + }; +} +``` + +The `let commonConfig = ...` defines a variable named `commonConfig`. The `//` operator merges two attribute sets, so the configuration of the second virtual host is the set `commonConfig` extended with the document root option. + +You can write a `let` wherever an expression is allowed. Thus, you also could have written: + +```nix +{ + services.httpd.virtualHosts = + let commonConfig = ...; in + { "blog.example.org" = (commonConfig // { ... }) + "wiki.example.org" = (commonConfig // { ... }) + }; +} +``` + +but not `{ let commonConfig = ...; in ...; }` since attributes (as opposed to attribute values) are not expressions. + +**Functions** provide another method of abstraction. For instance, suppose that we want to generate lots of different virtual hosts, all with identical configuration except for the document root. This can be done as follows: + +```nix +{ + services.httpd.virtualHosts = + let + makeVirtualHost = webroot: + { documentRoot = webroot; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; + in + { "example.org" = (makeVirtualHost "/webroot/example.org"); + "example.com" = (makeVirtualHost "/webroot/example.com"); + "example.gov" = (makeVirtualHost "/webroot/example.gov"); + "example.nl" = (makeVirtualHost "/webroot/example.nl"); + }; +} +``` + +Here, `makeVirtualHost` is a function that takes a single argument `webroot` and returns the configuration for a virtual host. That function is then called for several names to produce the list of virtual host configurations. diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml deleted file mode 100644 index df9ff2615e1..00000000000 --- a/nixos/doc/manual/configuration/abstractions.xml +++ /dev/null @@ -1,101 +0,0 @@ -
- Abstractions - - - If you find yourself repeating yourself over and over, it’s time to - abstract. Take, for instance, this Apache HTTP Server configuration: - -{ - = - { "blog.example.org" = { - documentRoot = "/webroot/blog.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - "wiki.example.org" = { - documentRoot = "/webroot/wiki.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - }; -} - - It defines two virtual hosts with nearly identical configuration; the only - difference is the document root directories. To prevent this - duplication, we can use a let: - -let - commonConfig = - { adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; -in -{ - = - { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); - "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); - }; -} - - The let commonConfig = ... - defines a variable named commonConfig. The - // operator merges two attribute sets, so the - configuration of the second virtual host is the set - commonConfig extended with the document root option. - - - - You can write a let wherever an expression is allowed. - Thus, you also could have written: - -{ - = - let commonConfig = ...; in - { "blog.example.org" = (commonConfig // { ... }) - "wiki.example.org" = (commonConfig // { ... }) - }; -} - - but not { let commonConfig = ...; in - ...; } since attributes (as opposed to - attribute values) are not expressions. - - - - Functions provide another method of abstraction. For - instance, suppose that we want to generate lots of different virtual hosts, - all with identical configuration except for the document root. This can be done - as follows: - -{ - = - let - makeVirtualHost = webroot: - { documentRoot = webroot; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; - in - { "example.org" = (makeVirtualHost "/webroot/example.org"); - "example.com" = (makeVirtualHost "/webroot/example.com"); - "example.gov" = (makeVirtualHost "/webroot/example.gov"); - "example.nl" = (makeVirtualHost "/webroot/example.nl"); - }; -} - - Here, makeVirtualHost is a function that takes a single - argument webroot and returns the configuration for a virtual - host. That function is then called for several names to produce the list of - virtual host configurations. - -
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 5526dea247c..a374c6a8707 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -19,7 +19,7 @@ xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix constructs useful in NixOS configuration files. - + diff --git a/nixos/doc/manual/from_md/configuration/abstractions.section.xml b/nixos/doc/manual/from_md/configuration/abstractions.section.xml new file mode 100644 index 00000000000..c71e23e34ad --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/abstractions.section.xml @@ -0,0 +1,101 @@ +
+ Abstractions + + If you find yourself repeating yourself over and over, it’s time to + abstract. Take, for instance, this Apache HTTP Server configuration: + + +{ + services.httpd.virtualHosts = + { "blog.example.org" = { + documentRoot = "/webroot/blog.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + "wiki.example.org" = { + documentRoot = "/webroot/wiki.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + }; +} + + + It defines two virtual hosts with nearly identical configuration; + the only difference is the document root directories. To prevent + this duplication, we can use a let: + + +let + commonConfig = + { adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; +in +{ + services.httpd.virtualHosts = + { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); + "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); + }; +} + + + The let commonConfig = ... defines a variable + named commonConfig. The // + operator merges two attribute sets, so the configuration of the + second virtual host is the set commonConfig + extended with the document root option. + + + You can write a let wherever an expression is + allowed. Thus, you also could have written: + + +{ + services.httpd.virtualHosts = + let commonConfig = ...; in + { "blog.example.org" = (commonConfig // { ... }) + "wiki.example.org" = (commonConfig // { ... }) + }; +} + + + but not { let commonConfig = ...; in ...; } since + attributes (as opposed to attribute values) are not expressions. + + + Functions provide another method + of abstraction. For instance, suppose that we want to generate lots + of different virtual hosts, all with identical configuration except + for the document root. This can be done as follows: + + +{ + services.httpd.virtualHosts = + let + makeVirtualHost = webroot: + { documentRoot = webroot; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; + in + { "example.org" = (makeVirtualHost "/webroot/example.org"); + "example.com" = (makeVirtualHost "/webroot/example.com"); + "example.gov" = (makeVirtualHost "/webroot/example.gov"); + "example.nl" = (makeVirtualHost "/webroot/example.nl"); + }; +} + + + Here, makeVirtualHost is a function that takes a + single argument webroot and returns the + configuration for a virtual host. That function is then called for + several names to produce the list of virtual host configurations. + +
From 947df26862a63a4c251f5b8752073e8930cd3c66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Jun 2021 03:51:07 +0000 Subject: [PATCH 045/797] flyctl: 0.0.220 -> 0.0.222 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index f531c9a902d..e0412b0dd36 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.220"; + version = "0.0.222"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-QuNe2Q7d0WSF3pkDNKxs6b6hO9Q99oJM+ZddHD/tOaI="; + sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-zoheYyeofg8oVRicnZt+lFOixIH/Ssv7Kh7zC6yT/uY="; + vendorSha256 = "sha256-NnHnSfm3XYiwgGn56GsthFKiflJvhYhjoxmm8ogm+Uc="; doCheck = false; From 4355ebb00e6bf725fc4330d3c9c117b709ef7a81 Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 3 Jun 2021 23:24:19 +0700 Subject: [PATCH 046/797] himalaya: 0.3.2 -> 0.4.0 --- .../networking/mailreaders/himalaya/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index b810103cf2e..b1c709b055b 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wiasnkoIU4l1yyhUSTahOJMCOyhpz2w4WJzi/UBmiHE="; + sha256 = "sha256-6RgT/SxO4vsk8Yx2AbaNIFvnAvgDmeTXvb/v6nUJxhc="; }; - cargoSha256 = "sha256-VXSJLDpT0s+sh6buOP63QSiUp34H6G/FWibemtNU9wQ="; + cargoSha256 = "sha256-NEuIh7FwIdAWzlChna3+G0VukfV8nYZfVWa+3LxQCIA="; # use --lib flag to avoid test with imap server # https://github.com/soywod/himalaya/issues/145 From 083ac8e64cfc33be74909e572622117927c45d73 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 4 Jun 2021 11:36:24 +0200 Subject: [PATCH 047/797] haskellPackages.llvmPackages: dontRecurseIntoAttrs They are not an exposed part of haskellPackages per se, so we shouldn't list them in nix-env. Additionally this should prevent the failed lldb build from cluttering our jobset output. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-head.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 9866364e34a..36fe13151f3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 9.x. - llvmPackages = pkgs.llvmPackages_9; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_9; # Disable GHC 8.10.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bcce0bb897c..99b53b9f14f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 6.x. - llvmPackages = pkgs.llvmPackages_6; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_6; # Disable GHC 8.6.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 8fb10d8b05f..aab26897cca 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 7.x. - llvmPackages = pkgs.llvmPackages_7; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_7; # Disable GHC 8.8.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index ff82fc8c199..16c85d1fef7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 10.x. - llvmPackages = pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; # Disable GHC 9.0.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2b136c6bf83..ca455a7c892 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -11,7 +11,7 @@ with haskellLib; self: super: { - llvmPackages = pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; # Disable GHC 8.7.x core libraries. array = null; From 30714ca47a1b373abb3a6acd86a20505bd138d3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Jun 2021 11:59:45 +0200 Subject: [PATCH 048/797] python3Packages.mcstatus: 5.2.0 -> 6.0.0 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index cf61eb2fa38..6a39ff347cd 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "5.2.0"; + version = "6.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RlqzeixaHgyIl/7mMRkZAEsqJEP79Bz1bDGAU8PIetU="; + sha256 = "sha256-YBtVWcOZDt2jQB9bHDrSCP9f2OC+IHzJKlBBGorLnZU="; }; propagatedBuildInputs = [ From 637c61c0a4bcf836c73c6b31856bb5ed44ec6f53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Jun 2021 12:05:35 +0200 Subject: [PATCH 049/797] python3Packages.asyncio-dgram: 1.2.0 -> 2.0.0 --- pkgs/development/python-modules/asyncio-dgram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index 2360d170f38..b5ae2b4baf8 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o="; + sha256 = "sha256-EL3iOoCfLAtfdMI1J2XMf4izOEo9+a+0PNQs+4HuEfo="; }; # OSError: AF_UNIX path too long From e57b58bd0e292c866f790475dd035ac3e2543dd1 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 4 Jun 2021 21:44:23 +0900 Subject: [PATCH 050/797] glibc: fix build vs host tool confusion Fixes cross compilation from aarch64-linux -> armv7l-linux --- pkgs/development/libraries/glibc/common.nix | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3597dd70f2c..888548d79f0 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -226,6 +226,28 @@ stdenv.mkDerivation ({ libc_cv_c_cleanup=yes libc_cv_gnu89_inline=yes EOF + + # ./configure has logic like + # + # AR=`$CC -print-prog-name=ar` + # + # This searches various directories in the gcc and its wrapper. In nixpkgs, + # this returns the bare string "ar", which is build ar. This can result as + # a build failure with the following message: + # + # libc_pic.a: error adding symbols: archive has no index; run ranlib to add one + # + # (Observed cross compiling from aarch64-linux -> armv7l-linux). + # + # Nixpkgs passes a correct value for AR and friends, so to use the correct + # set of tools, we only need to delete this special handling. + sed -i \ + -e '/^AR=/d' \ + -e '/^AS=/d' \ + -e '/^LD=/d' \ + -e '/^OBJCOPY=/d' \ + -e '/^OBJDUMP=/d' \ + $configureScript ''; preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; From c9ecf037ecd2e5ab84294d955a344ccf981e17b0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 4 Jun 2021 15:03:41 +0200 Subject: [PATCH 051/797] doc: Clean up generated media directory pandoc uses ./media to extract media files - add it to the list of directories that need to be removed by `make clean`. --- doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 7affbb0bb51..4308da148be 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -22,7 +22,7 @@ fix-misc-xml: .PHONY: clean clean: rm -f ${MD_TARGETS} doc-support/result .version manual-full.xml functions/library/locations.xml functions/library/generated - rm -rf ./out/ ./highlightjs + rm -rf ./out/ ./highlightjs ./media .PHONY: validate validate: manual-full.xml doc-support/result From 42b211f1756d115ca8f52f228f7df8cc40f7703d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 4 Jun 2021 13:32:02 +0000 Subject: [PATCH 052/797] nix: clarify config.nix hack The comment said that this was needed for Nix <2.3.8, which is wrong -- it's needed for all 2.3.x. I think this must have been caused by a nmisreading of the conditional, which applied to all versions _later_ than 2.3.8, not earlier. But we don't package anything that old any more, so we can remove that check entirely, in addition to clarifying the comment. --- pkgs/tools/package-management/nix/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5f139a1b3b9..a7b3d12f7a5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -93,14 +93,12 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + - # On all versions before c9f51e87057652db0013289a95deffba495b35e7, - # released with 2.3.8, we need to patch around an issue where the Nix - # configure step pulls in the build system's bash and other utilities - # when cross-compiling. + # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which + # removes config.nix entirely and is not present in 2.3.x, we need to + # patch around an issue where the Nix configure step pulls in the build + # system's bash and other utilities when cross-compiling. lib.optionalString ( - stdenv.buildPlatform != stdenv.hostPlatform && - (lib.versionOlder "2.3.8" version && !is24) - # The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings + stdenv.buildPlatform != stdenv.hostPlatform && !is24 ) '' mkdir tmp/ substitute corepkgs/config.nix.in tmp/config.nix.in \ From ab26db61e3248111246d2f329157e143ee1fe262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Fri, 4 Jun 2021 16:27:20 +0200 Subject: [PATCH 053/797] dbus-broker: 28 -> 29 --- pkgs/os-specific/linux/dbus-broker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c6f1c1d8250..b7e0a6b6158 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dbus-broker"; - version = "28"; + version = "29"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "1rsn74x6yhyl9w7jqgnzgzyhp9cln1602jyzpw5qvrkdk5b7zzgs"; + sha256 = "1abbi8c0mgdqjidlp2wnmy0a88xv173hq88sh5m966c5r1h6alkq"; fetchSubmodules = true; }; From 2af57b784f30d312d7a3f1a52e0503eb6123e436 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 4 Jun 2021 22:37:27 +0800 Subject: [PATCH 054/797] mpd: 0.22.6 -> 0.22.8 --- pkgs/servers/mpd/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 3e1f8100004..56bf0ed5d2f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost +# Darwin inputs +, AudioToolbox, AudioUnit # Inputs , curl, libmms, libnfs, liburing, samba # Archive support @@ -114,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.6"; + version = "0.22.8"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-Xu+MxMxR5u++R3lZHe6UQ+mEmRnWbN6173ZX39KS1A8="; + sha256 = "sha256-nlUgFmiIrheN/FsSlQ/16iqwBXDw6xuwJG/foPZD07M="; }; buildInputs = [ @@ -133,7 +135,7 @@ let gtest ] ++ concatAttrVals features_ featureDependencies - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ]; + ++ lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit ]; nativeBuildInputs = [ meson diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8294ff9ad8a..6d2ed9caae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19281,8 +19281,10 @@ in mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; - inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; }) - mpd mpd-small mpdWithFeatures; + inherit (callPackages ../servers/mpd { + stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; + }) mpd mpd-small mpdWithFeatures; libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; From 99b351b4bde2d9697b4e9abaa54458dcff1288d1 Mon Sep 17 00:00:00 2001 From: Carlos Hernandez Date: Mon, 31 May 2021 09:20:22 -0600 Subject: [PATCH 055/797] tree-sitter: explicitly incl CXX headers on Darwin clang needs to find headers + libraries for compiling with libc++. On Darwin we will include CXX headers when compiling C. This closes #124396 --- pkgs/development/tools/parsing/tree-sitter/grammar.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index 5ca381e6d2f..93e1cb3804f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -1,5 +1,7 @@ { stdenv , tree-sitter +, libcxx +, lib }: # Build a parser grammar and put the resulting shared object in `$out/parser` @@ -27,6 +29,7 @@ stdenv.mkDerivation { "${source}/${location}" ; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; buildInputs = [ tree-sitter ]; dontUnpack = true; From 823cddb92e4953ad34a64c379bc854e6eb340204 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Jun 2021 17:32:17 +0000 Subject: [PATCH 056/797] chafa: 1.6.0 -> 1.6.1 --- pkgs/tools/misc/chafa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index d830b8d81fc..041d799307e 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.6.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-GaXVMM23U3M+qNJrWYR+DLiCmILcuX5EIkQqzwN/l1Y="; + sha256 = "sha256-isQxeb7OQh4W8RvtKWXbKVYJ8LlfLiOkMJoPjsGFouM="; }; nativeBuildInputs = [ autoconf From 18118ea948d69b88be4420a9cdd1483432818d50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Jun 2021 22:49:54 +0200 Subject: [PATCH 057/797] python3packages.ruyaml: init at 0.90.0.2 --- .../python-modules/ruyaml/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/ruyaml/default.nix diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix new file mode 100644 index 00000000000..3b5a0d41283 --- /dev/null +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, distro +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +, setuptools-scm-git-archive +}: + +buildPythonPackage rec { + pname = "ruyaml"; + version = "0.90.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pycontribs"; + repo = pname; + rev = version; + sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al"; + }; + + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + distro + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "ruyaml" ]; + + meta = with lib; { + description = "YAML 1.2 loader/dumper package for Python"; + homepage = "https://ruyaml.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d39487bf1ec..08dddc67afc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7417,6 +7417,8 @@ in { runway-python = callPackage ../development/python-modules/runway-python { }; + ruyaml = callPackage ../development/python-modules/ruyaml { }; + rx = callPackage ../development/python-modules/rx { }; rxv = callPackage ../development/python-modules/rxv { }; From d9f3022f229c521acf4839097c2143002187f680 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Jun 2021 22:13:03 +0000 Subject: [PATCH 058/797] kak-lsp: 9.0.0 -> 10.0.0 --- pkgs/tools/misc/kak-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index d57a48598e0..86d85815374 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "9.0.0"; + version = "10.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8"; + sha256 = "sha256-SmK4G9AoKGqKGbXucn5AO5DTOeVNq3gCBGvDTIJQgRU="; }; - cargoSha256 = "1b6bcqbdkpxgxyfz89d8fhxfxvqc988pa9wxq5fsihnix8bm7jdk"; + cargoSha256 = "sha256-iY5xT8e/gRN/mBT9v5LhMcl9g1/SyrH/glPBP+toZ9o="; buildInputs = lib.optional stdenv.isDarwin [ Security ]; From 9a0592e6829229406c8b9d283ecbd678c46fe79c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 01:01:56 +0200 Subject: [PATCH 059/797] Revert "haskell.packages: remove constraint on monoid-extras" This reverts commit 52d69816b0f86c67844bfa34c22e86cdc187d074. Unfortunately there is no way to update to monoid-extras 0.6 yet without marking some packages as broken. The issue is that not all diagrams* packages have had an update adding support for GHC 9.x yet (which would also include monoid-extras 0.6 support). The only alternative to pinning diagrams* and monoid-extras would be to have mismatched versions between them which always causes issues with haskellPackages.diagrams. Note that this commit re-introduces some build failures which are to be fixed in a follow-up commit. --- .../haskell-modules/configuration-common.nix | 17 +++++---- .../configuration-hackage2nix/main.yaml | 7 ++++ .../haskell-modules/hackage-packages.nix | 36 +++++++++++++++++++ 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bbc5df3c696..d4a51216dc6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -710,12 +710,17 @@ self: super: { force-layout = doJailbreak super.force-layout; size-based = doJailbreak super.size-based; dual-tree = doJailbreak super.dual-tree; - diagrams-cairo = doJailbreak super.diagrams-cairo; diagrams-core = doJailbreak super.diagrams-core; diagrams-postscript = doJailbreak super.diagrams-postscript; diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; - diagrams-lib = doJailbreak super.diagrams-lib; + # Apply patch from master to add compat with optparse-applicative >= 0.16. + diagrams-lib = doJailbreak (appendPatch super.diagrams-lib + (pkgs.fetchpatch { + url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch"; + sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa"; + includes = [ "*/CmdLine.hs" ]; + })); diagrams-rasterific = doJailbreak super.diagrams-rasterific; # https://github.com/danidiaz/streaming-eversion/issues/1 @@ -1802,6 +1807,10 @@ self: super: { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; + # Too strict version bounds on base and optparse-applicative + # https://github.com/diagrams/diagrams-cairo/issues/77 + diagrams-cairo = doJailbreak super.diagrams-cairo; + # Too strict version bounds on base # https://github.com/gibiansky/IHaskell/issues/1217 ihaskell-display = doJailbreak super.ihaskell-display; @@ -1944,8 +1953,4 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; - # 2021-06-03: Too strict bounds on monoid-extras - # https://github.com/xu-hao/namespace/issues/1 - namespace = doJailbreak super.namespace; - } // 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 dbf356292e9..3680c044682 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,6 +77,13 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # + # 2021-05-11: not all diagrams libraries have adjusted to + # monoid-extras 0.6 yet, keep them pinned to lower versions + # until we can do a full migration, see + # https://github.com/diagrams/diagrams-core/issues/115 + # We can keep this pin at most until base 4.15 + - monoid-extras < 0.6 + - diagrams-core < 1.5.0 # 2021-05-11: Pin for hls 1.1.0 - ghcide == 1.2.* - hls-plugin-api == 1.1.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 258ef9fea7b..ff8e55e51f8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74287,6 +74287,25 @@ self: { }) {}; "diagrams-core" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , dual-tree, lens, linear, monoid-extras, mtl, profunctors + , semigroups, unordered-containers + }: + mkDerivation { + pname = "diagrams-core"; + version = "1.4.2"; + sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43"; + revision = "1"; + editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7"; + libraryHaskellDepends = [ + adjunctions base containers distributive dual-tree lens linear + monoid-extras mtl profunctors semigroups unordered-containers + ]; + description = "Core libraries for diagrams EDSL"; + license = lib.licenses.bsd3; + }) {}; + + "diagrams-core_1_5_0" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors , semigroups, unordered-containers @@ -74301,6 +74320,7 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage @@ -177943,6 +177963,21 @@ self: { }) {}; "monoid-extras" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.5.1"; + sha256 = "0xfrkgqn9d31z54l617m3w3kkd5m9vjb4yl247r3zzql3mpb1f37"; + revision = "2"; + editedCabalFile = "0gbrwpr7rzh9mmf59yhs74hixgclmxngaxx51j7pvr6wnkbvz3a3"; + libraryHaskellDepends = [ base groups semigroupoids semigroups ]; + benchmarkHaskellDepends = [ base criterion semigroups ]; + description = "Various extra monoid-related definitions and utilities"; + license = lib.licenses.bsd3; + }) {}; + + "monoid-extras_0_6" = callPackage ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups }: mkDerivation { @@ -177953,6 +177988,7 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "monoid-owns" = callPackage From e6cf0980db2a901aa9ba116e3d5ec00c6929e232 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 01:05:49 +0200 Subject: [PATCH 060/797] haskellPackages.diagrams-lib: pin to < 1.4.4 While diagrams-lib 1.4.4 doesn't per se require us to update any diagrams lib to 1.5.0 it would require monoid-extras 0.6 which would force us to update diagrams-core to 1.5.0, thus breaking haskellPackages.diagrams. Since we can just keep the patch we fetch and downgrade to 1.4.3, we can continue sitting out the slow update cycle of the diagrams universe. --- .../haskell-modules/configuration-common.nix | 2 ++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 34 +++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d4a51216dc6..f0c275c32fc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -715,6 +715,8 @@ self: super: { diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; # Apply patch from master to add compat with optparse-applicative >= 0.16. + # We unfortunately can't upgrade to 1.4.4 which includes this patch yet + # since it would require monoid-extras 0.6 which breaks other diagrams libs. diagrams-lib = doJailbreak (appendPatch super.diagrams-lib (pkgs.fetchpatch { url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3680c044682..3cdb1b4b7dd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -84,6 +84,7 @@ default-package-overrides: # We can keep this pin at most until base 4.15 - monoid-extras < 0.6 - diagrams-core < 1.5.0 + - diagrams-lib < 1.4.4 # 2021-05-11: Pin for hls 1.1.0 - ghcide == 1.2.* - hls-plugin-api == 1.1.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ff8e55e51f8..c10984beff3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74425,6 +74425,39 @@ self: { }) {}; "diagrams-lib" = callPackage + ({ mkDerivation, active, adjunctions, array, base, bytestring + , cereal, colour, containers, criterion, data-default-class + , deepseq, diagrams-core, diagrams-solve, directory, distributive + , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable + , intervals, JuicyPixels, lens, linear, monoid-extras, mtl + , numeric-extras, optparse-applicative, process, profunctors + , QuickCheck, semigroups, tagged, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unordered-containers + }: + mkDerivation { + pname = "diagrams-lib"; + version = "1.4.3"; + sha256 = "0gqrcyjyp3p78vmfxvhfjbkkl2xvwcv3qyyinbdcmalb5zb8vyy6"; + revision = "1"; + editedCabalFile = "0cqhqm2nz2ls00pfhx8hz6z6g17qhl380h24wp4d6l5msiw7gxq4"; + libraryHaskellDepends = [ + active adjunctions array base bytestring cereal colour containers + data-default-class diagrams-core diagrams-solve directory + distributive dual-tree exceptions filepath fingertree fsnotify + hashable intervals JuicyPixels lens linear monoid-extras mtl + optparse-applicative process profunctors semigroups tagged text + transformers unordered-containers + ]; + testHaskellDepends = [ + base deepseq diagrams-solve distributive lens numeric-extras + QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion diagrams-core ]; + description = "Embedded domain-specific language for declarative graphics"; + license = lib.licenses.bsd3; + }) {}; + + "diagrams-lib_1_4_4" = callPackage ({ mkDerivation, active, adjunctions, array, base, bytestring , cereal, colour, containers, criterion, data-default-class , deepseq, diagrams-core, diagrams-solve, directory, distributive @@ -74453,6 +74486,7 @@ self: { benchmarkHaskellDepends = [ base criterion diagrams-core ]; description = "Embedded domain-specific language for declarative graphics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-pandoc" = callPackage From 66090354101d4175fd2ad271b773131ec29f6ddd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 01:08:43 +0200 Subject: [PATCH 061/797] haskell.packages: group all diagrams overrides --- .../haskell-modules/configuration-common.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f0c275c32fc..fb5a70eb6fa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -705,6 +705,7 @@ self: super: { # https://github.com/diagrams/diagrams-core/issues/112 # https://github.com/diagrams/diagrams-cairo/issues/77 # https://github.com/diagrams/diagrams-rasterific/issues/63 + # https://github.com/diagrams/diagrams-cairo/issues/77 active = doJailbreak super.active; statestack = doJailbreak super.statestack; force-layout = doJailbreak super.force-layout; @@ -724,6 +725,10 @@ self: super: { includes = [ "*/CmdLine.hs" ]; })); diagrams-rasterific = doJailbreak super.diagrams-rasterific; + diagrams-cairo = doJailbreak super.diagrams-cairo; + + # https://github.com/diagrams/diagrams-solve/issues/4 + diagrams-solve = dontCheck super.diagrams-solve; # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; @@ -741,9 +746,6 @@ self: super: { # Has a dependency on outdated versions of directory. cautious-file = doJailbreak (dontCheck super.cautious-file); - # https://github.com/diagrams/diagrams-solve/issues/4 - diagrams-solve = dontCheck super.diagrams-solve; - # test suite does not compile with recent versions of QuickCheck integer-logarithms = dontCheck (super.integer-logarithms); @@ -1809,10 +1811,6 @@ self: super: { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; - # Too strict version bounds on base and optparse-applicative - # https://github.com/diagrams/diagrams-cairo/issues/77 - diagrams-cairo = doJailbreak super.diagrams-cairo; - # Too strict version bounds on base # https://github.com/gibiansky/IHaskell/issues/1217 ihaskell-display = doJailbreak super.ihaskell-display; From cab9d7a1ae523dd4ede22c3f9469d3329b37baee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 00:28:35 +0000 Subject: [PATCH 062/797] bacula: 11.0.3 -> 11.0.5 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index aca741175e5..c37e7893384 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.3"; + version = "11.0.5"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-AVh3NPdJD8t3N4AbLh/hsflHB7s/sLcbNnE8eqsDkjw="; + sha256 = "sha256-71s7Z4EEQiAbgNwdR8zvd7XtN4/hKFQG86c0AbboERo="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 9b1e0e4b7492c4bdba7d91d0c927144217e80cc7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 02:29:27 +0200 Subject: [PATCH 063/797] haskellPackages.jsaddle-webkit2gtk: remove now unnecessary patch Upstream seems to have fixed the issue in the meantime -- without merging Malte's PR, however. --- .../haskell-modules/configuration-common.nix | 4 -- .../patches/jsaddle-webkit2gtk.patch | 65 ------------------- 2 files changed, 69 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb5a70eb6fa..ee94b13bfbe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1311,10 +1311,6 @@ self: super: { gi-gdkx11 = self.gi-gdkx11_3_0_11; gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10; - # 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25 - # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 - jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; - # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 massiv = dontCheck super.massiv; diff --git a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch deleted file mode 100644 index 33c276926f4..00000000000 --- a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001 -From: Malte Brandy -Date: Fri, 14 Aug 2020 17:52:28 +0200 -Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound - ---- - jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal -index 93d0b77..60c2312 100644 ---- a/jsaddle-webkit2gtk.cabal -+++ b/jsaddle-webkit2gtk.cabal -@@ -35,7 +35,7 @@ library - gi-gtk >=3.0.17 && <3.1, - gi-webkit2 >=4.0.14 && <4.1, - gi-javascriptcore >=4.0.14 && <4.1, -- haskell-gi-base >=0.20 && <0.24, -+ haskell-gi-base >=0.20 && <0.26, - haskell-gi-overloading >=0.0 && < 2.0, - jsaddle >=0.9.4.0 && <0.10, - text >=1.2.1.3 && <1.3, - -From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001 -From: Malte Brandy -Date: Fri, 14 Aug 2020 18:10:26 +0200 -Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable - -Those two convenience definitions disappeared from gi-gio and gi-gtk in -newer versions. ---- - .../src/Language/Javascript/JSaddle/WebKitGTK.hs | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs -index 898dac2..5249477 100644 ---- a/src/Language/Javascript/JSaddle/WebKitGTK.hs -+++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs -@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF - import qualified GI.Gtk as Gtk (main, init) - import GI.Gtk - (windowSetPosition, windowSetDefaultSize, windowNew, -- scrolledWindowNew, noAdjustment, containerAdd, -+ scrolledWindowNew, Adjustment, containerAdd, - WindowType(..), WindowPosition(..), widgetDestroy, - widgetGetToplevel, widgetShowAll, onWidgetDestroy, - mainQuit) --import GI.Gio (noCancellable) -+import GI.Gio (Cancellable) - import GI.JavaScriptCore (valueToString) - import GI.WebKit2 - (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText, -@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch) - import Language.Javascript.JSaddle.Run (runJavaScript) - import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers) - -+noAdjustment :: Maybe Adjustment -+noAdjustment = Nothing -+ -+noCancellable :: Maybe Cancellable -+noCancellable = Nothing -+ - quitWebView :: WebView -> IO () - quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync? - widgetDestroy w From b00bcf21abc392ecb1d93bd49f7a5ffbc8524ecf Mon Sep 17 00:00:00 2001 From: Mewp Date: Sat, 5 Jun 2021 10:35:20 +0200 Subject: [PATCH 064/797] nixos/acme: Remove an incorrect assertion from tests Commit 3a2e0c36e79cecaf196cbea23e75e74710140ea4 has removed `--reuse-key` from default renew options, yet the tests still expected keys not to change. This assertion is now removed, as they are supposed to change on each renew/change. --- nixos/tests/acme.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 6f98b0da378..fe8c4af3ea2 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -392,14 +392,11 @@ in import ./make-test-python.nix ({ lib, ... }: { # Check the key hash before and after adding an alias. It should not change. # The previous test reverts the ed384 change webserver.wait_for_unit("acme-finished-a.example.test.target") - keyhash_old = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem") switch_to(webserver, "nginx-aliases") webserver.wait_for_unit("acme-finished-a.example.test.target") check_issuer(webserver, "a.example.test", "pebble") check_connection(client, "a.example.test") check_connection(client, "b.example.test") - keyhash_new = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem") - assert keyhash_old == keyhash_new with subtest("Can request certificates for vhost + aliases (apache-httpd)"): try: From 09127f1415634c05aeee88421f98d41fdf3919e3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 5 Jun 2021 11:32:04 +0200 Subject: [PATCH 065/797] mathematica: 12.2.0 -> 12.3.0 --- pkgs/applications/science/math/mathematica/l10ns.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 896983ce156..d9f6a0c74e8 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,10 +8,10 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { - version = "12.2.0"; + version = "12.3.0"; lang = "en"; language = "English"; - sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7"; + sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215"; } { version = "11.3.0"; From 24a4c65ca97e8f474e7af35c67fb1fce5a1c1f55 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 12:59:38 +0200 Subject: [PATCH 066/797] haskellPackages.pandoc-crossref: downgrade to retain pandoc 2.13 support --- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3cdb1b4b7dd..58ba5ec683e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -91,6 +91,8 @@ default-package-overrides: - hls-explicit-imports-plugin < 1.0.0.2 # 2021-05-12: remove once versions >= 5.0.0 is in stackage - futhark < 0.19.5 + # 2021-06-05: remove once pandoc 2.14 is in stackage + - pandoc-crossref < 0.3.11.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c10984beff3..002629c61fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -194042,6 +194042,44 @@ self: { }) {}; "pandoc-crossref" = callPackage + ({ mkDerivation, base, containers, data-accessor + , data-accessor-template, data-accessor-transformers, data-default + , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser + , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb + , template-haskell, temporary, text, utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.10.0"; + sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; + revision = "1"; + editedCabalFile = "0grjcp8r5fh41qnn3miw6bms3ml9v6n1rjb2yvimf1v69w61nlgq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default directory filepath mtl + pandoc pandoc-types roman-numerals syb template-haskell text + utility-ht + ]; + executableHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default deepseq directory filepath + gitrev mtl open-browser optparse-applicative pandoc pandoc-types + roman-numerals syb template-haskell temporary text utility-ht + ]; + testHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default directory filepath hspec + mtl pandoc pandoc-types roman-numerals syb template-haskell text + utility-ht + ]; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + }) {}; + + "pandoc-crossref_0_3_11_0" = callPackage ({ mkDerivation, base, containers, criterion, data-accessor , data-accessor-template, data-accessor-transformers, data-default , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser @@ -194075,6 +194113,7 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "pandoc-csv2table" = callPackage From a3fa2cf7c223bacbd255e200a548c84a1e583f14 Mon Sep 17 00:00:00 2001 From: ElXreno Date: Sat, 5 Jun 2021 16:45:17 +0300 Subject: [PATCH 067/797] bees: nixpkgs-fmt Change-Id: If4e9431dad00ffade3316cf22235d8d44d12d149 --- nixos/modules/services/misc/bees.nix | 71 +++++++++++++------------ pkgs/tools/filesystems/bees/default.nix | 30 +++++++---- 2 files changed, 58 insertions(+), 43 deletions(-) diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index b0ed2d5c286..84b3538e832 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -57,7 +57,7 @@ let }; options.extraOptions = mkOption { type = listOf str; - default = []; + default = [ ]; description = '' Extra command-line options passed to the daemon. See upstream bees documentation. ''; @@ -67,7 +67,8 @@ let }; }; -in { +in +{ options.services.beesd = { filesystems = mkOption { @@ -87,37 +88,41 @@ in { }; }; config = { - systemd.services = mapAttrs' (name: fs: nameValuePair "beesd@${name}" { - description = "Block-level BTRFS deduplication for %i"; - after = [ "sysinit.target" ]; + systemd.services = mapAttrs' + (name: fs: nameValuePair "beesd@${name}" { + description = "Block-level BTRFS deduplication for %i"; + after = [ "sysinit.target" ]; - serviceConfig = let - configOpts = [ - fs.spec - "verbosity=${toString fs.verbosity}" - "idxSizeMB=${toString fs.hashTableSizeMB}" - "workDir=${fs.workDir}" - ]; - configOptsStr = escapeShellArgs configOpts; - in { - # Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd%40.service.in - ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}"; - ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}"; - CPUAccounting = true; - CPUWeight = 12; - IOSchedulingClass = "idle"; - IOSchedulingPriority = 7; - IOWeight = 10; - KillMode = "control-group"; - KillSignal = "SIGTERM"; - MemoryAccounting = true; - Nice = 19; - Restart = "on-abnormal"; - StartupCPUWeight = 25; - StartupIOWeight = 25; - SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper" - }; - wantedBy = ["multi-user.target"]; - }) cfg.filesystems; + serviceConfig = + let + configOpts = [ + fs.spec + "verbosity=${toString fs.verbosity}" + "idxSizeMB=${toString fs.hashTableSizeMB}" + "workDir=${fs.workDir}" + ]; + configOptsStr = escapeShellArgs configOpts; + in + { + # Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd@.service.in + ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}"; + ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}"; + CPUAccounting = true; + CPUWeight = 12; + IOSchedulingClass = "idle"; + IOSchedulingPriority = 7; + IOWeight = 10; + KillMode = "control-group"; + KillSignal = "SIGTERM"; + MemoryAccounting = true; + Nice = 19; + Restart = "on-abnormal"; + StartupCPUWeight = 25; + StartupIOWeight = 25; + SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper" + }; + wantedBy = [ "multi-user.target" ]; + }) + cfg.filesystems; }; } diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 7ba27208fe8..5a3d6474c85 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils -, python3Packages, util-linux, nixosTests }: +{ lib +, stdenv +, runCommand +, fetchFromGitHub +, bash +, btrfs-progs +, coreutils +, python3Packages +, util-linux +, nixosTests +}: let @@ -15,12 +24,12 @@ let }; buildInputs = [ - btrfs-progs # for btrfs/ioctl.h - util-linux # for uuid.h + btrfs-progs # for btrfs/ioctl.h + util-linux # for uuid.h ]; nativeBuildInputs = [ - python3Packages.markdown # documentation build + python3Packages.markdown # documentation build ]; preBuild = '' @@ -56,11 +65,12 @@ let in -(runCommand "bees-service" { - inherit bash bees coreutils; - utillinux = util-linux; # needs to be a valid shell variable name - btrfsProgs = btrfs-progs; # needs to be a valid shell variable name -} '' +(runCommand "bees-service" + { + inherit bash bees coreutils; + utillinux = util-linux; # needs to be a valid shell variable name + btrfsProgs = btrfs-progs; # needs to be a valid shell variable name + } '' mkdir -p -- "$out/bin" substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper From 7b9df389829d3f5a30fa37c9e336a666a7c6ad91 Mon Sep 17 00:00:00 2001 From: ElXreno Date: Sat, 5 Jun 2021 16:55:12 +0300 Subject: [PATCH 068/797] bees: 0.6.3 -> 0.6.5 Change-Id: I1866eab9c348d9c10219290ecba698121a32d128 --- nixos/modules/services/misc/bees.nix | 5 +++-- pkgs/tools/filesystems/bees/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index 84b3538e832..6b8cae84642 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -104,10 +104,11 @@ in configOptsStr = escapeShellArgs configOpts; in { - # Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd@.service.in + # Values from https://github.com/Zygo/bees/blob/v0.6.5/scripts/beesd@.service.in ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}"; ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}"; CPUAccounting = true; + CPUSchedulingPolicy = "batch"; CPUWeight = 12; IOSchedulingClass = "idle"; IOSchedulingPriority = 7; @@ -119,7 +120,7 @@ in Restart = "on-abnormal"; StartupCPUWeight = 25; StartupIOWeight = 25; - SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper" + SyslogIdentifier = "beesd"; # would otherwise be "bees-service-wrapper" }; wantedBy = [ "multi-user.target" ]; }) diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 5a3d6474c85..c82ea23debd 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -14,13 +14,13 @@ let bees = stdenv.mkDerivation rec { pname = "bees"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "Zygo"; repo = "bees"; rev = "v${version}"; - sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8="; + sha256 = "11ppbf23b8ngzfy02am0skxlybzmgsp6kna21jimb01x9pp1q7l7"; }; buildInputs = [ From 51f2030430b7318c4577c1e5d63387bc09553515 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 5 Jun 2021 16:52:14 +0200 Subject: [PATCH 069/797] haskellPackages.cabal2nix-unstable: Use justStaticExecutables --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a9f6263ab5d..1270d2a9818 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -819,4 +819,8 @@ self: super: builtins.intersectAttrs super { # itself causing an infinite recursion at evaluation # time random = dontCheck super.random; + + # Since this package is primarily used by nixpkgs maintainers and is probably + # not used to link against by anyone, we can make it’s closure smaller. + cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable; } From 1e7351550cf05f2c467c240ea93b245a2b6bf7c2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 16:08:32 +0200 Subject: [PATCH 070/797] =?UTF-8?q?maintainers/=E2=80=A6/regenerate-hackag?= =?UTF-8?q?e-packages.sh:=20overrideable=20hackage2nix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow setting the HACKAGE2NIX environment variable to change the hackage2nix the script uses to an absolute path to a local build. Useful to test local changes in a realistic environment. --- maintainers/scripts/haskell/regenerate-hackage-packages.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 1effa5e2596..e7f91f2d79d 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -14,6 +14,8 @@ set -euo pipefail +HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" + # To prevent hackage2nix fails because of encoding. # See: https://github.com/NixOS/nixpkgs/pull/122023 export LC_ALL=C.UTF-8 @@ -23,7 +25,7 @@ unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." -hackage2nix \ +"$HACKAGE2NIX" \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ --nixpkgs "$PWD" \ From 776e8fd668560745d20bffc765a94400ef4a523b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 17:56:33 +0200 Subject: [PATCH 071/797] haskellPackages.nri-redis: disable tests They require a local redis daemon running. --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1270d2a9818..643e9edc627 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -823,4 +823,7 @@ self: super: builtins.intersectAttrs super { # Since this package is primarily used by nixpkgs maintainers and is probably # not used to link against by anyone, we can make it’s closure smaller. cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable; + + # test suite needs local redis daemon + nri-redis = dontCheck super.nri-redis; } From 26ac257e4fecc050f28da30399afdfee83d98836 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 4 Jun 2021 18:22:19 +0200 Subject: [PATCH 072/797] doc: nix-gitignore to CommonMark Closes #125670 --- doc/functions.xml | 2 +- doc/functions/nix-gitignore.section.md | 49 ++++++++++++++++++ doc/functions/nix-gitignore.xml | 70 -------------------------- 3 files changed, 50 insertions(+), 71 deletions(-) create mode 100644 doc/functions/nix-gitignore.section.md delete mode 100644 doc/functions/nix-gitignore.xml diff --git a/doc/functions.xml b/doc/functions.xml index 5a9240ec800..e8ab8d97b91 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -10,5 +10,5 @@ - + diff --git a/doc/functions/nix-gitignore.section.md b/doc/functions/nix-gitignore.section.md new file mode 100644 index 00000000000..2fb833b2300 --- /dev/null +++ b/doc/functions/nix-gitignore.section.md @@ -0,0 +1,49 @@ +# pkgs.nix-gitignore {#sec-pkgs-nix-gitignore} + +`pkgs.nix-gitignore` is a function that acts similarly to `builtins.filterSource` but also allows filtering with the help of the gitignore format. + +## Usage {#sec-pkgs-nix-gitignore-usage} + +`pkgs.nix-gitignore` exports a number of functions, but you\'ll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. + +```nix +{ pkgs ? import {} }: + + nix-gitignore.gitignoreSource [] ./source + # Simplest version + + nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source + # This one reads the ./source/.gitignore and concats the auxiliary ignores + + nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source + # Use this string as gitignore, don't read ./source/.gitignore. + + nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source + # It also accepts a list (of strings and paths) that will be concatenated + # once the paths are turned to strings via readFile. +``` + +These functions are derived from the `Filter` functions by setting the first filter argument to `(_: _: true)`: + +```nix +gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true); +gitignoreSource = gitignoreFilterSource (_: _: true); +``` + +Those filter functions accept the same arguments the `builtins.filterSource` function would pass to its filters, thus `fn: gitignoreFilterSourcePure fn ""` should be extensionally equivalent to `filterSource`. The file is blacklisted if it\'s blacklisted by either your filter or the gitignoreFilter. + +If you want to make your own filter from scratch, you may use + +```nix +gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root; +``` + +## gitignore files in subdirectories {#sec-pkgs-nix-gitignore-usage-recursive} + +If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function: + +```nix +gitignoreFilterRecursiveSource = filter: patterns: root: +# OR +gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true); +``` diff --git a/doc/functions/nix-gitignore.xml b/doc/functions/nix-gitignore.xml deleted file mode 100644 index 37a82b196cc..00000000000 --- a/doc/functions/nix-gitignore.xml +++ /dev/null @@ -1,70 +0,0 @@ -
- pkgs.nix-gitignore - - - pkgs.nix-gitignore is a function that acts similarly to builtins.filterSource but also allows filtering with the help of the gitignore format. - - -
- Usage - - - pkgs.nix-gitignore exports a number of functions, but you'll most likely need either gitignoreSource or gitignoreSourcePure. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. - - - {} }: - - nix-gitignore.gitignoreSource [] ./source - # Simplest version - - nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source - # This one reads the ./source/.gitignore and concats the auxiliary ignores - - nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source - # Use this string as gitignore, don't read ./source/.gitignore. - - nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source - # It also accepts a list (of strings and paths) that will be concatenated - # once the paths are turned to strings via readFile. - ]]> - - - These functions are derived from the Filter functions by setting the first filter argument to (_: _: true): - - - - - - Those filter functions accept the same arguments the builtins.filterSource function would pass to its filters, thus fn: gitignoreFilterSourcePure fn "" should be extensionally equivalent to filterSource. The file is blacklisted iff it's blacklisted by either your filter or the gitignoreFilter. - - - - If you want to make your own filter from scratch, you may use - - - -
- -
- gitignore files in subdirectories - - - If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function: - - - -
-
From e4d21886f43a8092331bb229601c3d624d3b1455 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 18:39:33 +0200 Subject: [PATCH 073/797] haskellPackages.tophat: unbreak --- pkgs/development/haskell-modules/configuration-nix.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 643e9edc627..538d5381a96 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -826,4 +826,11 @@ self: super: builtins.intersectAttrs super { # test suite needs local redis daemon nri-redis = dontCheck super.nri-redis; + + # Make tophat find itself for _compiling_ its test suite + tophat = overrideCabal super.tophat (drv: { + postPatch = '' + sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs + '' + (drv.postPatch or ""); + }); } From b7749c76715ba96727f7a12bc2514ddfa6847813 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 4 Jun 2021 14:48:00 +0200 Subject: [PATCH 074/797] nixos/test-driver: Run commands with error handling Bash's standard behavior of not propagating non-zero exit codes through a pipeline is unexpected and almost universally unwanted. Default to setting `pipefail` for the command being run; it can still be turned off by prefixing the pipeline with `set +o pipefail` if needed. Also, set `errexit` and `nonunset` options to make the first command of consecutive commands separated by `;` fail, and disallow dereferencing unset variables respectively. --- .../development/writing-nixos-tests.xml | 25 +++++++++++++++++-- nixos/lib/test-driver/test-driver.py | 2 +- nixos/tests/docker-tools.nix | 6 ++--- nixos/tests/wiki-js.nix | 6 ++--- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 32321deeddf..e372c66410d 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -274,8 +274,29 @@ start_all() - Execute a shell command, raising an exception if the exit status is not - zero, otherwise returning the standard output. + Execute a shell command, raising an exception if the exit status + is not zero, otherwise returning the standard output. Commands + are run with set -euo pipefail set: + + + + If several commands are separated by ; + and one fails, the command as a whole will fail. + + + + + For pipelines, the last non-zero exit status will be + returned (if there is one, zero will be returned + otherwise). + + + + + Dereferencing unset variables fail the command. + + + diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index e0e8b0fb71f..ab739ce3222 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -441,7 +441,7 @@ class Machine: def execute(self, command: str) -> Tuple[int, str]: self.connect() - out_command = "( {} ); echo '|!=EOF' $?\n".format(command) + out_command = "( set -euo pipefail; {} ); echo '|!=EOF' $?\n".format(command) self.shell.send(out_command.encode()) output = "" diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 831ef2fb77a..4c3c26980aa 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -23,15 +23,15 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("includeStorePath"): with subtest("assumption"): docker.succeed("${examples.helloOnRoot} | docker load") - docker.succeed("set -euo pipefail; docker run --rm hello | grep -i hello") + docker.succeed("docker run --rm hello | grep -i hello") docker.succeed("docker image rm hello:latest") with subtest("includeStorePath = false; breaks example"): docker.succeed("${examples.helloOnRootNoStore} | docker load") - docker.fail("set -euo pipefail; docker run --rm hello | grep -i hello") + docker.fail("docker run --rm hello | grep -i hello") docker.succeed("docker image rm hello:latest") with subtest("includeStorePath = false; works with mounted store"): docker.succeed("${examples.helloOnRootNoStore} | docker load") - docker.succeed("set -euo pipefail; docker run --rm --volume ${builtins.storeDir}:${builtins.storeDir}:ro hello | grep -i hello") + docker.succeed("docker run --rm --volume ${builtins.storeDir}:${builtins.storeDir}:ro hello | grep -i hello") docker.succeed("docker image rm hello:latest") with subtest("Ensure Docker images use a stable date by default"): diff --git a/nixos/tests/wiki-js.nix b/nixos/tests/wiki-js.nix index 9aa87d15366..783887d2dca 100644 --- a/nixos/tests/wiki-js.nix +++ b/nixos/tests/wiki-js.nix @@ -119,7 +119,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { with subtest("Setup"): result = machine.succeed( - "set -o pipefail; curl -sSf localhost:3000/finalize -X POST -d " + "curl -sSf localhost:3000/finalize -X POST -d " + "@${payloads.finalize} -H 'Content-Type: application/json' " + "| jq .ok | xargs echo" ) @@ -132,7 +132,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { with subtest("Base functionality"): auth = machine.succeed( - "set -o pipefail; curl -sSf localhost:3000/graphql -X POST " + "curl -sSf localhost:3000/graphql -X POST " + "-d @${payloads.login} -H 'Content-Type: application/json' " + "| jq '.[0].data.authentication.login.jwt' | xargs echo" ).strip() @@ -140,7 +140,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { assert auth create = machine.succeed( - "set -o pipefail; curl -sSf localhost:3000/graphql -X POST " + "curl -sSf localhost:3000/graphql -X POST " + "-d @${payloads.content} -H 'Content-Type: application/json' " + f"-H 'Authorization: Bearer {auth}' " + "| jq '.[0].data.pages.create.responseResult.succeeded'|xargs echo" From a86853501a339f95765a6763e9c409f374606faa Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 5 Jun 2021 00:26:01 +0200 Subject: [PATCH 075/797] nixosTests.nginx*: nginxUnstable -> nginxMainline Stop using the old `nginxUnstable` alias, which is invalid in tests since 3edde6562e19698da69a499881e0a2e4f5a497a2. --- nixos/tests/nginx-variants.nix | 2 +- nixos/tests/nginx.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix index ca4655391bc..a535030663b 100644 --- a/nixos/tests/nginx-variants.nix +++ b/nixos/tests/nginx-variants.nix @@ -29,5 +29,5 @@ builtins.listToAttrs ( }; } ) - [ "nginxStable" "nginxUnstable" "nginxShibboleth" "openresty" "tengine" ] + [ "nginxStable" "nginxMainline" "nginxShibboleth" "openresty" "tengine" ] ) diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 5686afcd043..d9d073822a1 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -56,11 +56,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; specialisation.reloadRestartSystem.configuration = { - services.nginx.package = pkgs.nginxUnstable; + services.nginx.package = pkgs.nginxMainline; }; specialisation.reloadWithErrorsSystem.configuration = { - services.nginx.package = pkgs.nginxUnstable; + services.nginx.package = pkgs.nginxMainline; services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;"; }; }; From 3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 5 Jun 2021 15:50:58 +0200 Subject: [PATCH 076/797] nixosTests.*: Don't use the `-q` flag with grep when used with curl The `-q` flag makes grep close the pipe early, which curl doesn't handle gracefully, but exits with an error like "(23) Failed writing body". --- nixos/tests/calibre-web.nix | 4 +- nixos/tests/doh-proxy-rust.nix | 2 +- nixos/tests/elk.nix | 2 +- nixos/tests/gitlab.nix | 2 +- nixos/tests/gocd-agent.nix | 2 +- nixos/tests/grafana.nix | 8 +-- nixos/tests/miniflux.nix | 12 ++-- nixos/tests/pomerium.nix | 6 +- nixos/tests/prometheus-exporters.nix | 100 +++++++++++++-------------- nixos/tests/shiori.nix | 2 +- nixos/tests/xandikos.nix | 8 +-- 11 files changed, 74 insertions(+), 74 deletions(-) diff --git a/nixos/tests/calibre-web.nix b/nixos/tests/calibre-web.nix index 4f73b331112..0af997317fc 100644 --- a/nixos/tests/calibre-web.nix +++ b/nixos/tests/calibre-web.nix @@ -36,7 +36,7 @@ import ./make-test-python.nix ( default.wait_for_unit("calibre-web.service") default.wait_for_open_port(${toString defaultPort}) default.succeed( - "curl --fail 'http://localhost:${toString defaultPort}/basicconfig' | grep -q 'Basic Configuration'" + "curl --fail 'http://localhost:${toString defaultPort}/basicconfig' | grep 'Basic Configuration'" ) customized.succeed( @@ -46,7 +46,7 @@ import ./make-test-python.nix ( customized.wait_for_unit("calibre-web.service") customized.wait_for_open_port(${toString port}) customized.succeed( - "curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep -q test-book" + "curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep test-book" ) ''; } diff --git a/nixos/tests/doh-proxy-rust.nix b/nixos/tests/doh-proxy-rust.nix index ca150cafab5..23f8616849c 100644 --- a/nixos/tests/doh-proxy-rust.nix +++ b/nixos/tests/doh-proxy-rust.nix @@ -38,6 +38,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_unit("doh-proxy-rust.service") machine.wait_for_open_port(53) machine.wait_for_open_port(3000) - machine.succeed(f"curl --fail '{url}?dns={query}' | grep -qF {bin_ip}") + machine.succeed(f"curl --fail '{url}?dns={query}' | grep -F {bin_ip}") ''; }) diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index fee350de65b..71d39a647a5 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -178,7 +178,7 @@ let one.systemctl("stop logstash") one.systemctl("start elasticsearch-curator") one.wait_until_succeeds( - '! curl --silent --show-error "${esUrl}/_cat/indices" | grep logstash | grep -q ^' + '! curl --silent --show-error "${esUrl}/_cat/indices" | grep logstash | grep ^' ) ''; }) {}; diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index af2ab12bf4b..696ebabb580 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -102,7 +102,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { # `doSetup` is is true. test = doSetup: '' gitlab.succeed( - "curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in" + "curl -isSf http://gitlab | grep -i location | grep http://gitlab/users/sign_in" ) gitlab.succeed( "${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2" diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix index 75edf43ee29..686d0b971d3 100644 --- a/nixos/tests/gocd-agent.nix +++ b/nixos/tests/gocd-agent.nix @@ -42,7 +42,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid" ) agent.succeed( - "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle" + "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep Idle" ) ''; }) diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index 4ba091b893f..174d664d877 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -74,7 +74,7 @@ in { declarativePlugins.wait_for_unit("grafana.service") declarativePlugins.wait_for_open_port(3000) declarativePlugins.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/plugins | grep -q grafana-clock-panel" + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/plugins | grep grafana-clock-panel" ) declarativePlugins.shutdown() @@ -82,7 +82,7 @@ in { sqlite.wait_for_unit("grafana.service") sqlite.wait_for_open_port(3000) sqlite.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep testadmin\@localhost" ) sqlite.shutdown() @@ -92,7 +92,7 @@ in { postgresql.wait_for_open_port(3000) postgresql.wait_for_open_port(5432) postgresql.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep testadmin\@localhost" ) postgresql.shutdown() @@ -102,7 +102,7 @@ in { mysql.wait_for_open_port(3000) mysql.wait_for_open_port(3306) mysql.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep testadmin\@localhost" ) mysql.shutdown() ''; diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index 797a2787d1a..9a25a9e77cc 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -48,23 +48,23 @@ with lib; default.wait_for_unit("miniflux.service") default.wait_for_open_port(${toString defaultPort}) - default.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep -q OK") + default.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep OK") default.succeed( - "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep -q '\"is_admin\":true'" + "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) withoutSudo.wait_for_unit("miniflux.service") withoutSudo.wait_for_open_port(${toString defaultPort}) - withoutSudo.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep -q OK") + withoutSudo.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep OK") withoutSudo.succeed( - "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep -q '\"is_admin\":true'" + "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) customized.wait_for_unit("miniflux.service") customized.wait_for_open_port(${toString port}) - customized.succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep -q OK") + customized.succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep OK") customized.succeed( - "curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep -q '\"is_admin\":true'" + "curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) ''; }) diff --git a/nixos/tests/pomerium.nix b/nixos/tests/pomerium.nix index 531b6212711..7af82832644 100644 --- a/nixos/tests/pomerium.nix +++ b/nixos/tests/pomerium.nix @@ -88,15 +88,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("no authentication required"): pomerium.succeed( - "curl --resolve my.website:80:127.0.0.1 http://my.website | grep -q 'hello world'" + "curl --resolve my.website:80:127.0.0.1 http://my.website | grep 'hello world'" ) with subtest("login required"): pomerium.succeed( - "curl -I --resolve login.required:80:127.0.0.1 http://login.required | grep -q pom-auth" + "curl -I --resolve login.required:80:127.0.0.1 http://login.required | grep pom-auth" ) pomerium.succeed( - "curl -L --resolve login.required:80:127.0.0.1 http://login.required | grep -q 'hello I am login page'" + "curl -L --resolve login.required:80:127.0.0.1 http://login.required | grep 'hello I am login page'" ) ''; }) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index e3bfff218ad..319bd0a8e33 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -71,7 +71,7 @@ let wait_for_open_port(3551) wait_for_unit("prometheus-apcupsd-exporter.service") wait_for_open_port(9162) - succeed("curl -sSf http://localhost:9162/metrics | grep -q 'apcupsd_info'") + succeed("curl -sSf http://localhost:9162/metrics | grep 'apcupsd_info'") ''; }; @@ -85,7 +85,7 @@ let wait_for_unit("prometheus-artifactory-exporter.service") wait_for_open_port(9531) succeed( - "curl -sSf http://localhost:9531/metrics | grep -q 'artifactory_up'" + "curl -sSf http://localhost:9531/metrics | grep 'artifactory_up'" ) ''; }; @@ -106,7 +106,7 @@ let wait_for_unit("prometheus-bind-exporter.service") wait_for_open_port(9119) succeed( - "curl -sSf http://localhost:9119/metrics | grep -q 'bind_query_recursions_total 0'" + "curl -sSf http://localhost:9119/metrics | grep 'bind_query_recursions_total 0'" ) ''; }; @@ -135,7 +135,7 @@ let wait_for_unit("prometheus-bird-exporter.service") wait_for_open_port(9324) wait_until_succeeds( - "curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'" + "curl -sSf http://localhost:9324/metrics | grep 'MyObviousTestString'" ) ''; }; @@ -154,7 +154,7 @@ let wait_for_unit("prometheus-bitcoin-exporter.service") wait_for_unit("bitcoind-default.service") wait_for_open_port(9332) - succeed("curl -sSf http://localhost:9332/metrics | grep -q '^bitcoin_blocks '") + succeed("curl -sSf http://localhost:9332/metrics | grep '^bitcoin_blocks '") ''; }; @@ -172,7 +172,7 @@ let wait_for_unit("prometheus-blackbox-exporter.service") wait_for_open_port(9115) succeed( - "curl -sSf 'http://localhost:9115/probe?target=localhost&module=icmp_v6' | grep -q 'probe_success 1'" + "curl -sSf 'http://localhost:9115/probe?target=localhost&module=icmp_v6' | grep 'probe_success 1'" ) ''; }; @@ -204,7 +204,7 @@ let "curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd" ) succeed( - "curl -sSf localhost:9103/metrics | grep -q 'collectd_testplugin_gauge{instance=\"testhost\"} 23'" + "curl -sSf localhost:9103/metrics | grep 'collectd_testplugin_gauge{instance=\"testhost\"} 23'" ) ''; }; @@ -220,7 +220,7 @@ let exporterTest = '' wait_for_unit("prometheus-dnsmasq-exporter.service") wait_for_open_port(9153) - succeed("curl -sSf http://localhost:9153/metrics | grep -q 'dnsmasq_leases 0'") + succeed("curl -sSf http://localhost:9153/metrics | grep 'dnsmasq_leases 0'") ''; }; @@ -235,7 +235,7 @@ let wait_for_unit("prometheus-domain-exporter.service") wait_for_open_port(9222) succeed( - "curl -sSf 'http://localhost:9222/probe?target=nixos.org' | grep -q 'domain_probe_success 0'" + "curl -sSf 'http://localhost:9222/probe?target=nixos.org' | grep 'domain_probe_success 0'" ) ''; }; @@ -254,7 +254,7 @@ let wait_for_unit("prometheus-dovecot-exporter.service") wait_for_open_port(9166) succeed( - "curl -sSf http://localhost:9166/metrics | grep -q 'dovecot_up{scope=\"global\"} 1'" + "curl -sSf http://localhost:9166/metrics | grep 'dovecot_up{scope=\"global\"} 1'" ) ''; }; @@ -268,7 +268,7 @@ let wait_for_unit("prometheus-fritzbox-exporter.service") wait_for_open_port(9133) succeed( - "curl -sSf http://localhost:9133/metrics | grep -q 'fritzbox_exporter_collect_errors 0'" + "curl -sSf http://localhost:9133/metrics | grep 'fritzbox_exporter_collect_errors 0'" ) ''; }; @@ -290,9 +290,9 @@ let wait_for_unit("prometheus-jitsi-exporter.service") wait_for_open_port(9700) wait_until_succeeds( - 'journalctl -eu prometheus-jitsi-exporter.service -o cat | grep -q "key=participants"' + 'journalctl -eu prometheus-jitsi-exporter.service -o cat | grep "key=participants"' ) - succeed("curl -sSf 'localhost:9700/metrics' | grep -q 'jitsi_participants 0'") + succeed("curl -sSf 'localhost:9700/metrics' | grep 'jitsi_participants 0'") ''; }; @@ -321,7 +321,7 @@ let wait_for_unit("prometheus-json-exporter.service") wait_for_open_port(7979) succeed( - "curl -sSf 'localhost:7979/probe?target=http://localhost' | grep -q 'json_test_metric 1'" + "curl -sSf 'localhost:7979/probe?target=http://localhost' | grep 'json_test_metric 1'" ) ''; }; @@ -426,7 +426,7 @@ let wait_for_unit("knot.service") wait_for_unit("prometheus-knot-exporter.service") wait_for_open_port(9433) - succeed("curl -sSf 'localhost:9433' | grep -q 'knot_server_zone_count 1.0'") + succeed("curl -sSf 'localhost:9433' | grep 'knot_server_zone_count 1.0'") ''; }; @@ -441,10 +441,10 @@ let wait_for_unit("prometheus-keylight-exporter.service") wait_for_open_port(9288) succeed( - "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics | grep -q '400'" + "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics | grep '400'" ) succeed( - "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics?target=nosuchdevice | grep -q '500'" + "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics?target=nosuchdevice | grep '500'" ) ''; }; @@ -489,7 +489,7 @@ let wait_for_open_port(10009) wait_for_unit("prometheus-lnd-exporter.service") wait_for_open_port(9092) - succeed("curl -sSf localhost:9092/metrics | grep -q '^promhttp_metric_handler'") + succeed("curl -sSf localhost:9092/metrics | grep '^promhttp_metric_handler'") ''; }; @@ -531,7 +531,7 @@ let wait_for_unit("prometheus-mail-exporter.service") wait_for_open_port(9225) wait_until_succeeds( - "curl -sSf http://localhost:9225/metrics | grep -q 'mail_deliver_success{configname=\"testserver\"} 1'" + "curl -sSf http://localhost:9225/metrics | grep 'mail_deliver_success{configname=\"testserver\"} 1'" ) ''; }; @@ -571,7 +571,7 @@ let wait_for_unit("prometheus-mikrotik-exporter.service") wait_for_open_port(9436) succeed( - "curl -sSf http://localhost:9436/metrics | grep -q 'mikrotik_scrape_collector_success{device=\"router\"} 0'" + "curl -sSf http://localhost:9436/metrics | grep 'mikrotik_scrape_collector_success{device=\"router\"} 0'" ) ''; }; @@ -596,7 +596,7 @@ let wait_for_unit("prometheus-modemmanager-exporter.service") wait_for_open_port(9539) succeed( - "curl -sSf http://localhost:9539/metrics | grep -q 'modemmanager_info'" + "curl -sSf http://localhost:9539/metrics | grep 'modemmanager_info'" ) ''; }; @@ -634,7 +634,7 @@ let wait_for_unit("nginx.service") wait_for_unit("prometheus-nextcloud-exporter.service") wait_for_open_port(9205) - succeed("curl -sSf http://localhost:9205/metrics | grep -q 'nextcloud_up 1'") + succeed("curl -sSf http://localhost:9205/metrics | grep 'nextcloud_up 1'") ''; }; @@ -653,7 +653,7 @@ let wait_for_unit("nginx.service") wait_for_unit("prometheus-nginx-exporter.service") wait_for_open_port(9113) - succeed("curl -sSf http://localhost:9113/metrics | grep -q 'nginx_up 1'") + succeed("curl -sSf http://localhost:9113/metrics | grep 'nginx_up 1'") ''; }; @@ -708,12 +708,12 @@ let succeed("curl http://localhost") execute("sleep 1") succeed( - "curl -sSf http://localhost:9117/metrics | grep 'filelogger_http_response_count_total' | grep -q 1" + "curl -sSf http://localhost:9117/metrics | grep 'filelogger_http_response_count_total' | grep 1" ) succeed("curl http://localhost:81") execute("sleep 1") succeed( - "curl -sSf http://localhost:9117/metrics | grep 'syslogger_http_response_count_total' | grep -q 1" + "curl -sSf http://localhost:9117/metrics | grep 'syslogger_http_response_count_total' | grep 1" ) ''; }; @@ -726,7 +726,7 @@ let wait_for_unit("prometheus-node-exporter.service") wait_for_open_port(9100) succeed( - "curl -sSf http://localhost:9100/metrics | grep -q 'node_exporter_build_info{.\\+} 1'" + "curl -sSf http://localhost:9100/metrics | grep 'node_exporter_build_info{.\\+} 1'" ) ''; }; @@ -786,7 +786,7 @@ let wait_for_open_port(389) wait_for_open_port(9330) wait_until_succeeds( - "curl -sSf http://localhost:9330/metrics | grep -q 'openldap_scrape{result=\"ok\"} 1'" + "curl -sSf http://localhost:9330/metrics | grep 'openldap_scrape{result=\"ok\"} 1'" ) ''; }; @@ -812,7 +812,7 @@ let exporterTest = '' wait_for_unit("openvpn-test.service") wait_for_unit("prometheus-openvpn-exporter.service") - succeed("curl -sSf http://localhost:9176/metrics | grep -q 'openvpn_up{.*} 1'") + succeed("curl -sSf http://localhost:9176/metrics | grep 'openvpn_up{.*} 1'") ''; }; @@ -828,9 +828,9 @@ let wait_for_file("/var/lib/postfix/queue/public/showq") wait_for_open_port(9154) succeed( - "curl -sSf http://localhost:9154/metrics | grep -q 'postfix_smtpd_connects_total 0'" + "curl -sSf http://localhost:9154/metrics | grep 'postfix_smtpd_connects_total 0'" ) - succeed("curl -sSf http://localhost:9154/metrics | grep -q 'postfix_up{.*} 1'") + succeed("curl -sSf http://localhost:9154/metrics | grep 'postfix_up{.*} 1'") ''; }; @@ -847,20 +847,20 @@ let wait_for_open_port(9187) wait_for_unit("postgresql.service") succeed( - "curl -sSf http://localhost:9187/metrics | grep -q 'pg_exporter_last_scrape_error 0'" + "curl -sSf http://localhost:9187/metrics | grep 'pg_exporter_last_scrape_error 0'" ) - succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 1'") + succeed("curl -sSf http://localhost:9187/metrics | grep 'pg_up 1'") systemctl("stop postgresql.service") succeed( - "curl -sSf http://localhost:9187/metrics | grep -qv 'pg_exporter_last_scrape_error 0'" + "curl -sSf http://localhost:9187/metrics | grep -v 'pg_exporter_last_scrape_error 0'" ) - succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 0'") + succeed("curl -sSf http://localhost:9187/metrics | grep 'pg_up 0'") systemctl("start postgresql.service") wait_for_unit("postgresql.service") succeed( - "curl -sSf http://localhost:9187/metrics | grep -q 'pg_exporter_last_scrape_error 0'" + "curl -sSf http://localhost:9187/metrics | grep 'pg_exporter_last_scrape_error 0'" ) - succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 1'") + succeed("curl -sSf http://localhost:9187/metrics | grep 'pg_up 1'") ''; }; @@ -874,7 +874,7 @@ let wait_for_unit("prometheus-py-air-control-exporter.service") wait_for_open_port(9896) succeed( - "curl -sSf http://localhost:9896/metrics | grep -q 'py_air_control_sampling_error_total'" + "curl -sSf http://localhost:9896/metrics | grep 'py_air_control_sampling_error_total'" ) ''; }; @@ -889,7 +889,7 @@ let wait_for_unit("prometheus-redis-exporter.service") wait_for_open_port(6379) wait_for_open_port(9121) - wait_until_succeeds("curl -sSf localhost:9121/metrics | grep -q 'redis_up 1'") + wait_until_succeeds("curl -sSf localhost:9121/metrics | grep 'redis_up 1'") ''; }; @@ -907,7 +907,7 @@ let wait_for_open_port(11334) wait_for_open_port(7980) wait_until_succeeds( - "curl -sSf 'localhost:7980/probe?target=http://localhost:11334/stat' | grep -q 'rspamd_scanned{host=\"rspamd\"} 0'" + "curl -sSf 'localhost:7980/probe?target=http://localhost:11334/stat' | grep 'rspamd_scanned{host=\"rspamd\"} 0'" ) ''; }; @@ -938,7 +938,7 @@ let wait_for_unit("prometheus-rtl_433-exporter.service") wait_for_open_port(9550) wait_until_succeeds( - "curl -sSf localhost:9550/metrics | grep -q '{}'".format( + "curl -sSf localhost:9550/metrics | grep '{}'".format( 'rtl_433_temperature_celsius{channel="3",id="55",location="",model="zopieux"} 18' ) ) @@ -954,12 +954,12 @@ let wait_for_unit("prometheus-smokeping-exporter.service") wait_for_open_port(9374) wait_until_succeeds( - "curl -sSf localhost:9374/metrics | grep '{}' | grep -qv ' 0$'".format( + "curl -sSf localhost:9374/metrics | grep '{}' | grep -v ' 0$'".format( 'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1"} ' ) ) wait_until_succeeds( - "curl -sSf localhost:9374/metrics | grep -q '{}'".format( + "curl -sSf localhost:9374/metrics | grep '{}'".format( 'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1"}' ) ) @@ -977,7 +977,7 @@ let exporterTest = '' wait_for_unit("prometheus-snmp-exporter.service") wait_for_open_port(9116) - succeed("curl -sSf localhost:9116/metrics | grep -q 'snmp_request_errors_total 0'") + succeed("curl -sSf localhost:9116/metrics | grep 'snmp_request_errors_total 0'") ''; }; @@ -1021,7 +1021,7 @@ let exporterTest = '' wait_for_unit("prometheus-sql-exporter.service") wait_for_open_port(9237) - succeed("curl http://localhost:9237/metrics | grep -c 'sql_points{' | grep -q 2") + succeed("curl http://localhost:9237/metrics | grep -c 'sql_points{' | grep 2") ''; }; @@ -1044,7 +1044,7 @@ let wait_for_open_port(80) wait_for_unit("prometheus-surfboard-exporter.service") wait_for_open_port(9239) - succeed("curl -sSf localhost:9239/metrics | grep -q 'surfboard_up 1'") + succeed("curl -sSf localhost:9239/metrics | grep 'surfboard_up 1'") ''; }; @@ -1057,7 +1057,7 @@ let wait_for_unit("prometheus-systemd-exporter.service") wait_for_open_port(9558) succeed( - "curl -sSf localhost:9558/metrics | grep -q '{}'".format( + "curl -sSf localhost:9558/metrics | grep '{}'".format( 'systemd_unit_state{name="basic.target",state="active",type="target"} 1' ) ) @@ -1079,7 +1079,7 @@ let wait_for_open_port(9051) wait_for_unit("prometheus-tor-exporter.service") wait_for_open_port(9130) - succeed("curl -sSf localhost:9130/metrics | grep -q 'tor_version{.\\+} 1'") + succeed("curl -sSf localhost:9130/metrics | grep 'tor_version{.\\+} 1'") ''; }; @@ -1091,7 +1091,7 @@ let wait_for_unit("prometheus-unifi-poller-exporter.service") wait_for_open_port(9130) succeed( - "curl -sSf localhost:9130/metrics | grep -q 'unifipoller_build_info{.\\+} 1'" + "curl -sSf localhost:9130/metrics | grep 'unifipoller_build_info{.\\+} 1'" ) ''; }; @@ -1115,7 +1115,7 @@ let wait_for_unit("unbound.service") wait_for_unit("prometheus-unbound-exporter.service") wait_for_open_port(9167) - succeed("curl -sSf localhost:9167/metrics | grep -q 'unbound_up 1'") + succeed("curl -sSf localhost:9167/metrics | grep 'unbound_up 1'") ''; }; @@ -1144,7 +1144,7 @@ let wait_for_unit("prometheus-varnish-exporter.service") wait_for_open_port(6081) wait_for_open_port(9131) - succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'") + succeed("curl -sSf http://localhost:9131/metrics | grep 'varnish_up 1'") ''; }; diff --git a/nixos/tests/shiori.nix b/nixos/tests/shiori.nix index a5771262c6f..418bee43c93 100644 --- a/nixos/tests/shiori.nix +++ b/nixos/tests/shiori.nix @@ -28,7 +28,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: machine.wait_for_unit("shiori.service") machine.wait_for_open_port(8080) machine.succeed("curl --fail http://localhost:8080/") - machine.succeed("curl --fail --location http://localhost:8080/ | grep -qi shiori") + machine.succeed("curl --fail --location http://localhost:8080/ | grep -i shiori") with subtest("login"): auth_json = machine.succeed( diff --git a/nixos/tests/xandikos.nix b/nixos/tests/xandikos.nix index 48c770a3d16..69d78ee21e7 100644 --- a/nixos/tests/xandikos.nix +++ b/nixos/tests/xandikos.nix @@ -44,7 +44,7 @@ import ./make-test-python.nix ( xandikos_default.wait_for_open_port(8080) xandikos_default.succeed("curl --fail http://localhost:8080/") xandikos_default.succeed( - "curl -s --fail --location http://localhost:8080/ | grep -qi Xandikos" + "curl -s --fail --location http://localhost:8080/ | grep -i Xandikos" ) xandikos_client.wait_for_unit("network.target") xandikos_client.fail("curl --fail http://xandikos_default:8080/") @@ -55,15 +55,15 @@ import ./make-test-python.nix ( xandikos_proxy.wait_for_open_port(8080) xandikos_proxy.succeed("curl --fail http://localhost:8080/") xandikos_proxy.succeed( - "curl -s --fail --location http://localhost:8080/ | grep -qi Xandikos" + "curl -s --fail --location http://localhost:8080/ | grep -i Xandikos" ) xandikos_client.wait_for_unit("network.target") xandikos_client.fail("curl --fail http://xandikos_proxy:8080/") xandikos_client.succeed( - "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/ | grep -qi Xandikos" + "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/ | grep -i Xandikos" ) xandikos_client.succeed( - "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/user/ | grep -qi Xandikos" + "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/user/ | grep -i Xandikos" ) ''; } From 7da313e10a2b73b05f27a2f6bfeafa1c1d37ce8b Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 13 Apr 2021 20:54:01 +0200 Subject: [PATCH 077/797] bootstrap-tools: Fix xnu python3 patch This patch only affects the xnu included in the bootstrap-tools to avoid a stdenv rebuild. --- pkgs/stdenv/darwin/fixed-xnu-python3.patch | 41 +++++++++++++++++++++ pkgs/stdenv/darwin/make-bootstrap-tools.nix | 12 ++++-- 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 pkgs/stdenv/darwin/fixed-xnu-python3.patch diff --git a/pkgs/stdenv/darwin/fixed-xnu-python3.patch b/pkgs/stdenv/darwin/fixed-xnu-python3.patch new file mode 100644 index 00000000000..9f29376187f --- /dev/null +++ b/pkgs/stdenv/darwin/fixed-xnu-python3.patch @@ -0,0 +1,41 @@ +diff --git a/bsd/kern/makekdebugevents.py b/bsd/kern/makekdebugevents.py +index 73b2db4..d354ba0 100755 +--- a/bsd/kern/makekdebugevents.py ++++ b/bsd/kern/makekdebugevents.py +@@ -5,7 +5,7 @@ + # named kd_events[] or these mappings. + # Required to generate a header file used by DEVELOPMENT and DEBUG kernels. + # +- ++ + import sys + import re + +@@ -21,18 +21,18 @@ code_table = [] + # scan file to generate internal table + with open(trace_code_file, 'rt') as codes: + for line in codes: +- m = id_name_pattern.match(line) +- if m: ++ m = id_name_pattern.match(line) ++ if m: + code_table += [(int(m.group(1),base=16), m.group(2))] + + # emit typedef: +-print "typedef struct {" +-print " uint32_t id;" +-print " const char *name;" +-print "} kd_event_t;" ++print("typedef struct {") ++print(" uint32_t id;") ++print(" const char *name;") ++print("} kd_event_t;") + # emit structure declaration and sorted initialization: +-print "kd_event_t kd_events[] = {" ++print("kd_event_t kd_events[] = {") + for mapping in sorted(code_table, key=lambda x: x[0]): +- print " {0x%x, \"%s\"}," % mapping +-print "};" ++ print(" {0x%x, \"%s\"}," % mapping) ++print("};") + diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 3af444a2e52..e8a2dd640f0 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -26,6 +26,12 @@ in rec { # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); + # Avoid stdenv rebuild. + Libsystem_ = darwin.Libsystem.override (args: + { xnu = darwin.xnu.overrideAttrs (oldAttrs: + { patches = [ ./fixed-xnu-python3.patch ]; }); + }); + build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; @@ -37,12 +43,12 @@ in rec { ${lib.optionalString stdenv.targetPlatform.isx86_64 '' # Copy libSystem's .o files for various low-level boot stuff. - cp -d ${darwin.Libsystem}/lib/*.o $out/lib + cp -d ${Libsystem_}/lib/*.o $out/lib # Resolv is actually a link to another package, so let's copy it properly - cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib + cp -L ${Libsystem_}/lib/libresolv.9.dylib $out/lib - cp -rL ${darwin.Libsystem}/include $out + cp -rL ${Libsystem_}/include $out chmod -R u+w $out/include cp -rL ${darwin.ICU}/include* $out/include cp -rL ${libiconv}/include/* $out/include From 3b8782a80652c02d060b91cb1001ccb8dfeb9cd8 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 19 Apr 2021 20:44:10 +0200 Subject: [PATCH 078/797] bootstrap-tools: Add bootstrapFiles argument I was having a hard time testing new bootstrapFiles because `make-bootstrap-tools.nix` imports `pkgspath` but does not pass anything but the current system. This is merely for convenience and I'm not entirely certain it's a sensible thing to do, maybe generating new bootstrapFiles while overriding the current bootstrapFiles isn't something you're supposed to do? --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index e8a2dd640f0..1889863ee74 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,10 +1,17 @@ -{ pkgspath ? ../../.., test-pkgspath ? pkgspath, system ? builtins.currentSystem, crossSystem ? null }: +{ pkgspath ? ../../.., test-pkgspath ? pkgspath +, system ? builtins.currentSystem, crossSystem ? null, bootstrapFiles ? null +}: -let - pkgs = import pkgspath ({ inherit system; } // (if (crossSystem != null) then { inherit crossSystem; } else {})); -in - -with pkgs; +let cross = if crossSystem != null + then { inherit crossSystem; } + else {}; + custom-bootstrap = if bootstrapFiles != null + then { stdenvStages = args: + let args' = args // { bootstrapFiles = bootstrapFiles; }; + in (import "${pkgspath}/pkgs/stdenv/darwin" args').stagesDarwin; + } + else {}; +in with import pkgspath ({ inherit system; } // cross // custom-bootstrap); let llvmPackageSet = if stdenv.hostPlatform.isAarch64 then "llvmPackages_11" else "llvmPackages_7"; From 4a2698221baa64754258e8a24706b4c1aeadf59a Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 13 Apr 2021 19:22:29 +0200 Subject: [PATCH 079/797] bootstrap-tools: Update to LLVM 11 --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 1889863ee74..6af3315dc3e 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -14,8 +14,7 @@ let cross = if crossSystem != null in with import pkgspath ({ inherit system; } // cross // custom-bootstrap); let - llvmPackageSet = if stdenv.hostPlatform.isAarch64 then "llvmPackages_11" else "llvmPackages_7"; - llvmPackages = pkgs."${llvmPackageSet}"; + llvmPackages = llvmPackages_11; storePrefixLen = builtins.stringLength builtins.storeDir; in rec { coreutils_ = coreutils.override (args: { From d259fcc3e25e33f6fa0bdf3a943730a80c29fe55 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 19 Apr 2021 16:54:50 +0200 Subject: [PATCH 080/797] bootstrap-tools: Include libclang-cpp.dylib Credits to @LnL7, this is based on commit ae68f1c447d775e64d6e16a33f2affe591c419bf from PR #85151. --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 6af3315dc3e..7abce18ac1b 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -99,6 +99,7 @@ in rec { cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin cp -rd ${llvmPackages.clang-unwrapped.lib}/lib/* $out/lib + cp -d ${llvmPackages.libclang}/lib/libclang-cpp.dylib $out/lib cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib cp -d ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin From fa49e70c1b441657eb5d7c5d78777fa4db3764dd Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 19 Apr 2021 17:01:02 +0200 Subject: [PATCH 081/797] bootstrap-tools: Include libclang-cpp.11.1.dylib too We need to include the library with the version suffix because `libclang-cpp.dylib` is just a symlink. --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 7abce18ac1b..7e72e4fa643 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -99,7 +99,7 @@ in rec { cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin cp -rd ${llvmPackages.clang-unwrapped.lib}/lib/* $out/lib - cp -d ${llvmPackages.libclang}/lib/libclang-cpp.dylib $out/lib + cp -d ${llvmPackages.libclang}/lib/libclang-cpp*.dylib $out/lib cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib cp -d ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin From 68f8c1fc66aba287ee42810652df699da46cc4bf Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 4 Jun 2021 01:57:42 -0700 Subject: [PATCH 082/797] stockfish: 12 -> 13 --- pkgs/games/stockfish/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index ef9c7fbe4d6..b09dc523d1a 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -12,13 +12,13 @@ let if stdenv.isi686 then "x86-32" else if stdenv.isAarch64 then "armv8" else "unknown"; - version = "12"; + version = "13"; - nnueFile = "nn-82215d0fd0df.nnue"; + nnueFile = "nn-62ef826d1a6d.nnue"; nnue = fetchurl { name = nnueFile; url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"; + sha256 = "0qsy9rr4zgxrpgwhwbi96z01a2560am2b00q2klbj4bd39nq5vv2"; }; in @@ -28,7 +28,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; - sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i"; + sha256 = "0qhxp2w543psanzhzn8jhfafx8aip57v9nsvafbwa5xynchlgl8m"; }; # This addresses a linker issue with Darwin From 5f8d85a93434e365f52fc858187bdf202d08ce27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 21:45:58 +0000 Subject: [PATCH 083/797] cpp-utilities: 5.10.3 -> 5.10.4 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 14e2c8878fd..de7bf560d3e 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.10.3"; + version = "5.10.4"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bEdDRvm5W12wJnW4xC+AcRLevZ0H7C625eknKzNrLLU="; + sha256 = "sha256-pZh/NbTzQR2kjMeauv1HcRn0hDBaCNRbaZ3+1qs5rxU="; }; nativeBuildInputs = [ cmake ]; From 5591b8e1fc39a05e4a6f792dc54d9085f6ad004c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 01:27:00 +0200 Subject: [PATCH 084/797] haskell.packages: let me maintain some more packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 6 ++++++ pkgs/development/haskell-modules/hackage-packages.nix | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 58ba5ec683e..56e2791c4f1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -306,6 +306,12 @@ package-maintainers: - yarn-lock - yarn2nix - large-hashable + - haskell-ci + - diagrams + # owothia + - irc-client + - chatter + - envy terlar: - nix-diff turion: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 002629c61fd..be5fecbe9ad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -53410,6 +53410,7 @@ self: { ]; description = "A library of simple NLP algorithms"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "chatty" = callPackage @@ -74144,6 +74145,7 @@ self: { doHaddock = false; description = "Embedded domain-specific language for declarative vector graphics"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "diagrams-boolean" = callPackage @@ -84196,6 +84198,7 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "envy-extensible" = callPackage @@ -118462,6 +118465,7 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "haskell-cnc" = callPackage @@ -149530,6 +149534,7 @@ self: { ]; description = "An IRC client library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "irc-colors" = callPackage From c8e00db1f3bbc8389d70af291dfdf9658ec35a7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 23:40:19 +0000 Subject: [PATCH 085/797] go-toml: 1.9.1 -> 1.9.2 --- pkgs/development/tools/go-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 355f468237c..fee8d94f754 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4="; + sha256 = "sha256-x740f6I+szhq4mEsed4bsXcC8PvzF6PKFJNJ9SKMGIE="; }; goPackagePath = "github.com/pelletier/go-toml"; From c62bf5e4a12a100350fc668e1217e0739a0e9346 Mon Sep 17 00:00:00 2001 From: schnusch Date: Sun, 6 Jun 2021 01:58:54 +0200 Subject: [PATCH 086/797] remote-touchpad: 1.0.1 -> 1.0.2 --- pkgs/tools/inputmethods/remote-touchpad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 0bd2b09aafc..a4dc6a1c463 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "0zmbn4s3yhcgmijc96vja7zj2sh6q0nkybhqy0fwz6sqzk8hq02x"; + sha256 = "09a252z69msy4wd5kazpca8dcn0a2djdw0vs663062fl977p73qs"; }; buildInputs = [ libX11 libXi libXt libXtst ]; buildFlags = [ "-tags" "portal,x11" ]; - vendorSha256 = "0q1qk5g7kqpcci5fgamvxa8989jglv69kwg5rvkphbnx1bzlivrl"; + vendorSha256 = "1pgj0m67g759mcs4s34h4pq3mc7gni643z5cp6ffq4rrn8mdi060"; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; From 19f80f0d327089029796b4482323bba9eb961bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Kennedy?= Date: Sat, 5 Jun 2021 15:07:37 -0700 Subject: [PATCH 087/797] veikk-linux-driver-gui: init at 2.0 Add configuration utility to configure VEIKK brand digitizers --- maintainers/maintainer-list.nix | 10 ++++++ .../misc/veikk-linux-driver-gui/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/tools/misc/veikk-linux-driver-gui/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1989c99c1ea..2448ad3f93d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7261,6 +7261,16 @@ githubId = 10180857; name = "Anmol Sethi"; }; + nicbk = { + email = "nicolas@nicbk.com"; + github = "nicbk"; + githubId = 77309427; + name = "Nicolás Kennedy"; + keys = [{ + longkeyid = "rsa4096/0xC061089EFEBF7A35"; + fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; + }]; + }; nichtsfrei = { email = "philipp.eder@posteo.net"; github = "nichtsfrei"; diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix new file mode 100644 index 00000000000..e216823f7ab --- /dev/null +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, gnumake, qmake }: + +mkDerivation rec { + name = "veikk-linux-driver-gui"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "jlam55555"; + repo = name; + rev = "v${version}"; + sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; + }; + + nativeBuildInputs = [ qmake ]; + + postBuild = '' + make all clean + ''; + + installPhase = '' + mkdir -p $out/bin + cp veikk-linux-driver-gui $out/bin + ''; + + meta = with lib; { + description = "Configuration tool for the VEIKK Linux driver"; + homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ nicbk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b10c4d8202f..e55d89a6240 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -870,6 +870,8 @@ in tnat64 = callPackage ../tools/networking/tnat64 { }; + veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; + xcd = callPackage ../tools/misc/xcd { }; xtrt = callPackage ../tools/archivers/xtrt { }; From d32c2470838e79d01fccf6e7a95b473610b9e1d2 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 6 Jun 2021 09:43:37 +0900 Subject: [PATCH 088/797] purescript: 0.14.0 -> 0.14.2 --- .../development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index fbe96ca179d..5554c537a5a 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.0"; + version = "0.14.2"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "0dfnn5ar7zgvgvxcvw5f6vwpkgkwa017y07s7mvdv44zf4hzsj3s"; + sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1l3i7mxlzb2dkq6ff37rvnaarikxzxj0fg9i2kk26s8pz7vpqgjh"; + sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw"; }; From 8f2ea9a96189d42a9402b7c726694d831802f1c4 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 6 Jun 2021 09:48:12 +0900 Subject: [PATCH 089/797] purescript: add changelog --- pkgs/development/compilers/purescript/purescript/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 5554c537a5a..568407c3614 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -62,5 +62,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; mainProgram = "purs"; + changelog = "https://github.com/purescript/purescript/releases/tag/v${version}"; }; } From b03b73c879884781134c2a28e68dad0de008197f Mon Sep 17 00:00:00 2001 From: Babbaj Date: Sat, 5 Jun 2021 21:02:44 -0400 Subject: [PATCH 090/797] depotdownloader: init at 2.4.1 --- pkgs/tools/misc/depotdownloader/default.nix | 49 ++++++++++++ pkgs/tools/misc/depotdownloader/deps.nix | 88 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 139 insertions(+) create mode 100644 pkgs/tools/misc/depotdownloader/default.nix create mode 100644 pkgs/tools/misc/depotdownloader/deps.nix diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix new file mode 100644 index 00000000000..384234f1f9c --- /dev/null +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper +, dotnet-sdk_5, dotnetPackages +}: + +let + fetchNuGet = {name, version, sha256}: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + deps = import ./deps.nix fetchNuGet; +in +stdenv.mkDerivation rec { + pname = "depotdownloader"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "SteamRE"; + repo = "DepotDownloader"; + rev = "DepotDownloader_${version}"; + sha256 = "1ldwda7wyvzqvqv1wshvqvqaimlm0rcdzhy9yn5hvxyswc0jxirr"; + }; + + nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper ]; + + buildPhase = '' + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + export HOME=$TMP/home + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget DepotDownloader/DepotDownloader.csproj + dotnet publish --no-restore -c Release --output $out + ''; + + installPhase = '' + makeWrapper ${dotnet-sdk_5}/bin/dotnet $out/bin/$pname \ + --add-flags $out/DepotDownloader.dll + ''; + + meta = with lib; { + description = "Steam depot downloader utilizing the SteamKit2 library."; + license = licenses.gpl2Only; + maintainers = [ maintainers.babbaj ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/tools/misc/depotdownloader/deps.nix new file mode 100644 index 00000000000..6f061186f82 --- /dev/null +++ b/pkgs/tools/misc/depotdownloader/deps.nix @@ -0,0 +1,88 @@ +fetchNuGet: +[ + (fetchNuGet { + name = "protobuf-net"; + version = "3.0.101"; + sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; + }) + (fetchNuGet { + name = "SteamKit2"; + version = "2.4.0-Alpha.2"; + sha256 = "1r6chqdp912pr8f8d7px2vp4y1ydx0kida7d5a1hbf6b7acnsg7d"; + }) + (fetchNuGet { + name = "protobuf-net.Core"; + version = "3.0.101"; + sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App"; + version = "2.0.0"; + sha256 = "0j8xkssrashyxrmdraci6kmj2gdrdxb0z61jwnzf1r9r2kqrd7d2"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetAppHost"; + version = "2.0.0"; + sha256 = "0yixdk1rslbznrl50d6pyhg50xxr6jbfb1qpy2yd8xv44s4shgwd"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.0"; + sha256 = "1zz9yfzcvcai4il78s3phjp1hryib2zk3w2r16v3fxm2yllssyaf"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetHostResolver"; + version = "2.0.0"; + sha256 = "0xy45xqmdqz7r6v0g8m7c1rp761ghavjl8nzxiyrpbp0wccxl3xb"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "5.0.0"; + sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "5.0.0"; + sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.0"; + sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.1"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.7.0"; + sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.7.0"; + sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.3"; + sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "5.0.0"; + sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "5.0.0"; + sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; + }) +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffbfb108c9d..c55a258c73b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30326,6 +30326,8 @@ in darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; + depotdownloader = callPackage ../tools/misc/depotdownloader { }; + desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; }; dbacl = callPackage ../tools/misc/dbacl { }; From 38db89df057daae580442c8b39177ad5db6b99ac Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Sat, 5 Jun 2021 13:28:57 -0500 Subject: [PATCH 091/797] verilator: specify lgpl3Only and artistic2 licenses --- pkgs/applications/science/electronics/verilator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 5039b842f41..5377a7b3d11 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; - license = licenses.lgpl3; + license = with licenses; [ lgpl3Only artistic2 ]; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; From cd2fea35aba8bd4e298037e8d2c40babdf69cec8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 01:44:36 +0000 Subject: [PATCH 092/797] lazygit: 0.28.1 -> 0.28.2 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 7038b7c1eb0..af33938c1a6 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tan8ksSyMIeDL7oRAWd3Qtz/sKbhAAfY7IknfwjyvgQ="; + sha256 = "sha256-s5Ou0FhL9+2/xm7lKMG/3ya5P8idI0cgtJ28cV37pJQ="; }; vendorSha256 = null; From 5c14e587c7ebd6f8e02120c41eb7b6e986e03f94 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 30 Apr 2020 12:42:17 -0700 Subject: [PATCH 093/797] emacsPackages.isearch-plus: init at 2021-01-01 --- .../elisp-packages/isearch-plus/default.nix | 36 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix new file mode 100644 index 00000000000..64cfbde98b7 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, emacs, lib }: + +stdenv.mkDerivation { + pname = "isearch-plus"; + version = "2021-01-01"; + + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "isearch-plus"; + rev = "376a8f9f8a9666d7e61d125abcdb645847cb8619"; + sha256 = "sha256-Kd5vpu+mI1tJPcsu7EpnnBcPVdVAijkAeTz+bLB3WlQ="; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + runHook preBuild + emacs -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + description = "Extensions to isearch"; + homepage = "https://www.emacswiki.org/emacs/download/isearch%2b.el"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ leungbk ]; + platforms = emacs.meta.platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 80cc7578b4f..fc71bc574b6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -111,6 +111,8 @@ helm-words = callPackage ./helm-words { }; + isearch-plus = callPackage ./isearch-plus { }; + jam-mode = callPackage ./jam-mode { }; llvm-mode = trivialBuild { From 473f1423432dafaad42684b131aedebcd3238178 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 30 Apr 2020 12:43:55 -0700 Subject: [PATCH 094/797] emacsPackages.isearch-prop: init at 2019-05-01 --- .../elisp-packages/isearch-prop/default.nix | 36 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix new file mode 100644 index 00000000000..0db28255f70 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, emacs, lib }: + +stdenv.mkDerivation { + pname = "isearch-prop"; + version = "2019-05-01"; + + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "isearch-prop"; + rev = "4a2765f835dd115d472142da05215c4c748809f4"; + sha256 = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk="; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + runHook preBuild + emacs -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + description = "Search text- or overlay-property contexts"; + homepage = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leungbk ]; + platforms = emacs.meta.platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index fc71bc574b6..061d58fbc5b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -113,6 +113,8 @@ isearch-plus = callPackage ./isearch-plus { }; + isearch-prop = callPackage ./isearch-prop { }; + jam-mode = callPackage ./jam-mode { }; llvm-mode = trivialBuild { From f135fdad38ecacf7735aff89f66d78b865890d2b Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 18 May 2020 11:45:16 -0700 Subject: [PATCH 095/797] emacsPackages.git-undo: init at 2019-10-13 --- .../emacs/elisp-packages/git-undo/default.nix | 36 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix new file mode 100644 index 00000000000..1b4da6340dc --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, emacs, lib }: + +stdenv.mkDerivation { + pname = "git-undo"; + version = "2019-10-13"; + + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "git-undo-el"; + rev = "cf31e38e7889e6ade7d2d2b9f8719fd44f52feb5"; + sha256 = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE="; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + runHook preBuild + emacs -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + description = "Revert region to most recent Git-historical version"; + homepage = "https://github.com/jwiegley/git-undo-el"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ leungbk ]; + platforms = emacs.meta.platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 061d58fbc5b..9e0631c5d11 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -88,6 +88,8 @@ }; }; + git-undo = callPackage ./git-undo { }; + haskell-unicode-input-method = melpaBuild { pname = "emacs-haskell-unicode-input-method"; version = "20110905.2307"; From 0d44260ebc4fb7c7d384a906608875d5cf9318e7 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 18 May 2020 11:57:08 -0700 Subject: [PATCH 096/797] emacsPackages.youtube-dl: init at 2018-10-12 --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../elisp-packages/youtube-dl/default.nix | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 9e0631c5d11..3e2579bd6b6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -212,6 +212,8 @@ tramp = callPackage ./tramp { }; + youtube-dl = callPackage ./youtube-dl { }; + zeitgeist = callPackage ./zeitgeist { }; # From old emacsPackages (pre emacsPackagesNg) diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix new file mode 100644 index 00000000000..c99693463a6 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, emacs, lib }: + +stdenv.mkDerivation { + pname = "youtube-dl"; + version = "2018-10-12"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = "youtube-dl-emacs"; + rev = "af877b5bc4f01c04fccfa7d47a2c328926f20ef4"; + sha256 = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + runHook preBuild + emacs -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + description = "Emacs frontend to the youtube-dl utility"; + homepage = "https://github.com/skeeto/youtube-dl-emacs"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ leungbk ]; + platforms = emacs.meta.platforms; + }; +} From 48b585cbe4deedb1790303053b614cd5ef68288f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 19 May 2020 10:04:10 -0700 Subject: [PATCH 097/797] emacsPackages.evil-markdown: init at 2020-06-01 --- .../elisp-packages/evil-markdown/default.nix | 46 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix new file mode 100644 index 00000000000..74fc1a17921 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, emacs, emacsPackages, lib }: + +let + runtimeDeps = with emacsPackages; [ + evil + markdown-mode + ]; +in +stdenv.mkDerivation { + pname = "evil-markdown"; + version = "2020-06-01"; + + src = fetchFromGitHub { + owner = "Somelauw"; + repo = "evil-markdown"; + rev = "064fe9b4767470472356d20bdd08e2f30ebbc9ac"; + sha256 = "sha256-Kt2wxG1XCFowavVWtj0urM/yURKegonpZcxTy/+CrJY="; + }; + + buildInputs = [ + emacs + ] ++ runtimeDeps; + + propagatedUserEnvPkgs = runtimeDeps; + + buildPhase = '' + runHook preBuild + emacs -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + description = "Vim-like keybindings for markdown-mode"; + homepage = "https://github.com/Somelauw/evil-markdown"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leungbk ]; + platforms = emacs.meta.platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 3e2579bd6b6..8ad0846847d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -70,6 +70,8 @@ ess-R-object-popup = callPackage ./ess-R-object-popup { }; + evil-markdown = callPackage ./evil-markdown { }; + font-lock-plus = callPackage ./font-lock-plus { }; ghc-mod = melpaBuild { From b736e9048b1b833b5d6bfd6959a010f20081c70c Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 19 May 2020 17:17:23 -0700 Subject: [PATCH 098/797] emacsPackages.mu4e-patch: init at 2019-05-09 --- .../emacs/elisp-packages/manual-packages.nix | 2 + .../elisp-packages/mu4e-patch/default.nix | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 8ad0846847d..0b54dcca199 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -185,6 +185,8 @@ }; + mu4e-patch = callPackage ./mu4e-patch { }; + org-mac-link = callPackage ./org-mac-link { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix b/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix new file mode 100644 index 00000000000..4a436339ebc --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, emacs, lib }: + +stdenv.mkDerivation { + pname = "mu4e-patch"; + version = "2019-05-09"; + + src = fetchFromGitHub { + owner = "seanfarley"; + repo = "mu4e-patch"; + rev = "522da46c1653b1cacc79cde91d6534da7ae9517d"; + sha256 = "sha256-1lV4dDuCdyCUXi/In2DzYJPEHuAc9Jfbz2ZecNZwn4I="; + }; + + buildInputs = [ + emacs + ]; + + buildPhase = '' + runHook preBuild + emacs -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + description = "Colorize patch emails in mu4e"; + homepage = "https://github.com/seanfarley/mu4e-patch"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leungbk ]; + platforms = emacs.meta.platforms; + }; +} From cf88d436dc2a511700c955008ab6a0c608351d17 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 5 Jun 2021 18:23:41 -0700 Subject: [PATCH 099/797] emacsPackages.apheleia: init at 2021-05-23 --- .../emacs/elisp-packages/apheleia/default.nix | 36 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix new file mode 100644 index 00000000000..658a18c0586 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, emacs, lib }: + +stdenv.mkDerivation { + pname = "apheleia"; + version = "2021-05-23"; + + src = fetchFromGitHub { + owner = "raxod502"; + repo = "apheleia"; + rev = "f865c165dac606187a66b2b25a57d5099b452120"; + sha256 = "sha256-n37jJsNOGhSjUtQysG3NVIjjayhbOa52iTXBc8SyKXE="; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + runHook preBuild + emacs -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + description = "Reformat buffer stably"; + homepage = "https://github.com/raxod502/apheleia"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leungbk ]; + platforms = emacs.meta.platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 0b54dcca199..f862a1ae8a5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -65,6 +65,8 @@ }; }; + apheleia = callPackage ./apheleia {}; + emacspeak = callPackage ./emacspeak {}; ess-R-object-popup = From 4a34590eced7ec7aadf4a64105d7a88125919738 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 27 May 2021 20:10:11 +0800 Subject: [PATCH 100/797] ocamlPackages.cooltt: init at unstable-2021-05-25 --- .../ocaml-modules/cooltt/default.nix | 47 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cooltt/default.nix diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix new file mode 100644 index 00000000000..2ece4543c2a --- /dev/null +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, cmdliner +, menhir +, menhirLib +, ppx_deriving +, ppxlib +, uuseg +, uutf +}: + +buildDunePackage { + pname = "cooltt"; + version = "unstable-2021-05-25"; + + minimumOCamlVersion = "4.10"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "cooltt"; + rev = "8ac06cbf7e05417d777f3ac6a471fe3576249f79"; + sha256 = "sha256-JBLNJaRuP/gwlg8RS3cpOpzxChOVKfmFulf5HKhhHh4="; + }; + + nativeBuildInputs = [ + cmdliner + menhir + ppxlib + ]; + + propagatedBuildInputs = [ + menhirLib + ppx_deriving + uuseg + uutf + ]; + + meta = with lib; { + homepage = "https://github.com/RedPRL/cooltt"; + description = "A cool implementation of normalization by evaluation (nbe) & elaboration for Cartesian cubical type theory"; + license = licenses.asl20; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1fba7289130..92894bf7a3b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -191,6 +191,8 @@ let containers-data = callPackage ../development/ocaml-modules/containers/data.nix { }; + cooltt = callPackage ../development/ocaml-modules/cooltt { }; + cow = callPackage ../development/ocaml-modules/cow { }; cpdf = callPackage ../development/ocaml-modules/cpdf { }; From 943d26cf3b3aa407c651395141b0a5bbf7043175 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 6 Jun 2021 12:59:18 +0800 Subject: [PATCH 101/797] linuxPackages_4_4.v4l2loopback: fix build for 4.4 kernels --- pkgs/os-specific/linux/v4l2loopback/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 73b2f589511..53f37e805fa 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { - name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.12.5"; + pname = "v4l2loopback"; + version = "unstable-2020-04-22-${kernel.version}"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "v${version}"; - sha256 = "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn"; + rev = "d26e624b4ead762d34152f9f825b3a51fb92fb9c"; + sha256 = "sha256-OA45vmuVieoL7J83D3TD5qi3SBsiqi0kiQn4i1K6dVE="; }; hardeningDisable = [ "format" "pic" ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = kernel.moduleBuildDependencies; + buildInputs = [ kmod ]; makeFlags = [ @@ -30,8 +31,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/umlaeute/v4l2loopback"; - license = licenses.gpl2; - maintainers = [ ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fortuneteller2k ]; platforms = platforms.linux; }; } From e17840d7391cd969e62b113a8d5c7a2b617ff1a5 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 1 Jun 2021 18:53:46 +0800 Subject: [PATCH 102/797] river: 2021-05-07 -> 2021-06-06 --- pkgs/applications/window-managers/river/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 5c02484236c..6fbcf1b2870 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-05-07"; + version = "unstable-2021-06-06"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d"; - sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j"; + rev = "0e9dc089d14e2b5c923d483c62d342af29493cf0"; + sha256 = "sha256-2rIZYr9Y+IBrox5MVrPpHeI8OVSXHsMZmcCagsX56lU="; fetchSubmodules = true; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native -Dxwayland -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install runHook postInstall ''; From 1aefc955f74aa71f63577026cb999b4990492912 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sat, 5 Jun 2021 23:41:56 -0600 Subject: [PATCH 103/797] rpg-cli: 0.3.0 -> 0.4.0 --- pkgs/games/rpg-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 0c3a58c98a9..1c5e8fce97a 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-pcVxUX6CPIE5GJniXbAiwZQjwv2eer8LevFl6gASKmM="; + sha256 = "0rbj27zd7ydkvnyszd56hazj64aqqrwn34fsy4jymk50lvicwxjg"; }; - cargoSha256 = "sha256-4DB3Zj9awmKX5t1zCgWxetz/+tl6ojpCEKxWpZFlMcw="; + cargoSha256 = "sha256-VftJgRqrFwTElp2/e+zQYZOLZPjbc9C8SZ4DlBEtRvQ="; # tests assume the authors macbook, and thus fail doCheck = false; From ee7ee13b27dbf969ee5f5a49b7fa18fa43e1f0e7 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 6 Jun 2021 14:01:19 +0800 Subject: [PATCH 104/797] zls: 0.1.0 -> unstable-2021-06-06 --- pkgs/development/tools/zls/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index 0c9a715e9bd..0fbe7bc3114 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zls"; - version = "0.1.0"; + version = "unstable-2021-06-06"; src = fetchFromGitHub { owner = "zigtools"; repo = pname; - rev = version; - sha256 = "sha256-A4aOdmlIxBUeKyczzLxH4y1Rl9TgE1EeiKGbWY4p/00="; + rev = "39d87188647bd8c8eed304ee18f2dd1df6942f60"; + sha256 = "sha256-22N508sVkP1OLySAijhtTPzk2fGf+FVnX9LTYRbRpB4="; fetchSubmodules = true; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native --prefix $out install + zig build -Drelease-safe -Dcpu=baseline --prefix $out install ''; meta = with lib; { From 4beede5bf0bdea917b6a78fd5af18f9f76983c33 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 6 Jun 2021 14:31:18 +0800 Subject: [PATCH 105/797] cpufrequtils: set platform to x86_64-linux --- pkgs/os-specific/linux/cpufrequtils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index d099a62bc81..6f94d0f8925 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to display or change the CPU governor settings"; homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"; - license = licenses.gpl2; - platforms = platforms.linux; + license = licenses.gpl2Only; + platforms = [ "x86_64-linux" ]; }; } From 381dcecd65e14f1b71b4a2491fe3da0dc8401930 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 06:38:36 +0000 Subject: [PATCH 106/797] gnome.eog: 40.1 -> 40.2 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 426a8783352..e67a623069b 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok="; + sha256 = "sha256-kITimZMftX3ih+V9vS7i0pf7Z0DA1TW52o1fGWqP0ZU="; }; nativeBuildInputs = [ From c27d583b427262bec1d4de707d1bbba401fffcd2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Jun 2021 08:33:46 +0200 Subject: [PATCH 107/797] php: Simplify generic.nix There is no need for the outer function since all arguments are shadowed anyway. --- pkgs/development/interpreters/php/7.4.nix | 6 +- pkgs/development/interpreters/php/8.0.nix | 6 +- pkgs/development/interpreters/php/generic.nix | 421 +++++++++--------- 3 files changed, 214 insertions(+), 219 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 79e736b30d5..c4e566ee27c 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -1,9 +1,7 @@ -{ callPackage, lib, stdenv, nixosTests, ... }@_args: +{ callPackage, lib, stdenv, ... }@_args: let - generic = (import ./generic.nix) _args; - - base = callPackage generic (_args // { + base = callPackage ./generic.nix (_args // { version = "7.4.20"; sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; }); diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 9d357f88afe..90f7c3b796c 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -1,9 +1,7 @@ -{ callPackage, lib, stdenv, nixosTests, ... }@_args: +{ callPackage, lib, stdenv, ... }@_args: let - generic = (import ./generic.nix) _args; - - base = callPackage generic (_args // { + base = callPackage ./generic.nix (_args // { version = "8.0.7"; sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; }); diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 233e1b7007f..558fa45a1fd 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -1,8 +1,6 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, lib, stdenv, nixosTests, ... }: - let generic = { callPackage, lib, stdenv, nixosTests, fetchurl, makeWrapper @@ -33,250 +31,251 @@ let , valgrindSupport ? !stdenv.isDarwin , ztsSupport ? apxs2Support }@args: - let - # buildEnv wraps php to provide additional extensions and - # configuration. Its usage is documented in - # doc/languages-frameworks/php.section.md. - # - # Create a buildEnv with earlier overridden values and - # extensions functions in its closure. This is necessary for - # consecutive calls to buildEnv and overrides to work as - # expected. - mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( - { extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs: - let - allArgs = args // prevArgs // innerArgs; - filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; - php = generic filteredArgs; - php-packages = (callPackage ../../../top-level/php-packages.nix { - phpPackage = phpWithExtensions; - }).overrideScope' packageOverrides; + let + # buildEnv wraps php to provide additional extensions and + # configuration. Its usage is documented in + # doc/languages-frameworks/php.section.md. + # + # Create a buildEnv with earlier overridden values and + # extensions functions in its closure. This is necessary for + # consecutive calls to buildEnv and overrides to work as + # expected. + mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( + { extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs: + let + allArgs = args // prevArgs // innerArgs; + filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; + php = generic filteredArgs; - allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; - enabledExtensions = - builtins.foldl' - (enabled: f: - f { inherit enabled; all = php-packages.extensions; }) - [] - allExtensionFunctions; + php-packages = (callPackage ../../../top-level/php-packages.nix { + phpPackage = phpWithExtensions; + }).overrideScope' packageOverrides; - getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; + enabledExtensions = + builtins.foldl' + (enabled: f: + f { inherit enabled; all = php-packages.extensions; }) + [] + allExtensionFunctions; - # Recursively get a list of all internal dependencies - # for a list of extensions. - getDepsRecursively = extensions: - let - deps = lib.concatMap - (ext: (ext.internalDeps or []) ++ (ext.peclDeps or [])) - extensions; - in - if ! (deps == []) then - deps ++ (getDepsRecursively deps) - else - deps; + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - # Generate extension load configuration snippets from the - # extension parameter. This is an attrset suitable for use - # with textClosureList, which is used to put the strings in - # the right order - if a plugin which is dependent on - # another plugin is placed before its dependency, it will - # fail to load. - extensionTexts = - lib.listToAttrs - (map (ext: - let - extName = getExtName ext; - phpDeps = (ext.internalDeps or []) ++ (ext.peclDeps or []); - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; - in - lib.nameValuePair extName { - text = "${type}=${ext}/lib/php/extensions/${extName}.so"; - deps = map getExtName phpDeps; - }) - (enabledExtensions ++ (getDepsRecursively enabledExtensions))); + # Recursively get a list of all internal dependencies + # for a list of extensions. + getDepsRecursively = extensions: + let + deps = lib.concatMap + (ext: (ext.internalDeps or []) ++ (ext.peclDeps or [])) + extensions; + in + if ! (deps == []) then + deps ++ (getDepsRecursively deps) + else + deps; - extNames = map getExtName enabledExtensions; - extraInit = writeText "php-extra-init-${version}.ini" '' - ${lib.concatStringsSep "\n" - (lib.textClosureList extensionTexts extNames)} - ${extraConfig} - ''; + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + phpDeps = (ext.internalDeps or []) ++ (ext.peclDeps or []); + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = map getExtName phpDeps; + }) + (enabledExtensions ++ (getDepsRecursively enabledExtensions))); - phpWithExtensions = symlinkJoin { - name = "php-with-extensions-${version}"; - inherit (php) version; - nativeBuildInputs = [ makeWrapper ]; - passthru = php.passthru // { - buildEnv = mkBuildEnv allArgs allExtensionFunctions; - withExtensions = mkWithExtensions allArgs allExtensionFunctions; - phpIni = "${phpWithExtensions}/lib/php.ini"; - unwrapped = php; - # Select the right php tests for the php version - tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; - inherit (php-packages) extensions buildPecl; - packages = php-packages.tools; - meta = php.meta // { - outputsToInstall = [ "out" ]; - }; + extNames = map getExtName enabledExtensions; + extraInit = writeText "php-extra-init-${version}.ini" '' + ${lib.concatStringsSep "\n" + (lib.textClosureList extensionTexts extNames)} + ${extraConfig} + ''; + + phpWithExtensions = symlinkJoin { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = php.passthru // { + buildEnv = mkBuildEnv allArgs allExtensionFunctions; + withExtensions = mkWithExtensions allArgs allExtensionFunctions; + phpIni = "${phpWithExtensions}/lib/php.ini"; + unwrapped = php; + # Select the right php tests for the php version + tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; + inherit (php-packages) extensions buildPecl; + packages = php-packages.tools; + meta = php.meta // { + outputsToInstall = [ "out" ]; }; - paths = [ php ]; - postBuild = '' - ln -s ${extraInit} $out/lib/php.ini - - if test -e $out/bin/php; then - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib - fi - - if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib - fi - - if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib - fi - ''; }; - in - phpWithExtensions); + paths = [ php ]; + postBuild = '' + ln -s ${extraInit} $out/lib/php.ini - mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: - mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; - in - stdenv.mkDerivation { - pname = "php"; + if test -e $out/bin/php; then + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + fi - inherit version; + if test -e $out/bin/php-fpm; then + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + fi - enableParallelBuilding = true; + if test -e $out/bin/phpdbg; then + wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib + fi + ''; + }; + in + phpWithExtensions); - nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] - ++ lib.optional stdenv.isDarwin xcbuild; + mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: + mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; + in + stdenv.mkDerivation { + pname = "php"; - buildInputs = - # PCRE extension - [ pcre2 ] + inherit version; - # Enable sapis - ++ lib.optional pearSupport [ libxml2.dev ] + enableParallelBuilding = true; - # Misc deps - ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional argon2Support libargon2 - ++ lib.optional systemdSupport systemd - ++ lib.optional valgrindSupport valgrind - ; + nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] + ++ lib.optional stdenv.isDarwin xcbuild; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + buildInputs = + # PCRE extension + [ pcre2 ] - configureFlags = - # Disable all extensions - [ "--disable-all" ] + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] - # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre2}" ] + # Misc deps + ++ lib.optional apxs2Support apacheHttpd + ++ lib.optional argon2Support libargon2 + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; + + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] + ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] + ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre2}" ] - # Enable sapis - ++ lib.optional (!cgiSupport) "--disable-cgi" - ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] - ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ - "--enable-libxml" - "--with-libxml-dir=${libxml2.dev}" - ] - ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" + # Enable sapis + ++ lib.optional (!cgiSupport) "--disable-cgi" + ++ lib.optional (!cliSupport) "--disable-cli" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] + ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ + "--enable-libxml" + "--with-libxml-dir=${libxml2.dev}" + ] + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" - # Misc flags - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional systemdSupport "--with-fpm-systemd" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" - ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" + ++ lib.optional cgotoSupport "--enable-re2c-cgoto" + ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional (!ipv6Support) "--disable-ipv6" + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" + ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" - # Sendmail - ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] - ; + # Sendmail + ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] + ; - hardeningDisable = [ "bindnow" ]; + hardeningDisable = [ "bindnow" ]; - preConfigure = - # Don't record the configure flags since this causes unnecessary - # runtime dependencies - '' - for i in main/build-defs.h.in scripts/php-config.in; do - substituteInPlace $i \ - --replace '@CONFIGURE_COMMAND@' '(omitted)' \ - --replace '@CONFIGURE_OPTIONS@' "" \ - --replace '@PHP_LDFLAGS@' "" - done + preConfigure = + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + '' + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done - export EXTENSION_DIR=$out/lib/php/extensions - '' - # PKG_CONFIG need not be a relative path - + lib.optionalString (! lib.versionAtLeast version "7.4") '' - for i in $(find . -type f -name "*.m4"); do - substituteInPlace $i \ - --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' - done - '' + '' - ./buildconf --copy --force + export EXTENSION_DIR=$out/lib/php/extensions + '' + # PKG_CONFIG need not be a relative path + + lib.optionalString (! lib.versionAtLeast version "7.4") '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + '' + '' + ./buildconf --copy --force - if test -f $src/genfiles; then - ./genfiles - fi - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-lstdc++" "-lc++" - ''; + if test -f $src/genfiles; then + ./genfiles + fi + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-lstdc++" "-lc++" + ''; - postInstall = '' - test -d $out/etc || mkdir $out/etc - cp php.ini-production $out/etc/php.ini - ''; + postInstall = '' + test -d $out/etc || mkdir $out/etc + cp php.ini-production $out/etc/php.ini + ''; - postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 - mv $out/bin/phpize $out/bin/php-config $dev/bin/ - mv $out/share/man/man1/phpize.1.gz \ - $out/share/man/man1/php-config.1.gz \ - $dev/share/man/man1/ - ''; + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; - }; + src = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; + }; - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - separateDebugInfo = true; + separateDebugInfo = true; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ]; - passthru = { - buildEnv = mkBuildEnv {} []; - withExtensions = mkWithExtensions {} []; - inherit ztsSupport; - }; + passthru = { + buildEnv = mkBuildEnv {} []; + withExtensions = mkWithExtensions {} []; + inherit ztsSupport; + }; - meta = with lib; { - description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; - license = licenses.php301; - maintainers = teams.php.members; - platforms = platforms.all; - outputsToInstall = [ "out" "dev" ]; - }; - }; + meta = with lib; { + description = "An HTML-embedded scripting language"; + homepage = "https://www.php.net/"; + license = licenses.php301; + maintainers = teams.php.members; + platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; + }; + }; in generic From 78952c80b4081383c5159ef5349b220202868c6d Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 6 Jun 2021 14:45:22 +0800 Subject: [PATCH 108/797] silicon: 0.4.1 -> 0.4.2 --- pkgs/tools/misc/silicon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index ae580545114..40586f6be65 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s="; + sha256 = "sha256-k+p8AEEL1BBJTmPc58QoIk7EOzu8QKdG00RQ58EN3bg="; }; - cargoSha256 = "sha256-sUPOf9er+BOMqDJ8C6+Xjjqj6NQUV2JTzGA4yUWtDWM="; + cargoSha256 = "sha256-vpegobS7lpRkt/oZePW9WggYeg0JXDte8fQP/bf7oAI="; buildInputs = [ llvmPackages.libclang expat freetype fira-code ] ++ lib.optionals stdenv.isLinux [ libxcb ] From c0d04fe53cebfd7a12127f57310558b5d5996d41 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Jun 2021 09:40:41 +0200 Subject: [PATCH 109/797] codeowners: add jtojnar to php I am maintaining out-of-tree PHP expressions (https://github.com/fossar/nix-phps) so I would like to get notified of changes of the code I depend on, even though I cannot commit to becoming a PHP maintaintainer at the moment. --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index be54040ca2e..597978aa53b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -199,9 +199,9 @@ /doc/languages-frameworks/php.section.md @NixOS/php /nixos/tests/php @NixOS/php /pkgs/build-support/build-pecl.nix @NixOS/php -/pkgs/development/interpreters/php @NixOS/php +/pkgs/development/interpreters/php @NixOS/php @jtojnar /pkgs/development/php-packages @NixOS/php -/pkgs/top-level/php-packages.nix @NixOS/php +/pkgs/top-level/php-packages.nix @NixOS/php @jtojnar # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq From 47371be95b595923c6c3d2736e2ed339a8457f0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 08:03:43 +0000 Subject: [PATCH 110/797] exploitdb: 2021-06-03 -> 2021-06-05 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e32386acbb2..a1e43618346 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-03"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-a2x9Hfo39VeaMsio9VbOPe5hr2xLjmAzlSNUWtaXG6A="; + sha256 = "sha256-91BJ0rgR9pP4rlLz38Tug0Cd5s7WajgdxA7Dtm4Pre0="; }; installPhase = '' From 466c28c81929672f2a885a045fb275d3e307cc91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 10:05:49 +0200 Subject: [PATCH 111/797] python3Packages.aioguardian: allow later asyncio_dgram releases --- .../python-modules/aioguardian/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 47b82016188..388c856fc61 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -5,7 +5,7 @@ , asynctest , buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytest-asyncio , pytestCheckHook @@ -27,7 +27,9 @@ buildPythonPackage rec { format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -44,8 +46,17 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + postPatch = '' + # https://github.com/bachya/aioguardian/pull/66 + substituteInPlace pyproject.toml \ + --replace 'asyncio_dgram = "^1.0.1"' 'asyncio_dgram = "^2.0.0"' + # https://github.com/bachya/aioguardian/pull/67 + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" "poetry-core" + ''; + + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "aioguardian" ]; meta = with lib; { From e4866dca0a77989431b4765107c28631cb44aa13 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 6 Jun 2021 04:35:55 -0300 Subject: [PATCH 112/797] emacsPackages.tramp: 2.4.2 -> 2.5.0 --- .../emacs/elisp-packages/tramp/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix index 237c05c5fa7..72dbf7a0f47 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix @@ -1,16 +1,28 @@ -{ lib, stdenv, fetchurl, emacs, texinfo }: +{ lib +, stdenv +, fetchurl +, emacs +, texinfo +}: stdenv.mkDerivation rec { - name = "tramp-2.4.2"; + pname = "tramp"; + version = "2.5.0"; + src = fetchurl { - url = "mirror://gnu/tramp/${name}.tar.gz"; - sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61"; + url = "mirror://gnu/tramp/${pname}-${version}.tar.gz"; + sha256 = "sha256-w+6HJA8kFb75Z+7vM1zDnzOnkSSIXKnLVyCcEh+nMGY="; }; - buildInputs = [ emacs texinfo ]; + + buildInputs = [ + emacs + texinfo + ]; + meta = { - description = "Transparently access remote files from Emacs. Newer versions than built-in."; homepage = "https://www.gnu.org/software/tramp"; + description = "Transparently access remote files from Emacs. Newer versions than built-in."; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.all; + inherit (emacs.meta) platforms; }; } From d1ded9d599b7ca491942062a581476181734bc33 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 6 Jun 2021 04:31:29 -0300 Subject: [PATCH 113/797] emacsPackages.nano-theme: init at 2021-06-05 --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../elisp-packages/nano-theme/default.nix | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index f862a1ae8a5..e0e25db788d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -207,6 +207,8 @@ perl-completion = callPackage ./perl-completion { }; + nano-theme = callPackage ./nano-theme { }; + pod-mode = callPackage ./pod-mode { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix new file mode 100644 index 00000000000..8034f41a72d --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: + +stdenv.mkDerivation rec { + pname = "nano-theme"; + version = "2021-06-05"; + + src = fetchFromGitHub { + owner = "rougier"; + repo = pname; + rev = "99ff1c5e78296a073c6e63b966045e0d83a136e7"; + hash = "sha256-IDVnl4J4hx2mlLaiA+tKxxRGcIyBULr2HBeY/GMHD90="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/emacs/site-lisp + install *.el $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/rougier/nano-theme"; + description = "GNU Emacs / N Λ N O Theme"; + inherit (emacs.meta) platforms; + }; +} From 6d5ddfd909bea66b14390e938b4fab6fafe78501 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 6 Jun 2021 05:15:25 -0300 Subject: [PATCH 114/797] emacsPackages.power-mode: init at 2021-06-06 --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../elisp-packages/power-mode/default.nix | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index e0e25db788d..336c500900e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -212,6 +212,8 @@ pod-mode = callPackage ./pod-mode { }; + power-mode = callPackage ./power-mode { }; + railgun = callPackage ./railgun { }; structured-haskell-mode = self.shm; diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix new file mode 100644 index 00000000000..035c906c8ab --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: + +stdenv.mkDerivation rec { + pname = "power-mode"; + version = "2021-06-06"; + + src = fetchFromGitHub { + owner = "elizagamedev"; + repo = "power-mode.el"; + rev = "940e0aa36220f863e8f43840b4ed634b464fbdbb"; + hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/emacs/site-lisp + install *.el $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/rougier/nano-theme"; + description = "Imbue Emacs with power!"; + inherit (emacs.meta) platforms; + }; +} From 82b0579de7d70361602e987bb861a8dfb950c729 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 6 Jun 2021 04:55:55 -0300 Subject: [PATCH 115/797] emacsPackages: reformat manual-packages.nix file --- .../emacs/elisp-packages/manual-packages.nix | 101 +++++++++--------- 1 file changed, 53 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 336c500900e..7ccd96a9ca0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -3,20 +3,25 @@ elisp-ffi = melpaBuild rec { pname = "elisp-ffi"; version = "1.0.0"; + src = pkgs.fetchFromGitHub { owner = "skeeto"; repo = "elisp-ffi"; rev = version; sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; }; + buildInputs = [ pkgs.libffi ]; + preBuild = "make"; + recipe = pkgs.writeText "recipe" '' (elisp-ffi :repo "skeeto/elisp-ffi" :fetcher github :files ("ffi-glue" "ffi.el")) ''; + meta = { description = "Emacs Lisp Foreign Function Interface"; longDescription = '' @@ -65,27 +70,22 @@ }; }; - apheleia = callPackage ./apheleia {}; - - emacspeak = callPackage ./emacspeak {}; - - ess-R-object-popup = - callPackage ./ess-R-object-popup { }; - - evil-markdown = callPackage ./evil-markdown { }; - - font-lock-plus = callPackage ./font-lock-plus { }; - ghc-mod = melpaBuild { pname = "ghc"; version = pkgs.haskellPackages.ghc-mod.version; + src = pkgs.haskellPackages.ghc-mod.src; + packageRequires = [ haskell-mode ]; + propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ]; + recipe = pkgs.writeText "recipe" '' (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) ''; + fileSpecs = [ "elisp/*.el" ]; + meta = { description = "An extension of haskell-mode that provides completion of symbols and documentation browsing"; license = bsd3; @@ -97,32 +97,28 @@ haskell-unicode-input-method = melpaBuild { pname = "emacs-haskell-unicode-input-method"; version = "20110905.2307"; + src = pkgs.fetchFromGitHub { owner = "roelvandijk"; repo = "emacs-haskell-unicode-input-method"; rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; + recipe = pkgs.writeText "recipe" '' (emacs-haskell-unicode-input-method :repo "roelvandijk/emacs-haskell-unicode-input-method" :fetcher github) ''; + packageRequires = []; + meta = { homepage = "https://melpa.org/#haskell-unicode-input-method/"; license = lib.licenses.free; }; }; - helm-words = callPackage ./helm-words { }; - - isearch-plus = callPackage ./isearch-plus { }; - - isearch-prop = callPackage ./isearch-prop { }; - - jam-mode = callPackage ./jam-mode { }; - llvm-mode = trivialBuild { pname = "llvm-mode"; inherit (pkgs.llvmPackages.llvm) src version; @@ -150,6 +146,7 @@ }; patches = [ + # Fix: avatar loading when imagemagick support is not available (pkgs.fetchpatch { url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm"; @@ -187,11 +184,6 @@ }; - mu4e-patch = callPackage ./mu4e-patch { }; - - org-mac-link = - callPackage ./org-mac-link { }; - ott-mode = self.trivialBuild { pname = "ott-mod"; @@ -205,10 +197,23 @@ }; }; - perl-completion = - callPackage ./perl-completion { }; + # Packages made the classical callPackage way + + emacspeak = callPackage ./emacspeak { }; + + ess-R-object-popup = callPackage ./ess-R-object-popup { }; + + font-lock-plus = callPackage ./font-lock-plus { }; + + helm-words = callPackage ./helm-words { }; + + jam-mode = callPackage ./jam-mode { }; + nano-theme = callPackage ./nano-theme { }; + org-mac-link = callPackage ./org-mac-link { }; + + perl-completion = callPackage ./perl-completion { }; pod-mode = callPackage ./pod-mode { }; @@ -247,34 +252,34 @@ # closer to the old outdated package infra. # # Ideally this should be dropped some time during/after 20.03 + + autoComplete = self.melpaStablePackages.auto-complete; bbdb3 = self.melpaStablePackages.bbdb; - jade = self.jade-mode; - # scalaMode2 = null; # No clear mapping as of now - flymakeCursor = self.melpaStablePackages.flymake-cursor; + colorTheme = self.color-theme; cryptol = self.melpaStablePackages.cryptol-mode; + d = self.melpaStablePackages.d-mode; + emacsw3m = self.w3m; + erlangMode = self.melpaStablePackages.erlang; + flymakeCursor = self.melpaStablePackages.flymake-cursor; + graphvizDot = self.melpaStablePackages.graphviz-dot-mode; + haskellMode = self.melpaStablePackages.haskell-mode; + hsc3Mode = self.hsc3-mode; + idris = self.melpaStablePackages.idris-mode; + jade = self.jade-mode; + js2 = self.melpaStablePackages.js2-mode; + loremIpsum = self.lorem-ipsum; + markdownMode = self.melpaStablePackages.markdown-mode; maudeMode = self.maude-mode; phpMode = self.melpaStablePackages.php-mode; - idris = self.melpaStablePackages.idris-mode; - rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters; - colorTheme = self.color-theme; - sbtMode = self.melpaStablePackages.sbt-mode; - markdownMode = self.melpaStablePackages.markdown-mode; - scalaMode1 = self.melpaStablePackages.scala-mode; prologMode = self.prolog-mode; - hsc3Mode = self.hsc3-mode; - graphvizDot = self.melpaStablePackages.graphviz-dot-mode; - proofgeneral_HEAD = self.proof-general; proofgeneral = self.melpaStablePackages.proof-general; - haskellMode = self.melpaStablePackages.haskell-mode; - writeGood = self.melpaStablePackages.writegood-mode; - erlangMode = self.melpaStablePackages.erlang; - d = self.melpaStablePackages.d-mode; - autoComplete = self.melpaStablePackages.auto-complete; - tuaregMode = self.melpaStablePackages.tuareg; + proofgeneral_HEAD = self.proof-general; + rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters; + sbtMode = self.melpaStablePackages.sbt-mode; + scalaMode1 = self.melpaStablePackages.scala-mode; + # scalaMode2 = null; # No clear mapping as of now structuredHaskellMode = self.melpaStablePackages.shm; + tuaregMode = self.melpaStablePackages.tuareg; + writeGood = self.melpaStablePackages.writegood-mode; xmlRpc = self.melpaStablePackages.xml-rpc; - emacsw3m = self.w3m; - loremIpsum = self.lorem-ipsum; - js2 = self.melpaStablePackages.js2-mode; - } From fb4023f046648ce248948ef229e0c23e48718458 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 07:34:18 +0000 Subject: [PATCH 116/797] erlangR21: 21.3.8.23 -> 21.3.8.24 --- pkgs/development/interpreters/erlang/R21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 3959c13e57b..7706bd69fbf 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "21.3.8.23"; - sha256 = "sha256-zIEXn2HuXeRKHfXmm0AAv9rEqqc4gIgaYek0hSUK5YU="; + version = "21.3.8.24"; + sha256 = "sha256-FNs+M4KFFKzfb4EG513HtyQ9eRRtxSPMpYq0bmRgY3g="; } From 53387621e5fd893947ec4924d320687f8c96c7cb Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sun, 6 Jun 2021 02:37:32 -0600 Subject: [PATCH 117/797] remove chris-martin from maintainer list on various crypto packages --- pkgs/applications/blockchains/stellar-core.nix | 2 +- pkgs/development/compilers/serpent/default.nix | 2 +- pkgs/development/python-modules/secp256k1/default.nix | 2 +- pkgs/tools/misc/libbitcoin/libbitcoin-client.nix | 2 +- pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix | 2 +- pkgs/tools/misc/libbitcoin/libbitcoin.nix | 2 +- pkgs/tools/security/secp256k1/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix index 197453599b2..6ecc4e241cb 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.stellar.org/"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index fbcbf4485a4..227e8037eae 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 78ddb269f3d..bb5cc138a74 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/ludbb/secp256k1-py"; description = "Python FFI bindings for secp256k1"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ chris-martin ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 6f9c07209cf..a940fba2967 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { description = "Bitcoin client query library"; homepage = "https://github.com/libbitcoin/libbitcoin-client"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ ]; # AGPL with a lesser clause license = licenses.agpl3; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index dd0ed857314..7d00e4c09ad 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { description = "Bitcoin command line tool"; homepage = "https://github.com/libbitcoin/libbitcoin-explorer"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chris-martin asymmetric ]; + maintainers = with maintainers; [ asymmetric ]; # AGPL with a lesser clause license = licenses.agpl3; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 122aed696fc..b4f91bc936d 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { description = "C++ library for building bitcoin applications"; homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ ]; # AGPL with a lesser clause license = licenses.agpl3; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index a8acf3586c9..e82b544e66c 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/bitcoin-core/secp256k1"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } From 124b3ed75a32659a76388c730af46f253d97d401 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 16 Oct 2020 10:31:31 +0200 Subject: [PATCH 118/797] gocryptfs: 1.8.0 -> 2.0 - add libfido2 to propagatedBuildInputs to enable fido2 features (gocryptfs uses command-line tools contained in the package) - skip documentation on aarch64-darwin (pandoc is broken because of the missing ghc) --- pkgs/tools/filesystems/gocryptfs/default.nix | 27 +++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index b8b330c129a..83d53c31888 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,28 +1,42 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , openssl , pandoc , pkg-config +, libfido2 }: +let + # pandoc is currently broken on aarch64-darwin + # because of missing ghc + brokenPandoc = stdenv.isDarwin && stdenv.isAarch64; +in + buildGoModule rec { pname = "gocryptfs"; - version = "1.8.0"; + version = "2.0"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "1acalwrr5xqhpqca3gypj0s68w6vpckxmg5z5gfgh8wx6nqx4aw9"; + sha256 = "1wpdzi1qfpab76v0ki74qkk82m3ykr4iqb8r6a8k11l4fn42fjk0"; }; - runVend = true; - vendorSha256 = "0z3y51sgr1rmr23jpc5h5d5lw14p3qzv48rc7zj7qa4rd5cfhsgi"; + vendorSha256 = "10az8n7z4rhsk1af2x6v3pmxg4zp7c9cal35ily8bdzzcb9cpgs0"; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (!brokenPandoc) [ + pandoc + ]; - nativeBuildInputs = [ pandoc pkg-config ]; buildInputs = [ openssl ]; + propagatedBuildInputs = [ libfido2 ]; + buildFlagsArray = '' -ldflags= -X main.GitVersion=${version} @@ -32,9 +46,10 @@ buildGoModule rec { subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; - postBuild = '' + postBuild = lib.optionalString (!brokenPandoc) '' pushd Documentation/ mkdir -p $out/share/man/man1 + # taken from Documentation/MANPAGE-render.bash pandoc MANPAGE.md -s -t man -o $out/share/man/man1/gocryptfs.1 pandoc MANPAGE-XRAY.md -s -t man -o $out/share/man/man1/gocryptfs-xray.1 pandoc MANPAGE-STATFS.md -s -t man -o $out/share/man/man1/statfs.1 From 0fc1a3d0d89ce06992714c690449c45713af75a6 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 6 Jun 2021 11:10:16 +0200 Subject: [PATCH 119/797] tor-browser-bundle-bin: 10.0.16 -> 10.0.17 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 72b17400df3..09128301d6c 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.16"; + version = "10.0.17"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "07h2gd6cwwq17lrwjpfah1xvr8ny8700qvi971qacrr7ssicw2pw"; + sha256 = "13x38n1cvqmxjz0jf2fda8lx2k25szzmg7gvv08z3q5na7109m2m"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "145kniiby5nnd0ll3v2gggzxz52bqbrdp72hvh96i8qnzi0fq25a"; + sha256 = "0f0ndwmzh732svwbcf1lbxlvdxw4i4d56w9xdl5fxd4n7ivqml1q"; }; }; in From 92636c86dae58679a036ea29b39194fb04b431d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 10:56:22 +0000 Subject: [PATCH 120/797] gnome.gnome-maps: 40.1 -> 40.2 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 2818215a4ff..0a07428b1b2 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo="; + sha256 = "sha256-g+gVAFTQxLWmPJoJvyx9+YmuaQ7Kwb5r97ExKqpjm9Q="; }; doCheck = true; From 4343b60f9c00ce35027fed2a53a5e6d46212511d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 09:39:17 +0000 Subject: [PATCH 121/797] gnome.gnome-boxes: 40.1 -> 40.2 --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 5972843ab31..8d0e86b1a93 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg="; + sha256 = "hzN1mi2GpWNnWWpTSQRjO4HKqlxFpWNtsulZDHFK6Nk="; }; doCheck = true; From 64ab23e7a77e0c15ca4b8ccf78caa76b091a025a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 08:59:49 +0000 Subject: [PATCH 122/797] gnome.gnome-software: 40.1 -> 40.2 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 64cd214e809..226b251ec46 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in"; + sha256 = "y9HdKguvw/U93kIAPEpKA3RsuNZNxdJ+uNvmc27nJ5Y="; }; patches = [ From b671334a4fb6994c07de416552b36f6a680c4ee7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 07:57:40 +0000 Subject: [PATCH 123/797] gnome.gnome-calendar: 40.1 -> 40.2 --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 9c0b1f65976..da2e37e51fc 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "2M30n57uHDo8aZHDL4VjxKfE2w23ymPOUcyRjkM7M6U="; + sha256 = "njcB/UoOWJgA0iUgN3BkTzHVI0ZV9UqDqF/wVW3X6jM="; }; patches = [ From 1c8c6e2d9adfdcf2d78460fda45ec9b892765731 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 05:56:48 +0000 Subject: [PATCH 124/797] evolution-data-server: 3.40.1 -> 3.40.2 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 0ed3565d7f0..8781a2aa7fd 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.40.1"; + version = "3.40.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza"; + sha256 = "7IKVFjnzKlzs6AqLC5qj9mt9MY4+4sHDUjTy4r3opBg="; }; patches = [ From d8eb97e3801bde96491535f40483d550b57605b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 03:31:49 +0000 Subject: [PATCH 125/797] epiphany: 40.1 -> 40.2 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index f286d384c4e..0b4191b2266 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9"; + sha256 = "dRGeIgZWV89w7ytgPU9zg1VzvQNPHmGMD2YkeP1saDU="; }; nativeBuildInputs = [ From 1b73aa2aea013f23614fe5a5a61621cc6d06c908 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 6 Jun 2021 11:55:02 +0200 Subject: [PATCH 126/797] tor-browser-bundle: delete unused extensions.nix --- .../tor-browser-bundle/extensions.nix | 111 ------------------ 1 file changed, 111 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix deleted file mode 100644 index 7356768f397..00000000000 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv -, fetchgit -, fetchurl - -# common -, zip - -# HTTPS Everywhere -, git -, libxml2 # xmllint -, python27 -, python27Packages -, rsync -}: - -{ - https-everywhere = stdenv.mkDerivation rec { - pname = "https-everywhere"; - version = "2017.10.4"; - - extid = "https-everywhere-eff@eff.org"; - - src = fetchgit { - url = "https://git.torproject.org/https-everywhere.git"; - rev = "refs/tags/${version}"; - sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj"; - fetchSubmodules = true; # for translations, TODO: remove - }; - - nativeBuildInputs = [ - git - libxml2 # xmllint - python27 - python27Packages.lxml - rsync - zip - ]; - - buildPhase = '' - $shell ./makexpi.sh ${version} --no-recurse - ''; - - installPhase = '' - install -m 444 -D pkg/https-everywhere-$version-eff.xpi "$out/$extid.xpi" - ''; - }; - - noscript = stdenv.mkDerivation rec { - pname = "noscript"; - version = "5.1.2"; - - extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; - - src = fetchurl { - url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi"; - sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42"; - }; - - dontUnpack = true; - - installPhase = '' - install -m 444 -D $src "$out/$extid.xpi" - ''; - }; - - torbutton = stdenv.mkDerivation rec { - pname = "torbutton"; - version = "1.9.8.1"; - - extid = "torbutton@torproject.org"; - - src = fetchgit { - url = "https://git.torproject.org/torbutton.git"; - rev = "refs/tags/${version}"; - sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l"; - }; - - nativeBuildInputs = [ zip ]; - - buildPhase = '' - $shell ./makexpi.sh - ''; - - installPhase = '' - install -m 444 -D pkg/torbutton-$version.xpi "$out/$extid.xpi" - ''; - }; - - tor-launcher = stdenv.mkDerivation rec { - pname = "tor-launcher"; - version = "0.2.13"; - - extid = "tor-launcher@torproject.org"; - - src = fetchgit { - url = "https://git.torproject.org/tor-launcher.git"; - rev = "refs/tags/${version}"; - sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0"; - }; - - nativeBuildInputs = [ zip ]; - - buildPhase = '' - make package - ''; - - installPhase = '' - install -m 444 -D pkg/tor-launcher-$version.xpi "$out/$extid.xpi" - ''; - }; -} From d6714cd18bec59aec23a703a2ff65e7a78bca154 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sun, 6 Jun 2021 00:14:04 -0700 Subject: [PATCH 127/797] renderdoc: 1.13 -> 1.14 Signed-off-by: Jordan Justen --- pkgs/applications/graphics/renderdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 597bd1f1705..d6a2658d862 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.13"; + version = "1.14"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc="; + sha256 = "VO7pOLodXI0J7O4Y9b7YSl5BdtsIxmalFG5mqfuiJEw="; }; buildInputs = [ From 8c5d416cb5437bd1bada4d1bd520c31844d9a382 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 6 Jun 2021 13:19:13 +0300 Subject: [PATCH 128/797] zsh-prezto: unstable-2021-01-19 -> unstable-2021-06-02 --- pkgs/shells/zsh/zsh-prezto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index d3e2c6534aa..88451979cbb 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2021-01-19"; + version = "unstable-2021-06-02"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "704fc46c3f83ca1055becce65fb513a533f48982"; - sha256 = "0rkbx6hllf6w6x64mggbhvm1fvbq5sr5kvf06sarfkpz5l0a5wh3"; + rev = "6833fcd2f2afbc7396ea7a5fa9eb3b49f4678242"; + sha256 = "1a8gndj1f8sjnq7clc742lm4qyhp1a2zid6g6lmfr1axhcbn38v6"; fetchSubmodules = true; }; From 5527a6495a15d8b58a2cc90d8e6b5bacfb35b142 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 12:35:40 +0200 Subject: [PATCH 129/797] python3Packages.python-velbus: 2.1.2 -> 2.1.4 --- .../python-modules/python-velbus/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix index a02edfdc1f6..c83ff853f1d 100644 --- a/pkgs/development/python-modules/python-velbus/default.nix +++ b/pkgs/development/python-modules/python-velbus/default.nix @@ -6,19 +6,22 @@ buildPythonPackage rec { pname = "python-velbus"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "thomasdelaet"; repo = pname; - rev = "v${version}"; - sha256 = "0dv7dsjp5li87ispdphaz7jd0a9xc328rxwawf2f58b1ii904xr4"; + rev = version; + sha256 = "1z0a7fc9xfrcpwi9xiimxsgbzbp2iwyi1rij6vqd5z47mzi49fv9"; }; - propagatedBuildInputs = [ pyserial ]; + propagatedBuildInputs = [ + pyserial + ]; # Project has not tests doCheck = false; + pythonImportsCheck = [ "velbus" ]; meta = with lib; { From d1bc2928bf70a713bd96bf7f9a23454ce2b727d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 12:46:02 +0200 Subject: [PATCH 130/797] python3Packages.minio: 7.0.2 -> 7.0.3 --- .../python-modules/minio/default.nix | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index b23d264f72d..fdbcf09534b 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -1,38 +1,53 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi +{ lib +, buildPythonPackage +, certifi , configparser , faker +, fetchFromGitHub , future , mock , nose -, python-dateutil -, pytz , pytestCheckHook +, python-dateutil +, pythonOlder +, pytz , urllib3 -, certifi }: buildPythonPackage rec { pname = "minio"; - version = "7.0.2"; - disabled = !isPy3k; + version = "7.0.3"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "f2f6022cfe4694d946972efef2a752f87d08cc030940faa50a640088772953c8"; + src = fetchFromGitHub { + owner = "minio"; + repo = "minio-py"; + rev = version; + sha256 = "14symk7b3i9xzfc2wkcnqmfsvh9j3jx2ijz7dgy1xyrbjwb7yzhc"; }; propagatedBuildInputs = [ + certifi configparser future python-dateutil pytz urllib3 - certifi ]; - checkInputs = [ faker mock nose pytestCheckHook ]; + checkInputs = [ + faker + mock + nose + pytestCheckHook + ]; + # example credentials aren't present - pytestFlagsArray = [ "--ignore=tests/unit/credentials_test.py" ]; + disabledTestPaths = [ + "tests/unit/credentials_test.py" + ]; + + pythonImportsCheck = [ "minio" ]; meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; From cae74f27ecc6a5bd19550d11b463597555dd31ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 12:55:56 +0200 Subject: [PATCH 131/797] python3Packages.pyialarm: 1.7 -> 1.8.1 --- pkgs/development/python-modules/pyialarm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix index 977fbcd323c..9603964ca48 100644 --- a/pkgs/development/python-modules/pyialarm/default.nix +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyialarm"; - version = "1.7"; + version = "1.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RyuzakiKK"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gk5kWOqsPyq/0Vc+jdRRyj+ko3CpmqQ6/McvJYAGjLY="; + sha256 = "sha256-Hig1BlgZX2FBh+wx7qz9lmkBIFn/IHActf9FXDU6Yz8="; }; propagatedBuildInputs = [ From 210df95f7e6365e47c5440264a3bc96128d3d363 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 6 Jun 2021 13:06:01 +0200 Subject: [PATCH 132/797] python3Packages.skytemple-dtef: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/skytemple-dtef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index 80bebd55696..c1a950dc2ae 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "skytemple-dtef"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "177ydif01fai6z5yhgpa27pzfgabblzhl8nsczczcmw74vxqwzyc"; + sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82"; }; propagatedBuildInputs = [ skytemple-files ]; From 642dce498a97289417a085b4b2e58b9d76a2e30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sun, 6 Jun 2021 14:15:36 +0300 Subject: [PATCH 133/797] rlottie: 0.1 -> 0.2 --- lib/licenses.nix | 5 +++++ pkgs/development/libraries/rlottie/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index d79ac900439..d1177041068 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -346,6 +346,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({ fullName = "Unspecified free software license"; }; + ftl = spdx { + spdxId = "FTL"; + fullName = "Freetype Project License"; + }; + g4sl = { fullName = "Geant4 Software License"; url = "https://geant4.web.cern.ch/geant4/license/LICENSE.html"; diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index a8cd88cae50..f1d3ffd0212 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rlottie"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "Samsung"; repo = pname; rev = "v${version}"; - hash = "sha256-8KQ0ZnVg5rTb44IYnn02WBSe2SA5UGUOSLEdmmscUDs="; + sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; - license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING + license = with licenses; [ mit bsd3 mpl11 ftl ]; platforms = platforms.all; maintainers = with maintainers; [ CRTified ]; }; From c5c3be682b0d8af5417e84bab405a7cb50fa038d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 4 Jun 2021 13:23:37 +0300 Subject: [PATCH 134/797] pico-sdk: init at 1.2.0 --- .../libraries/pico-sdk/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/pico-sdk/default.nix diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix new file mode 100644 index 00000000000..3db4ff336ff --- /dev/null +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "pico-sdk"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = pname; + rev = version; + sha256 = "00z160f7ypws5pzp1ql7xrs3gmjcbw6gywnnq2fiwl47940balns"; + }; + + nativeBuildInputs = [ cmake ]; + + # SDK contains libraries and build-system to develop projects for RP2040 chip + # We only need to compile pioasm binary + sourceRoot = "source/tools/pioasm"; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/pico-sdk + cp -a ../../../* $out/lib/pico-sdk/ + chmod 755 $out/lib/pico-sdk/tools/pioasm/build/pioasm + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/raspberrypi/picotool"; + description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; + license = licenses.bsd3; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 088b49e1038..c3f10fbe072 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17460,6 +17460,8 @@ in physfs_2 physfs; + pico-sdk = callPackage ../development/libraries/pico-sdk { }; + pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; wine-staging = pkgsi686Linux.wine-staging; From b261ff7be0ef035160836bead4242eedfea71da6 Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Sat, 5 Jun 2021 20:26:34 +0300 Subject: [PATCH 135/797] python3Packages.pipx: 0.16.2.1 -> 0.16.3 --- .../python-modules/pipx/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index e6f9242dde6..c4960178673 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -6,13 +6,12 @@ , argcomplete , packaging , importlib-metadata -, colorama , pytestCheckHook }: buildPythonPackage rec { pname = "pipx"; - version = "0.16.2.1"; + version = "0.16.3"; disabled = pythonOlder "3.6"; @@ -21,14 +20,13 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "1agdp8j4lw6z0lk2vv1m8d49r5vwfkpal3hdgq67vnjyp9904pf6"; + sha256 = "1w5pzn5mgl9rr9zbmqza5is4mvjvcgjps1q9qa1mvbnyvakdkr4c"; }; propagatedBuildInputs = [ userpath argcomplete packaging - colorama ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -39,9 +37,17 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # disable tests, which require internet connection - pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ]; + pytestFlagsArray = [ + "--ignore=tests/test_install_all_packages.py" + # start local pypi server and use in tests + "--net-pypiserver" + ]; disabledTests = [ + # disable tests which are difficult to emulate due to shell manipulations + "path_warning" + "script_from_internet" + "ensure_null_pythonpath" + # disable tests, which require internet connection "install" "inject" "ensure_null_pythonpath" From fdca90d07f654cb54f41659567bed130524cece6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 6 Jun 2021 14:27:13 +0200 Subject: [PATCH 136/797] docs: acme: Fix typo --- nixos/modules/security/acme.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index a78ff05f2ea..8249da948c6 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -194,7 +194,7 @@ services.httpd = { This is useful if you want to generate a wildcard certificate, since ACME servers will only hand out wildcard certs over DNS validation. - There a number of supported DNS providers and servers you can utilise, + There are a number of supported DNS providers and servers you can utilise, see the lego docs for provider/server specific configuration values. For the sake of these docs, we will provide a fully self-hosted example using bind. From 690496c4e545e68482b5c162a03f0a4f97d35373 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 05:35:05 -0300 Subject: [PATCH 137/797] ocamlPackages.ppx_gen_rec: 1.1.0 -> 2.0.0 --- .../ocaml-modules/ppx_gen_rec/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index 87ccd85a07d..ee801f6adfd 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchurl, buildDunePackage, ocaml-migrate-parsetree }: +{ lib, fetchurl, buildDunePackage, ppxlib }: buildDunePackage rec { pname = "ppx_gen_rec"; - version = "1.1.0"; - - useDune2 = true; + version = "2.0.0"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0fwi4bknq8h9zgpsarjvnzdm9bm8qlyyw0lz30pihg02aiiljqbh"; + sha256 = "sha256-/mMj5UT22KQGVy1sjgEoOgPzyCYyeDPtWJYNDvQ9nlk="; }; - buildInputs = [ ocaml-migrate-parsetree ]; + minimumOCamlVersion = "4.07"; + useDune2 = true; + + buildInputs = [ ppxlib ]; meta = with lib; { homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec"; - description = "ocaml preprocessor that generates a recursive module"; + description = "A ppx rewriter that transforms a recursive module expression into a struct."; license = licenses.mit; - maintainers = [ maintainers.frontsideair ]; + maintainers = with maintainers; [ frontsideair ]; }; } From be267abcad8785c9e0cd77f4a1a7032a16261eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 3 Jun 2021 16:50:04 +0300 Subject: [PATCH 138/797] picotool: init at 1.0.1 --- pkgs/development/tools/picotool/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/picotool/default.nix diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix new file mode 100644 index 00000000000..d4a6f1c409b --- /dev/null +++ b/pkgs/development/tools/picotool/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }: + +stdenv.mkDerivation rec { + pname = "picotool"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = pname; + rev = version; + sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig"; + }; + + buildInputs = [ libusb1 pico-sdk ]; + nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; + + installPhase = '' + runHook preInstall + install -Dm755 ./picotool -t $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/raspberrypi/picotool"; + description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; + license = licenses.bsd3; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3f10fbe072..7c30adfa2cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13695,6 +13695,8 @@ in phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { }; + picotool = callPackage ../development/tools/picotool { }; + pmccabe = callPackage ../development/tools/misc/pmccabe { }; pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf {}; From b24cc395ccf892827585d32246b4902bd9379113 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 6 Jun 2021 16:08:22 +0200 Subject: [PATCH 139/797] maintainers/teams: remove pacien from the matrix team I prefer to focus only on the individual packages which I know. --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ab05ab7a5b2..3e6843f0e57 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -155,7 +155,6 @@ with lib.maintainers; { matrix = { members = [ ma27 - pacien fadenb mguentner ekleog From 92f62de6f1ee9c9e31a8432ad222e79deef2ad87 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 6 Jun 2021 16:09:19 +0200 Subject: [PATCH 140/797] matrix-appservice-discord: increase test timeout Hydra and my local machine are sometimes hitting the default timeout. See https://hydra.nixos.org/build/138032455/nixlog/8/tail --- pkgs/servers/matrix-appservice-discord/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix index 4a41f019e17..7b7a67821f9 100644 --- a/pkgs/servers/matrix-appservice-discord/default.nix +++ b/pkgs/servers/matrix-appservice-discord/default.nix @@ -43,7 +43,8 @@ in mkYarnPackage rec { doCheck = true; checkPhase = '' - yarn --offline test + # the default 2000ms timeout is sometimes too short on our busy builders + yarn --offline test --timeout 10000 ''; postInstall = '' From 3b4cace64dc19096e6696cfc474fc47b7189e73b Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 6 Jun 2021 15:14:51 +1000 Subject: [PATCH 141/797] vim-utils: append customRC after plug / pathogen plugins are loaded --- pkgs/misc/vim-plugins/vim-utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 52bf4341fa5..1163f5dd9f0 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -341,10 +341,10 @@ let beforePlugins vamImpl (nativeImpl packages) - customRC ] ++ lib.optional (pathogen != null) pathogenImpl - ++ lib.optional (plug != null) plugImpl; + ++ lib.optional (plug != null) plugImpl + ++ [ customRC ]; in lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries); From bd103151ea885a9802fa25f359f19ed0a0e162ef Mon Sep 17 00:00:00 2001 From: ernestkz Date: Sun, 6 Jun 2021 02:45:12 +0100 Subject: [PATCH 142/797] haskellPackages.reactive-banana: unbreak Co-authored-by: sterni --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ee94b13bfbe..cc39fb4fd10 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1949,4 +1949,8 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; + # unrestrict bounds for hashable and semigroups + # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 + reactive-banana = doJailbreak super.reactive-banana; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ae5e77644b1..20ecee3bd7c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3798,7 +3798,6 @@ broken-packages: - react-haskell - reaction-logic - reactive-bacon - - reactive-banana - reactive-thread - react-tutorial-haskell-server - readability diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index be5fecbe9ad..f35eb8c26a6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -216649,8 +216649,6 @@ self: { ]; description = "Library for functional reactive programming (FRP)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-automation" = callPackage From 012f2315c51d1258bcdda4d5bd62b1963aaab51b Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 6 Jun 2021 13:23:49 +0200 Subject: [PATCH 143/797] flips: unstable-2020-10-02 -> unstable-2021-05-18 --- pkgs/tools/compression/flips/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index e99f3fec163..b4a79aac212 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -2,20 +2,24 @@ stdenv.mkDerivation { pname = "flips"; - version = "unstable-2020-10-02"; + version = "unstable-2021-05-18"; src = fetchFromGitHub { owner = "Alcaro"; repo = "Flips"; - rev = "5a3d2012b8ea53ae777c24b8ac4edb9a6bdb9761"; - sha256 = "1ksh9j1n5z8b78yd7gjxswndsqnb1azp84xk4rc0p7zq127l0fyy"; + rev = "3476e5e46fc6f10df475f0cad1714358ba04c756"; + sha256 = "0s13qrmqfmlb2vy0smpgw39vjkl8vzsmpzk52jnc9r7b4hisii39"; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 libdivsufsort ]; patches = [ ./use-system-libdivsufsort.patch ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - buildPhase = "./make.sh"; + buildPhase = '' + runHook preBuild + ./make.sh + runHook postBuild + ''; meta = with lib; { description = "A patcher for IPS and BPS files"; From 778f07cea82267a0969c01a0a62239b43d8b2b37 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 17:27:18 +0200 Subject: [PATCH 144/797] hackage2nix: Mark failing builds broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 16 ++++ .../transitive-broken.yaml | 53 +++--------- .../haskell-modules/hackage-packages.nix | 81 +++++++++---------- 3 files changed, 65 insertions(+), 85 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 20ecee3bd7c..dc827a1b6f1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -703,6 +703,7 @@ broken-packages: - commander - Commando - commodities + - commonmark-cli - commsec - compactable - Compactable @@ -1038,6 +1039,7 @@ broken-packages: - direct-plugins - direct-rocksdb - direm + - discord-haskell - discordian-calendar - discord-types - discrete @@ -1884,6 +1886,7 @@ broken-packages: - haskey - haskheap - haskhol-core + - hasklepias - haskmon - haskoin - haskoin-util @@ -1895,6 +1898,7 @@ broken-packages: - haskus-binary - haskyapi - hasmin + - hasqlator-mysql - hasql-backend - hasql-class - hasql-cursor-transaction @@ -2079,6 +2083,7 @@ broken-packages: - hlogger - HLogger - hlongurl + - hlrdb-core - hls-exactprint-utils - hls-floskell-plugin - hls-fourmolu-plugin @@ -3405,6 +3410,7 @@ broken-packages: - parser-helper - parsers-megaparsec - parsimony + - parsley - parsnip - partage - partial-records @@ -3465,6 +3471,7 @@ broken-packages: - persistent-cereal - persistent-database-url - persistent-discover + - persistent-documentation - persistent-equivalence - persistent-migration - persistent-mongoDB @@ -3610,6 +3617,7 @@ broken-packages: - postmaster - potato-tool - potoki-core + - powerdns - powermate - powerpc - powerqueue-levelmem @@ -3761,6 +3769,7 @@ broken-packages: - quiver - quokka - quoridor-hs + - raaz - RabbitMQ - rad - radian @@ -3982,6 +3991,9 @@ broken-packages: - SableCC2Hs - safe-buffer-monad - safe-coerce + - safe-coloured-text-gen + - safe-coloured-text-layout + - safe-coloured-text-terminfo - safecopy-migrate - safecopy-store - safe-freeze @@ -4334,6 +4346,7 @@ broken-packages: - sparse-lin-alg - special-functors - special-keys + - speculate - speculation - sphinx - sphinxesc @@ -4817,6 +4830,7 @@ broken-packages: - typed-encoding - typedflow - typedquery + - typed-time - typed-wire - type-eq - type-fun @@ -4887,6 +4901,7 @@ broken-packages: - unpack-funcs - unroll-ghc-plugin - unsafely + - unsatisfiable - unsequential - unused - uom-plugin @@ -5182,6 +5197,7 @@ broken-packages: - yahoo-web-search - yajl - yall + - yam-app - yam-config - yaml-pretty-extras - YamlReference diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 20d6617d3c7..e9be7c64c64 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -29,6 +29,7 @@ dont-distribute-packages: - Advgame - Advise-me - aern2-real + - aern2-real_0_2_7_0 - AERN-Net - AERN-Real - AERN-Real-Double @@ -93,7 +94,6 @@ dont-distribute-packages: - ApplePush - approx-rand-test - arbor-monad-metric-datadog - - arch-hs - archlinux-web - arduino-copilot - arff @@ -399,9 +399,7 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc - - clash-ghc_1_4_2 - clash-lib - - clash-lib_1_4_2 - clash-multisignal - clash-prelude-quickcheck - clash-systemverilog @@ -440,6 +438,7 @@ dont-distribute-packages: - cnc-spec-compiler - Coadjute - codec + - code-conjure - codec-rpm - codemonitor - cognimeta-utils @@ -625,11 +624,8 @@ dont-distribute-packages: - dhall-docs - dhcp-lease-parser - dia-functions - - diagrams-braille - - diagrams-builder - diagrams-haddock - diagrams-html5 - - diagrams-pandoc - diagrams-pgf - diagrams-reflex - diagrams-wx @@ -782,9 +778,9 @@ dont-distribute-packages: - extemp - extensible-data - extract-dependencies + - extrapolate - Facts - factual-api - - fadno-braids - FailureT - fakedata-quickcheck - fallingblocks @@ -970,7 +966,6 @@ dont-distribute-packages: - global-config - glome-hs - GlomeView - - gloss-banana - gloss-devil - gloss-examples - gloss-sodium @@ -1086,29 +1081,8 @@ dont-distribute-packages: - hadoop-tools - haggis - hails-bin - - hakyll-agda - - hakyll-alectryon - - hakyll-blaze-templates - - hakyll-contrib - - hakyll-contrib-csv - - hakyll-contrib-elm - - hakyll-contrib-hyphenation - - hakyll-contrib-i18n - - hakyll-contrib-links - - hakyll-dhall - - hakyll-dir-list - hakyll-elm - - hakyll-favicon - - hakyll-filestore - - hakyll-images - hakyll-ogmarkup - - hakyll-process - - hakyll-R - - hakyll-sass - - hakyll-series - - hakyll-shakespeare - - hakyll-shortcut-links - - hakyll-typescript - halberd - hall-symbols - halma-gui @@ -1351,10 +1325,10 @@ dont-distribute-packages: - HLearn-datastructures - HLearn-distributions - hledger-api + - hlrdb - hls - hly - hmark - - hmatrix-sundials - hmeap - hmeap-utils - hmep @@ -1610,7 +1584,6 @@ dont-distribute-packages: - iteratee-parsec - iteratee-stm - iterio-server - - iterm-show-diagrams - iter-stats - ivor - ivory-avr-atmega328p-registers @@ -1680,7 +1653,6 @@ dont-distribute-packages: - karakuri - katip-elasticsearch - katip-rollbar - - kawaii - keera-hails-i18n - keera-hails-mvc-environment-gtk - keera-hails-mvc-model-lightmodel @@ -1917,7 +1889,6 @@ dont-distribute-packages: - marquise - marvin - masakazu-bot - - master-plan - matchers - mathblog - mathlink @@ -2000,6 +1971,7 @@ dont-distribute-packages: - Monocle - monte-carlo - moo + - moo-nad - morley - morloc - morphisms-functors-inventory @@ -2118,6 +2090,7 @@ dont-distribute-packages: - NoSlow - notmuch-haskell - notmuch-web + - nri-prelude_0_6_0_1 - numerical - numeric-ode - numhask-hedgehog @@ -2344,8 +2317,6 @@ dont-distribute-packages: - push-notify-apn - push-notify-ccs - push-notify-general - - puzzle-draw - - puzzle-draw-cmdline - pvd - qd-vec - qhs @@ -2417,18 +2388,10 @@ dont-distribute-packages: - rdioh - react-flux-servant - reactive - - reactive-balsa - - reactive-banana-automation - - reactive-banana-bunch - - reactive-banana-gi-gtk - reactive-banana-sdl - - reactive-banana-sdl2 - - reactive-banana-threepenny - reactive-banana-wx - reactive-fieldtrip - reactive-glut - - reactive-jack - - reactive-midyim - reactor - readline-statevar - readpyc @@ -2559,6 +2522,7 @@ dont-distribute-packages: - ruler-core - runtime-arbitrary - S3 + - safe-coloured-text-layout-gen - safe-numeric - safer-file-handles - safer-file-handles-bytestring @@ -2929,7 +2893,6 @@ dont-distribute-packages: - tensorflow-core-ops - tensorflow-logging - tensorflow-ops - - termbox-banana - terminal-text - terrahs - testbench @@ -3248,6 +3211,7 @@ dont-distribute-packages: - yajl-enumerator - yam - yam-datasource + - yam-job - yam-logger - yaml-rpc-scotty - yaml-rpc-snap @@ -3255,6 +3219,7 @@ dont-distribute-packages: - yam-redis - yam-transaction - yam-transaction-odbc + - yam-transaction-postgresql - yam-web - yarr-image-io - yavie diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f35eb8c26a6..bc3fbd9b7b1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -32268,7 +32268,6 @@ self: { ]; description = "Distribute hackage packages to archlinux"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "arch-web" = callPackage @@ -57601,6 +57600,7 @@ self: { testHaskellDepends = [ base express leancheck speculate ]; description = "conjure Haskell functions out of partial definitions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "code-page" = callPackage @@ -59049,6 +59049,8 @@ self: { ]; description = "Command-line commonmark converter and highlighter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "commonmark-extensions" = callPackage @@ -74186,7 +74188,6 @@ self: { ]; description = "Braille diagrams with plain text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-builder" = callPackage @@ -74215,7 +74216,6 @@ self: { ]; description = "hint-based build service for the diagrams graphics EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -74514,7 +74514,6 @@ self: { ]; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-pdf" = callPackage @@ -76088,6 +76087,8 @@ self: { executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "discord-hs" = callPackage @@ -87936,6 +87937,7 @@ self: { testHaskellDepends = [ base express leancheck speculate ]; description = "generalize counter-examples of test properties"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -88147,7 +88149,6 @@ self: { ]; description = "Braid representations in Haskell"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "fadno-xml" = callPackage @@ -106057,7 +106058,6 @@ self: { libraryHaskellDepends = [ base gloss reactive-banana ]; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "gloss-devil" = callPackage @@ -114982,7 +114982,6 @@ self: { ]; description = "A package allowing to write Hakyll blog posts in Rmd"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-agda" = callPackage @@ -114999,7 +114998,6 @@ self: { ]; description = "Wrapper to integrate literate Agda files with Hakyll"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-alectryon" = callPackage @@ -115016,7 +115014,6 @@ self: { ]; description = "Hakyll extension for rendering Coq code using Alectryon"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-blaze-templates" = callPackage @@ -115028,7 +115025,6 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ]; description = "Blaze templates for Hakyll"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib" = callPackage @@ -115044,7 +115040,6 @@ self: { executableHaskellDepends = [ base directory filepath hakyll ]; description = "Extra modules for the hakyll website compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib-csv" = callPackage @@ -115061,7 +115056,6 @@ self: { testHaskellDepends = [ base blaze-html bytestring cassava hspec ]; description = "Generate Html tables from Csv files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib-elm" = callPackage @@ -115080,7 +115074,6 @@ self: { executableHaskellDepends = [ base hakyll ]; description = "Compile Elm code for inclusion in Hakyll static site"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib-hyphenation" = callPackage @@ -115092,7 +115085,6 @@ self: { libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ]; description = "automatic hyphenation for Hakyll"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ erictapen ]; }) {}; @@ -115138,7 +115130,6 @@ self: { ]; description = "A hakyll library that helps maintain a separate links database"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-convert" = callPackage @@ -115187,7 +115178,6 @@ self: { executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-dir-list" = callPackage @@ -115202,7 +115192,6 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -115232,7 +115221,6 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-filestore" = callPackage @@ -115247,7 +115235,6 @@ self: { ]; description = "FileStore utilities for Hakyll"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-images" = callPackage @@ -115269,7 +115256,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage @@ -115293,7 +115279,6 @@ self: { libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-sass" = callPackage @@ -115309,7 +115294,6 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-series" = callPackage @@ -115321,7 +115305,6 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -115339,7 +115322,6 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-shortcode" = callPackage @@ -115379,7 +115361,6 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-typescript" = callPackage @@ -115396,7 +115377,6 @@ self: { testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hal" = callPackage @@ -121000,6 +120980,8 @@ self: { ]; description = "Define features from events"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskmon" = callPackage @@ -122517,6 +122499,8 @@ self: { ]; description = "composable SQL generation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasqly-mysql" = callPackage @@ -130065,6 +130049,7 @@ self: { ]; description = "High-level Redis Database"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hlrdb-core" = callPackage @@ -130083,6 +130068,8 @@ self: { ]; description = "High-level Redis Database Core API"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls" = callPackage @@ -130818,7 +130805,6 @@ self: { ]; description = "hmatrix interface to sundials"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {sundials_arkode = null; sundials_cvode = null;}; "hmatrix-svdlibc" = callPackage @@ -150423,7 +150409,6 @@ self: { ]; description = "Orphan Show instances for diagrams package that render inline in some terminals"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ival" = callPackage @@ -154592,7 +154577,6 @@ self: { ]; description = "Utilities for serving static sites and blogs with Wai/Warp"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "kawhi" = callPackage @@ -170469,7 +170453,6 @@ self: { ]; description = "The project management tool for hackers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "mastermind" = callPackage @@ -178367,6 +178350,7 @@ self: { doHaddock = false; description = "Invocation helpers for the ReaderT-record-of-functions style"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "moonshine" = callPackage @@ -196245,6 +196229,8 @@ self: { libraryToolDepends = [ cpphs ]; description = "A fast parser combinator library backed by Typed Template Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "parsnip" = callPackage @@ -198927,6 +198913,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Documentation DSL for persistent entities"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "persistent-equivalence" = callPackage @@ -206902,6 +206890,8 @@ self: { ]; description = "PowerDNS API bindings for api/v1"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "powermate" = callPackage @@ -212309,7 +212299,6 @@ self: { ]; description = "Creating graphics for pencil puzzles"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "puzzle-draw-cmdline" = callPackage @@ -212328,7 +212317,6 @@ self: { ]; description = "Creating graphics for pencil puzzles, command line tools"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pvar" = callPackage @@ -214582,6 +214570,8 @@ self: { doHaddock = false; description = "Fast and type safe cryptography"; license = "(Apache-2.0 OR BSD-3-Clause)"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rabocsv2qif" = callPackage @@ -216626,7 +216616,6 @@ self: { ]; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana" = callPackage @@ -216665,7 +216654,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "home (etc) automation using reactive-banana"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-bunch" = callPackage @@ -216681,7 +216669,6 @@ self: { ]; description = "Extend reactive-banana to multiple events per time point"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-gi-gtk" = callPackage @@ -216698,7 +216685,6 @@ self: { testHaskellDepends = [ base ]; description = "Simple reactive programming with GTK GObject Introspection"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-sdl" = callPackage @@ -216728,7 +216714,6 @@ self: { testHaskellDepends = [ base ]; description = "Reactive Banana integration with SDL2"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-threepenny" = callPackage @@ -216743,7 +216728,6 @@ self: { libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; description = "Examples for the reactive-banana library, using threepenny-gui"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-wx" = callPackage @@ -216837,7 +216821,6 @@ self: { ]; description = "Process MIDI events via reactive-banana and JACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-midyim" = callPackage @@ -216857,7 +216840,6 @@ self: { ]; description = "Process MIDI events via reactive-banana"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -225889,6 +225871,8 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-coloured-text-layout" = callPackage @@ -225906,6 +225890,8 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Safely layout output coloured text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-coloured-text-layout-gen" = callPackage @@ -225926,6 +225912,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-terminfo" = callPackage @@ -225937,6 +225924,8 @@ self: { libraryHaskellDepends = [ base safe-coloured-text terminfo ]; description = "Safely output coloured text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-decimal" = callPackage @@ -243457,6 +243446,8 @@ self: { benchmarkHaskellDepends = [ base express leancheck ]; description = "discovery of properties about Haskell functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "speculate_0_4_8" = callPackage @@ -243473,6 +243464,7 @@ self: { description = "discovery of properties about Haskell functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "speculation" = callPackage @@ -256992,7 +256984,6 @@ self: { libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "termbox-bindings" = callPackage @@ -267959,6 +267950,8 @@ self: { testHaskellDepends = [ base hspec hspec-core time ]; description = "A strongly typed way to handle time and date formats"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typed-uuid" = callPackage @@ -271291,6 +271284,8 @@ self: { libraryHaskellDepends = [ base ghc ]; description = "Unsatisfiable type class"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unscramble" = callPackage @@ -285166,6 +285161,8 @@ self: { ]; description = "Yam App"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yam-config" = callPackage @@ -285212,6 +285209,7 @@ self: { sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895"; libraryHaskellDepends = [ base cron yam-app ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "yam-logger" = callPackage @@ -285311,6 +285309,7 @@ self: { base containers persistent-postgresql unliftio-core yam-app ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "yam-web" = callPackage From daf4b12b00fbddde2d2e612cc616e1f5c4fb2c4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 17:27:25 +0200 Subject: [PATCH 145/797] python3Packages.pymfy: 0.9.4 -> 0.10.1 --- pkgs/development/python-modules/pymfy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymfy/default.nix b/pkgs/development/python-modules/pymfy/default.nix index 32483eea7b9..2c17c0a085d 100644 --- a/pkgs/development/python-modules/pymfy/default.nix +++ b/pkgs/development/python-modules/pymfy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pymfy"; - version = "0.9.4"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tetienne"; repo = "somfy-open-api"; rev = "v${version}"; - sha256 = "1ml536dvva2xd52jfgrd557h2sr5w6567sxnyq0blhkgpyz4m2av"; + sha256 = "sha256-xX7vNBQaYPdnsukFcQyEa2G1XIvf9ehADNXbLUUCRoU="; }; nativeBuildInputs = [ poetry-core ]; From ceab4362b2437a95dc5bc0c8bfe795a849034da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ho=C3=A0ng=20Minh=20Th=E1=BA=AFng?= Date: Sun, 6 Jun 2021 13:26:02 +0700 Subject: [PATCH 146/797] interception-tools: 0.2.1 -> 0.6.6 - use fetchFromGitLab - add boost to build inputs - remove outdated patches --- .../interception-tools/default.nix | 27 +++++++--------- .../fix-udevmon-configuration-job-path.patch | 32 ------------------- 2 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 21636ea8d8e..35b3b1e336d 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,19 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, cmake, libyamlcpp, - libevdev, udev }: +{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp, + libevdev, udev, boost }: -let - version = "0.2.1"; - baseName = "interception-tools"; -in stdenv.mkDerivation { - name = "${baseName}-${version}"; - - src = fetchurl { - url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz"; - sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi"; +stdenv.mkDerivation rec { + pname = "interception-tools"; + version = "0.6.6"; + src = fetchFromGitLab { + owner = "interception/linux"; + repo = "tools"; + rev = "v${version}"; + sha256 = "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj"; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libevdev udev libyamlcpp ]; + buildInputs = [ libevdev udev libyamlcpp boost ]; prePatch = '' substituteInPlace CMakeLists.txt --replace \ @@ -21,12 +20,10 @@ in stdenv.mkDerivation { "\"$(pkg-config --cflags libevdev | cut -c 3-)\"" ''; - patches = [ ./fix-udevmon-configuration-job-path.patch ]; - meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.vyp ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch b/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch deleted file mode 100644 index 469c96647d6..00000000000 --- a/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d3a5d661b80f3597368f517ebaeddfdfaafc1bf2 Mon Sep 17 00:00:00 2001 -From: xd1le -Date: Mon, 28 Aug 2017 00:19:09 +1000 -Subject: [PATCH] fix udevmon configuration job path - -For some reason, the udevmon job $PATH seems to be empty (or otherwise -seems to point to `/no-such-path`). This commit fixes that by setting -its $PATH to the same $PATH that the parent udevmon process has. ---- - udevmon.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/udevmon.cpp b/udevmon.cpp -index ebdd909..b523efd 100644 ---- a/udevmon.cpp -+++ b/udevmon.cpp -@@ -237,8 +237,11 @@ private: - case 0: { - char *command[] = {(char *)"sh", (char *)"-c", - (char *)job.c_str(), nullptr}; -+ std::string path = getenv("PATH"); - std::string variables = "DEVNODE=" + devnode; -- char *environment[] = {(char *)variables.c_str(), nullptr}; -+ std::string pathenv = "PATH=" + path; -+ char *environment[] = {(char *)variables.c_str(), -+ (char *)pathenv.c_str(), nullptr}; - execvpe(command[0], command, environment); - std::fprintf(stderr, - R"(exec failed for devnode %s, job "%s" )" --- -2.14.1 - From d2eff10292d86a305e06c1c09873141b9cfe9c8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 17:35:46 +0200 Subject: [PATCH 147/797] python3Packages.pylutron-caseta: 0.10.0 -> 0.11.0 --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 1066b95fd6f..f71f2f4d52a 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.10.0"; + version = "0.11.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gurumitts"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wKnca9sMdjvxxAW5YwLZFK/skmE6QMZG99HZRR3BIzw="; + sha256 = "sha256-2w8kRSZK9Bq3O6r6i0CJgxEXGo8KsWah9bMLlDNzMGk="; }; propagatedBuildInputs = [ From a1c9a51fa7a1c7f266bca2a2555718352c9eee07 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Fri, 4 Jun 2021 05:41:19 -0400 Subject: [PATCH 148/797] awk-sdk-cpp: propagate libraries --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index dd215dc01c5..2aa5ea015fd 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -25,15 +25,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl s2n-tls zlib - aws-c-common aws-c-event-stream aws-checksums + curl openssl zlib ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; # propagation is needed for Security.framework to be available when linking - propagatedBuildInputs = [ aws-c-cal aws-c-io ]; + propagatedBuildInputs = [ + aws-c-cal + aws-c-event-stream + aws-c-io + aws-c-common + aws-checksums + s2n-tls + ]; cmakeFlags = [ "-DBUILD_DEPS=OFF" From 1fca83e1b6765313e92ef7dc609ae1f50e773766 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 17:57:14 +0200 Subject: [PATCH 149/797] haskellPakcages.reactive-balsa: disable on darwin --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 56e2791c4f1..6f380810306 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -405,6 +405,7 @@ unsupported-platforms: PortMidi: [ x86_64-darwin ] posix-api: [ x86_64-darwin ] Raincat: [ x86_64-darwin ] + reactive-balsa: [ x86_64-darwin ] # depends on alsa-core reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-linux ] reflex-dom: [ x86_64-darwin, aarch64-linux ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bc3fbd9b7b1..6f04f9a75ac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -216616,6 +216616,9 @@ self: { ]; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "reactive-banana" = callPackage From 05813f4bf45718dbcca29f467755fedcc97168e9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 18:07:16 +0200 Subject: [PATCH 150/797] hackage2nix: Mark failing builds broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 21 +++++++++ .../transitive-broken.yaml | 3 ++ .../haskell-modules/hackage-packages.nix | 45 +++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index dc827a1b6f1..bc9881ee1fc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1001,6 +1001,7 @@ broken-packages: - dhrun - dia-base - diagrams-boolean + - diagrams-builder - diagrams-canvas - diagrams-graphviz - diagrams-gtk @@ -1283,6 +1284,7 @@ broken-packages: - Facebook-Password-Hacker-Online-Latest-Version - faceted - facts + - fadno-braids - failable-list - failure-detector - fakedata @@ -1636,6 +1638,7 @@ broken-packages: - global-variables - glob-posix - GlomeTrace + - gloss-banana - gloss-export - gloss-game - glpk-headers @@ -1759,7 +1762,18 @@ broken-packages: - hakismet - hakka - hako + - hakyll-blaze-templates + - hakyll-contrib + - hakyll-contrib-csv + - hakyll-contrib-elm + - hakyll-contrib-links + - hakyll-dhall + - hakyll-dir-list + - hakyll-process + - hakyll-R + - hakyll-series - hakyll-shortcode + - hakyll-shortcut-links - HaLeX - halfs - halipeto @@ -2095,6 +2109,7 @@ broken-packages: - hmatrix-nipals - hmatrix-sparse - hmatrix-static + - hmatrix-sundials - hmatrix-svdlibc - hmatrix-syntax - hmatrix-tests @@ -2560,6 +2575,7 @@ broken-packages: - katip-syslog - katt - katydid + - kawaii - kawhi - kdesrc-build-extra - kd-tree @@ -2860,6 +2876,7 @@ broken-packages: - MASMGen - massiv-persist - massiv-serialise + - master-plan - mathflow - math-grads - math-interpolate @@ -3725,6 +3742,7 @@ broken-packages: - pushme - push-notifications - putlenses + - puzzle-draw - pyffi - pyfi - python-pickle @@ -3807,6 +3825,9 @@ broken-packages: - react-haskell - reaction-logic - reactive-bacon + - reactive-banana-gi-gtk + - reactive-banana-sdl2 + - reactive-banana-threepenny - reactive-thread - react-tutorial-haskell-server - readability diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e9be7c64c64..e813a2a8347 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -626,6 +626,7 @@ dont-distribute-packages: - dia-functions - diagrams-haddock - diagrams-html5 + - diagrams-pandoc - diagrams-pgf - diagrams-reflex - diagrams-wx @@ -1083,6 +1084,7 @@ dont-distribute-packages: - hails-bin - hakyll-elm - hakyll-ogmarkup + - hakyll-typescript - halberd - hall-symbols - halma-gui @@ -2317,6 +2319,7 @@ dont-distribute-packages: - push-notify-apn - push-notify-ccs - push-notify-general + - puzzle-draw-cmdline - pvd - qd-vec - qhs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6f04f9a75ac..459821f253f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74216,6 +74216,8 @@ self: { ]; description = "hint-based build service for the diagrams graphics EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "diagrams-cairo" = callPackage @@ -74514,6 +74516,7 @@ self: { ]; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-pdf" = callPackage @@ -88149,6 +88152,8 @@ self: { ]; description = "Braid representations in Haskell"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fadno-xml" = callPackage @@ -106058,6 +106063,8 @@ self: { libraryHaskellDepends = [ base gloss reactive-banana ]; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gloss-devil" = callPackage @@ -114982,6 +114989,8 @@ self: { ]; description = "A package allowing to write Hakyll blog posts in Rmd"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-agda" = callPackage @@ -115025,6 +115034,8 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ]; description = "Blaze templates for Hakyll"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib" = callPackage @@ -115040,6 +115051,8 @@ self: { executableHaskellDepends = [ base directory filepath hakyll ]; description = "Extra modules for the hakyll website compiler"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-csv" = callPackage @@ -115056,6 +115069,8 @@ self: { testHaskellDepends = [ base blaze-html bytestring cassava hspec ]; description = "Generate Html tables from Csv files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-elm" = callPackage @@ -115074,6 +115089,8 @@ self: { executableHaskellDepends = [ base hakyll ]; description = "Compile Elm code for inclusion in Hakyll static site"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-hyphenation" = callPackage @@ -115130,6 +115147,8 @@ self: { ]; description = "A hakyll library that helps maintain a separate links database"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-convert" = callPackage @@ -115178,6 +115197,8 @@ self: { executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-dir-list" = callPackage @@ -115192,6 +115213,8 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-elm" = callPackage @@ -115279,6 +115302,8 @@ self: { libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-sass" = callPackage @@ -115305,6 +115330,8 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-shakespeare" = callPackage @@ -115361,6 +115388,8 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-typescript" = callPackage @@ -115377,6 +115406,7 @@ self: { testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hal" = callPackage @@ -130805,6 +130835,8 @@ self: { ]; description = "hmatrix interface to sundials"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {sundials_arkode = null; sundials_cvode = null;}; "hmatrix-svdlibc" = callPackage @@ -154577,6 +154609,8 @@ self: { ]; description = "Utilities for serving static sites and blogs with Wai/Warp"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kawhi" = callPackage @@ -170453,6 +170487,8 @@ self: { ]; description = "The project management tool for hackers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mastermind" = callPackage @@ -212299,6 +212335,8 @@ self: { ]; description = "Creating graphics for pencil puzzles"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "puzzle-draw-cmdline" = callPackage @@ -212317,6 +212355,7 @@ self: { ]; description = "Creating graphics for pencil puzzles, command line tools"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "pvar" = callPackage @@ -216688,6 +216727,8 @@ self: { testHaskellDepends = [ base ]; description = "Simple reactive programming with GTK GObject Introspection"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reactive-banana-sdl" = callPackage @@ -216717,6 +216758,8 @@ self: { testHaskellDepends = [ base ]; description = "Reactive Banana integration with SDL2"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reactive-banana-threepenny" = callPackage @@ -216731,6 +216774,8 @@ self: { libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; description = "Examples for the reactive-banana library, using threepenny-gui"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reactive-banana-wx" = callPackage From 97d2cfaf810607f590b1b133c4b3d447b9f6f198 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 13:23:22 +0000 Subject: [PATCH 151/797] adwaita-qt: 1.3.0 -> 1.3.1 --- pkgs/data/themes/adwaita-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 2722c4fe20c..fa69afe50c5 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "1fkivdiz4al84nhgg1srj33l109j9si63biw3asy339cyyzj28c9"; + sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg="; }; nativeBuildInputs = [ From bfa89fbfca62837ec0b73ed61e6bad47297845e6 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Sun, 6 Jun 2021 13:35:10 -0300 Subject: [PATCH 152/797] dotnetPackages.FSharpFormatting: 2.9.8 -> 11.2.0 --- pkgs/top-level/dotnet-packages.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index b26dd1b1e59..55eb5676403 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -174,9 +174,23 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { FSharpFormatting = fetchNuGet { baseName = "FSharp.Formatting"; - version = "2.9.8"; - sha256 = "1bswcpa68i2lqds4kkl2qxgkfrppbpxa4jkyja48azljajh0df3m"; - outputFiles = [ "lib/net40/*" ]; + version = "11.2.0"; + sha256 = "4IMrd+jpRZw+vBXx4X89/B/Fdpiuy2hwtmQNGWQp0wM="; + outputFiles = [ "lib/*" ]; + postUnpack = '' + chmod -R a+r $sourceRoot + ''; + + meta = with lib; { + description = "F# tools for generating documentation (Markdown processor and F# code formatter)"; + homepage = "https://fsprojects.github.io/FSharp.Formatting/"; + longDescription = '' + The FSharp.Formatting package includes libraries and tools for processing F# script files, + markdown and components for documentation generation. + ''; + license = licenses.asl20; + maintainers = [ maintainers.ratsclub ]; + }; }; NUnit3 = fetchNuGet { From 670d6ac45824cc591e294a0a6e051f5dfbaa0c65 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 12:38:24 +0200 Subject: [PATCH 153/797] haskell-generic-builder: fix buildTarget specification if isLibrary If we don't pass buildTarget to ./Setup copy and buildTarget is not empty it will try installing targets that don't exist and thus fail. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a9c8f11223f..b91da166952 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -481,7 +481,7 @@ stdenv.mkDerivation ({ # ^^ if the project is not a library, and we have a build target, then use "copy" to install # just the target specified; "install" will error here, since not all targets have been built. else '' - ${setupCommand} copy + ${setupCommand} copy ${buildTarget} local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" From 683d06d4ae42e6170a2f461bf21b452c1ab1ebb3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 11:52:51 +0200 Subject: [PATCH 154/797] haskellPackages.discord-haskell: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc39fb4fd10..4ef8828cb02 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1953,4 +1953,8 @@ EOT # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 reactive-banana = doJailbreak super.reactive-banana; + # Example executable doesn't compile + # https://github.com/aquarial/discord-haskell/issues/69 + discord-haskell = setBuildTarget super.discord-haskell "lib:discord-haskell"; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From be6de30ca47d0f3beda445109cc6e68cdff0f59b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 18:48:42 +0200 Subject: [PATCH 155/797] maintainers/scripts/haskell: make commit messages more consistent Make sure they are all prefixed with haskellPackages: except for update-hackage.sh which changes the top-level attribute all-cabal-hashes. --- maintainers/scripts/haskell/mark-broken.sh | 2 +- maintainers/scripts/haskell/regenerate-hackage-packages.sh | 2 +- maintainers/scripts/haskell/update-stackage.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index ddf2b1243b1..58433abe662 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -38,7 +38,7 @@ git add $broken_config git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF -hackage2nix: Mark failing builds broken +haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh EOF diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index e7f91f2d79d..285f6ed7cf9 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -37,7 +37,7 @@ echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackag if [[ "${1:-}" == "--do-commit" ]]; then git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF -hackage-packages.nix: Regenerate based on current config +haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh EOF diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index db336bf12da..7a0e1e1f81a 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -61,7 +61,7 @@ sed -r \ if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config git commit -F - << EOF -Stackage Nightly: $old_version -> $version +haskellPackages: stackage-nightly $old_version -> $version This commit has been generated by maintainers/scripts/haskell/update-stackage.sh EOF From 30c602ac7aa2ba89b5055984ebd69a17cf9e5924 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 6 Jun 2021 17:44:39 +0000 Subject: [PATCH 156/797] qbittorrent: 4.3.3 -> 4.3.5 https://github.com/qbittorrent/qBittorrent/blob/release-4.3.5/Changelog --- .../networking/p2p/qbittorrent/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 4c0d391ccaa..bd4fafed111 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,15 +12,17 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.3"; + version = "4.3.5"; src = fetchFromGitHub { owner = "qbittorrent"; - repo = "qbittorrent"; + repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "0y8vrvfv8n6zg6pgg5a9hmvxi2z9rrfd9k8zv04nv5js91b99ncq"; + sha256 = "1vdk42f8rxffyfydjk5cgzg5gl88ng2pynlyxw5ajh08wvkkjzgy"; }; + enableParallelBuilding = true; + # NOTE: 2018-05-31: CMake is working but it is not officially supported nativeBuildInputs = [ makeWrapper pkg-config ]; @@ -47,7 +49,8 @@ mkDerivation rec { meta = { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; - license = licenses.gpl2; + changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ Anton-Latukha ]; }; From ad21be36ac70180bac5a74eab2a4ee0304862fa2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 6 Jun 2021 17:56:23 +0000 Subject: [PATCH 157/797] electron_13: 13.0.1 -> 13.1.0 https://github.com/electron/electron/releases/tag/v13.1.0 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index e3cd9d2cf90..b63df78cdbe 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "1vwcjzkjag2wxrwnsbi8bgbv8bi6vn5iq9b04krwlk7mlhm4ax66"; }; - electron_13 = mkElectron "13.0.1" { - x86_64-linux = "05c6cfc2804d426d6c2af15cc16e0265782917e76fb2c4e87b7469d0f3ab0f81"; - x86_64-darwin = "a65a44bfafcdfcdee0bb2b3515dab57e884e0700830ccd142e15f01e6c3a4976"; - i686-linux = "3f3b358879523b10e6341a5c74842f8c09a1073f6064410f3495143733663f8d"; - armv7l-linux = "b6657862bf4b1f61f5c1e0c836401f82822fc5ebd69ecb2efd0777255fefc813"; - aarch64-linux = "ccc581dc5ddf9d2adefb60d8bc495b5a04363a80614d617094c142b8c5aa95de"; - aarch64-darwin = "e58e3ea3fffc8c3b280b0b6c22c685f9ecd82ef0340a5207d8b9c6f20e7c0197"; - headers = "0idlap698vqz7i2by3g9k4yqhm87fqc34pgzxcidzan9qvyd0njx"; + electron_13 = mkElectron "13.1.0" { + x86_64-linux = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4"; + x86_64-darwin = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de"; + i686-linux = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355"; + armv7l-linux = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a"; + aarch64-linux = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb"; + aarch64-darwin = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea"; + headers = "1h4saavsy97kmbfaw6xcya5l0iybr37vyw7bv539c7a064kam07b"; }; } From 711c6d57fb65d9f8086dd0f1ac2d90042fccd462 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 6 Jun 2021 17:57:11 +0000 Subject: [PATCH 158/797] electron_12: 12.0.9 -> 12.0.10 https://github.com/electron/electron/releases/tag/v12.0.10 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index b63df78cdbe..0b2cdbe9c04 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry"; }; - electron_12 = mkElectron "12.0.9" { - x86_64-linux = "3ab0a873f720d3bf56cce6ca1bf9d8b956843920798f659ca0829e4cc3126f6d"; - x86_64-darwin = "b3f1e378f58e7c36b54451c5a3485adc370277827974e1eb0790b6965737c872"; - i686-linux = "37405b3b27779ad417c3ae432d7f0d969c126c958a0ad8f2585c34fc8ee6c6e6"; - armv7l-linux = "2d41ef3ed6a215efe2c7d03d8055fcfda0079f09e9580e5bf70e8ac4a22b0898"; - aarch64-linux = "22a85817ea2edbba2e17b35f6e3a8104b2165e070ea21a1f2fa3b40e8d7aecc9"; - aarch64-darwin = "cb8aa8153005ea0d801182eb714d56af0217345b1152d867317291670731daeb"; - headers = "1vwcjzkjag2wxrwnsbi8bgbv8bi6vn5iq9b04krwlk7mlhm4ax66"; + electron_12 = mkElectron "12.0.10" { + x86_64-linux = "b5383b5818062de42536a7966df875ae781433a7ee991da34643bc6fda4ad038"; + x86_64-darwin = "3d4111280bf50dbfb141b46551974b0e4e39eb0d1f8ef789d71f7d3295a8e24f"; + i686-linux = "6fd10db8d896ef82ac8f2a1d796942dc56f5b41e504c86121d83eababa0cccb8"; + armv7l-linux = "5820ac7e70488507417122aaa0381439f929da1819c2c710ba74569a609cc972"; + aarch64-linux = "022ff009969d9f270704e918fe2dda6cd395c3e9d9e9515e99eca628d996a503"; + aarch64-darwin = "d2af4870a79866621469043e44a2a0e995abc5530d4aaf1add567b00eb286b01"; + headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6"; }; electron_13 = mkElectron "13.1.0" { From 03bfa298913e752ff804697ec7f95fdac647b5c3 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sun, 6 Jun 2021 12:07:02 -0500 Subject: [PATCH 159/797] nixos/tests/test-driver: cleanup "dead" code (USE_SERIAL) At nixpkgs root: `rg redirectSerial ./` does not result in any other match nor does `rg USE_SERIAL ./` except for an unrelated match in: pkgs/tools/graphics/argyllcms/default.nix --- nixos/lib/test-driver/test-driver.py | 1 - nixos/lib/testing-python.nix | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index ab739ce3222..9c97ce38343 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -907,7 +907,6 @@ class Machine: def create_machine(args: Dict[str, Any]) -> Machine: global log args["log"] = log - args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1" return Machine(args) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 99d0a9a0bfa..715482e8730 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -196,8 +196,7 @@ rec { --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests 'start_all(); join_all();' \ - --set VLANS '${toString vlans}' \ - ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} + --set VLANS '${toString vlans}' ''); # " passMeta = drv: drv // lib.optionalAttrs (t ? meta) { From ce6b1a4f8f9cbbb7fd2d1c637bcc39fff1ef49df Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 Jun 2021 15:10:57 +0200 Subject: [PATCH 160/797] doc: Document markup syntax Not depicted: - Diagrams using Lua filter and dot - fenced code attributes (enabled by the attributes extension) --- .../contributing-to-documentation.chapter.md | 72 ++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 7fd4b93f0d2..05b00d9bdda 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -1,6 +1,6 @@ # Contributing to this documentation {#chap-contributing} -The DocBook sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. +The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. The manual is still partially written in DocBook but it is progressively being converted to [Markdown](#sec-contributing-markup). You can quickly check your edits with `make`: @@ -22,3 +22,73 @@ $ nix-shell ``` If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`. + +## Syntax {#sec-contributing-markup} + +As per [RFC 0062](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. + +Additionally, the following syntax extensions are currently used: + +- []{#ssec-contributing-markup-anchors} + Explicitly defined **anchors** on headings, to allow linking to sections. These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between [automatically assigned identifiers](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/auto_identifiers.md). + + It uses the widely compatible [header attributes](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/attributes.md) syntax: + + ```markdown + ## Syntax {#sec-contributing-markup} + ``` + +- []{#ssec-contributing-markup-anchors-inline} + **Inline anchors**, which allow linking arbitrary place in the text (e.g. individual list items, sentences…). + + They are defined using a hybrid of the link syntax with the attributes syntax known from headings, called [bracketed spans](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/bracketed_spans.md): + + ```markdown + - []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`. + ``` + +- []{#ssec-contributing-markup-admonitions} + **Admonitions**, set off from the text to bring attention to something. + + It uses pandoc’s [fenced `div`s syntax](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/fenced_divs.md): + + ```markdown + ::: {.warning} + This is a warning + ::: + ``` + + which renders as + + > ::: {.warning} + > This is a warning. + > ::: + + The following are supported: + + - [`caution`](https://tdg.docbook.org/tdg/5.0/caution.html) + - [`important`](https://tdg.docbook.org/tdg/5.0/important.html) + - [`note`](https://tdg.docbook.org/tdg/5.0/note.html) + - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html) + - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html) + +- []{#ssec-contributing-markup-definition-lists} + [**Definition lists**](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md), for defining a group of terms: + + ```markdown + pear + : green or yellow bulbous fruit + + watermelon + : green fruit with red flesh + ``` + + which renders as + + > pear + > : green or yellow bulbous fruit + > + > watermelon + > : green fruit with red flesh + +For contributing to the legacy parts, please see [DocBook: The Definitive Guide](https://tdg.docbook.org/) or the [DocBook rocks! primer](https://web.archive.org/web/20200816233747/https://docbook.rocks/). From 336d82617f1cdd2f5ae77e262afa3f88f5a5e578 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 21 Apr 2021 18:34:13 +0200 Subject: [PATCH 161/797] bootstrap-tools: Patch TargetConditionals.h `TargetConditionals.h` was missing several definitions, like `TARGET_OS_TV` that are part of SDK 10.12 at least. And one that doesn't seem to occur in any SDK afaict, `TARGET_OS_EMBEDDED_OTHER`. I added the definitions from SDK 10.12 verbatim and defined `TARGET_OS_EMBEDDED_OTHER` to be equal to `0`. This is a modified version of a patch to avoid a stdenv rebuild. --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 40 ++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 7e72e4fa643..f73a028bcac 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -33,9 +33,47 @@ in rec { curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); # Avoid stdenv rebuild. - Libsystem_ = darwin.Libsystem.override (args: + Libsystem_ = (darwin.Libsystem.override (args: { xnu = darwin.xnu.overrideAttrs (oldAttrs: { patches = [ ./fixed-xnu-python3.patch ]; }); + })).overrideAttrs (oldAttrs: + { installPhase = oldAttrs.installPhase + '' + cat < $out/include/TargetConditionals.h + #ifndef __TARGETCONDITIONALS__ + #define __TARGETCONDITIONALS__ + #define TARGET_OS_MAC 1 + #define TARGET_OS_WIN32 0 + #define TARGET_OS_UNIX 0 + #define TARGET_OS_OSX 1 + #define TARGET_OS_IPHONE 0 + #define TARGET_OS_IOS 0 + #define TARGET_OS_WATCH 0 + #define TARGET_OS_BRIDGE 0 + #define TARGET_OS_TV 0 + #define TARGET_OS_SIMULATOR 0 + #define TARGET_OS_EMBEDDED 0 + #define TARGET_OS_EMBEDDED_OTHER 0 /* Used in configd */ + #define TARGET_IPHONE_SIMULATOR TARGET_OS_SIMULATOR /* deprecated */ + #define TARGET_OS_NANO TARGET_OS_WATCH /* deprecated */ + + #define TARGET_CPU_PPC 0 + #define TARGET_CPU_PPC64 0 + #define TARGET_CPU_68K 0 + #define TARGET_CPU_X86 0 + #define TARGET_CPU_X86_64 1 + #define TARGET_CPU_ARM 0 + #define TARGET_CPU_ARM64 0 + #define TARGET_CPU_MIPS 0 + #define TARGET_CPU_SPARC 0 + #define TARGET_CPU_ALPHA 0 + #define TARGET_RT_MAC_CFM 0 + #define TARGET_RT_MAC_MACHO 1 + #define TARGET_RT_LITTLE_ENDIAN 1 + #define TARGET_RT_BIG_ENDIAN 0 + #define TARGET_RT_64_BIT 1 + #endif /* __TARGETCONDITIONALS__ */ + EOF + ''; }); build = stdenv.mkDerivation { From c7b433acf9cc080d7ebd8d2daa9bacde216ae570 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 18 May 2021 12:15:47 +0200 Subject: [PATCH 162/797] bootstrap-tools: libclang-cpp already included Changes to llvmPackages have caused the `libclang-cpp*.dylib` files to be included in the `clang-unwrapped.lib` output. So we no longer need to copy them from libclang. --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index f73a028bcac..08b4372a0a1 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -137,7 +137,6 @@ in rec { cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin cp -rd ${llvmPackages.clang-unwrapped.lib}/lib/* $out/lib - cp -d ${llvmPackages.libclang}/lib/libclang-cpp*.dylib $out/lib cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib cp -d ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin From d856ea701b26fdf984759067d5c1725b5515769a Mon Sep 17 00:00:00 2001 From: Casey Marshall Date: Sun, 6 Jun 2021 13:29:42 -0500 Subject: [PATCH 163/797] maintainers: add Casey Marshall --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2448ad3f93d..41ea89baffc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1907,6 +1907,16 @@ githubId = 3392199; name = "Calum MacRae"; }; + cmars = { + email = "nix@cmars.tech"; + github = "cmars"; + githubId = 23741; + name = "Casey Marshall"; + keys = [{ + longkeyid = "rsa3072/0x6DEC2758ACD5A973"; + fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973"; + }]; + }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; github = "cmcdragonkai"; From 5a84fc1cbe5494bcd2a4d1d5bfe220871830b9b8 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 6 Jun 2021 14:34:00 -0400 Subject: [PATCH 164/797] iio-sensor-proxy: 2.8 -> 3.0 --- pkgs/os-specific/linux/iio-sensor-proxy/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 971a1abffdd..5566103b2cd 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake +{ lib, stdenv, fetchFromGitLab, autoconf-archive, gettext, libtool, intltool, autoconf, automake , glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; - version = "2.8"; + version = "3.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; owner = "hadess"; repo = pname; rev = version; - sha256 = "07rzm1z2p6lh4iv5pyp0p2x5805m9gsh19kcsjls3fi25p3a2c00"; + sha256 = "0ngbz1vkbjci3ml6p47jh6c6caipvbkm8mxrc8ayr6vc2p9l1g49"; }; configurePhase = '' From 9fcd7d4e36b8758e121d09aed970133e2f88d3eb Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 05:48:24 -0300 Subject: [PATCH 165/797] ocamlPackages.fix: 20130611 -> 20201120 --- .../development/ocaml-modules/fix/default.nix | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index d4ce484653b..ffd0b5003ce 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,25 +1,24 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitLab, buildDunePackage }: -assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; +buildDunePackage rec { + pname = "fix"; + version = "20201120"; -stdenv.mkDerivation { - - name = "ocaml-fix-20130611"; - - src = fetchurl { - url = "http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz"; - sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0"; + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "fpottier"; + repo = "fix"; + rev = "${version}"; + sha256 = "sha256-RO+JCG6R2i5uZfwTYEnQBCVq963fjv5lA2wA/8KrgMg="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; + minimumOCamlVersion = "4.03"; + useDune2 = true; meta = with lib; { - homepage = "http://gallium.inria.fr/~fpottier/fix/"; + homepage = "https://gitlab.inria.fr/fpottier/fix/"; description = "A simple OCaml module for computing the least solution of a system of monotone equations"; license = licenses.cecill-c; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ vbgl ]; }; } From 5a8372d04e5afbca44daed90ff82e0f0003e59b2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 1 Jun 2021 14:52:18 +0000 Subject: [PATCH 166/797] lib.systems.parse.kernels: fix typo in comment --- lib/systems/parse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index accaeb652d0..b27d37f55ae 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -276,7 +276,7 @@ rec { kernels = with execFormats; with kernelFamilies; setTypes types.openKernel { # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as - # the nnormalized name for macOS. + # the normalized name for macOS. macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; ios = { execFormat = macho; families = { inherit darwin; }; }; freebsd = { execFormat = elf; families = { inherit bsd; }; }; From 4d6a0bb9667c8083076a96744bdc71643c6febc6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 1 Jun 2021 14:54:14 +0000 Subject: [PATCH 167/797] lib.systems.parsed: add "elf" for some NetBSD archs In Autoconf, some old NetBSD targets like "i686-unknown-netbsd" are interpreted as a.out, not elf, and virtually nothing supports it. We need to specify e.g. "i686-unknown-netbsdelf" to get the right behaviour. --- lib/systems/parse.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index b27d37f55ae..2b789fd8ecb 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -121,6 +121,14 @@ rec { js = { bits = 32; significantByte = littleEndian; family = "js"; }; }; + # GNU build systems assume that older NetBSD architectures are using a.out. + gnuNetBSDDefaultExecFormat = cpu: + if (cpu.family == "x86" && cpu.bits == 32) || + (cpu.family == "arm" && cpu.bits == 32) || + (cpu.family == "sparc" && cpu.bits == 32) + then execFormats.aout + else execFormats.elf; + # Determine when two CPUs are compatible with each other. That is, # can code built for system B run on system A? For that to happen, # the programs that system B accepts must be a subset of the @@ -463,8 +471,12 @@ rec { else "${cpu.name}-${kernel.name}"; tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let + optExecFormat = + lib.optionalString (kernel.name == "netbsd" && + gnuNetBSDDefaultExecFormat cpu != kernel.execFormat) + kernel.execFormat.name; optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}"; - in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}"; + in "${cpu.name}-${vendor.name}-${kernel.name}${optExecFormat}${optAbi}"; ################################################################################ From f2c72bca630b13c23aad2addfee3c0dc9b64f29a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 1 Jun 2021 14:58:28 +0000 Subject: [PATCH 168/797] netbsd: disable stack protection on i686 Builds fail otherwise, because the linker can't find the stack protector symbols. --- pkgs/os-specific/bsd/netbsd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 9e0b734c817..d53a1afe5e6 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -96,6 +96,8 @@ in lib.makeScopeWithSplicing HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } // lib.optionalAttrs (stdenv'.isx86_32) { + USE_SSP = "no"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase"; dontBuild = true; From 39f3777e923784cbe9af20fe86be0403fe9c8763 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 5 Jun 2021 18:50:45 -0300 Subject: [PATCH 169/797] ocamlPackages.bisect_ppx: 2.5.0 -> 2.6.1 --- .../ocaml-modules/bisect_ppx/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index eba01081994..ddeda86e9bf 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,27 +1,28 @@ -{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ocaml-migrate-parsetree, ppx_tools_versioned }: +{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }: buildDunePackage rec { pname = "bisect_ppx"; - version = "2.5.0"; - - useDune2 = true; + version = "2.6.1"; src = fetchFromGitHub { owner = "aantron"; repo = "bisect_ppx"; rev = version; - sha256 = "0w2qd1myvh333jvkf8hgrqzl8ns4xgfggk4frf1ij3jyc7qc0868"; + sha256 = "sha256-YeLDlH3mUbVEY4OmzlrvSwVUav3uMtSsTFlOsQKnz84="; }; + minimumOCamlVersion = "4.08"; + useDune2 = true; + buildInputs = [ cmdliner - ocaml-migrate-parsetree - ppx_tools_versioned + ppxlib ]; - meta = { - description = "Code coverage for OCaml"; - license = lib.licenses.mit; + meta = with lib; { + description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested."; + license = licenses.mit; homepage = "https://github.com/aantron/bisect_ppx"; + maintainers = with maintainers; [ ]; }; } From 6d3d57a20d9a6530625733060d152911663fbe7d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 5 Jun 2021 19:59:32 -0300 Subject: [PATCH 170/797] ocamlPackages.ocaml-version: 3.0.0 -> 3.1.0 --- .../ocaml-modules/ocaml-version/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index 4fde475cf93..a8912c0f5d5 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -1,24 +1,21 @@ { lib, fetchurl, buildDunePackage }: buildDunePackage rec { - pname = "ocaml-version"; - version = "3.0.0"; - - minimumOCamlVersion = "4.07"; - - useDune2 = true; + version = "3.1.0"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz"; - sha256 = "15vk8sh50p3f2mbv8z7mqnx76cffri36f2krp25zkkwix8jg7ci4"; + sha256 = "sha256-rHuhagnY9yISdC85NpgPv667aYx7v2JRgq99ayw83l8="; }; - meta = { + minimumOCamlVersion = "4.07"; + useDune2 = true; + + meta = with lib; { description = "Manipulate, parse and generate OCaml compiler version strings"; homepage = "https://github.com/ocurrent/ocaml-version"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + license = licenses.isc; + maintainers = with maintainers; [ vbgl ]; }; - } From 06b6503467c2701bd9f532627462846ed409cd55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 21:15:06 +0200 Subject: [PATCH 171/797] python3Packages.dwdwfsapi: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/dwdwfsapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix index 6699050035d..1a68e7474af 100644 --- a/pkgs/development/python-modules/dwdwfsapi/default.nix +++ b/pkgs/development/python-modules/dwdwfsapi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "dwdwfsapi"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PX1b1msaZH8HKVBo3GU7TOr8Lo7INLjjJBkDHHs6mzk="; + sha256 = "sha256-JOIg6rLrU8v39z1I6smIPEeiUPdSdJcD2avUsTQq+bU="; }; propagatedBuildInputs = [ From eb0eb621a75306cc2c70f6481a24b348c2d082bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 19:45:58 +0000 Subject: [PATCH 172/797] lxd: 4.14 -> 4.15 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 11c2da247d7..fde3e829cc1 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.14"; + version = "4.15"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "1x9gv70j333w254jgg1n0kvxpwv6vww0v0i862pglq48xhdaa7hy"; + sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU="; }; postPatch = '' From a1c5f4e2205cff910b849c19ab6218241582d574 Mon Sep 17 00:00:00 2001 From: Matthias Devlamynck Date: Sun, 6 Jun 2021 16:22:23 +0200 Subject: [PATCH 173/797] graphene: fix nixos test The file introspection.py was missing in the installed-tests files and it requires python3 to run. --- ...1-meson-add-options-for-tests-installation-dirs.patch | 9 +++++++-- pkgs/development/libraries/graphene/default.nix | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch index a82a06d427b..9111217ea08 100644 --- a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch +++ b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch @@ -23,7 +23,7 @@ index b9a2fb5..4b8629f 100644 + value: '', + description: 'Installation directory for binary files in tests') diff --git a/tests/meson.build b/tests/meson.build -index 77281f5..c4c7fac 100644 +index 77281f5..7522456 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -21,8 +21,17 @@ unit_tests = [ @@ -71,7 +71,12 @@ index 77281f5..c4c7fac 100644 ), env: ['MUTEST_OUTPUT=tap'], protocol: 'tap', -@@ -70,13 +79,13 @@ if build_gir and host_system == 'linux' and not meson.is_cross_build() +@@ -66,17 +75,18 @@ endif + if build_gir and host_system == 'linux' and not meson.is_cross_build() + foreach unit: ['introspection.py'] + wrapper = '@0@.test'.format(unit) ++ install_data(unit, install_dir: test_bindir) + custom_target(wrapper, output: wrapper, command: [ gen_installed_test, diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index a9c647268ac..a8e0d117982 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -12,6 +12,7 @@ , docbook_xsl , docbook_xml_dtd_43 , gobject-introspection +, makeWrapper }: stdenv.mkDerivation rec { @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { pkg-config gobject-introspection python3 + makeWrapper ]; buildInputs = [ @@ -62,6 +64,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests/gen-installed-test.py + PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py + ''; + + postFixup = '' + wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/graphene-1.0/introspection.py" \ + --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" ''; passthru = { From 498b5e578a29d3b5a4e0cb155db6e02f8442d34b Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 27 May 2021 22:53:40 +0200 Subject: [PATCH 174/797] cmake: Add man and info outputs By default, the cmake derivation contains the documentation in .rst format. This format is not well suited for interactive use. Therefore, we add both man and info outputs and convert the documentation to these formats using Sphinx. These formats are enabled by default only in cmake versions for interactive use (ncurses, Qt), because using Sphinx in the basic version leads to circular dependency (infinite recursion). Namely, Sphinx has imagemagick in its checkInputs and imagemagick has several transitive dependencies, which have cmake in nativeBuildInputs. --- .../tools/build-managers/cmake/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index b04eac35b05..702652db878 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -8,6 +8,7 @@ , useOpenSSL ? !isBootstrap, openssl , useNcurses ? false, ncurses , withQt5 ? false, qtbase +, buildDocs ? (!isBootstrap && (useNcurses || withQt5)), sphinx, texinfo }: stdenv.mkDerivation (rec { @@ -35,14 +36,16 @@ stdenv.mkDerivation (rec { ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; - outputs = [ "out" ]; + outputs = [ "out" ] + ++ lib.optionals buildDocs [ "man" "info" ]; setOutputFlags = false; setupHook = ./setup-hook.sh; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ setupHook pkg-config ]; + nativeBuildInputs = [ setupHook pkg-config ] + ++ lib.optionals buildDocs [ texinfo ]; buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] @@ -68,6 +71,11 @@ stdenv.mkDerivation (rec { "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ++ lib.optional withQt5 "--qt-gui" + ++ lib.optionals buildDocs [ + "--sphinx-build=${sphinx}/bin/sphinx-build" + "--sphinx-man" + "--sphinx-info" + ] # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 ++ lib.optionals stdenv.hostPlatform.is32bit [ "CFLAGS=-D_FILE_OFFSET_BITS=64" From 69111ce11ecb9ca873847150257255d14f3f1145 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 22:32:14 +0200 Subject: [PATCH 175/797] notemap: init at 1.3 --- pkgs/tools/networking/notemap/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/networking/notemap/default.nix diff --git a/pkgs/tools/networking/notemap/default.nix b/pkgs/tools/networking/notemap/default.nix new file mode 100644 index 00000000000..040f26752b5 --- /dev/null +++ b/pkgs/tools/networking/notemap/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchzip +, pkg-config +, libressl +}: + +stdenv.mkDerivation rec { + pname = "notemap"; + version = "1.3"; + + src = fetchzip { + url = "https://git.causal.agency/notemap/snapshot/notemap-${version}.tar.gz"; + sha256 = "0s9c1xx0iggyzclqw3294bjv7qgvd5l5zgbryks4hvfibr73r6ps"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libressl + ]; + + meta = { + description = "Mirror notes to IMAP"; + longDescription = '' + notemap(1) mirrors text files to an IMAP mailbox in a format compatible with the iOS + Notes app. It's intended to make notes managed in git(1) easily accessible + from the phone. + ''; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.sternenseemann ]; + homepage = "https://git.causal.agency/notemap/about/"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0ab5ac5ffb..e584b5d5cda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3033,6 +3033,8 @@ in nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; + notemap = callPackage ../tools/networking/notemap { }; + noteshrink = callPackage ../tools/misc/noteshrink { }; noti = callPackage ../tools/misc/noti { From 8d3e55dc707875548a5aea4ed721e4d0ea1fa568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Kennedy?= Date: Sun, 6 Jun 2021 07:33:12 -0700 Subject: [PATCH 176/797] veikk-linux-driver-gui: update license Package is licensed under SDPX `GPL-2.0-only` --- pkgs/tools/misc/veikk-linux-driver-gui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix index e216823f7ab..a833846dd00 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "Configuration tool for the VEIKK Linux driver"; homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/"; - license = licenses.unfree; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ nicbk ]; }; From d83bd16a2eab64e3e1b67cd5689807ec844450ba Mon Sep 17 00:00:00 2001 From: Flakebi Date: Tue, 18 May 2021 22:49:32 +0200 Subject: [PATCH 177/797] prometheus-script-exporter: init at 1.2.0 --- .../monitoring/prometheus/script-exporter.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/script-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix new file mode 100644 index 00000000000..d0806b6c5fa --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "script_exporter"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "adhocteam"; + repo = pname; + rev = "v${version}"; + sha256 = "t/xgRalcHxEcT1peU1ePJUItD02rQdfz1uWpXDBo6C0="; + }; + + vendorSha256 = "Hs1SNpC+t1OCcoF3FBgpVGkhR97ulq6zYhi8BQlgfVc="; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) script; }; + + meta = with lib; { + description = "Shell script prometheus exporter"; + homepage = "https://github.com/adhocteam/script_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ Flakebi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88e6731df85..5cdce350904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19701,6 +19701,7 @@ in prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; + prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; From 3bcf4e31ef70e2d6ec3fd387c174673aa01ef736 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Tue, 18 May 2021 22:53:10 +0200 Subject: [PATCH 178/797] nixos/prometheus: add script exporter --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/script.nix | 64 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 18 ++++++ 3 files changed, 83 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/script.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 9fcfe7b52e0..b57b73522f8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -55,6 +55,7 @@ let "redis" "rspamd" "rtl_433" + "script" "snmp" "smokeping" "sql" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/script.nix b/nixos/modules/services/monitoring/prometheus/exporters/script.nix new file mode 100644 index 00000000000..104ab859f2e --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/script.nix @@ -0,0 +1,64 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.script; + configFile = pkgs.writeText "script-exporter.yaml" (builtins.toJSON cfg.settings); +in +{ + port = 9172; + extraOpts = { + settings.scripts = mkOption { + type = with types; listOf (submodule { + options = { + name = mkOption { + type = str; + example = "sleep"; + description = "Name of the script."; + }; + script = mkOption { + type = str; + example = "sleep 5"; + description = "Shell script to execute when metrics are requested."; + }; + timeout = mkOption { + type = nullOr int; + default = null; + example = 60; + description = "Optional timeout for the script in seconds."; + }; + }; + }); + example = literalExample '' + { + scripts = [ + { name = "sleep"; script = "sleep 5"; } + ]; + } + ''; + description = '' + All settings expressed as an Nix attrset. + + Check the official documentation for the corresponding YAML + settings that can all be used here: + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-script-exporter}/bin/script_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --config.file ${configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + NoNewPrivileges = true; + ProtectHome = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index e3bfff218ad..defec2b8376 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -945,6 +945,24 @@ let ''; }; + script = { + exporterConfig = { + enable = true; + settings.scripts = [ + { name = "success"; script = "sleep 1"; } + ]; + }; + exporterTest = '' + wait_for_unit("prometheus-script-exporter.service") + wait_for_open_port(9172) + wait_until_succeeds( + "curl -sSf 'localhost:9172/probe?name=success' | grep -q '{}'".format( + 'script_success{script="success"} 1' + ) + ) + ''; + }; + smokeping = { exporterConfig = { enable = true; From bc260c31f12e3f21542cfe3828663225995e9554 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 6 Jun 2021 21:18:56 +0000 Subject: [PATCH 179/797] buildBazelPackage: don't fail if the marker file doesn't exist This was the intent of my previous change, but it didn't quite work because the pipeline still exits false even if the file doesn't exist. Oops. --- pkgs/build-support/build-bazel-package/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 988298ac72b..502be398eaa 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -126,7 +126,7 @@ in stdenv.mkDerivation (fBuildAttrs // { find $bazelOut/external -maxdepth 1 -type l | while read symlink; do name="$(basename "$symlink")" rm "$symlink" - test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" + test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" || true done # Patching symlinks to remove build directory reference From ffb7cfcfad15e3bff9d05336767e59ee6ee24cb6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Jun 2021 19:48:29 +0000 Subject: [PATCH 180/797] pr-tracker: 1.0.0 -> 1.1.0; adopt; add changelog --- pkgs/servers/pr-tracker/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix index 1bc53f352b6..d7bb27b4f29 100644 --- a/pkgs/servers/pr-tracker/default.nix +++ b/pkgs/servers/pr-tracker/default.nix @@ -1,6 +1,6 @@ { rustPlatform , lib -, fetchgit +, fetchurl , openssl , pkg-config , systemd @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.0.0"; + version = "1.1.0"; - src = fetchgit { - url = "https://git.qyliss.net/pr-tracker"; - rev = version; - sha256 = "sha256-NHtY05Llrvfvcb3uyagLd6kaVW630TIP3IreFrY3wl0="; + src = fetchurl { + url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; + sha256 = "0881ckb4y762isisf9d6xk6fh9207xi1i04kays298zx2dq6gh6h"; }; - cargoSha256 = "sha256-SgSASfIanADV31pVy+VIwozTLxq7P3oMDIiAAQ8s+k0="; + cargoSha256 = "0r8pxg65s5jv95a0g8pzr693za7jfb4rv0wc739lkbpf0dssw8sr"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl systemd ]; meta = with lib; { + changelog = "https://git.qyliss.net/pr-tracker/plain/NEWS?h=${version}"; description = "Nixpkgs pull request channel tracker"; longDescription = '' A web server that displays the path a Nixpkgs pull request will take @@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec { platforms = platforms.linux; homepage = "https://git.qyliss.net/pr-tracker"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ sumnerevans ]; + maintainers = with maintainers; [ qyliss sumnerevans ]; }; } From 0998c6a73e80ad376f7fc5542ea9412fe477dec2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 6 Jun 2021 18:16:07 -0400 Subject: [PATCH 181/797] freshfetch: init at 0.2.0 --- pkgs/tools/misc/freshfetch/Cargo.lock | 587 +++++++++++++++++++++++++ pkgs/tools/misc/freshfetch/default.nix | 31 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 620 insertions(+) create mode 100644 pkgs/tools/misc/freshfetch/Cargo.lock create mode 100644 pkgs/tools/misc/freshfetch/default.nix diff --git a/pkgs/tools/misc/freshfetch/Cargo.lock b/pkgs/tools/misc/freshfetch/Cargo.lock new file mode 100644 index 00000000000..24cfb7e9de9 --- /dev/null +++ b/pkgs/tools/misc/freshfetch/Cargo.lock @@ -0,0 +1,587 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bstr" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + +[[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", + "time", + "winapi", +] + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "clml_rs" +version = "0.3.0" +source = "git+https://github.com/K4rakara/clml-rs#eecf1378f4e85a9b3dc91e8a15d497a2fd75906f" +dependencies = [ + "lazy_static", + "rand", + "regex", +] + +[[package]] +name = "cmd_lib" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42443b644d30f401746fb4483fba96b13076e1ef6cb5bca7d6a14d1d8f9f2bd9" +dependencies = [ + "cmd_lib_core", + "cmd_lib_macros", +] + +[[package]] +name = "cmd_lib_core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50c50a1536e882455aeaff22015146ea143b9106fc8e116669dd078ec7b7fc8" + +[[package]] +name = "cmd_lib_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d202b0cfc28d8928ba89138c0a8248cf921b9870c6c9d60c9951092df5b62b2" +dependencies = [ + "cmd_lib_core", + "proc-macro2", + "quote", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +dependencies = [ + "autocfg", + "cfg-if", + "lazy_static", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "freshfetch" +version = "0.2.0" +dependencies = [ + "chrono", + "clap", + "clml_rs", + "cmd_lib", + "cmd_lib_core", + "lazy_static", + "mlua", + "regex", + "sysinfo", + "term_size", + "uname", + "users", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lua-src" +version = "543.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029180f994b9b36f47d905f92569b516acf7d073778e2e781c15ee375b1ca27d" +dependencies = [ + "cc", +] + +[[package]] +name = "luajit-src" +version = "210.1.3+restyfe08842" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36d3de8377d8e0492b646527befb7eb826a9ecd2dc8c1f81ab0e654bc03a029b" +dependencies = [ + "cc", +] + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "memoffset" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mlua" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2fc8e1085d53b72898c59ceee1980b5826b0c98ce99886b7518f0ead00e5cb" +dependencies = [ + "bstr", + "cc", + "lazy_static", + "lua-src", + "luajit-src", + "num-traits", + "pkg-config", +] + +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi", +] + +[[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 = "once_cell" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + +[[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 = "proc-macro2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +dependencies = [ + "unicode-xid", +] + +[[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.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "regex" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "sysinfo" +version = "0.15.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de94457a09609f33fec5e7fceaf907488967c6c7c75d64da6a7ce6ffdb8b5abd" +dependencies = [ + "cc", + "cfg-if", + "core-foundation-sys", + "doc-comment", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[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", +] + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[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.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "users" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[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 = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/misc/freshfetch/default.nix b/pkgs/tools/misc/freshfetch/default.nix new file mode 100644 index 00000000000..7ed33436035 --- /dev/null +++ b/pkgs/tools/misc/freshfetch/default.nix @@ -0,0 +1,31 @@ +{ fetchFromGitHub, fetchurl, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "freshfetch"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "k4rakara"; + repo = pname; + rev = "v${version}"; + sha256 = "1l9zngr5l12g71j85iyph4jjri3crxc2pi9q0gczrrzvs03439mn"; + }; + + cargoLock = { + # update Cargo.lock every new release of freshfetch + lockFile = ./Cargo.lock; + outputHashes = { + "clml_rs-0.3.0" = "0hvd59zh7czk9jd1a2wwcm1acpcfbz32v9ka7ap6f74d638jcc19"; + }; + }; + + # freshfetch depends on rust nightly features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "A fresh take on neofetch"; + homepage = "https://github.com/k4rakara/freshfetch"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07af5632d9a..2d231437f74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4802,6 +4802,8 @@ in frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; + freshfetch = callPackage ../tools/misc/freshfetch { }; + frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; From 92c6400651c2fe90aa86bdd728fe7e2f035644cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 6 Jun 2021 19:46:35 -0300 Subject: [PATCH 182/797] nordic: unstable-2021-05-21 -> unstable-2021-06-04 --- pkgs/data/themes/nordic/default.nix | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index c12f9e2ba78..1014d483440 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,70 +2,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2021-05-21"; + version = "unstable-2021-06-04"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "7e4f95ddaa8d94a66ed11a3b939cbd10864f1610"; - sha256 = "079gf8gxn1d2j44nhx4jzx2hz8hpsid7xwh414fjl3g2avb7n05a"; + rev = "9a98c05f4d4f6c9e701ac20b0bf5c18284ad0015"; + sha256 = "0ghgr7fr7anm8hdq6n46xhkjxydqkr0qlk1q7mdg08j43f0yra7b"; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "0b4197e281ba306ac4918cabbd83003c38c0067d"; - sha256 = "1w85i2fbils2ivwsa85g1asj2nx0p0cak840nyr58hdwky49ci5p"; + rev = "90ce6f539735af1f231c4fa07708cef602e1c8a2"; + sha256 = "1g6sz7ifpc8jf4iplcsmihqhjdc7yp5xygw8584n122jmh8mak47"; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "aba3c78910de8a47950a0b2defb8022c615d91f6"; - sha256 = "1746w0iahmdgw3kj1q2cswf12pf0ln7qq1grfz9sn8rjafzjchj8"; + rev = "529cdb86b4d4474a67a56eb9377e3c7907b452db"; + sha256 = "06li44i5wh4h06fbhvjf5cjma5czjdgnwvm79d8hg6vmi2101b0a"; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "9946dd747e1ea05782e084d2c2d94e2e4c7605ac"; - sha256 = "0mz1l1h26zhv0pnsbs0rx0xrwrn2y8g3ik0aa8ww5f411vvzgfr5"; + rev = "1d16f37de315c298a6c3d79a552ed6f18cbb7fb4"; + sha256 = "0nxzygnysg4ciib337vay0qcc80hpryjnclwjwjzj51i95366k25"; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "5c0be5a783cd14af5c7647ca13d946c64e03561d"; - sha256 = "0751z3b9s0ycrsha20jx8lhdgvggcl0rdgv975dpaiqqjqyd9z06"; + rev = "78a30080bc50ee88c23d393049306ef1925bcdb8"; + sha256 = "10w4815fcf3pd24ar7jp0wcdiwn3zzrdj2p6fqlgx26biz7kf3iv"; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "9cb8d9f786614579e59ec2c3dd9fd8dd9b56316e"; - sha256 = "09s9y7waygrx3p6c0c4py0ywg2ihpdmx73xhw5f92rr5nhsvish7"; + rev = "e4363da8d457e8b14f6e4340979225db92d34aa9"; + sha256 = "1sjw2hvg4jgxqzgqhqixq216a7vv5licbc8ii1rsz88ycafsbr7j"; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "69652db56e1721ac183cd57d21a801a09655a811"; - sha256 = "0zjd4np11mjwmc1kh2n1ig77g4wq88s2yrmnga0gvw1lf44n3qn2"; + rev = "a38fd7d440309573947d3e53ea3ed295cf027ce7"; + sha256 = "1r6hz0m0y7c1d0ka1x9cd47r0jvpgkld6x3gf2b7w7yvqpmh6a44"; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "3a67c1a2308ba3e9ec5d82f4a3416f85b6085b08"; - sha256 = "0gpg2izh4ay78j79vjp4svmi3qy9qaw0n6ai8zwm7p25dwm56fjy"; + rev = "b86d43c48bcac57c49d891b967311fd90f6d4bcd"; + sha256 = "0c725kf5ql42zrqk6dwk6i7wyrhr3gddipvhy6692nv0dszqm0ml"; name = "Nordic-Polar-standard-buttons"; }) ]; From 9aedb717ec877e8e9344d87091121dfcef638e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 6 Jun 2021 20:02:47 -0300 Subject: [PATCH 183/797] vimix-gtk-themes: 2020-11-28 -> 2021-04-25 - Update version - FIx license - Install all theme variants - Add calls to run hooks in installPhase --- pkgs/data/themes/vimix/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 5a561289370..1694063e4fe 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; - version = "2020-11-28"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1m84p4cs9dfwc27zfjnwgkfdnfmlzbimq3g5z4mhz23cijm178rf"; + sha256 = "0ak763vs27h5z2pgcqpz1g1hypn5gl0p0ylffawc9zdi1wp2mpxb"; }; buildInputs = [ gtk_engines ]; @@ -16,16 +16,18 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' + runHook preInstall patchShebangs . mkdir -p $out/share/themes - name= ./install.sh -d $out/share/themes + name= ./install.sh --all --dest $out/share/themes rm $out/share/themes/*/{AUTHORS,LICENSE} + runHook postInstall ''; meta = with lib; { description = "Flat Material Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/vimix-gtk-themes"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; From e6a3c39aead2be3ea45fca8f9b9d99436e784303 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 23:32:33 +0000 Subject: [PATCH 184/797] bshapr: 0.12 -> 0.13 --- pkgs/applications/audio/bshapr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index e1a83537a6a..728c60b2e86 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bshapr"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BShapr"; rev = "v${version}"; - sha256 = "sha256-2DySlD5ZTxeQ2U++Dr67bek5oVbAiOHCxM6S5rTTZN0="; + sha256 = "sha256-9I4DPRl6i/VL8Etw3qLGZkP45BGsbxFxNOvRy3B3I+M="; }; nativeBuildInputs = [ pkg-config ]; From 56ca47ff3dfd24d45e75d385bac367afe23884db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 01:22:06 +0200 Subject: [PATCH 185/797] python3Packages.textacy: 0.10.1 -> 0.11.0 --- .../python-modules/textacy/default.nix | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 9f9fe685c95..5c8928a385d 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -1,34 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage , cachetools , cytoolz +, fetchPypi , jellyfish +, joblib , matplotlib , networkx , numpy , pyemd , pyphen -, pytest +, pytestCheckHook +, pythonOlder , requests , scikit-learn , scipy , spacy -, srsly +, tqdm }: buildPythonPackage rec { pname = "textacy"; - version = "0.10.1"; - disabled = isPy27; + version = "0.11.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "ff72adc6dbb85db6981324e226fff77830da57d7fe7e4adb2cafd9dc2a8bfa7d"; + sha256 = "sha256-d/tyTCewoERA15iBv4H2LORFzgco15fnnN1sneeGuF4="; }; propagatedBuildInputs = [ cachetools cytoolz jellyfish + joblib matplotlib networkx numpy @@ -38,22 +43,25 @@ buildPythonPackage rec { scikit-learn scipy spacy - srsly + tqdm ]; - checkInputs = [ pytest ]; - # almost all tests have to deal with downloading a dataset, only test pure tests - checkPhase = '' - pytest tests/test_text_utils.py \ - tests/test_utils.py \ - tests/preprocessing \ - tests/datasets/test_base_dataset.py - ''; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # Almost all tests have to deal with downloading a dataset, only test pure tests + "tests/test_constants.py" + "tests/preprocessing/test_normalize.py" + "tests/similarity/test_edits.py" + "tests/preprocessing/test_resources.py" + "tests/preprocessing/test_replace.py" + ]; + + pythonImportsCheck = [ "textacy" ]; meta = with lib; { - # scikit-learn in pythonPackages is too new for textacy - # remove as soon as textacy support scikit-learn >= 0.24 - broken = true; description = "Higher-level text processing, built on spaCy"; homepage = "https://textacy.readthedocs.io/"; license = licenses.asl20; From 5ee8800be0262b74d3815a2c2ea2410464c3b13c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 23:12:05 +0200 Subject: [PATCH 186/797] python3Packages.pyupgrade: 2.18.0 -> 2.19.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 74723b665be..412b032db7f 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.18.0"; + version = "2.19.1"; disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nkMKy1NAFBG/PuPdj3LAqr0c4UqEM2R2kHKuORql2dw="; + sha256 = "sha256-zDT8VskHEX4uldMvxnb9A+FKMuvZbtEcmdVl5mghTs4="; }; checkInputs = [ pytestCheckHook ]; From e8a9f9164c5d4aa08fb1aea3794a47e685f2bedb Mon Sep 17 00:00:00 2001 From: Chad Jablonski Date: Sun, 6 Jun 2021 16:30:19 -0400 Subject: [PATCH 187/797] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 142 ++++++++++++++-------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 842b2600bd6..0e27b1f8c9a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -185,12 +185,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-06-03"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "8d5601629f123e9553688a6705a1490ee8be9a1c"; - sha256 = "0i2nyk46yvr59hxwc99iaa0zdy0xcnaa1z1q93xf85i2pdyjg99b"; + rev = "6a77e8ecf38b0e7a547df58f499cecc1c50cd444"; + sha256 = "1yh88v6p1ingwydzr40jcva9gw58ihmgjndaf7h3sp0ldvl75ci2"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-05"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "a33387ffed163f922d93f142a908adfda521a224"; - sha256 = "1gs06vs1bgjr76hg1pdkxsd81c12fnaqg8r1lfvwcvph1nzqj7d9"; + rev = "00fe69a21e128d0378d1e00eb5334cde9cd7a227"; + sha256 = "0nrcxsf00x2ygh16965d6fp5lhjq7hg9wzqgail2l0pwjdxnizm4"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -970,8 +970,8 @@ final: prev: src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "27890150286f62d9c2fcb624f6f3bd1fd45c7f3c"; - sha256 = "0fvwdjqiqwhaxwkrnzfai0ay4sksr4ma4akhzqnfqd0blbhc4x2i"; + rev = "b42f1b974a50d4c0ebe563a210b5a3bf138c0166"; + sha256 = "0z0xd5qnrm85ibwy826n7wbk0w8nzwmrs5xii9xkxgych4q9xanp"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1014,12 +1014,12 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-06-05"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "70ca378f399be626020e2994f9604eae35c232a6"; - sha256 = "0njjwa2ixqm792chvkq91fb7dadaf05kws727w1q9r5sp8k000sr"; + rev = "a20d2376b57ca500782719f1c4f83796d160c296"; + sha256 = "15hrlr6f98y1cmdyrlady6h4b501b7mvyzfbvsqcxjj8vj18pxas"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1030,8 +1030,8 @@ final: prev: src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "5d4ca0cab361962a58db6f4a3ad06b00348b743d"; - sha256 = "04ja8ps0vmvg5aggr6lr4qb4pv46hi86x8zw8mwrzav04z8fhxcw"; + rev = "6f3574b091d48e37599dcb356349a31472556716"; + sha256 = "0im9jnrbf1qbglh9wzqalfvp98wx9ccg5gk89k40nz3gggpwsbfh"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1256,12 +1256,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-06-05"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "e9bd32d18430ee2c95b154d90533affc3ca6f62b"; - sha256 = "0g5ssg6363552fx7y74hl5wbmpmdz6z7y98jwa5y3dkq3xqh6ykn"; + rev = "218229c593de9ca3b526605c50da7cb7e6ffb47c"; + sha256 = "13xhzhpdwq680imvm7208wyhb2l5hppnflhbzyl1w3i7bzpczaxc"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1280,12 +1280,12 @@ final: prev: dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2020-08-19"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e"; - sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy"; + rev = "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae"; + sha256 = "0lwna4kcq7davfvh3535n8wl9jxkjm7cg6jgpisd17kvagihh8qw"; }; meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; @@ -1739,12 +1739,12 @@ final: prev: gina-vim = buildVimPluginFrom2Nix { pname = "gina-vim"; - version = "2021-04-28"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "gina.vim"; - rev = "699d1e9d4104c994a37cb18b730f38ff7f32f2d1"; - sha256 = "1akcpf5iyrbj4apjvp02613x328igp9gk4gaqgkx4qvwha4khbi5"; + rev = "7069668147157d872821ebed1eee07742ece48fd"; + sha256 = "0fbr154jgvr71liq0cwdl1qwg8j40yg9i2gb6ykz4p2y5cvs3wz6"; }; meta.homepage = "https://github.com/lambdalisue/gina.vim/"; }; @@ -1763,12 +1763,12 @@ final: prev: git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-05-14"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "2a26734c6322449a56d02c25a2947e9b7519ca49"; - sha256 = "0ib0yl7zqklj9i1sgv854d3xl5sqbdf2khh9cpraik1rv23nlf2h"; + rev = "f17e40e9995bbb21e0e9b7fd29278637a69fcc02"; + sha256 = "09izgdlba3413llb698r8iagpfnhvp57yaz7qlcypbyvqr9l41mm"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1799,12 +1799,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-06-02"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "4e3e2626af9573758a4e8c0d463ff3b733d40644"; - sha256 = "01cr2a6xqzazyapkdlqjbxswsm9y7hnwl3bs7wcp23dwlpdvxc89"; + rev = "0d8db4531a508f875d98b55f5e78bc1c560d6342"; + sha256 = "1avp9df2lbiczycgfiigbyny8s6srjw6h88a88161m29g2mznr2s"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3100,8 +3100,8 @@ final: prev: src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "5d65a8fde5c3f4dfc0dc1a13639515948d8a28a5"; - sha256 = "1iaapjpx91kcz9h2gp7vzgj7lnjs86g0iqkg3vgr04kj9lsvj3j7"; + rev = "d2e1e6b4c4e17cab2debd0353fed77b417b53237"; + sha256 = "0bwlcija1sbml5ni7mz4q97hhnl7hiqamzzvqw8qyp8aw2b0kj1q"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -3324,12 +3324,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-06-05"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "b09ab7495e55f09293500aacf460d176f942504d"; - sha256 = "05w7bjn1iy1qa3ni12vm9p28y4bsz4kkfgmcs44152qmcqj13wp1"; + rev = "64c937940c2d890bd192a56e1a831e378fe0168b"; + sha256 = "05pa2zz7dwzfjsgz8chv0wkx202f8x3plbxyczlkp390sfhqk0nn"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3348,12 +3348,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-06-02"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "554ae68f404492c8d37381545b9a785fda30c26e"; - sha256 = "0z6xb6wsq5kjcnyiqbp2ik97yl2kb9hxy0rfccfswh5pgmfv2z1i"; + rev = "85b05cdc0ce371b055504be5d16cdfb1ea110f22"; + sha256 = "0sr3rcy5mw0gx06x12dqc4bsb2ypc2xvcr6cqzw4w8w520ys7aid"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -3432,12 +3432,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-05-31"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "055b143fdd23fee1d86247a8ec7c43c84a2a896b"; - sha256 = "0v9mxpr5m01w948ddh598k1vzaiyq2zl6fkykbpzkijhk8qvjnv9"; + rev = "3c221fe2cc2d675ebf8c83bb62e0b44516ae34ae"; + sha256 = "0hcfs9c5m610sh5105kd4qbgj8ikfds7zfh2hcf1ly5ikkbz1ma4"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3480,12 +3480,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-06-04"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "d5ba4abab33808dbf653cc8270d82561f96b220b"; - sha256 = "0qyb6fjjcgjifkgvcy475gxplbvdvzd51z7xv2m7gshy6m4vlzk6"; + rev = "081fac590588ce0f6bcf54699658ba960a514172"; + sha256 = "05sw210pfsb4nfcix978x1mrnmjz5yv1rmv1501mqla8xq18cskv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3504,24 +3504,24 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-06-03"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "8bd4eac08c637961b10ac01c124fb5091484c265"; - sha256 = "0jjsq718m0c1f45k9b68z0inlhy5nas48ff5yd0v29qlcv01w3wf"; + rev = "89fdc14457f2b18eebebeb226df9f6d5e464e318"; + sha256 = "09rd1hq8rzp84aiplvp0w4j1wykycrb55z1qwk83d9fv006sqvcl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-03-13"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "9c3b264ae2da1d984f0482d5a0dfa43f567fa064"; - sha256 = "0yjxmnn3a7fw0fjwfqk284zshlw8v7wp8pn16d5m40rvbkk2ipzr"; + rev = "388cc8caaf3e10836810aabbb9283a27dd8584cd"; + sha256 = "0a7izbvpwn0sx9gvpczvl57fy9rm7jaibc4m44asjz501m04lbra"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; @@ -3600,12 +3600,12 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-06-01"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "53134b08a5a5e66f343c4e431966a0a19ce2d162"; - sha256 = "00gxkl87f8gawil9bdxa5s15yswc1ac4y9c5vx3kmhv6g5ipcrrn"; + rev = "7e13134c7e252746586ccb35a535c42a1c3b07c4"; + sha256 = "17md8wvfvy9z2an89fxcg64d6lmqndmzj9qn294s311fn7zpaz0p"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3616,8 +3616,8 @@ final: prev: src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "f56ac7884c9b12343d66a2bacf90097af3c58cf6"; - sha256 = "0v2aznndmc5bsipqbj4q40qqmv384z6k5xh17yfcp7a6iak5zzjq"; + rev = "82f1598bd4388c8089cf08007b17a3555c0328f0"; + sha256 = "1mpszdypmhw3zizm699rq1m3zfrzmn1ilqaha01zb3q64l7mddzc"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -3636,12 +3636,12 @@ final: prev: nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-05-25"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "af10a3251f3e826c3fb2062ddeb4c74f23a2f52d"; - sha256 = "1pl1v28wscdcns4cs2cv44rh0vrk8fwmr2banjgp5lcjynivzrwr"; + rev = "bdc598b519cfbfdf61baf9a27953da2fc1642b23"; + sha256 = "1slyjfjcrna06b23kbw4vf81qbncgimzhw1qsqwsqldnvdc35lcr"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -4405,12 +4405,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-05-24"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "9ce855ab448467dc1468ef8b46bb86d38aa3d0fa"; - sha256 = "0ldz09hjck5pq0lhbk93gm1zvc0aifsfk75w5pzrwqmwidimzyid"; + rev = "15acde01892efd6e8d2a5c452babe862ce05f74d"; + sha256 = "0bb06g2knzqj7himsvpfydq8yig2szz9q5pqds9yv83m3vh4kppl"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4887,12 +4887,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-06-03"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "2697bcfaf0fac861e08c3a55d9334ec6d823029f"; - sha256 = "0q9kq64y3yrazcks476yplkrhx59z82ij5wj1w8qakidy2i008z1"; + rev = "feaed4b6e23bd56906089154f293f2b1ecb68c7e"; + sha256 = "0kx9xmlv6smpqgf2mdz0n6r4cwrsldw9d92xk5m1pdsmpi1b61sa"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5536,12 +5536,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-05-24"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "728d42f93054e15d260e25da0255378f171df7d2"; - sha256 = "1r86100i30jqyxz1hc4z6ykx5s44iaapffs1xbv3pg8grz8fmf6x"; + rev = "31e47bb9ee7a8b7aa2d324723dac75ea02896044"; + sha256 = "1pw5iipr6yln1nspy2sn13cx7p1cn5485l8rkkkyqfwqgqsj3jfq"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -5716,12 +5716,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-04"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "c743b1171194f85469a64556a1f54882cb73cc17"; - sha256 = "0ws8rvvmszcspwvzns7i82l458sa2mhi0013li8c61g1g2wbpphn"; + rev = "351ec86836986fb36e48ba414d65b62a7793374a"; + sha256 = "1gksn9s40fjzwp6v0cmss2mxhpprj8ycysy5rbfp8h3vdghkkya7"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6484,12 +6484,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-06-03"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "f7f1413ed9b69eb80c8af07d38ebcc889ed64d96"; - sha256 = "16az604z245bw64dhkgmszifg1ajnf0i9binllixwaifnh6vfnhh"; + rev = "41960996e0c532069533072b3fd820fafe9ce0b3"; + sha256 = "0lzjwjbdq90b39561yp7qs1l69iw4jlxcjrsi5yvh1rbhv7gpy1i"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; From df1d134ee4af581e3228fd332982a7f823f6e9e0 Mon Sep 17 00:00:00 2001 From: Chad Jablonski Date: Sun, 6 Jun 2021 15:34:02 -0400 Subject: [PATCH 188/797] vimPlugins.vim-simpledb: init at 2020-10-02 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 0e27b1f8c9a..c74261ee4be 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -8357,6 +8357,18 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-signify/"; }; + vim-simpledb = buildVimPluginFrom2Nix { + pname = "vim-simpledb"; + version = "2020-10-02"; + src = fetchFromGitHub { + owner = "ivalkeen"; + repo = "vim-simpledb"; + rev = "1e9e72160dd01c837b5afb4f75cbb587a15b31b5"; + sha256 = "1y0i876p2pxx7gbr04acnv94cjrincsbg03bqxr89xbqlbggxf0w"; + }; + meta.homepage = "https://github.com/ivalkeen/vim-simpledb/"; + }; + vim-slash = buildVimPluginFrom2Nix { pname = "vim-slash"; version = "2019-08-28"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9d150c93c7c..66c1daee15a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -214,6 +214,7 @@ itchyny/thumbnail.vim itchyny/vim-cursorword itchyny/vim-gitbranch itspriddle/vim-shellcheck +ivalkeen/vim-simpledb ivanov/vim-ipython jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim From 953be75ba2bdb41e0b72e772e168e7cc27e092bd Mon Sep 17 00:00:00 2001 From: Chad Jablonski Date: Sun, 6 Jun 2021 16:24:19 -0400 Subject: [PATCH 189/797] vimPlugins.lightline-gruvbox-vim: init at 2018-03-23 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c74261ee4be..12c6e885d7b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2506,6 +2506,18 @@ final: prev: meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; + lightline-gruvbox-vim = buildVimPluginFrom2Nix { + pname = "lightline-gruvbox-vim"; + version = "2018-03-23"; + src = fetchFromGitHub { + owner = "shinchu"; + repo = "lightline-gruvbox.vim"; + rev = "21659af1fc980ebe7de0f475e57c3fda9a82c2d3"; + sha256 = "0h9br1r5vbrx5cplnk34xlg1kagasj3zn18f8d4ifi0pibyq6pm1"; + }; + meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; version = "2021-05-30"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 66c1daee15a..1d43a2d8eae 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -578,6 +578,7 @@ SevereOverfl0w/deoplete-github shaunsingh/moonlight.nvim@pure-lua shaunsingh/nord.nvim sheerun/vim-polyglot +shinchu/lightline-gruvbox.vim Shougo/context_filetype.vim Shougo/defx.nvim Shougo/denite.nvim From a15bd8e006f08202f1c35dc6c0d69a539f372e87 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Jun 2021 16:45:59 -0700 Subject: [PATCH 190/797] vimPlugins.vim-clap: fix rust build --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 8618d2c506f..4e43bbe29a2 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -621,7 +621,7 @@ self: super: { libiconv ]; - cargoSha256 = "16fhiv6qmf7dv968jyybkgs1wkphy383s78g8w5wnz4i0czld8dq"; + cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs="; }; in '' From 69c5219cba9610fd4bc084043144df8e541092a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Jun 2021 11:15:35 +0200 Subject: [PATCH 191/797] python3Packages.adblock: 0.4.0 -> 0.4.4 --- .../python-modules/adblock/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 59d1f2e4e7a..186e2e9e443 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , buildPythonPackage , rustPlatform -, pythonImportsCheckHook , pkg-config , openssl , publicsuffix-list @@ -11,11 +10,14 @@ , libiconv , CoreFoundation , Security +, pytestCheckHook +, toml +, python }: buildPythonPackage rec { pname = "adblock"; - version = "0.4.0"; + version = "0.4.4"; disabled = isPy27; # Pypi only has binary releases @@ -23,18 +25,18 @@ buildPythonPackage rec { owner = "ArniDagur"; repo = "python-adblock"; rev = version; - sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg"; + sha256 = "sha256-zNQ8zEpTLzyU5AnFBNpOGDJ02Ogu2+xl85LA+ia7Si4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-gEFmj3/KvhvvsOK2nX2L1RUD4Wfp3nYzEzVnQZIsIDY="; + hash = "sha256-ajVZ0xPxC31hM1gQr3DC1HWdpIYBCSmqm0z2cflcClg="; }; format = "pyproject"; - nativeBuildInputs = [ pkg-config pythonImportsCheckHook ] + nativeBuildInputs = [ pkg-config ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); buildInputs = [ openssl ] @@ -42,10 +44,19 @@ buildPythonPackage rec { PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; - # There are no rust tests - doCheck = false; + checkInputs = [ pytestCheckHook toml ]; - pythonImportsCheck = [ "adblock" ]; + preCheck = '' + # import from $out instead + rm -r adblock + ''; + + disabledTestPaths = [ + # relies on directory removed above + "tests/test_typestubs.py" + ]; + + pythonImportsCheck = [ "adblock" "adblock.adblock" ]; meta = with lib; { description = "Python wrapper for Brave's adblocking library, which is written in Rust"; From 02e88067f7243ed9283710d15d99c31d1b7ef58e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 20:06:18 +0200 Subject: [PATCH 192/797] python3Packages.datadog: 0.40.1 -> 0.41.0 --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index ad3f66b5d65..fbe3316e010 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.40.1"; + version = "0.41.0"; src = fetchPypi { inherit pname version; - sha256 = "438c1dde5462e68c5c792b7b4a1d87a0ddd970af3db31b3cf15980eed0c44311"; + sha256 = "sha256-PeGkO4qNX2sZ0WLsG0gtxasmNsWc9l5gWJcCMEUQpok="; }; postPatch = '' From b6a8f9ac5d0eca5167e9ede1bac5ce7fb62d8f03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 20:15:21 +0200 Subject: [PATCH 193/797] python3Packages.google-api-python-client: 2.6.0 -> 2.7.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index f5c8bcc6c31..e2b15ccca65 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va"; + sha256 = "sha256-mHm40dGCEq6Ss1urYejqntXqY++cjKhHk4U42hDdGTs="; }; # No tests included in archive From 7e89fb12e4ac75a3db4318e848b35f62bf43bbb3 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sun, 6 Jun 2021 12:34:46 -0400 Subject: [PATCH 194/797] ec2-amis: add release 21.05 --- nixos/modules/virtualisation/ec2-amis.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 892af513b03..d38f41ab39d 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -348,5 +348,24 @@ let self = { "20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f"; "20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d"; - latest = self."20.09"; + # 21.05.740.aa576357673 + "21.05".eu-west-1.hvm-ebs = "ami-048dbc738074a3083"; + "21.05".eu-west-2.hvm-ebs = "ami-0234cf81fec68315d"; + "21.05".eu-west-3.hvm-ebs = "ami-020e459baf709107d"; + "21.05".eu-central-1.hvm-ebs = "ami-0857d5d1309ab8b77"; + "21.05".eu-north-1.hvm-ebs = "ami-05403e3ae53d3716f"; + "21.05".us-east-1.hvm-ebs = "ami-0d3002ba40b5b9897"; + "21.05".us-east-2.hvm-ebs = "ami-069a0ca1bde6dea52"; + "21.05".us-west-1.hvm-ebs = "ami-0b415460a84bcf9bc"; + "21.05".us-west-2.hvm-ebs = "ami-093cba49754abd7f8"; + "21.05".ca-central-1.hvm-ebs = "ami-065c13e1d52d60b33"; + "21.05".ap-southeast-1.hvm-ebs = "ami-04f570c70ff9b665e"; + "21.05".ap-southeast-2.hvm-ebs = "ami-02a3d1df595df5ef6"; + "21.05".ap-northeast-1.hvm-ebs = "ami-027836fddb5c56012"; + "21.05".ap-northeast-2.hvm-ebs = "ami-0edacd41dc7700c39"; + "21.05".ap-south-1.hvm-ebs = "ami-0b279b5bb55288059"; + "21.05".ap-east-1.hvm-ebs = "ami-06dc98082bc55c1fc"; + "21.05".sa-east-1.hvm-ebs = "ami-04737dd49b98936c6"; + + latest = self."21.05"; }; in self From 0a776e108f85d9a8e2f4c2147f6e61cf1880fe6e Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 16:26:06 +0900 Subject: [PATCH 195/797] vscode-extensions.b4dm4n.vscode-nixpkgs-fmt: add nixpkgs-fmt dependency --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 4e7713bdc5f..9d21b057c8a 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }: +{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -99,13 +99,21 @@ let }; }; - B4dM4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { + b4dm4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { mktplcRef = { name = "nixpkgs-fmt"; publisher = "B4dM4n"; version = "0.0.1"; sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; }; + nativeBuildInputs = [ jq ]; + buildInputs = [ nixpkgs-fmt ]; + postInstall = '' + cd "$out/$installPrefix" + tmp_package_json=$(mktemp) + jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json > "$tmp_package_json" + mv "$tmp_package_json" package.json + ''; meta = with lib; { license = licenses.mit; }; From 5e56caf52f876b07b2d04ae36516e54e52f4ba8c Mon Sep 17 00:00:00 2001 From: David Date: Sun, 6 Jun 2021 10:59:17 +0200 Subject: [PATCH 196/797] rebar3Relx: strip native binaries --- pkgs/development/beam-modules/rebar3-release.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index d2c9da6414f..80082945e4c 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -46,7 +46,8 @@ let buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; - dontStrip = true; + # ensure we strip any native binaries (eg. NIFs, ports) + stripDebugList = lib.optional (releaseType == "release") "rel"; inherit src; From 3edda09ec8d8a0bcc35827f09337dba2b101988a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <33374965+musfay@users.noreply.github.com> Date: Mon, 7 Jun 2021 03:40:07 +0300 Subject: [PATCH 197/797] ngrok-2: 2.3.35 -> 2.3.40 (#125949) --- pkgs/tools/networking/ngrok-2/default.nix | 2 +- pkgs/tools/networking/ngrok-2/update.sh | 1 + pkgs/tools/networking/ngrok-2/versions.json | 36 ++++++++++++--------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 3549677e22f..fbfab8d2f05 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "Allows you to expose a web server running on your local machine to the internet"; homepage = "https://ngrok.com/"; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = [ maintainers.bobvanderlinden ]; }; } diff --git a/pkgs/tools/networking/ngrok-2/update.sh b/pkgs/tools/networking/ngrok-2/update.sh index 7908a1524e5..4e2aaf4e559 100755 --- a/pkgs/tools/networking/ngrok-2/update.sh +++ b/pkgs/tools/networking/ngrok-2/update.sh @@ -29,5 +29,6 @@ get_download_info() { get_download_info linux arm get_download_info linux arm64 get_download_info darwin amd64 + get_download_info darwin arm64 ) | jq --slurp 'map ({ (.sys): . }) | add' \ > pkgs/tools/networking/ngrok-2/versions.json diff --git a/pkgs/tools/networking/ngrok-2/versions.json b/pkgs/tools/networking/ngrok-2/versions.json index 656e6a640e5..85b0e47168a 100644 --- a/pkgs/tools/networking/ngrok-2/versions.json +++ b/pkgs/tools/networking/ngrok-2/versions.json @@ -1,32 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/bjFaKy3TSAg/ngrok-2.3.35-linux-386", - "sha256": "1fdd1c057c3c31044400ef6ade20ad3f10bce415ad33ccfb4bc2fd83bb36f62f", - "version": "2.3.35" + "url": "https://bin.equinox.io/a/c4ZY6f7svn7/ngrok-2.3.40-linux-386", + "sha256": "1b645ff0abbb28ca7c0f6a2109653be2dc281860b582b4de6927fde12c99da26", + "version": "2.3.40" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/52fZaxjGg9n/ngrok-2.3.35-linux-amd64", - "sha256": "b456608239cdf4b5119916c62a87640667d1cb1900c53faed89e3dacc1fe4679", - "version": "2.3.35" + "url": "https://bin.equinox.io/a/b5PAmc6L9z2/ngrok-2.3.40-linux-amd64", + "sha256": "218d267cd1195334718bafac14bfdf1c19dc95dcf8a24aaa6a1383c21dc86e76", + "version": "2.3.40" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/2cUd5mRRjoF/ngrok-2.3.35-linux-arm", - "sha256": "94d88311e9b2baea615d9fe7c6921ac0167040ec66aa0d0cbb856c027d617f1f", - "version": "2.3.35" + "url": "https://bin.equinox.io/a/aRh9rdUAJyf/ngrok-2.3.40-linux-arm", + "sha256": "538a7431df141a929a250eaf6ed7afdcce817bcd8cfe60b61f4c6d7a289b1d1c", + "version": "2.3.40" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/k2qx6ipHqpb/ngrok-2.3.35-linux-arm64", - "sha256": "fd07f5c449f1c1444606bbc9d06fa6b649325ddf0b3e6dac6f32d785a886f170", - "version": "2.3.35" + "url": "https://bin.equinox.io/a/2gpRjDRBpJv/ngrok-2.3.40-linux-arm64", + "sha256": "dc7b4465ef95f6d04d1b1996111b3a2631e5f464d7dca7f4994f59ea4edbe21f", + "version": "2.3.40" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/jKkD2Wcds2L/ngrok-2.3.35-darwin-amd64", - "sha256": "dd74a6be1a155c41ff06aadad910196cae13e06ab997bc0b144288b2da568f2a", - "version": "2.3.35" + "url": "https://bin.equinox.io/a/fcZQXtHSDgM/ngrok-2.3.40-darwin-amd64", + "sha256": "80c8fb121d6c93350d84351d9516674f4e20a3e003cdd7dcb4c3e7c48b9c5b07", + "version": "2.3.40" + }, + "darwin-arm64": { + "sys": "darwin-arm64", + "url": "https://bin.equinox.io/a/3TEKdZeyAnt/ngrok-2.3.40-darwin-arm64", + "sha256": "c9e6dfec454f9faec92a13dfd3f3857de982007e3b85987bb875aa0d74ca8101", + "version": "2.3.40" } } From e41c7bc1f825518993bfd6311e02e3145ceed154 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 08:41:58 +0900 Subject: [PATCH 198/797] erlang: remove unused setup hook --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 -- pkgs/development/interpreters/erlang/setup-hook.sh | 5 ----- 2 files changed, 7 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/setup-hook.sh diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1f2f3a25a5e..13d2d33abfc 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -142,8 +142,6 @@ stdenv.mkDerivation ({ wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${lib.makeBinPath [ gnused gawk ]}" ''; - setupHook = ./setup-hook.sh; - passthru = { updateScript = let major = builtins.head (builtins.splitVersion version); diff --git a/pkgs/development/interpreters/erlang/setup-hook.sh b/pkgs/development/interpreters/erlang/setup-hook.sh deleted file mode 100644 index 3962d154ba9..00000000000 --- a/pkgs/development/interpreters/erlang/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addErlangLibPath() { - addToSearchPath ERL_LIBS $1/lib/erlang/lib -} - -addEnvHooks "$hostOffset" addErlangLibPath From 3bc80f19388a8b29b65c91fd4550f51cbc9a3a96 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 08:42:28 +0900 Subject: [PATCH 199/797] buildMix: switch buildInputs to nativeBuildInputs --- pkgs/development/beam-modules/build-mix.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 4da627a844b..31d266d3578 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -23,8 +23,7 @@ let pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; - inherit version; - inherit src; + inherit version src buildInputs; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; @@ -41,7 +40,7 @@ let addToSearchPath ERL_LIBS "$1/lib/erlang/lib" ''; - buildInputs = buildInputs ++ [ elixir hex ]; + nativeBuildInputs = [ elixir hex ]; propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; buildPhase = attrs.buildPhase or '' From 357cc8e05d1f05c84e778cdd316dce8987396b5f Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 08:43:29 +0900 Subject: [PATCH 200/797] mix-release: remove rebar dep --- pkgs/development/beam-modules/mix-release.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 774af2e5ec9..3ee460fd5f4 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git }: +{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git }: { pname , version @@ -31,7 +31,6 @@ stdenv.mkDerivation (overridable // { HEX_OFFLINE = 1; DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation # the api with `mix local.rebar rebar path` makes a copy of the binary - MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; postUnpack = '' From 8989d2eae8aee06ee35b2cbdba74a5e7c366d683 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 17:36:51 +0900 Subject: [PATCH 201/797] mix-release: remove erlang ref in erts dir --- pkgs/development/beam-modules/mix-release.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 3ee460fd5f4..91ebacc1f05 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -93,21 +93,21 @@ stdenv.mkDerivation (overridable // { if [ -e $out/releases/COOKIE ]; then # absent in special cases, i.e. elixir-ls rm $out/releases/COOKIE fi - # TODO remove the uneeded reference too erlang - # one possible way would be - # for f in $(${findutils}/bin/find $out -name start); do - # substituteInPlace $f \ - # --replace 'ROOTDIR=${erlang}/lib/erlang' 'ROOTDIR=""' - # done - # What is left to do is to check that erlang is not required on - # the host + # removing unused erlang reference from resulting derivation to reduce + # closure size + if [ -e $out/erts-* ]; then + echo "ERTS found in $dir - removing references to erlang to reduce closure size" + for file in $out/erts-*/bin/{erl,start}; do + substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" + done + fi patchShebangs $out runHook postFixup ''; - # TODO figure out how to do a Fixed Output Derivation and add the output hash - # This doesn't play well at the moment with Phoenix projects - # for example that have frontend dependencies + # TODO investigate why the resulting closure still has + # a reference to erlang. + # uncommenting the following will fail the build # disallowedReferences = [ erlang ]; }) From 2a87cb7a8b4436bcd85fe0fe9532664386879a67 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 19:56:33 +0900 Subject: [PATCH 202/797] build-mix buildRebar3: strip out derivation for NIFs --- pkgs/development/beam-modules/build-mix.nix | 7 ++++--- pkgs/development/beam-modules/build-rebar3.nix | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 31d266d3578..783ae34dcd3 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -29,9 +29,6 @@ let MIX_DEBUG = if enableDebugInfo then 1 else 0; HEX_OFFLINE = 1; - # stripping does not have any effect on beam files - dontStrip = true; - # add to ERL_LIBS so other modules can find at runtime. # http://erlang.org/doc/man/code.html#code-path # Mix also searches the code path when compiling with the --no-deps-check flag @@ -72,6 +69,10 @@ let runHook postInstall ''; + # stripping does not have any effect on beam files + # it is however needed for dependencies with NIFs like bcrypt for example + dontStrip = false; + passthru = { packageName = name; env = shell self; diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index b66dc535ce0..0dfd68f0993 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -42,9 +42,13 @@ let buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; propagatedBuildInputs = unique beamDeps; - dontStrip = true; inherit src; + # stripping does not have any effect on beam files + # it is however needed for dependencies with NIFs + # false is the default but we keep this for readability + dontStrip = false; + setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; From 5e9f18c572fa24750a278b80f6ad9ad101f48069 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 19:58:21 +0900 Subject: [PATCH 203/797] mix-release: remove erlang ref in resulting derivation --- pkgs/development/beam-modules/mix-release.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 91ebacc1f05..9f63244f17e 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git }: +{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: { pname , version @@ -23,7 +23,8 @@ let in assert mixNixDeps != { } -> mixFodDeps == null; stdenv.mkDerivation (overridable // { - nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ]; + # rg is used as a better grep to search for erlang references in the final release + nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ]; buildInputs = builtins.attrValues mixNixDeps; MIX_ENV = mixEnv; @@ -96,8 +97,8 @@ stdenv.mkDerivation (overridable // { # removing unused erlang reference from resulting derivation to reduce # closure size if [ -e $out/erts-* ]; then - echo "ERTS found in $dir - removing references to erlang to reduce closure size" - for file in $out/erts-*/bin/{erl,start}; do + echo "ERTS found in $out - removing references to erlang to reduce closure size" + for file in $(rg "${erlang}/lib/erlang" "$out" --text --files-with-matches); do substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" done fi From e13301fd5c916ef89d302085c5fdf364a4e5e069 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 21:03:44 +0900 Subject: [PATCH 204/797] mix-release: do not override fixup to strip binary --- pkgs/development/beam-modules/mix-release.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 9f63244f17e..ecb15628c32 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -82,8 +82,7 @@ stdenv.mkDerivation (overridable // { runHook postInstall ''; - fixupPhase = '' - runHook preFixup + postFixup = '' if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls rm "$out/bin/${pname}.bat" # windows file fi @@ -102,9 +101,6 @@ stdenv.mkDerivation (overridable // { substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" done fi - - patchShebangs $out - runHook postFixup ''; # TODO investigate why the resulting closure still has From 2e3e591211c1afe4d1b2abc93d537c93f250ce1a Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 7 Jun 2021 09:22:07 +0900 Subject: [PATCH 205/797] mix-release: add comments --- pkgs/development/beam-modules/mix-release.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index ecb15628c32..e096bdee0cf 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -82,6 +82,9 @@ stdenv.mkDerivation (overridable // { runHook postInstall ''; + # Stripping of the binary is intentional + # even though it does not affect beam files + # it is necessary for NIFs binaries postFixup = '' if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls rm "$out/bin/${pname}.bat" # windows file @@ -97,6 +100,8 @@ stdenv.mkDerivation (overridable // { # closure size if [ -e $out/erts-* ]; then echo "ERTS found in $out - removing references to erlang to reduce closure size" + # there is a link in $out/erts-*/bin/start always + # sometimes there are links in dependencies like bcrypt compiled binaries for file in $(rg "${erlang}/lib/erlang" "$out" --text --files-with-matches); do substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" done From 3cbcbfc4fc5770946bb9fbd91273ca26aa8219d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Lucr=C3=A8ce=20C=C3=A9leste?= Date: Sun, 6 Jun 2021 16:45:12 -0400 Subject: [PATCH 206/797] powershell: add aarch64 support for Linux --- pkgs/shells/powershell/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index cedf578d46a..135cfb40ff0 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,11 +1,15 @@ { stdenv, lib, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl , darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }: -let platformString = if stdenv.isDarwin then "osx" +let archString = if stdenv.isAarch64 then "arm64" + else if stdenv.isx86_64 then "x64" + else throw "unsupported platform"; + platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; platformSha = if stdenv.isDarwin then "0w44ws8b6zfixf7xz93hmplqsx18279n9x8j77y4rbzs13fldvsn" - else if stdenv.isLinux then "0xm7l49zhkz2fly3d751kjd5cy3ws9zji9i0061lkd06dvkch7jy" + else if (stdenv.isLinux && stdenv.isx86_64) then "0xm7l49zhkz2fly3d751kjd5cy3ws9zji9i0061lkd06dvkch7jy" + else if (stdenv.isLinux && stdenv.isAarch64) then "1axbi4kmb1ydys7c45jhp729w1srid3c8jgivb4bdmdp56rf6h32" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -18,7 +22,7 @@ stdenv.mkDerivation rec { version = "7.1.3"; src = fetchzip { - url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; + url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; sha256 = platformSha; stripRoot = false; }; @@ -42,7 +46,7 @@ stdenv.mkDerivation rec { chmod a+x $pslibs/pwsh ls $pslibs - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin && !stdenv.isAarch64) '' patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so '' + '' @@ -66,7 +70,7 @@ stdenv.mkDerivation rec { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; maintainers = with maintainers; [ yrashk srgom ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux"]; license = with licenses; [ mit ]; }; From 7ef488f819e8a631f4f9689f75c3ad168a6ebd1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 17:06:18 +0200 Subject: [PATCH 207/797] python3Packages.pyezviz: 0.1.8.7 -> 0.1.8.9 --- pkgs/development/python-modules/pyezviz/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 14f2e55a1f4..323b58e8257 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -1,30 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub +, paho-mqtt , pandas +, pycryptodome , pythonOlder , requests +, xmltodict }: buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.8.7"; + version = "0.1.8.9"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "0k7wl9wf5i0yfdds6f9ma78ckz1p4h72z5s3qg0axzra62fvl9xg"; + sha256 = "sha256-ZjHDha7hSRXy86wm61bMMF8zMi5Lux6RbD0yFD/78J4="; }; propagatedBuildInputs = [ + paho-mqtt pandas + pycryptodome requests + xmltodict ]; # Project has no tests. test_cam_rtsp.py is more a sample for using the module doCheck = false; + pythonImportsCheck = [ "pyezviz" ]; meta = with lib; { From cfd38a4006163277e2de9cf0810c23ba5d6c7e1d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 6 Jun 2021 21:28:19 +0000 Subject: [PATCH 208/797] buildBazelPackage: set fetchConfigured default to true --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ pkgs/build-support/build-bazel-package/default.nix | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 7ac120b693f..adda1025d2f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -56,6 +56,13 @@ this version for the entire lifecycle of the 21.11 release. + + + Those making use of buildBazelPackage will + need to regenerate the fetch hashes (preferred), or set + fetchConfigured = false;. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 577d7592935..b7a4e13f75e 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -24,4 +24,7 @@ In addition to numerous new and upgraded packages, this release has the followin * PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. +* Those making use of `buildBazelPackage` will need to regenerate the fetch + hashes (preferred), or set `fetchConfigured = false;`. + ## Other Notable Changes diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 502be398eaa..198b9c3f617 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -35,7 +35,7 @@ args@{ # required for the build as configured, rather than fetching all the dependencies # which may not work in some situations (e.g. Java code which ends up relying on # Debian-specific /usr/share/java paths, but doesn't in the configured build). -, fetchConfigured ? false +, fetchConfigured ? true # Don’t add Bazel --copt and --linkopt from NIX_CFLAGS_COMPILE / # NIX_LDFLAGS. This is necessary when using a custom toolchain which From 5b30dd9b1c6a62cd10f3854117cf61ed2c2d841a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 6 Jun 2021 21:29:00 +0000 Subject: [PATCH 209/797] gvisor: 2019-11-14 -> 20210518.0 This also now seems to depend on protoc, but we substitute out the version of protoc so that we don't download the binary artifacts, and instead compile protoc from support. TBD: using the Nixpkgs built version of protoc instead of building from source. --- .../virtualization/gvisor/default.nix | 35 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index e6b83286c00..4cd043d4eb6 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -1,6 +1,8 @@ { lib , buildBazelPackage , fetchFromGitHub +, callPackage +, bash , cacert , git , glibcLocales @@ -9,6 +11,7 @@ , iptables , makeWrapper , procps +, protobuf , python3 }: @@ -16,9 +19,12 @@ let preBuild = '' patchShebangs . + substituteInPlace tools/defs.bzl \ + --replace "#!/bin/bash" "#!${bash}/bin/bash" + # Tell rules_go to use the Go binary found in the PATH sed -E -i \ - -e 's|go_version\s*=\s*"[^"]+",|go_version = "host",|g' \ + -e 's|go_version\s*=\s*"[^"]+"|go_version = "host"|g' \ WORKSPACE # The gazelle Go tooling needs CA certs @@ -31,20 +37,37 @@ let export GOPATH= ''; + # Patch the protoc alias so that it always builds from source. + rulesProto = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_proto"; + rev = "f7a30f6f80006b591fa7c437fe5a951eb10bcbcf"; + sha256 = "10bcw0ir0skk7h33lmqm38n9w4nfs24mwajnngkbs6jb5wsvkqv8"; + extraPostFetch = '' + sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release + cat <>$out/proto/private/BUILD.release + alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"]) + EOF + ''; + }; + in buildBazelPackage rec { name = "gvisor-${version}"; - version = "2019-11-14"; + version = "20210518.0"; src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "release-20191114.0"; - sha256 = "0kyixjjlws9iz2r2srgpdd4rrq94vpxkmh2rmmzxd9mcqy2i9bg1"; + rev = "release-${version}"; + sha256 = "15a6mlclnyfc9mx3bjksnnf4vla0xh0rv9kxdp34la4gw3c4hksn"; }; nativeBuildInputs = [ git glibcLocales go makeWrapper python3 ]; bazelTarget = "//runsc:runsc"; + bazelFlags = [ + "--override_repository=rules_proto=${rulesProto}" + ]; # gvisor uses the Starlark implementation of rules_cc, not the built-in one, # so we shouldn't delete it from our dependencies. @@ -76,14 +99,14 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "0fhmlq0d2317gwhma2mz1anb69j4chybk90j71j88wpgw1hxbk34"; + sha256 = "13pahppm431m198v5bffrzq5iw8m79riplbfqp0afh384ln669hb"; }; buildAttrs = { inherit preBuild; installPhase = '' - install -Dm755 bazel-bin/runsc/*_pure_stripped/runsc $out/bin/runsc + install -Dm755 bazel-out/*/bin/runsc/runsc_/runsc $out/bin/runsc # Needed for the 'runsc do' subcomand wrapProgram $out/bin/runsc \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c537b0545a3..72a53a99cb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24160,7 +24160,7 @@ in gv = callPackage ../applications/misc/gv { }; gvisor = callPackage ../applications/virtualization/gvisor { - go = go_1_14; + go = go_1_16; }; gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; From d4963ae43530f861df135e8bc31b6a36067b144b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Jun 2021 02:21:26 +0000 Subject: [PATCH 210/797] gitui: 0.16.0 -> 0.16.1 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 6331ab32acd..3049012160d 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XPXldkNLlxgUBdDDR+n3JAO75JQQOvKoduwnWvIompY="; + sha256 = "sha256-8RPIPimDImLUR9oHVZZ7ZeKLtIhebv/d0kl4CQ5NFdU="; }; - cargoSha256 = "sha256-jHrjAdghuFADf/Gd3GeUOpPBG5tqsBG/Q4R0pNxHAps="; + cargoSha256 = "sha256-1IHbOjZV8Rc0el7J983B8pvnbt8+QtYiknZU/I85OnY="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] From 91a67c5c1a414d1e7c7eac6dd50d70e203713be7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Jun 2021 02:26:31 +0000 Subject: [PATCH 211/797] gmt: 6.1.1 -> 6.2.0 --- pkgs/applications/gis/gmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 0e2b45888b4..a894d121bd3 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "gmt"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "04mdxxcild56jhg9ax522xh78v1wl1x8iqv2f6wv32x9b2lgy1lp"; + sha256 = "sha256-q3BikSrurRAhdw+tR1bgqZhg/ejqm0KPsAwi+hWju/w="; }; nativeBuildInputs = [ cmake ]; From 4871a550bf5dcb25bde07f621c44bdf5d101d574 Mon Sep 17 00:00:00 2001 From: Jeffrey Lau Date: Wed, 24 Feb 2021 19:19:52 +0800 Subject: [PATCH 212/797] maintainers: add ribose-jeffreylau --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2448ad3f93d..ab1a22312cc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8589,6 +8589,12 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; + ribose-jeffreylau = { + name = "Jeffrey Lau"; + email = "jeffrey.lau@ribose.com"; + github = "ribose-jeffreylau"; + githubId = 2649467; + }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; From f38ee1290806d24d1cd49511fb76ff60599bdf19 Mon Sep 17 00:00:00 2001 From: Chua Hou Date: Mon, 7 Jun 2021 00:01:45 +0800 Subject: [PATCH 213/797] fdr: 4.2.3 -> 4.2.7 New releases/homepage are hosted on cocotec.io. --- pkgs/applications/science/programming/fdr/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 8beecf2def9..62e4c6876fd 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -1,9 +1,10 @@ -{lib, stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}: +{ lib, stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages }: stdenv.mkDerivation { - name = "fdr-4.2.3"; + pname = "fdr"; + version = "4.2.7"; src = fetchurl { - url = "https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz"; - sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; + url = "https://dl.cocotec.io/fdr/fdr-3814-linux-x86_64.tar.gz"; + sha256 = "0cajz1gz4slq9nfhm8dqdgxl0kc950838n0lrf8jw4vl54gv6chh"; }; libPath = lib.makeLibraryPath [ @@ -59,7 +60,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "https://www.cs.ox.ac.uk/projects/fdr/"; + homepage = "https://cocotec.io/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; platforms = platforms.linux; From b80814dd245bdcab70fb4fdef4510343aff174ba Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 6 Jun 2021 21:57:07 -0500 Subject: [PATCH 214/797] mix2nix: 0.1.3 -> 0.1.4 --- pkgs/development/tools/mix2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix index e814f44757f..21520d9dbe3 100644 --- a/pkgs/development/tools/mix2nix/default.nix +++ b/pkgs/development/tools/mix2nix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mix2nix"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ydlr"; repo = "mix2nix"; rev = version; - sha256 = "11qn80im5zfbx25ibxqrgi90mglf8pnsmrqsami633mcf2gvj2hy"; + sha256 = "0q4yq8glrdj72j7b9xnwb6j3cli3cccimh9sb7acb4npaiivvf69"; }; nativeBuildInputs = [ elixir ]; From 05e2a71c8bfe02bd3c39b4e5cc541e8329fa9bf7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Jun 2021 04:25:48 +0000 Subject: [PATCH 215/797] kubie: 0.14.1 -> 0.15.0 --- pkgs/development/tools/kubie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 6fc254153d1..c563d9bef09 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "0mhm2j3i2ql7dz5vx0mwab8h8zr05ar5lfzdacgnrc293g1c01aq"; + sha256 = "sha256-uNlKxcU1iCR4JzNfBatEeKMMdu9ZqvOqna0sGrcwK30="; }; - cargoSha256 = "1rfqk7dmcz5zfq9fm9kvxf5718m0v0yfjm5a8718d40zzzvam7sy"; + cargoSha256 = "sha256-4Xo17HlYvJLf90R0gS9EFJSJKmNHClXqAJTx9mY29KA="; nativeBuildInputs = [ installShellFiles ]; From 6ecc641d087df8b8896ebd876bba592e981877c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 Jun 2021 21:22:45 +0200 Subject: [PATCH 216/797] doc: prepare for commonmark MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are still using Pandoc’s Markdown parser, which differs from CommonMark spec slightly. Notably: - Line breaks in lists behave differently. - Admonitions do not support the simpler syntax https://github.com/jgm/commonmark-hs/issues/75 - The auto_identifiers uses a different algorithm – I made the previous ones explicit. - Languages (classes) of code blocks cannot contain whitespace so we have to use “pycon” alias instead of Python “console” as GitHub’s linguist While at it, I also fixed the following issues: - ShellSesssion was used - Removed some pointless docbook tags. --- doc/builders/fetchers.chapter.md | 25 ++-- doc/builders/images/appimagetools.section.md | 2 +- doc/builders/images/dockertools.section.md | 4 +- doc/builders/images/snaptools.section.md | 4 +- .../packages/cataclysm-dda.section.md | 6 +- doc/builders/packages/elm.section.md | 2 +- doc/builders/packages/firefox.section.md | 2 +- doc/builders/packages/opengl.section.md | 4 +- doc/builders/packages/steam.section.md | 23 +-- doc/builders/packages/xorg.section.md | 8 +- doc/builders/trivial-builders.chapter.md | 2 +- .../coding-conventions.chapter.md | 4 +- .../contributing-to-documentation.chapter.md | 2 +- .../reviewing-contributions.chapter.md | 5 +- .../submitting-changes.chapter.md | 4 +- doc/languages-frameworks/agda.section.md | 35 +++-- doc/languages-frameworks/android.section.md | 33 ++--- doc/languages-frameworks/beam.section.md | 10 +- doc/languages-frameworks/bower.section.md | 2 +- doc/languages-frameworks/coq.section.md | 4 +- doc/languages-frameworks/crystal.section.md | 4 +- doc/languages-frameworks/dotnet.section.md | 14 +- .../emscripten.section.md | 14 +- doc/languages-frameworks/gnome.section.md | 2 +- doc/languages-frameworks/go.section.md | 4 +- doc/languages-frameworks/idris.section.md | 26 ++-- doc/languages-frameworks/ios.section.md | 17 +-- doc/languages-frameworks/lua.section.md | 56 +++++--- doc/languages-frameworks/maven.section.md | 17 ++- doc/languages-frameworks/python.section.md | 121 ++++++++-------- doc/languages-frameworks/qt.section.md | 11 +- doc/languages-frameworks/r.section.md | 10 +- doc/languages-frameworks/ruby.section.md | 22 +-- doc/languages-frameworks/rust.section.md | 102 ++++++++------ doc/languages-frameworks/texlive.section.md | 2 + doc/languages-frameworks/titanium.section.md | 8 +- doc/languages-frameworks/vim.section.md | 20 +-- doc/preface.chapter.md | 2 +- doc/stdenv/cross-compilation.chapter.md | 31 ++-- doc/stdenv/meta.chapter.md | 10 +- doc/stdenv/multiple-output.chapter.md | 22 +-- doc/stdenv/stdenv.chapter.md | 132 +++++++++--------- doc/using/overlays.chapter.md | 2 +- doc/using/overrides.chapter.md | 12 +- 44 files changed, 454 insertions(+), 388 deletions(-) diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index c70e3020bbf..30d06534485 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -20,59 +20,58 @@ The main difference between `fetchurl` and `fetchzip` is in how they store the c `fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. - Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`. -## `fetchsvn` +## `fetchsvn` {#fetchsvn} Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha256`. -## `fetchgit` +## `fetchgit` {#fetchgit} Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`. Additionally the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout. -## `fetchfossil` +## `fetchfossil` {#fetchfossil} Used with Fossil. Expects `url` to a Fossil archive, `rev`, and `sha256`. -## `fetchcvs` +## `fetchcvs` {#fetchcvs} Used with CVS. Expects `cvsRoot`, `tag`, and `sha256`. -## `fetchhg` +## `fetchhg` {#fetchhg} Used with Mercurial. Expects `url`, `rev`, and `sha256`. A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below. -## `fetchFromGitHub` +## `fetchFromGitHub` {#fetchfromgithub} `fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred. `fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options. -## `fetchFromGitLab` +## `fetchFromGitLab` {#fetchfromgitlab} This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above. -## `fetchFromGitiles` +## `fetchFromGitiles` {#fetchfromgitiles} This is used with Gitiles repositories. The arguments expected are similar to fetchgit. -## `fetchFromBitbucket` +## `fetchFromBitbucket` {#fetchfrombitbucket} This is used with BitBucket repositories. The arguments expected are very similar to fetchFromGitHub above. -## `fetchFromSavannah` +## `fetchFromSavannah` {#fetchfromsavannah} This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above. -## `fetchFromRepoOrCz` +## `fetchFromRepoOrCz` {#fetchfromrepoorcz} This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above. -## `fetchFromSourcehut` +## `fetchFromSourcehut` {#fetchfromsourcehut} This is used with sourcehut repositories. The arguments expected are very similar to fetchFromGitHub above. Don't forget the tilde (~) in front of the user name! diff --git a/doc/builders/images/appimagetools.section.md b/doc/builders/images/appimagetools.section.md index 7ab4e4e9d85..67e63dc5f61 100644 --- a/doc/builders/images/appimagetools.section.md +++ b/doc/builders/images/appimagetools.section.md @@ -2,7 +2,7 @@ `pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, `pkgs.appimage-run` can be used as well. -::: warning +::: {.warning} The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future. ::: diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index 2d21eb1c2e0..bfe1d17a606 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -1,6 +1,6 @@ # pkgs.dockerTools {#sec-pkgs-dockerTools} -`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120). Docker itself is not used to perform any of the operations done by these functions. +`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120). Docker itself is not used to perform any of the operations done by these functions. ## buildImage {#ssec-pkgs-dockerTools-buildImage} @@ -52,7 +52,7 @@ The above example will build a Docker image `redis/latest` from the given base i > **_NOTE:_** Using this parameter requires the `kvm` device to be available. -- `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). +- `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). After the new layer has been created, its closure (to which `contents`, `config` and `runAsRoot` contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied. diff --git a/doc/builders/images/snaptools.section.md b/doc/builders/images/snaptools.section.md index 9e1403b8828..5f710d2de7f 100644 --- a/doc/builders/images/snaptools.section.md +++ b/doc/builders/images/snaptools.section.md @@ -14,7 +14,7 @@ Currently, `makeSnap` does not support creating GUI stubs. The following expression packages GNU Hello as a Snapcraft snap. -```{#ex-snapTools-buildSnap-hello .nix} +``` {#ex-snapTools-buildSnap-hello .nix} let inherit (import { }) snapTools hello; in snapTools.makeSnap { @@ -35,7 +35,7 @@ in snapTools.makeSnap { Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package. -```{#ex-snapTools-buildSnap-firefox .nix} +``` {#ex-snapTools-buildSnap-firefox .nix} let inherit (import { }) snapTools firefox; in snapTools.makeSnap { diff --git a/doc/builders/packages/cataclysm-dda.section.md b/doc/builders/packages/cataclysm-dda.section.md index 0f908cb7590..bfeacb47fef 100644 --- a/doc/builders/packages/cataclysm-dda.section.md +++ b/doc/builders/packages/cataclysm-dda.section.md @@ -1,6 +1,6 @@ # Cataclysm: Dark Days Ahead {#cataclysm-dark-days-ahead} -## How to install Cataclysm DDA +## How to install Cataclysm DDA {#how-to-install-cataclysm-dda} To install the latest stable release of Cataclysm DDA to your profile, execute `nix-env -f "" -iA cataclysm-dda`. For the curses build (build @@ -34,7 +34,7 @@ cataclysm-dda.override { } ``` -## Important note for overriding packages +## Important note for overriding packages {#important-note-for-overriding-packages} After applying `overrideAttrs`, you need to fix `passthru.pkgs` and `passthru.withMods` attributes either manually or by using `attachPkgs`: @@ -69,7 +69,7 @@ in goodExample2.withMods (_: []) # parallel building enabled ``` -## Customizing with mods +## Customizing with mods {#customizing-with-mods} To install Cataclysm DDA with mods of your choice, you can use `withMods` attribute: diff --git a/doc/builders/packages/elm.section.md b/doc/builders/packages/elm.section.md index 53087c0e9de..ae223c802da 100644 --- a/doc/builders/packages/elm.section.md +++ b/doc/builders/packages/elm.section.md @@ -6,6 +6,6 @@ To start a development environment do nix-shell -p elmPackages.elm elmPackages.elm-format ``` -To update the Elm compiler, see nixpkgs/pkgs/development/compilers/elm/README.md. +To update the Elm compiler, see `nixpkgs/pkgs/development/compilers/elm/README.md`. To package Elm applications, [read about elm2nix](https://github.com/hercules-ci/elm2nix#elm2nix). diff --git a/doc/builders/packages/firefox.section.md b/doc/builders/packages/firefox.section.md index acf31e188c3..b7c430db232 100644 --- a/doc/builders/packages/firefox.section.md +++ b/doc/builders/packages/firefox.section.md @@ -1,6 +1,6 @@ # Firefox {#sec-firefox} -## Build wrapped Firefox with extensions and policies +## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies} The `wrapFirefox` function allows to pass policies, preferences and extension that are available to firefox. With the help of `fetchFirefoxAddon` this allows build a firefox version that already comes with addons pre-installed: diff --git a/doc/builders/packages/opengl.section.md b/doc/builders/packages/opengl.section.md index 6866bf89221..ee7f3af98cf 100644 --- a/doc/builders/packages/opengl.section.md +++ b/doc/builders/packages/opengl.section.md @@ -4,11 +4,11 @@ OpenGL support varies depending on which hardware is used and which drivers are Broadly, we support both GL vendors: Mesa and NVIDIA. -## NixOS Desktop +## NixOS Desktop {#nixos-desktop} The NixOS desktop or other non-headless configurations are the primary target for OpenGL libraries and applications. The current solution for discovering which drivers are available is based on [libglvnd](https://gitlab.freedesktop.org/glvnd/libglvnd). `libglvnd` performs "vendor-neutral dispatch", trying a variety of techniques to find the system's GL implementation. In practice, this will be either via standard GLX for X11 users or EGL for Wayland users, and supporting either NVIDIA or Mesa extensions. -## Nix on GNU/Linux +## Nix on GNU/Linux {#nix-on-gnulinux} If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa.drivers` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs. diff --git a/doc/builders/packages/steam.section.md b/doc/builders/packages/steam.section.md index e33f1192f7c..d7bb6e69d7d 100644 --- a/doc/builders/packages/steam.section.md +++ b/doc/builders/packages/steam.section.md @@ -20,6 +20,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a ## Troubleshooting {#sec-steam-troub} - **Steam fails to start. What do I do?** + Try to run ```ShellSession @@ -32,24 +33,26 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a - The `newStdcpp` parameter was removed since NixOS 17.09 and should not be needed anymore. - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error + ``` steam.sh: line 713: 7842 Segmentation fault (core dumped) ``` + have a look at [this pull request](https://github.com/NixOS/nixpkgs/pull/20269). - **Java** 1. There is no java in steam chrootenv by default. If you get a message like - ``` - /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - ``` + ``` + /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + ``` - You need to add + you need to add - ```nix - steam.override { withJava = true; }; - ``` + ```nix + steam.override { withJava = true; }; + ``` ## steam-run {#sec-steam-run} @@ -57,9 +60,9 @@ The FHS-compatible chroot used for steam can also be used to run other linux gam ```nix pkgs.steam.override ({ - nativeOnly = true; - newStdcpp = true; - }).run + nativeOnly = true; + newStdcpp = true; +}).run ``` to your configuration, rebuild, and run the game with diff --git a/doc/builders/packages/xorg.section.md b/doc/builders/packages/xorg.section.md index be220a25404..ae885f92346 100644 --- a/doc/builders/packages/xorg.section.md +++ b/doc/builders/packages/xorg.section.md @@ -2,7 +2,7 @@ The Nix expressions for the X.org packages reside in `pkgs/servers/x11/xorg/default.nix`. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file `pkgs/servers/x11/xorg/overrides.nix`, in which you can override or add to the derivations produced by the generator. -## Katamari Tarballs +## Katamari Tarballs {#katamari-tarballs} X.org upstream releases used to include [katamari](https://en.wiktionary.org/wiki/%E3%81%8B%E3%81%9F%E3%81%BE%E3%82%8A) releases, which included a holistic recommended version for each tarball, up until 7.7. To create a list of tarballs in a katamari release: @@ -14,11 +14,11 @@ cat $(PRINT_PATH=1 nix-prefetch-url $url | tail -n 1) \ | sort > "tarballs-$release.list" ``` -## Individual Tarballs +## Individual Tarballs {#individual-tarballs} The upstream release process for [X11R7.8](https://x.org/wiki/Releases/7.8/) does not include a planned katamari. Instead, each component of X.org is released as its own tarball. We maintain `pkgs/servers/x11/xorg/tarballs.list` as a list of tarballs for each individual package. This list includes X.org core libraries and protocol descriptions, extra newer X11 interface libraries, like `xorg.libxcb`, and classic utilities which are largely unused but still available if needed, like `xorg.imake`. -## Generating Nix Expressions +## Generating Nix Expressions {#generating-nix-expressions} The generator is invoked as follows: @@ -29,6 +29,6 @@ cd pkgs/servers/x11/xorg For each of the tarballs in the `.list` files, the script downloads it, unpacks it, and searches its `configure.ac` and `*.pc.in` files for dependencies. This information is used to generate `default.nix`. The generator caches downloaded tarballs between runs. Pay close attention to the `NOT FOUND: $NAME` messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.) -## Overriding the Generator +## Overriding the Generator {#overriding-the-generator} If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, `patches` or a `postInstall` hook), you should modify `pkgs/servers/x11/xorg/overrides.nix`. diff --git a/doc/builders/trivial-builders.chapter.md b/doc/builders/trivial-builders.chapter.md index bc1317cc49c..46620e1b459 100644 --- a/doc/builders/trivial-builders.chapter.md +++ b/doc/builders/trivial-builders.chapter.md @@ -37,7 +37,7 @@ This works just like `runCommand`. The only difference is that it also provides Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build. -::: note +::: {.note} This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`. ::: diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 1eaa06a659d..4fa88895484 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -462,9 +462,9 @@ Preferred source hash type is sha256. There are several ways to get it. For package updates it is enough to change one symbol to make hash fake. For new packages, you can use `lib.fakeSha256`, `lib.fakeSha512` or any other fake hash. - This is last resort method when reconstructing source URL is non-trivial and `nix-prefetch-url -A` isn't applicable (for example, [one of `kodi` dependencies](https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73")). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash. + This is last resort method when reconstructing source URL is non-trivial and `nix-prefetch-url -A` isn’t applicable (for example, [one of `kodi` dependencies](https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73)). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash. -::: warning +::: {.warning} This method has security problems. Check below for details. ::: diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 05b00d9bdda..44feac7fbf7 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -25,7 +25,7 @@ If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual. ## Syntax {#sec-contributing-markup} -As per [RFC 0062](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. +As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. Additionally, the following syntax extensions are currently used: diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 0dfe22199c6..3f3ba60947c 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -1,6 +1,6 @@ # Reviewing contributions {#chap-reviewing-contributions} -::: warning +::: {.warning} The following section is a draft, and the policy for reviewing is still being discussed in issues such as [#11166](https://github.com/NixOS/nixpkgs/issues/11166) and [#20836](https://github.com/NixOS/nixpkgs/issues/20836). ::: @@ -35,15 +35,18 @@ Reviewing process: - Building the package locally. - pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds. - It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. + ```ShellSession $ git fetch origin nixos-unstable $ git fetch origin pull/PRNUMBER/head $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD ``` + - The first command fetches the nixos-unstable branch. - The second command fetches the pull request changes, `PRNUMBER` is the number at the end of the pull request title and `BASEBRANCH` the base branch of the pull request. - The third command rebases the pull request changes to the nixos-unstable branch. - The [nixpkgs-review](https://github.com/Mic92/nixpkgs-review) tool can be used to review a pull request content in a single command. `PRNUMBER` should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url. + ```ShellSession $ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER" ``` diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 0a465020092..97b32c15df1 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -71,6 +71,7 @@ Security fixes are submitted in the same way as other changes and thus the same - If a new version fixing the vulnerability has been released, update the package; - If the security fix comes in the form of a patch and a CVE is available, then add the patch to the Nixpkgs tree, and apply it to the package. The name of the patch should be the CVE identifier, so e.g. `CVE-2019-13636.patch`; If a patch is fetched the name needs to be set as well, e.g.: + ```nix (fetchpatch { name = "CVE-2019-11068.patch"; @@ -89,7 +90,7 @@ There is currently no policy when to remove a package. Before removing a package, one should try to find a new maintainer or fix smaller issues first. -### Steps to remove a package from Nixpkgs +### Steps to remove a package from Nixpkgs {#steps-to-remove-a-package-from-nixpkgs} We use jbidwatcher as an example for a discontinued project here. @@ -100,6 +101,7 @@ We use jbidwatcher as an example for a discontinued project here. 1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) For example in this case: + ``` jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 ``` diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 1675fcb0a79..2b7c35f68d3 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -1,6 +1,6 @@ # Agda {#agda} -## How to use Agda +## How to use Agda {#how-to-use-agda} Agda is available as the [agda](https://search.nixos.org/packages?channel=unstable&show=agda&from=0&size=30&sort=relevance&query=agda) package. @@ -43,6 +43,7 @@ agda.withPackages (p: [ ``` You can also reference a GitHub repository + ```nix agda.withPackages (p: [ (p.standard-library.overrideAttrs (oldAttrs: { @@ -59,6 +60,7 @@ agda.withPackages (p: [ If you want to use a library not added to Nixpkgs, you can add a dependency to a local library by calling `agdaPackages.mkDerivation`. + ```nix agda.withPackages (p: [ (p.mkDerivation { @@ -92,20 +94,21 @@ See [Building Agda Packages](#building-agda-packages) for more information on `m Agda will not by default use these libraries. To tell Agda to use a library we have some options: * Call `agda` with the library flag: -```ShellSession -$ agda -l standard-library -i . MyFile.agda -``` + ```ShellSession + $ agda -l standard-library -i . MyFile.agda + ``` * Write a `my-library.agda-lib` file for the project you are working on which may look like: -``` -name: my-library -include: . -depend: standard-library -``` + ``` + name: my-library + include: . + depend: standard-library + ``` * Create the file `~/.agda/defaults` and add any libraries you want to use by default. More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html). -## Compiling Agda +## Compiling Agda {#compiling-agda} + Agda modules can be compiled using the GHC backend with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag. This can be overridden by a different version of `ghc` as follows: @@ -116,7 +119,8 @@ agda.withPackages { } ``` -## Writing Agda packages +## Writing Agda packages {#writing-agda-packages} + To write a nix derivation for an Agda library, first check that the library has a `*.agda-lib` file. A derivation can then be written using `agdaPackages.mkDerivation`. This has similar arguments to `stdenv.mkDerivation` with the following additions: @@ -140,19 +144,21 @@ agdaPackages.mkDerivation { } ``` -### Building Agda packages +### Building Agda packages {#building-agda-packages} + The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file. `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. -### Installing Agda packages +### Installing Agda packages {#installing-agda-packages} + The default install phase copies Agda source files, Agda interface files (`*.agdai`) and `*.agda-lib` files to the output directory. This can be overridden. By default, Agda sources are files ending on `.agda`, or literate Agda files ending on `.lagda`, `.lagda.tex`, `.lagda.org`, `.lagda.md`, `.lagda.rst`. The list of recognised Agda source extensions can be extended by setting the `extraExtensions` config variable. -## Adding Agda packages to Nixpkgs +## Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs} To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: @@ -182,6 +188,7 @@ mkDerivation { ''; } ``` + This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`. When writing an Agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes Agda to think that the nix store is a Agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613). diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index e7dbbf6f8ec..28128ead663 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -3,8 +3,8 @@ The Android build environment provides three major features and a number of supporting features. -Deploying an Android SDK installation with plugins --------------------------------------------------- +## Deploying an Android SDK installation with plugins {#deploying-an-android-sdk-installation-with-plugins} + The first use case is deploying the SDK with a desired set of plugins or subsets of an SDK. @@ -136,8 +136,8 @@ in androidComposition.platform-tools ``` -Using predefined Android package compositions ---------------------------------------------- +## Using predefined Android package compositions {#using-predefined-android-package-compositions} + In addition to composing an Android package set manually, it is also possible to use a predefined composition that contains all basic packages for a specific Android version, such as version 9.0 (API-level 28). @@ -159,12 +159,13 @@ with import {}; androidenv.androidPkgs_9_0.platform-tools ``` -Building an Android application -------------------------------- +## Building an Android application {#building-an-android-application} + In addition to the SDK, it is also possible to build an Ant-based Android project and automatically deploy all the Android plugins that a project requires. + ```nix with import {}; @@ -199,8 +200,8 @@ to build Android apps. An Android APK gets exposed as a build product and can be installed on any Android device with a web browser by navigating to the build result page. -Spawning emulator instances ---------------------------- +## Spawning emulator instances {#spawning-emulator-instances} + For testing purposes, it can also be quite convenient to automatically generate scripts that spawn emulator instances with all desired configuration settings. @@ -241,8 +242,8 @@ androidenv.emulateApp { In addition to prebuilt APKs, you can also bind the APK parameter to a `buildApp {}` function invocation shown in the previous example. -Notes on environment variables in Android projects --------------------------------------------------- +## Notes on environment variables in Android projects {#notes-on-environment-variables-in-android-projects} + * `ANDROID_SDK_ROOT` should point to the Android SDK. In your Nix expressions, this should be `${androidComposition.androidsdk}/libexec/android-sdk`. Note that `ANDROID_HOME` is deprecated, but if you rely on tools that need it, you can export it too. @@ -300,8 +301,8 @@ This shell.nix includes a shell hook that overwrites local.properties with the c sdk.dir and ndk.dir values. This will ensure that the SDK and NDK directories will both be correct when you run Android Studio inside nix-shell. -Notes on improving build.gradle compatibility ---------------------------------------------- +## Notes on improving build.gradle compatibility {#notes-on-improving-build.gradle-compatibility} + Ensure that your buildToolsVersion and ndkVersion match what is declared in androidenv. If you are using cmake, make sure its declared version is correct too. @@ -321,8 +322,8 @@ android { ``` -Querying the available versions of each plugin ----------------------------------------------- +## Querying the available versions of each plugin {#querying-the-available-versions-of-each-plugin} + repo.json provides all the options in one file now. A shell script in the `pkgs/development/mobile/androidenv/` subdirectory can be used to retrieve all @@ -334,8 +335,8 @@ possible options: The above command-line instruction queries all package versions in repo.json. -Updating the generated expressions ----------------------------------- +## Updating the generated expressions {#updating-the-generated-expressions} + repo.json is generated from XML files that the Android Studio package manager uses. To update the expressions run the `generate.sh` script that is stored in the `pkgs/development/mobile/androidenv/` subdirectory: diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 68e84d2f990..348f66d4279 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -4,9 +4,9 @@ In this document and related Nix expressions, we use the term, _BEAM_, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction. -## Available versions and deprecations schedule +## Available versions and deprecations schedule {#available-versions-and-deprecations-schedule} -### Elixir +### Elixir {#elixir} nixpkgs follows the [official elixir deprecation schedule](https://hexdocs.pm/elixir/compatibility-and-deprecations.html) and keeps the last 5 released versions of Elixir available. @@ -68,7 +68,7 @@ Erlang.mk functions similarly to Rebar3, except we use `buildErlangMk` instead o `mixRelease` is used to make a release in the mix sense. Dependencies will need to be fetched with `fetchMixDeps` and passed to it. -#### mixRelease - Elixir Phoenix example +#### mixRelease - Elixir Phoenix example {#mixrelease---elixir-phoenix-example} Here is how your `default.nix` file would look. @@ -148,7 +148,7 @@ Setup will require the following steps: - you can now `nix-build .` - To run the release, set the `RELEASE_TMP` environment variable to a directory that your program has write access to. It will be used to store the BEAM settings. -#### Example of creating a service for an Elixir - Phoenix project +#### Example of creating a service for an Elixir - Phoenix project {#example-of-creating-a-service-for-an-elixir---phoenix-project} In order to create a service with your release, you could add a `service.nix` in your project with the following @@ -228,7 +228,7 @@ mkShell { } ``` -#### Elixir - Phoenix project +#### Elixir - Phoenix project {#elixir---phoenix-project} Here is an example `shell.nix`. diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md index f408bd5b2c9..6226dc0702d 100644 --- a/doc/languages-frameworks/bower.section.md +++ b/doc/languages-frameworks/bower.section.md @@ -149,7 +149,7 @@ A few notes about [Full example — `default.nix`](#ex-buildBowerComponentsDefau ## Troubleshooting {#ssec-bower2nix-troubleshooting} -### ENOCACHE errors from buildBowerComponents +### ENOCACHE errors from buildBowerComponents {#enocache-errors-from-buildbowercomponents} This means that Bower was looking for a package version which doesn't exist in the generated `bower-packages.nix`. diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 5964d46e2f8..0674c5a4702 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -1,6 +1,6 @@ # Coq and coq packages {#sec-language-coq} -## Coq derivation: `coq` +## Coq derivation: `coq` {#coq-derivation-coq} The Coq derivation is overridable through the `coq.override overrides`, where overrides is an attribute set which contains the arguments to override. We recommend overriding either of the following @@ -8,7 +8,7 @@ The Coq derivation is overridable through the `coq.override overrides`, where ov * `customOCamlPackage` (optional, defaults to `null`, which lets Coq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_10` which is the default for Coq 8.11 for example). * `coq-version` (optional, defaults to the short version e.g. "8.10"), is a version number of the form "x.y" that indicates which Coq's version build behavior to mimic when using a source which is not a release. E.g. `coq.override { version = "d370a9d1328a4e1cdb9d02ee032f605a9d94ec7a"; coq-version = "8.10"; }`. -## Coq packages attribute sets: `coqPackages` +## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages} The recommended way of defining a derivation for a Coq library, is to use the `coqPackages.mkCoqDerivation` function, which is essentially a specialization of `mkDerivation` taking into account most of the specifics of Coq libraries. The following attributes are supported: diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md index 74790132974..cbe31f9f0b2 100644 --- a/doc/languages-frameworks/crystal.section.md +++ b/doc/languages-frameworks/crystal.section.md @@ -1,10 +1,11 @@ # Crystal {#crystal} -## Building a Crystal package +## Building a Crystal package {#building-a-crystal-package} This section uses [Mint](https://github.com/mint-lang/mint) as an example for how to build a Crystal package. If the Crystal project has any dependencies, the first step is to get a `shards.nix` file encoding those. Get a copy of the project and go to its root directory such that its `shard.lock` file is in the current directory, then run `crystal2nix` in it + ```bash $ git clone https://github.com/mint-lang/mint $ cd mint @@ -15,6 +16,7 @@ $ nix-shell -p crystal2nix --run crystal2nix This should have generated a `shards.nix` file. Next create a Nix file for your derivation and use `pkgs.crystal.buildCrystalPackage` as follows: + ```nix with import {}; crystal.buildCrystalPackage rec { diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 725ffd4becc..1bcb6e45210 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -1,6 +1,6 @@ -# Dotnet +# Dotnet {#dotnet} -## Local Development Workflow +## Local Development Workflow {#local-development-workflow} For local development, it's recommended to use nix-shell to create a dotnet environment: @@ -16,7 +16,7 @@ mkShell { } ``` -### Using many sdks in a workflow +### Using many sdks in a workflow {#using-many-sdks-in-a-workflow} It's very likely that more than one sdk will be needed on a given project. Dotnet provides several different frameworks (E.g dotnetcore, aspnetcore, etc.) as well as many versions for a given framework. Normally, dotnet is able to fetch a framework and install it relative to the executable. However, this would mean writing to the nix store in nixpkgs, which is read-only. To support the many-sdk use case, one can compose an environment using `dotnetCorePackages.combinePackages`: @@ -37,7 +37,7 @@ mkShell { This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: -```ShellSesssion +```ShellSession $ dotnet --info .NET Core SDK (reflecting any global.json): Version: 3.1.101 @@ -60,15 +60,15 @@ $ dotnet --info Microsoft.NETCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App] ``` -## dotnet-sdk vs dotnetCorePackages.sdk +## dotnet-sdk vs dotnetCorePackages.sdk {#dotnet-sdk-vs-dotnetcorepackages.sdk} The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project. -## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore +## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.net-vs-dotnetcorepackages.netcore-vs-dotnetcorepackages.aspnetcore} The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version. -## Packaging a Dotnet Application +## Packaging a Dotnet Application {#packaging-a-dotnet-application} Ideally, we would like to build against the sdk, then only have the dotnet runtime available in the runtime closure. diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index d391e038070..b3ddf0cedae 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -27,16 +27,14 @@ Modes of use of `emscripten`: * dev-shell for zlib implementation hacking: * `nix-shell -A emscriptenPackages.zlib` - -## Imperative usage +## Imperative usage {#imperative-usage} A few things to note: * `export EMCC_DEBUG=2` is nice for debugging * `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time - -## Declarative usage +## Declarative usage {#declarative-usage} Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`: @@ -50,7 +48,7 @@ A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = tru * Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong. * ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic. -### Usage 1: pkgs.zlib.override +### Usage 1: pkgs.zlib.override {#usage-1-pkgs.zlib.override} This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside... @@ -110,7 +108,7 @@ See the `zlib` example: ''; }); -### Usage 2: pkgs.buildEmscriptenPackage +### Usage 2: pkgs.buildEmscriptenPackage {#usage-2-pkgs.buildemscriptenpackage} This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used. @@ -165,7 +163,7 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel ''; }; -### Declarative debugging +### Declarative debugging {#declarative-debugging} Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project. @@ -177,7 +175,7 @@ Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from 6. `buildPhase` 7. ... happy hacking... -## Summary +## Summary {#summary} Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from. diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 732b529cc22..a1121efe3f0 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -84,7 +84,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti - []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`. - ::: warning + ::: {.warning} The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`. ::: diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index f52570ac8cc..b20a8d0c354 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -44,7 +44,7 @@ pet = buildGoModule rec { The function `buildGoPackage` builds legacy Go programs, not supporting Go modules. -### Example for `buildGoPackage` +### Example for `buildGoPackage` {#example-for-buildgopackage} In the following is an example expression using buildGoPackage, the following arguments are of special significance to the function: @@ -140,4 +140,4 @@ Removes the pre-existing vendor directory. This should only be used if the depen ### `subPackages` {#var-go-subPackages} -Limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. +Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built. diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 000e3627d70..ffdd706eb0b 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -1,10 +1,10 @@ # Idris {#idris} -## Installing Idris +## Installing Idris {#installing-idris} The easiest way to get a working idris version is to install the `idris` attribute: -```ShellSesssion +```ShellSession $ # On NixOS $ nix-env -i nixos.idris $ # On non-NixOS @@ -21,7 +21,7 @@ self: super: { And then: -```ShellSesssion +```ShellSession $ # On NixOS $ nix-env -iA nixos.myIdris $ # On non-NixOS @@ -29,7 +29,8 @@ $ nix-env -iA nixpkgs.myIdris ``` To see all available Idris packages: -```ShellSesssion + +```ShellSession $ # On NixOS $ nix-env -qaPA nixos.idrisPackages $ # On non-NixOS @@ -37,22 +38,23 @@ $ nix-env -qaPA nixpkgs.idrisPackages ``` Similarly, entering a `nix-shell`: -```ShellSesssion + +```ShellSession $ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])' ``` -## Starting Idris with library support +## Starting Idris with library support {#starting-idris-with-library-support} To have access to these libraries in idris, call it with an argument `-p ` for each library: -```ShellSesssion +```ShellSession $ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])' [nix-shell:~]$ idris -p contrib -p pruviloj ``` A listing of all available packages the Idris binary has access to is available via `--listlibs`: -```ShellSesssion +```ShellSession $ idris --listlibs 00prelude-idx.ibc pruviloj @@ -64,7 +66,7 @@ prelude 00contrib-idx.ibc ``` -## Building an Idris project with Nix +## Building an Idris project with Nix {#building-an-idris-project-with-nix} As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`: @@ -105,7 +107,7 @@ build-idris-package { Assuming this file is saved as `yaml.nix`, it's buildable using -```ShellSesssion +```ShellSession $ nix-build -E '(import {}).idrisPackages.callPackage ./yaml.nix {}' ``` @@ -121,11 +123,11 @@ with import {}; in another file (say `default.nix`) to be able to build it with -```ShellSesssion +```ShellSession $ nix-build -A yaml ``` -## Passing options to `idris` commands +## Passing options to `idris` commands {#passing-options-to-idris-commands} The `build-idris-package` function provides also optional input values to set additional options for the used `idris` commands. diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md index a162e8d19fd..04b013be12e 100644 --- a/doc/languages-frameworks/ios.section.md +++ b/doc/languages-frameworks/ios.section.md @@ -20,8 +20,8 @@ Hydra. The Xcode build environment implements a number of features. -Deploying a proxy component wrapper exposing Xcode --------------------------------------------------- +## Deploying a proxy component wrapper exposing Xcode {#deploying-a-proxy-component-wrapper-exposing-xcode} + The first use case is deploying a Nix package that provides symlinks to the Xcode installation on the host system. This package can be used as a build input to any build function implemented in the Nix expression language that requires @@ -55,8 +55,8 @@ lrwxr-xr-x 1 sander staff 61 1 jan 1970 xcodebuild -> /Applications/Xcode.a lrwxr-xr-x 1 sander staff 14 1 jan 1970 xcrun -> /usr/bin/xcrun ``` -Building an iOS application ---------------------------- +## Building an iOS application {#building-an-ios-application} + We can build an iOS app executable for the simulator, or an IPA/xcarchive file for release purposes, e.g. ad-hoc, enterprise or store installations, by executing the `xcodeenv.buildApp {}` function: @@ -99,6 +99,7 @@ xcodeenv.buildApp { ``` The above function takes a variety of parameters: + * The `name` and `src` parameters are mandatory and specify the name of the app and the location where the source code resides * `sdkVersion` specifies which version of the iOS SDK to use. @@ -151,8 +152,8 @@ the `xcodeenv.composeXcodeWrapper {}` function takes. For example, the `xcodeBaseDir` parameter can be overridden to refer to a different Xcode version. -Spawning simulator instances ----------------------------- +## Spawning simulator instances {#spawning-simulator-instances} + In addition to building iOS apps, we can also automatically spawn simulator instances: @@ -213,8 +214,8 @@ xcode.simulateApp { By providing the result of an `xcode.buildApp {}` function and configuring the app bundle id, the app gets deployed automatically and started. -Troubleshooting ---------------- +## Troubleshooting {#troubleshooting} + In some rare cases, it may happen that after a failure, changes are not picked up. Most likely, this is caused by a derived data cache that Xcode maintains. To wipe it you can run: diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 5935cbd7bd5..ea893ce3a4a 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -1,8 +1,8 @@ -# User's Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure} +# User’s Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure} -## Using Lua +## Using Lua {#using-lua} -### Overview of Lua +### Overview of Lua {#overview-of-lua} Several versions of the Lua interpreter are available: luajit, lua 5.1, 5.2, 5.3. The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua5_2` refers to Lua 5.2. @@ -17,27 +17,31 @@ The main package set contains aliases to these package sets, e.g. `luaPackages` refers to `lua5_1.pkgs` and `lua52Packages` to `lua5_2.pkgs`. -### Installing Lua and packages +### Installing Lua and packages {#installing-lua-and-packages} -#### Lua environment defined in separate `.nix` file +#### Lua environment defined in separate `.nix` file {#lua-environment-defined-in-separate-.nix-file} Create a file, e.g. `build.nix`, with the following expression + ```nix with import {}; lua5_2.withPackages (ps: with ps; [ busted luafilesystem ]) ``` + and install it in your profile with + ```shell nix-env -if build.nix ``` Now you can use the Lua interpreter, as well as the extra packages (`busted`, `luafilesystem`) that you added to the environment. -#### Lua environment defined in `~/.config/nixpkgs/config.nix` +#### Lua environment defined in `~/.config/nixpkgs/config.nix` {#lua-environment-defined-in-.confignixpkgsconfig.nix} If you prefer to, you could also add the environment as a package override to the Nixpkgs set, e.g. using `config.nix`, + ```nix { # ... @@ -46,14 +50,16 @@ using `config.nix`, }; } ``` + and install it in your profile with + ```shell nix-env -iA nixpkgs.myLuaEnv ``` The environment is installed by referring to the attribute, and considering the `nixpkgs` channel was used. -#### Lua environment defined in `/etc/nixos/configuration.nix` +#### Lua environment defined in `/etc/nixos/configuration.nix` {#lua-environment-defined-in-etcnixosconfiguration.nix} For the sake of completeness, here's another example how to install the environment system-wide. @@ -66,7 +72,7 @@ For the sake of completeness, here's another example how to install the environm } ``` -### How to override a Lua package using overlays? +### How to override a Lua package using overlays? {#how-to-override-a-lua-package-using-overlays} Use the following overlay template: @@ -87,18 +93,22 @@ final: prev: } ``` -### Temporary Lua environment with `nix-shell` +### Temporary Lua environment with `nix-shell` {#temporary-lua-environment-with-nix-shell} There are two methods for loading a shell with Lua packages. The first and recommended method is to create an environment with `lua.buildEnv` or `lua.withPackages` and load that. E.g. + ```sh $ nix-shell -p 'lua.withPackages(ps: with ps; [ busted luafilesystem ])' ``` + opens a shell from which you can launch the interpreter + ```sh [nix-shell:~] lua ``` + The other method, which is not recommended, does not create an environment and requires you to list the packages directly, ```sh @@ -108,7 +118,7 @@ Again, it is possible to launch the interpreter from the shell. The Lua interpreter has the attribute `pkgs` which contains all Lua libraries for that specific interpreter. -## Developing with Lua +## Developing with Lua {#developing-with-lua} Now that you know how to get a working Lua environment with Nix, it is time to go forward and start actually developing with Lua. There are two ways to @@ -116,7 +126,7 @@ package lua software, either it is on luarocks and most of it can be taken care of by the luarocks2nix converter or the packaging has to be done manually. Let's present the luarocks way first and the manual one in a second time. -### Packaging a library on luarocks +### Packaging a library on luarocks {#packaging-a-library-on-luarocks} [Luarocks.org](www.luarocks.org) is the main repository of lua packages. The site proposes two types of packages, the rockspec and the src.rock @@ -135,10 +145,11 @@ You can try converting luarocks packages to nix packages with the command `nix-s Nix rely on luarocks to install lua packages, basically it runs: `luarocks make --deps-mode=none --tree $out` -#### Packaging a library manually +#### Packaging a library manually {#packaging-a-library-manually} You can develop your package as you usually would, just don't forget to wrap it within a `toLuaModule` call, for instance + ```nix mynewlib = toLuaModule ( stdenv.mkDerivation { ... }); ``` @@ -146,16 +157,15 @@ mynewlib = toLuaModule ( stdenv.mkDerivation { ... }); There is also the `buildLuaPackage` function that can be used when lua modules are not packaged for luarocks. You can see a few examples at `pkgs/top-level/lua-packages.nix`. -## Lua Reference +## Lua Reference {#lua-reference} -### Lua interpreters +### Lua interpreters {#lua-interpreters} Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as respectively `lua5_1`, `lua5_2` and `lua5_3`. Luajit is available too. The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua-5`. - -#### Attributes on lua interpreters packages +#### Attributes on lua interpreters packages {#attributes-on-lua-interpreters-packages} Each interpreter has the following attributes: @@ -164,8 +174,7 @@ Each interpreter has the following attributes: - `withPackages`. Simpler interface to `buildEnv`. - `pkgs`. Set of Lua packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. - -#### `buildLuarocksPackage` function +#### `buildLuarocksPackage` function {#buildluarockspackage-function} The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-lua-package.nix` The following is an example: @@ -205,16 +214,17 @@ install the package By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. -#### `buildLuaApplication` function +#### `buildLuaApplication` function {#buildluaapplication-function} The `buildLuaApplication` function is practically the same as `buildLuaPackage`. The difference is that `buildLuaPackage` by default prefixes the names of the packages with the version of the interpreter. Because with an application we're not interested in multiple version the prefix is dropped. -#### lua.withPackages function +#### lua.withPackages function {#lua.withpackages-function} The `lua.withPackages` takes a function as an argument that is passed the set of lua packages and returns the list of packages to be included in the environment. Using the `withPackages` function, the previous example for the luafilesystem environment can be written like this: + ```nix with import {}; @@ -223,6 +233,7 @@ lua.withPackages (ps: [ps.luafilesystem]) `withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`. But you can also easily switch to using `lua5_2`: + ```nix with import {}; @@ -231,13 +242,12 @@ lua5_2.withPackages (ps: [ps.lua]) Now, `ps` is set to `lua52Packages`, matching the version of the interpreter. - -### Possible Todos +### Possible Todos {#possible-todos} * export/use version specific variables such as `LUA_PATH_5_2`/`LUAROCKS_CONFIG_5_2` * let luarocks check for dependencies via exporting the different rocktrees in temporary config -### Lua Contributing guidelines +### Lua Contributing guidelines {#lua-contributing-guidelines} Following rules should be respected: diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index d66931e808d..f53a6fa8ac2 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -43,9 +43,9 @@ public class Main { You find this demo project at https://github.com/fzakaria/nixos-maven-example -## Solving for dependencies +## Solving for dependencies {#solving-for-dependencies} -### buildMaven with NixOS/mvn2nix-maven-plugin +### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin} > ⚠️ Although `buildMaven` is the "blessed" way within nixpkgs, as of 2020, it hasn't seen much activity in quite a while. @@ -82,6 +82,7 @@ This file is then given to the `buildMaven` function, and it returns 2 attribute A simple derivation that runs through `mvn compile` & `mvn package` to build the JAR. You may use this as inspiration for more complicated derivations. Here is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/build-maven-repository.nix) of building the Maven repository + ```nix { pkgs ? import { } }: with pkgs; @@ -103,7 +104,8 @@ The benefit over the _double invocation_ as we will see below, is that the _/nix │   └── 4.1.3 │   ├── avalon-framework-4.1.3.jar -> /nix/store/iv5fp3955w3nq28ff9xfz86wvxbiw6n9-avalon-framework-4.1.3.jar ``` -### Double Invocation + +### Double Invocation {#double-invocation} > ⚠️ This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing. @@ -163,7 +165,7 @@ The build will fail, and tell you the expected `outputHash` to place. When you'v If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a strong likelihood that over-time your output hash will change since the resolved dependencies may change. Hence this method is less recommended then using `buildMaven`. -## Building a JAR +## Building a JAR {#building-a-jar} Regardless of which strategy is chosen above, the step to build the derivation is the same. @@ -201,7 +203,7 @@ in stdenv.mkDerivation rec { 2 directories, 1 file ``` -## Runnable JAR +## Runnable JAR {#runnable-jar} The previous example builds a `jar` file but that's not a file one can run. @@ -213,7 +215,7 @@ We will use the same repository we built above (either _double invocation_ or _b The following two methods are more suited to Nix then building an [UberJar](https://imagej.net/Uber-JAR) which may be the more traditional approach. -### CLASSPATH +### CLASSPATH {#classpath} > This is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`. @@ -252,11 +254,12 @@ in stdenv.mkDerivation rec { } ``` -### MANIFEST file via Maven Plugin +### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin} > This is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it. Augment the `pom.xml` to create a JAR with the following manifest: + ```xml diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index feefefeabb7..54face47d1e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1,10 +1,10 @@ # Python {#python} -## User Guide +## User Guide {#user-guide} -### Using Python +### Using Python {#using-python} -#### Overview +#### Overview {#overview} Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default @@ -31,7 +31,7 @@ The main package set contains aliases to these package sets, e.g. `pythonPackages` refers to `python.pkgs` and `python38Packages` to `python38.pkgs`. -#### Installing Python and packages +#### Installing Python and packages {#installing-python-and-packages} The Nix and NixOS manuals explain how packages are generally installed. In the case of Python and Nix, it is important to make a distinction between whether the @@ -62,7 +62,7 @@ Philosphically, this should be familiar to users who are used to a `venv` style of development: individual projects create their own Python environments without impacting the global environment or each other. -#### Ad-hoc temporary Python environment with `nix-shell` +#### Ad-hoc temporary Python environment with `nix-shell` {#ad-hoc-temporary-python-environment-with-nix-shell} The simplest way to start playing with the way nix wraps and sets up Python environments is with `nix-shell` at the cmdline. These environments create a @@ -131,7 +131,7 @@ arbitrary dependencies. This is a good way to get a feel for how the Python interpreter and dependencies work in Nix and NixOS, but to do some actual development, we'll want to make it a bit more persistent. -##### Running Python scripts and using `nix-shell` as shebang +##### Running Python scripts and using `nix-shell` as shebang {#running-python-scripts-and-using-nix-shell-as-shebang} Sometimes, we have a script whose header looks like this: @@ -146,7 +146,7 @@ print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") Executing this script requires a `python3` that has `numpy`. Using what we learned in the previous section, we could startup a shell and just run it like so: -```ShellSesssion +```ShellSession $ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py' The dot product of [1 2] and [3 4] is: 11 ``` @@ -203,7 +203,7 @@ of the package versions. This is also a great way to ensure the script executes identically on different servers. -##### Load environment from `.nix` expression +##### Load environment from `.nix` expression {#load-environment-from-.nix-expression} We've now seen how to create an ad-hoc temporary shell session, and how to create a single script with Python dependencies, but in the course of normal @@ -262,7 +262,7 @@ and its Python dependencies, but also tools like `black` or `mypy` and libraries like `libffi` the `openssl` in scope. This is generic and can span any number of tools or languages across the Nixpkgs ecosystem. -##### Installing environments globally on the system +##### Installing environments globally on the system {#installing-environments-globally-on-the-system} Up to now, we've been creating environments scoped to an ad-hoc shell session, or a single script, or a single project. This is generally advisable, as it @@ -315,7 +315,7 @@ If you get a conflict or prefer to keep the setup clean, you can have `nix-env` atomically *uninstall* all other imperatively installed packages and replace your profile with just `myEnv` by using the `--replace` flag. -##### Environment defined in `/etc/nixos/configuration.nix` +##### Environment defined in `/etc/nixos/configuration.nix` {#environment-defined-in-etcnixosconfiguration.nix} For the sake of completeness, here's how to install the environment system-wide on NixOS. @@ -329,7 +329,7 @@ on NixOS. } ``` -### Developing with Python +### Developing with Python {#developing-with-python} Above, we were mostly just focused on use cases and what to do to get started creating working Python environments in nix. @@ -338,7 +338,7 @@ Now that you know the basics to be up and running, it is time to take a step back and take a deeper look at how Python packages are packaged on Nix. Then, we will look at how you can use development mode with your code. -#### Python library packages in Nixpkgs +#### Python library packages in Nixpkgs {#python-library-packages-in-nixpkgs} With Nix all packages are built by functions. The main function in Nix for building Python libraries is `buildPythonPackage`. Let's see how we can build the @@ -425,7 +425,7 @@ of `withPackages` we used a `let` expression. You can see that we used `toolz` from the Nixpkgs package set this time, but instead took our own version that we introduced with the `let` expression. -#### Handling dependencies +#### Handling dependencies {#handling-dependencies} Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. According to the manual, `buildPythonPackage` uses the @@ -537,9 +537,10 @@ buildPythonPackage rec { }; } ``` + Note also the line `doCheck = false;`, we explicitly disabled running the test-suite. -#### Testing Python Packages +#### Testing Python Packages {#testing-python-packages} It is highly encouraged to have testing as part of the package build. This helps to avoid situations where the package was able to build and install, @@ -559,10 +560,11 @@ thus can cause issues when a test suite asserts on that behavior. as many tests should be enabled as possible. Failing tests can still be a good indication that the package is not in a valid state. -#### Using pytest +#### Using pytest {#using-pytest} Pytest is the most common test runner for python repositories. A trivial test run would be: + ``` checkInputs = [ pytest ]; checkPhase = "pytest"; @@ -572,6 +574,7 @@ However, many repositories' test suites do not translate well to nix's build sandbox, and will generally need many tests to be disabled. To filter tests using pytest, one can do the following: + ``` checkInputs = [ pytest ]; # avoid tests which need additional data or touch network @@ -587,19 +590,20 @@ easier than having to create a new package. `-k` is used to define a predicate for test names. In this example, we are filtering out tests which contain `download` or `update` in their test case name. -Only one `-k` argument is allows, and thus a long predicate should be concatenated -with "\" and wrapped to the next line. +Only one `-k` argument is allowed, and thus a long predicate should be concatenated +with “\\” and wrapped to the next line. -*NOTE:* In pytest==6.0.1, the use of "\" to continue a line (e.g. `-k 'not download \'`) has +*NOTE:* In pytest==6.0.1, the use of “\\” to continue a line (e.g. `-k 'not download \'`) has been removed, in this case, it's recommended to use `pytestCheckHook`. -#### Using pytestCheckHook +#### Using pytestCheckHook {#using-pytestcheckhook} `pytestCheckHook` is a convenient hook which will substitute the setuptools `test` command for a checkPhase which runs `pytest`. This is also beneficial when a package may need many items disabled to run the test suite. Using the example above, the analagous pytestCheckHook usage would be: + ``` checkInputs = [ pytestCheckHook ]; @@ -637,7 +641,7 @@ Trying to concatenate the related strings to disable tests in a regular checkPha would be much harder to read. This also enables us to comment on why specific tests are disabled. -#### Using pythonImportsCheck +#### Using pythonImportsCheck {#using-pythonimportscheck} Although unit tests are highly prefered to validate correctness of a package, not all packages have test suites that can be ran easily, and some have none at all. @@ -659,7 +663,7 @@ However, this is done in it's own phase, and not dependent on whether `doCheck = This can also be useful in verifying that the package doesn't assume commonly present packages (e.g. `setuptools`) -### Develop local package +### Develop local package {#develop-local-package} As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); instead of installing the package this command @@ -694,7 +698,7 @@ buildPythonPackage rec { It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode. -### Organising your packages +### Organising your packages {#organising-your-packages} So far we discussed how you can use Python on Nix, and how you can develop with it. We've looked at how you write expressions to package Python packages, and we @@ -706,7 +710,7 @@ like to be able to use in different projects. In order to minimise unnecessary duplication we now look at how you can maintain a repository with your own packages. The important functions here are `import` and `callPackage`. -### Including a derivation using `callPackage` +### Including a derivation using `callPackage` {#including-a-derivation-using-callpackage} Earlier we created a Python environment using `withPackages`, and included the `toolz` package via a `let` expression. @@ -756,9 +760,9 @@ don't explicitly define which `python` derivation should be used. In the above example we use `buildPythonPackage` that is part of the set `python38Packages`, and in this case the `python38` interpreter is automatically used. -## Reference +## Reference {#reference} -### Interpreters +### Interpreters {#interpreters} Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as respectively `python27`, `python36`, `python37`, `python38` and `python39`. The @@ -773,11 +777,11 @@ All packages depending on any Python interpreter get appended `out/{python.sitePackages}` to `$PYTHONPATH` if such directory exists. -#### Missing `tkinter` module standard library +#### Missing `tkinter` module standard library {#missing-tkinter-module-standard-library} To reduce closure size the `Tkinter`/`tkinter` is available as a separate package, `pythonPackages.tkinter`. -#### Attributes on interpreters packages +#### Attributes on interpreters packages {#attributes-on-interpreters-packages} Each interpreter has the following attributes: @@ -789,7 +793,7 @@ Each interpreter has the following attributes: - `executable`. Name of the interpreter executable, e.g. `python3.8`. - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. -### Optimizations +### Optimizations {#optimizations} The Python interpreters are by default not build with optimizations enabled, because the builds are in that case not reproducible. To enable optimizations, override the @@ -806,7 +810,7 @@ let in mypython ``` -### Building packages and applications +### Building packages and applications {#building-packages-and-applications} Python libraries and applications that use `setuptools` or `distutils` are typically built with respectively the `buildPythonPackage` and @@ -838,7 +842,7 @@ and the aliases * `pkgs.python3Packages` pointing to `pkgs.python38Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` -#### `buildPythonPackage` function +#### `buildPythonPackage` function {#buildpythonpackage-function} The `buildPythonPackage` function is implemented in `pkgs/development/interpreters/python/mk-python-derivation` @@ -890,7 +894,7 @@ e.g. the test runner, should be added to `checkInputs`. By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. -##### `buildPythonPackage` parameters +##### `buildPythonPackage` parameters {#buildpythonpackage-parameters} All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`: @@ -946,7 +950,7 @@ because their behaviour is different: `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here. -##### Overriding Python packages +##### Overriding Python packages {#overriding-python-packages} The `buildPythonPackage` function has a `overridePythonAttrs` method that can be used to override the package. In the following example we create an environment @@ -974,7 +978,7 @@ with import {}; in python.withPackages(ps: [ps.blaze])).env ``` -#### `buildPythonApplication` function +#### `buildPythonApplication` function {#buildpythonapplication-function} The `buildPythonApplication` function is practically the same as `buildPythonPackage`. The main purpose of this function is to build a Python @@ -1019,7 +1023,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { }; Since the package is an application, a consumer doesn't need to care about Python versions or modules, which is why they don't go in `pythonPackages`. -#### `toPythonApplication` function +#### `toPythonApplication` function {#topythonapplication-function} A distinction is made between applications and libraries, however, sometimes a package is used as both. In this case the package is added as a library to @@ -1031,11 +1035,12 @@ The Nix expression shall use `buildPythonPackage` and be called from `python-packages.nix`. A reference shall be created from `all-packages.nix` to the attribute in `python-packages.nix`, and the `toPythonApplication` shall be applied to the reference: + ```nix youtube-dl = with pythonPackages; toPythonApplication youtube-dl; ``` -#### `toPythonModule` function +#### `toPythonModule` function {#topythonmodule-function} In some cases, such as bindings, a package is created using `stdenv.mkDerivation` and added as attribute in `all-packages.nix`. The Python @@ -1052,7 +1057,7 @@ opencv = toPythonModule (pkgs.opencv.override { Do pay attention to passing in the right Python version! -#### `python.buildEnv` function +#### `python.buildEnv` function {#python.buildenv-function} Python environments can be created using the low-level `pkgs.buildEnv` function. This example shows how to create an environment that has the Pyramid Web Framework. @@ -1090,8 +1095,8 @@ with import {}; will drop you into a shell where Python will have the specified packages in its path. +##### `python.buildEnv` arguments {#python.buildenv-arguments} -##### `python.buildEnv` arguments * `extraLibs`: List of packages installed inside the environment. * `postBuild`: Shell command executed after the build of environment. @@ -1099,7 +1104,7 @@ specified packages in its path. * `permitUserSite`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped binaries in the environment. -#### `python.withPackages` function +#### `python.withPackages` function {#python.withpackages-function} The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. It takes a function as an argument that is passed the set of python packages and returns the list @@ -1141,7 +1146,7 @@ need them, you have to use `python.buildEnv`. Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` should be used with `ignoreCollisions = true`. -#### Setup hooks +#### Setup hooks {#setup-hooks} The following are setup hooks specifically for Python packages. Most of these are used in `buildPythonPackage`. @@ -1166,7 +1171,7 @@ are used in `buildPythonPackage`. - `wheelUnpackHook` to move a wheel to the correct folder so it can be installed with the `pipInstallHook`. -### Development mode +### Development mode {#development-mode} Development or editable mode is supported. To develop Python packages `buildPythonPackage` has additional logic inside `shellPhase` to run `pip @@ -1175,6 +1180,7 @@ install -e . --prefix $TMPDIR/`for the package. Warning: `shellPhase` is executed only if `setup.py` exists. Given a `default.nix`: + ```nix with import {}; @@ -1197,7 +1203,7 @@ nix-shell -p pythonPackages.pyramid zlib libjpeg git Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked. -### Tools +### Tools {#tools} Packages inside nixpkgs are written by hand. However many tools exist in community to help save time. No tool is preferred at the moment. @@ -1209,7 +1215,7 @@ community to help save time. No tool is preferred at the moment. - [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools) - [poetry2nix](https://github.com/nix-community/poetry2nix) -### Deterministic builds +### Deterministic builds {#deterministic-builds} The Python interpreters are now built deterministically. Minor modifications had to be made to the interpreters in order to generate deterministic bytecode. This @@ -1221,7 +1227,7 @@ have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. -### Automatic tests +### Automatic tests {#automatic-tests} It is recommended to test packages as part of the build process. Source distributions (`sdist`) often include test files, but not always. @@ -1230,7 +1236,7 @@ By default the command `python setup.py test` is run as part of the `checkPhase`, but often it is necessary to pass a custom `checkPhase`. An example of such a situation is when `py.test` is used. -#### Common issues +#### Common issues {#common-issues} * Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`. Most Python modules follows the standard test @@ -1247,18 +1253,19 @@ example of such a situation is when `py.test` is used. ''; } ``` + * Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` -## FAQ +## FAQ {#faq} -### How to solve circular dependencies? +### How to solve circular dependencies? {#how-to-solve-circular-dependencies} Consider the packages `A` and `B` that depend on each other. When packaging `B`, a solution is to override package `A` not to depend on `B` as an input. The same should also be done when packaging `A`. -### How to override a Python package? +### How to override a Python package? {#how-to-override-a-python-package} We can override the interpreter and pass `packageOverrides`. In the following example we rename the `pandas` package and build it. @@ -1316,7 +1323,7 @@ let in newpkgs.inkscape ``` -### `python setup.py bdist_wheel` cannot create .whl +### `python setup.py bdist_wheel` cannot create .whl {#python-setup.py-bdist_wheel-cannot-create-.whl} Executing `python setup.py bdist_wheel` in a `nix-shell `fails with ``` @@ -1349,7 +1356,7 @@ or unset `SOURCE_DATE_EPOCH`: nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel" ``` -### `install_data` / `data_files` problems +### `install_data` / `data_files` problems {#install_data-data_files-problems} If you get the following error: @@ -1369,7 +1376,7 @@ ${python.interpreter} setup.py install_data --install-dir=$out --root=$out sed -i '/ = data\_files/d' setup.py ``` -### Rationale of non-existent global site-packages +### Rationale of non-existent global site-packages {#rationale-of-non-existent-global-site-packages} On most operating systems a global `site-packages` is maintained. This however becomes problematic if you want to run multiple Python versions or have multiple @@ -1384,7 +1391,7 @@ If you want to create a Python environment for development, then the recommended method is to use `nix-shell`, either with or without the `python.buildEnv` function. -### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems? +### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems? {#how-to-consume-python-modules-using-pip-in-a-virtual-environment-like-i-am-used-to-on-other-operating-systems} While this approach is not very idiomatic from Nix perspective, it can still be useful when dealing with pre-existing projects or in situations where it's not @@ -1497,7 +1504,7 @@ is executed it will attempt to download the Python modules listed in requirements.txt. However these will be cached locally within the `virtualenv` folder and not downloaded again. -### How to override a Python package from `configuration.nix`? +### How to override a Python package from `configuration.nix`? {#how-to-override-a-python-package-from-configuration.nix} If you need to change a package's attribute(s) from `configuration.nix` you could do: @@ -1535,7 +1542,7 @@ this snippet: } ``` -### How to override a Python package using overlays? +### How to override a Python package using overlays? {#how-to-override-a-python-package-using-overlays} Use the following overlay template: @@ -1556,12 +1563,12 @@ self: super: { } ``` -### How to use Intel's MKL with numpy and scipy? +### How to use Intel’s MKL with numpy and scipy? {#how-to-use-intels-mkl-with-numpy-and-scipy} MKL can be configured using an overlay. See the section "[Using overlays to configure alternatives](#sec-overlays-alternatives-blas-lapack)". -### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? +### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? {#what-inputs-do-setup_requires-install_requires-and-tests_require-map-to} In a `setup.py` or `setup.cfg` it is common to declare dependencies: @@ -1569,9 +1576,9 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies: * `install_requires` corresponds to `propagatedBuildInputs` * `tests_require` corresponds to `checkInputs` -## Contributing +## Contributing {#contributing} -### Contributing guidelines +### Contributing guidelines {#contributing-guidelines} The following rules are desired to be respected: diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 6f8c9626e6d..986deeb0d4b 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -90,19 +90,21 @@ stdenv.mkDerivation { } ``` -::: note +::: {.note} `wrapQtAppsHook` ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQt. ::: -## Adding a library to Nixpkgs +## Adding a library to Nixpkgs {#adding-a-library-to-nixpkgs} + Add Qt libraries to `qt5-packages.nix` to make them available for every supported Qt version. ### Example adding a Qt library {#qt-library-all-packages-nix} The following represents the contents of `qt5-packages.nix`. + ```nix { # ... @@ -126,13 +128,15 @@ stdenv.mkDerivation { } ``` -## Adding an application to Nixpkgs +## Adding an application to Nixpkgs {#adding-an-application-to-nixpkgs} + Add Qt applications to `qt5-packages.nix`. Add an alias to `all-packages.nix` to select the Qt 5 version used for the application. ### Example adding a Qt application {#qt-application-all-packages-nix} The following represents the contents of `qt5-packages.nix`. + ```nix { # ... @@ -144,6 +148,7 @@ The following represents the contents of `qt5-packages.nix`. ``` The following represents the contents of `all-packages.nix`. + ```nix { # ... diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md index c420d112c91..56e3da64df2 100644 --- a/doc/languages-frameworks/r.section.md +++ b/doc/languages-frameworks/r.section.md @@ -1,6 +1,6 @@ # R {#r} -## Installation +## Installation {#installation} Define an environment for R that contains all the libraries that you'd like to use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: @@ -31,6 +31,7 @@ output is the name that has to be passed to rWrapper in the code snipped above. However, if you'd like to add a file to your project source to make the environment available for other contributors, you can create a `default.nix` file like so: + ```nix with import {}; { @@ -50,7 +51,7 @@ with import {}; and then run `nix-shell .` to be dropped into a shell with those packages available. -## RStudio +## RStudio {#rstudio} RStudio uses a standard set of packages and ignores any custom R environments or installed packages you may have. To create a custom @@ -93,7 +94,7 @@ Executing `nix-shell` will then drop you into an environment equivalent to the one above. If you need additional packages just add them to the list and re-enter the shell. -## Updating the package set +## Updating the package set {#updating-the-package-set} ```bash nix-shell generate-shell.nix @@ -113,8 +114,7 @@ mv bioc-experiment-packages.nix.new bioc-experiment-packages.nix `generate-r-packages.R ` reads `-packages.nix`, therefor the renaming. - -## Testing if the Nix-expression could be evaluated +## Testing if the Nix-expression could be evaluated {#testing-if-the-nix-expression-could-be-evaluated} ```bash nix-build test-evaluation.nix --dry-run diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index b8fc19eb6b0..36b794458cb 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -1,6 +1,6 @@ # Ruby {#sec-language-ruby} -## Using Ruby +## Using Ruby {#using-ruby} Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 2.6. It's also possible to refer to specific versions, e.g. `ruby_2_y`, `jruby`, or `mruby`. @@ -12,7 +12,7 @@ The interpreters have common attributes, namely `gems`, and `withPackages`. So y Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual. -### Temporary Ruby environment with `nix-shell` +### Temporary Ruby environment with `nix-shell` {#temporary-ruby-environment-with-nix-shell} Rather than having a single Ruby environment shared by all Ruby development projects on a system, Nix allows you to create separate environments per project. `nix-shell` gives you the possibility to temporarily load another environment akin to a combined `chruby` or `rvm` and `bundle exec`. @@ -30,7 +30,7 @@ $ nix-shell -p ruby.gems.nokogiri ruby.gems.pry Again, it's possible to launch the interpreter from the shell. The Ruby interpreter has the attribute `gems` which contains all Ruby gems for that specific interpreter. -#### Load Ruby environment from `.nix` expression +#### Load Ruby environment from `.nix` expression {#load-ruby-environment-from-.nix-expression} As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with: @@ -45,7 +45,7 @@ What's happening here? 2. Then we create a Ruby environment with the `withPackages` function. 3. The `withPackages` function expects us to provide a function as an argument that takes the set of all ruby gems and returns a list of packages to include in the environment. Here, we select the packages `nokogiri` and `pry` from the package set. -#### Execute command with `--run` +#### Execute command with `--run` {#execute-command-with---run} A convenient flag for `nix-shell` is `--run`. It executes a command in the `nix-shell`. We can e.g. directly open a `pry` REPL: @@ -65,7 +65,7 @@ Or run a script using this environment: $ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb" ``` -#### Using `nix-shell` as shebang +#### Using `nix-shell` as shebang {#using-nix-shell-as-shebang} In fact, for the last case, there is a more convenient method. You can add a [shebang]() to your script specifying which dependencies `nix-shell` needs. With the following shebang, you can just execute `./example.rb`, and it will run with all dependencies. @@ -80,9 +80,9 @@ body = RestClient.get('http://example.com').body puts Nokogiri::HTML(body).at('h1').text ``` -## Developing with Ruby +## Developing with Ruby {#developing-with-ruby} -### Using an existing Gemfile +### Using an existing Gemfile {#using-an-existing-gemfile} In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. This can be used to generate a `gemset.nix` which is used to fetch the gems and combine them into a single environment. The reason why you need to have a separate file for this, is that Nix requires you to have a checksum for each input to your build. Since the `Gemfile.lock` that `bundler` generates doesn't provide us with checksums, we have to first download each gem, calculate its SHA256, and store it in this separate file. @@ -120,7 +120,7 @@ One common issue that you might have is that you have Ruby 2.6, but also `bundle mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; } ``` -### Gem-specific configurations and workarounds +### Gem-specific configurations and workarounds {#gem-specific-configurations-and-workarounds} In some cases, especially if the gem has native extensions, you might need to modify the way the gem is built. @@ -201,7 +201,7 @@ $ nix-shell --run 'ruby -rpg -e "puts PG.library_version"' Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice. -### Adding a gem to the default gemset +### Adding a gem to the default gemset {#adding-a-gem-to-the-default-gemset} Now that you know how to get a working Ruby environment with Nix, it's time to go forward and start actually developing with Ruby. We will first have a look at how Ruby gems are packaged on Nix. Then, we will look at how you can use development mode with your code. @@ -215,7 +215,7 @@ To test that it works, you can then try using the gem with: NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])" ``` -### Packaging applications +### Packaging applications {#packaging-applications} A common task is to add a ruby executable to nixpkgs, popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` function, that allows you to make a package that only exposes the listed executables, otherwise the package may cause conflicts through common paths like `bin/rake` or `bin/bundler` that aren't meant to be used. @@ -243,7 +243,7 @@ bundlerApp { All that's left to do is to generate the corresponding `Gemfile.lock` and `gemset.nix` as described above in the `Using an existing Gemfile` section. -#### Packaging executables that require wrapping +#### Packaging executables that require wrapping {#packaging-executables-that-require-wrapping} Sometimes your app will depend on other executables at runtime, and tries to find it through the `PATH` environment variable. diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 5ff7a5edefd..f5c664bec20 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -15,7 +15,7 @@ For other versions such as daily builds (beta and nightly), use either `rustup` from nixpkgs (which will manage the rust installation in your home directory), or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay). -## Compiling Rust applications with Cargo +## Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo} Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: @@ -107,7 +107,7 @@ rustPlatform.buildRustPackage rec { } ``` -### Importing a `Cargo.lock` file +### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file} Using `cargoSha256` or `cargoHash` is tedious when using `buildRustPackage` within a project, since it requires that the hash @@ -156,7 +156,7 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or `lib.fakeHash` as a stub hash. Building the package (and thus the vendored dependencies) will then inform you of the correct hash. -### Cross compilation +### Cross compilation {#cross-compilation} By default, Rust packages are compiled for the host platform, just like any other package is. The `--target` passed to rust tools is computed from this. @@ -168,6 +168,7 @@ where they are known to differ. But there are ways to customize the argument: name will be used instead. For example: + ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { @@ -175,7 +176,9 @@ where they are known to differ. But there are ways to customize the argument: }; } ``` + will result in: + ```shell --target thumbv7em-none-eabi ``` @@ -188,6 +191,7 @@ where they are known to differ. But there are ways to customize the argument: will be used instead. For example: + ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { @@ -196,7 +200,9 @@ where they are known to differ. But there are ways to customize the argument: }; } ``` + will result in: + ```shell --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""} ``` @@ -220,7 +226,7 @@ ad-hoc escape hatch to `buildRustPackage` can be removed. Note that currently custom targets aren't compiled with `std`, so `cargo test` will fail. This can be ignored by adding `doCheck = false;` to your derivation. -### Running package tests +### Running package tests {#running-package-tests} When using `buildRustPackage`, the `checkPhase` is enabled by default and runs `cargo test` on the package to build. To make sure that we don't compile the @@ -248,7 +254,7 @@ Another attribute, called `checkFlags`, is used to pass arguments to the test binary itself, as stated (here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html]. -#### Tests relying on the structure of the `target/` directory +#### Tests relying on the structure of the `target/` directory {#tests-relying-on-the-structure-of-the-target-directory} Some tests may rely on the structure of the `target/` directory. Those tests are likely to fail because we use `cargo --target` during the build. This means that @@ -258,7 +264,7 @@ rather than in `target/release/`. This can only be worked around by patching the affected tests accordingly. -#### Disabling package-tests +#### Disabling package-tests {#disabling-package-tests} In some instances, it may be necessary to disable testing altogether (with `doCheck = false;`): @@ -272,7 +278,7 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b However, please check if it's possible to disable a problematic subset of the test suite and leave a comment explaining your reasoning. -#### Setting `test-threads` +#### Setting `test-threads` {#setting-test-threads} `buildRustPackage` will use parallel test threads by default, sometimes it may be necessary to disable this so the tests run consecutively. @@ -284,7 +290,7 @@ rustPlatform.buildRustPackage { } ``` -### Building a package in `debug` mode +### Building a package in `debug` mode {#building-a-package-in-debug-mode} By default, `buildRustPackage` will use `release` mode for builds. If a package should be built in `debug` mode, it can be configured like so: @@ -298,14 +304,14 @@ rustPlatform.buildRustPackage { In this scenario, the `checkPhase` will be ran in `debug` mode as well. -### Custom `build`/`install`-procedures +### Custom `build`/`install`-procedures {#custom-buildinstall-procedures} Some packages may use custom scripts for building/installing, e.g. with a `Makefile`. In these cases, it's recommended to override the `buildPhase`/`installPhase`/`checkPhase`. Otherwise, some steps may fail because of the modified directory structure of `target/`. -### Building a crate with an absent or out-of-date Cargo.lock file +### Building a crate with an absent or out-of-date Cargo.lock file {#building-a-crate-with-an-absent-or-out-of-date-cargo.lock-file} `buildRustPackage` needs a `Cargo.lock` file to get all dependencies in the source code in a reproducible way. If it is missing or out-of-date one can use @@ -321,13 +327,13 @@ rustPlatform.buildRustPackage rec { } ``` -## Compiling non-Rust packages that include Rust code +## Compiling non-Rust packages that include Rust code {#compiling-non-rust-packages-that-include-rust-code} Several non-Rust packages incorporate Rust code for performance- or security-sensitive parts. `rustPlatform` exposes several functions and hooks that can be used to integrate Cargo in non-Rust packages. -### Vendoring of dependencies +### Vendoring of dependencies {#vendoring-of-dependencies} Since network access is not allowed in sandboxed builds, Rust crate dependencies need to be retrieved using a fetcher. `rustPlatform` @@ -387,7 +393,7 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or `lib.fakeHash` as a stub hash. Building `cargoDeps` will then inform you of the correct hash. -### Hooks +### Hooks {#hooks} `rustPlatform` provides the following hooks to automate Cargo builds: @@ -416,9 +422,9 @@ you of the correct hash. * `cargoInstallHook`: install binaries and static/shared libraries that were built using `cargoBuildHook`. -### Examples +### Examples {#examples} -#### Python package using `setuptools-rust` +#### Python package using `setuptools-rust` {#python-package-using-setuptools-rust} For Python packages using `setuptools-rust`, you can use `fetchCargoTarball` and `cargoSetupHook` to retrieve and set up Cargo @@ -504,7 +510,7 @@ buildPythonPackage rec { } ``` -#### Python package using `maturin` +#### Python package using `maturin` {#python-package-using-maturin} Python packages that use [Maturin](https://github.com/PyO3/maturin) can be built with `fetchCargoTarball`, `cargoSetupHook`, and @@ -545,9 +551,9 @@ buildPythonPackage rec { } ``` -## Compiling Rust crates using Nix instead of Cargo +## Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo} -### Simple operation +### Simple operation {#simple-operation} When run, `cargo build` produces a file called `Cargo.lock`, containing pinned versions of all dependencies. Nixpkgs contains a @@ -558,14 +564,15 @@ That Nix expression calls `rustc` directly (hence bypassing Cargo), and can be used to compile a crate and all its dependencies. Here is an example for a minimal `hello` crate: - - $ cargo new hello - $ cd hello - $ cargo build +```ShellSession +$ cargo new hello +$ cd hello +$ cargo build Compiling hello v0.1.0 (file:///tmp/hello) - Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs - $ carnix -o hello.nix --src ./. Cargo.lock --standalone - $ nix-build hello.nix -A hello_0_1_0 + Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs +$ carnix -o hello.nix --src ./. Cargo.lock --standalone +$ nix-build hello.nix -A hello_0_1_0 +``` Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: @@ -644,7 +651,7 @@ Here, the `libc` crate has no `src` attribute, so `buildRustCrate` will fetch it from [crates.io](https://crates.io). A `sha256` attribute is still needed for Nix purity. -### Handling external dependencies +### Handling external dependencies {#handling-external-dependencies} Some crates require external libraries. For crates from [crates.io](https://crates.io), such libraries can be specified in @@ -703,7 +710,7 @@ with import {}; } ``` -### Options and phases configuration +### Options and phases configuration {#options-and-phases-configuration} Actually, the overrides introduced in the previous section are more general. A number of other parameters can be overridden: @@ -750,7 +757,7 @@ general. A number of other parameters can be overridden: }; ``` -### Features +### Features {#features} One can also supply features switches. For example, if we want to compile `diesel_cli` only with the `postgres` feature, and no default @@ -765,14 +772,15 @@ features, we would write: Where `diesel.nix` is the file generated by Carnix, as explained above. +## Setting Up `nix-shell` {#setting-up-nix-shell} -## Setting Up `nix-shell` Oftentimes you want to develop code from within `nix-shell`. Unfortunately `buildRustCrate` does not support common `nix-shell` operations directly (see [this issue](https://github.com/NixOS/nixpkgs/issues/37945)) so we will use `stdenv.mkDerivation` instead. Using the example `hello` project above, we want to do the following: + - Have access to `cargo` and `rustc` - Have the `openssl` library available to a crate through it's _normal_ compilation mechanism (`pkg-config`). @@ -801,13 +809,15 @@ stdenv.mkDerivation { ``` You should now be able to run the following: -```ShellSesssion + +```ShellSession $ nix-shell --pure $ cargo build $ cargo test ``` -### Controlling Rust Version Inside `nix-shell` +### Controlling Rust Version Inside `nix-shell` {#controlling-rust-version-inside-nix-shell} + To control your rust version (i.e. use nightly) from within `shell.nix` (or other nix expressions) you can use the following `shell.nix` @@ -839,6 +849,7 @@ stdenv.mkDerivation { ``` Now run: + ```ShellSession $ rustc --version rustc 1.26.0-nightly (188e693b3 2018-03-26) @@ -846,31 +857,32 @@ rustc 1.26.0-nightly (188e693b3 2018-03-26) To see that you are using nightly. - -## Using the Rust nightlies overlay +## Using the Rust nightlies overlay {#using-the-rust-nightlies-overlay} Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. This overlay can _also_ be used to install recent unstable or stable versions of Rust, if desired. -### Rust overlay installation +### Rust overlay installation {#rust-overlay-installation} You can use this overlay by either changing your local nixpkgs configuration, or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`. -For more information see [#sec-overlays-install](the manual on installing overlays). +For more information see [the manual on installing overlays](#sec-overlays-install). -#### Imperative rust overlay installation +#### Imperative rust overlay installation {#imperative-rust-overlay-installation} Clone [nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), and create a symbolic link to the file [rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix) in the `~/.config/nixpkgs/overlays` directory. - $ git clone https://github.com/mozilla/nixpkgs-mozilla.git - $ mkdir -p ~/.config/nixpkgs/overlays - $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix +```ShellSession +$ git clone https://github.com/mozilla/nixpkgs-mozilla.git +$ mkdir -p ~/.config/nixpkgs/overlays +$ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix +``` -### Declarative rust overlay installation +### Declarative rust overlay installation {#declarative-rust-overlay-installation} Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: @@ -886,7 +898,7 @@ Add the following to your `configuration.nix`, `home-configuration.nix`, `shell. Note that this will fetch the latest overlay version when rebuilding your system. -### Rust overlay usage +### Rust overlay usage {#rust-overlay-usage} The overlay contains attribute sets corresponding to different versions of the rust toolchain, such as: @@ -900,11 +912,15 @@ For example, you might want to add `latest.rustChannels.stable.rust` to the list Imperatively, the latest stable version can be installed with the following command: - $ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust +```ShellSession +$ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust +``` Or using the attribute with nix-shell: - $ nix-shell -p nixpkgs.latest.rustChannels.stable.rust +```ShellSession +$ nix-shell -p nixpkgs.latest.rustChannels.stable.rust +``` Substitute the `nixpkgs` prefix with `nixos` on NixOS. To install the beta or nightly channel, "stable" should be substituted by diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index c3028731f4e..6b505cefcc9 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -5,6 +5,7 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under ## User's guide {#sec-language-texlive-user-guide} - For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support. + - It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this: ```nix @@ -14,6 +15,7 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under ``` - There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). + - By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add `pkgFilter` function to `combine`. ```nix diff --git a/doc/languages-frameworks/titanium.section.md b/doc/languages-frameworks/titanium.section.md index 57360f034b9..306ad866276 100644 --- a/doc/languages-frameworks/titanium.section.md +++ b/doc/languages-frameworks/titanium.section.md @@ -9,8 +9,8 @@ applications for Android and iOS devices from source code. Not all Titanium features supported -- currently, it can only be used to build Android and iOS apps. -Building a Titanium app ------------------------ +## Building a Titanium app {#building-a-titanium-app} + We can build a Titanium app from source for Android or iOS and for debugging or release purposes by invoking the `titaniumenv.buildApp {}` function: @@ -103,8 +103,8 @@ When `enableWirelessDistribution` has been enabled, you must also provide the path of the PHP script (`installURL`) (that is included with the iOS build environment) to enable wireless ad-hoc installations. -Emulating or simulating the app -------------------------------- +## Emulating or simulating the app {#emulating-or-simulating-the-app} + It is also possible to simulate the correspond iOS simulator build by using `xcodeenv.simulateApp {}` and emulate an Android APK by using `androidenv.emulateApp {}`. diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 5316db9a137..e170591605c 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -12,7 +12,7 @@ At the moment we support three different methods for managing plugins: - Pathogen - vim-plug -## Custom configuration +## Custom configuration {#custom-configuration} Adding custom .vimrc lines can be done using the following code: @@ -56,7 +56,7 @@ neovim-qt.override { } ``` -## Managing plugins with Vim packages +## Managing plugins with Vim packages {#managing-plugins-with-vim-packages} To store you plugins in Vim packages (the native Vim plugin manager, see `:help packages`) the following example can be used: @@ -116,7 +116,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n After that you can install your special grafted `myVim` or `myNeovim` packages. -### What if your favourite Vim plugin isn't already packaged? +### What if your favourite Vim plugin isn’t already packaged? {#what-if-your-favourite-vim-plugin-isnt-already-packaged} If one of your favourite plugins isn't packaged, you can package it yourself: @@ -154,7 +154,7 @@ in } ``` -## Managing plugins with vim-plug +## Managing plugins with vim-plug {#managing-plugins-with-vim-plug} To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim plugins the following example can be used: @@ -183,14 +183,14 @@ neovim.override { } ``` -## Managing plugins with VAM +## Managing plugins with VAM {#managing-plugins-with-vam} -### Handling dependencies of Vim plugins +### Handling dependencies of Vim plugins {#handling-dependencies-of-vim-plugins} VAM introduced .json files supporting dependencies without versioning assuming that "using latest version" is ok most of the time. -### Example +### Example {#example} First create a vim-scripts file having one plugin name per line. Example: @@ -280,7 +280,7 @@ Sample output2: ] ``` -## Adding new plugins to nixpkgs +## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. @@ -298,7 +298,7 @@ To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This sc Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of Language Server Protocol integration with vim/neovim. -## Updating plugins in nixpkgs +## Updating plugins in nixpkgs {#updating-plugins-in-nixpkgs} Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). @@ -312,7 +312,7 @@ Alternatively, set the number of processes to a lower count to avoid rate-limiti ./pkgs/misc/vim-plugins/update.py --proc 1 ``` -## Important repositories +## Important repositories {#important-repositories} - [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository from VAM plugin manager meant to be used by others as well used by diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 64c921c711b..16f228272b3 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -12,7 +12,7 @@ Nixpkgs. If you like to learn more about the Nix package manager and the Nix expression language, then you are kindly referred to the [Nix manual](https://nixos.org/nix/manual/). The NixOS distribution is documented in the [NixOS manual](https://nixos.org/nixos/manual/). -## Overview of Nixpkgs +## Overview of Nixpkgs {#overview-of-nixpkgs} Nix expressions describe how to build packages from source and are collected in the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 3755c13facf..b27e9cc6fea 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -6,7 +6,6 @@ This chapter will be organized in three parts. First, it will describe the basics of how to package software in a way that supports cross-compilation. Second, it will describe how to use Nixpkgs when cross-compiling. Third, it will describe the internal infrastructure supporting cross-compilation. - ## Packaging in a cross-friendly manner {#sec-cross-packaging} ### Platform parameters {#ssec-cross-platform-parameters} @@ -65,7 +64,7 @@ The exact schema these fields follow is a bit ill-defined due to a long and conv ### Theory of dependency categorization {#ssec-cross-dependency-categorization} -::: note +::: {.note} This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to `mkDerivation`, see . For a description of how everything is implemented, see . ::: @@ -81,10 +80,10 @@ Finally, if the depending package is a compiler or other machine-code-producing Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations: +#### Possible dependency types {#possible-dependency-types} -#### Possible dependency types -| Dependency's host platform | Dependency's target platform | -| -- | -- | +| Dependency’s host platform | Dependency’s target platform | +|----------------------------|------------------------------| | build | build | | build | host | | build | target | @@ -113,15 +112,18 @@ On less powerful machines, it can be inconvenient to cross-compile a package onl $ nix-build '' -A pkgsCross.raspberryPi.hello ``` -#### What if my package's build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment} +#### What if my package’s build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment} + Add the following to your `mkDerivation` invocation. + ```nix depsBuildBuild = [ buildPackages.stdenv.cc ]; ``` -#### My package's testsuite needs to run host platform code. {#cross-testsuite-runs-host-code} +#### My package’s testsuite needs to run host platform code. {#cross-testsuite-runs-host-code} Add the following to your `mkDerivation` invocation. + ```nix doCheck = stdenv.hostPlatform == stdenv.buildPlatform; ``` @@ -134,7 +136,7 @@ Nixpkgs can be instantiated with `localSystem` alone, in which case there is no $ nix-build '' --arg crossSystem '(import ).systems.examples.fooBarBaz' -A whatever ``` -::: note +::: {.note} Eventually we would like to make these platform examples an unnecessary convenience so that ```ShellSession @@ -146,7 +148,7 @@ works in the vast majority of cases. The problem today is dependencies on other While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. As discussed in the previous section, only one of `system`, `config`, and `parsed` is needed to infer the other two. Additionally, `libc` will be inferred from `parse`. Finally, `localSystem.system` is also _impurely_ inferred based on the platform evaluation occurs. This means it is often not necessary to pass `localSystem` at all, as in the command-line example in the previous paragraph. -::: note +::: {.note} Many sources (manual, wiki, etc) probably mention passing `system`, `platform`, along with the optional `crossSystem` to Nixpkgs: `import { system = ..; platform = ..; crossSystem = ..; }`. Passing those two instead of `localSystem` is still supported for compatibility, but is discouraged. Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience. ::: @@ -178,7 +180,7 @@ While there are many package sets, and thus many edges, the stages can also be a In each stage, `pkgsBuildHost` refers to the previous stage, `pkgsBuildBuild` refers to the one before that, and `pkgsHostTarget` refers to the current one, and `pkgsTargetTarget` refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. `pkgsBuildTarget` and `pkgsHostHost` are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in `pkgs/stdenv/booter.nix`, and secondarily aliases in `pkgs/top-level/stage.nix`. -::: note +::: {.note} The native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the bootstrapping stages leading up to the final stages are ignored in the previous paragraph. ::: @@ -186,6 +188,7 @@ If one looks at the 3 platform triples, one can see that they overlap such that ``` (native, native, native, foreign, foreign) ``` + If one imagines the saturating self references at the end being replaced with infinite stages, and then overlays those platform triples, one ends up with the infinite tuple: ``` (native..., native, native, native, foreign, foreign, foreign...) @@ -193,8 +196,8 @@ If one imagines the saturating self references at the end being replaced with in One can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstrapping stage where `build != host != target`, more bootstrapping stages are needed since no sliding window provides the pesky `pkgsBuildTarget` package set since it skips the Canadian cross stage's "host". -::: note -It is much better to refer to `buildPackages` than `targetPackages`, or more broadly package sets that do not mention "target". There are three reasons for this. +::: {.note} +It is much better to refer to `buildPackages` than `targetPackages`, or more broadly package sets that do not mention “target”. There are three reasons for this. First, it is because bootstrapping stages do not have a unique `targetPackages`. For example a `(x86-linux, x86-linux, arm-linux)` and `(x86-linux, x86-linux, x86-windows)` package set both have a `(x86-linux, x86-linux, x86-linux)` package set. Because there is no canonical `targetPackages` for such a native (`build == host == target`) package set, we set their `targetPackages` @@ -203,6 +206,6 @@ Second, it is because this is a frequent source of hard-to-follow "infinite recu Thirdly, it is because everything target-mentioning only exists to accommodate compilers with lousy build systems that insist on the compiler itself and standard library being built together. Of course that is bad because bigger derivations means longer rebuilds. It is also problematic because it tends to make the standard libraries less like other libraries than they could be, complicating code and build systems alike. Because of the other problems, and because of these innate disadvantages, compilers ought to be packaged another way where possible. ::: -::: note -If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with "Cross" in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon. +::: {.note} +If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon. ::: diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index dd9f5325855..f226a725480 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -130,7 +130,7 @@ Attribute Set `lib.platforms` defines [various common lists](https://github.com/ ### `tests` {#var-meta-tests} -::: warning +::: {.warning} This attribute is special in that it is not actually under the `meta` attribute set but rather under the `passthru` attribute set. This is due to how `meta` attributes work, and the fact that they are supposed to contain only metadata, not derivations. ::: @@ -175,20 +175,20 @@ The `meta.license` attribute should preferably contain a value from `lib.license Although it’s typically better to indicate the specific license, a few generic options are available: -### `lib.licenses.free`, `"free"` +### `lib.licenses.free`, `"free"` {#lib.licenses.free-free} Catch-all for free software licenses not listed above. -### `lib.licenses.unfreeRedistributable`, `"unfree-redistributable"` +### `lib.licenses.unfreeRedistributable`, `"unfree-redistributable"` {#lib.licenses.unfreeredistributable-unfree-redistributable} Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the *output* of the derivation. This means that the package can be included in the Nixpkgs channel. Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies `patchelf` to make them work. Thus, its license is `"unfree"` and it cannot be included in the Nixpkgs channel. -### `lib.licenses.unfree`, `"unfree"` +### `lib.licenses.unfree`, `"unfree"` {#lib.licenses.unfree-unfree} Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel. -### `lib.licenses.unfreeRedistributableFirmware`, `"unfree-redistributable-firmware"` +### `lib.licenses.unfreeRedistributableFirmware`, `"unfree-redistributable-firmware"` {#lib.licenses.unfreeredistributablefirmware-unfree-redistributable-firmware} This package supplies unfree, redistributable firmware. This is a separate value from `unfree-redistributable` because not everybody cares whether firmware is free. diff --git a/doc/stdenv/multiple-output.chapter.md b/doc/stdenv/multiple-output.chapter.md index 90bc25bef73..b8414614279 100644 --- a/doc/stdenv/multiple-output.chapter.md +++ b/doc/stdenv/multiple-output.chapter.md @@ -6,7 +6,7 @@ The Nix language allows a derivation to produce multiple outputs, which is simil The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less. -::: note +::: {.note} The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. ::: @@ -28,7 +28,7 @@ NixOS provides two ways to select the outputs to install for packages listed in `nix-env` lacks an easy way to select the outputs to install. When installing a package, `nix-env` always installs the outputs listed in `meta.outputsToInstall`, even when the user explicitly selects an output. -::: warning +::: {.warning} `nix-env` silenty disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example, ```ShellSession @@ -69,7 +69,7 @@ outputs = [ "bin" "dev" "out" "doc" ]; Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main `out` output, as it catches any files that didn’t get elsewhere. -::: note +::: {.note} There is a special handling of the `debug` output, described at . ::: @@ -85,35 +85,35 @@ The reason for why `glibc` deviates from the convention is because referencing a The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an `outputFoo` variable specifying the output name where they should go. If that variable isn’t defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn’t defined. -#### ` $outputDev` +#### `$outputDev` {#outputdev} is for development-only files. These include C(++) headers (`include/`), pkg-config (`lib/pkgconfig/`), cmake (`lib/cmake/`) and aclocal files (`share/aclocal/`). They go to `dev` or `out` by default. -#### ` $outputBin` +#### `$outputBin` {#outputbin} is meant for user-facing binaries, typically residing in `bin/`. They go to `bin` or `out` by default. -#### ` $outputLib` +#### `$outputLib` {#outputlib} is meant for libraries, typically residing in `lib/` and `libexec/`. They go to `lib` or `out` by default. -#### ` $outputDoc` +#### `$outputDoc` {#outputdoc} is for user documentation, typically residing in `share/doc/`. It goes to `doc` or `out` by default. -#### ` $outputDevdoc` +#### `$outputDevdoc` {#outputdevdoc} is for _developer_ documentation. Currently we count gtk-doc and devhelp books, typically residing in `share/gtk-doc/` and `share/devhelp/`, in there. It goes to `devdoc` or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. -#### ` $outputMan` +#### `$outputMan` {#outputman} is for man pages (except for section 3), typically residing in `share/man/man[0-9]/`. They go to `man` or `$outputBin` by default. -#### ` $outputDevman` +#### `$outputDevman` {#outputdevman} is for section 3 man pages, typically residing in `share/man/man[0-9]/`. They go to `devman` or `$outputMan` by default. -#### ` $outputInfo` +#### `$outputInfo` {#outputinfo} is for info pages, typically residing in `share/info/`. They go to `info` or `$outputBin` by default. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index b23c50e8364..71eb991bbae 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -175,7 +175,8 @@ Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In Overall, the unifying theme here is that propagation shouldn’t be introducing transitive dependencies involving platforms the depending package is unaware of. \[One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn’t know how to ask for. The platform description in that scenario is a kind of unforagable capability.\] The offset bounds checking and definition of `mapOffset` together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren’t in the derivation “spec” of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. -### Variables specifying dependencies +### Variables specifying dependencies {#variables-specifying-dependencies} + #### `depsBuildBuild` {#var-stdenv-depsBuildBuild} A list of dependencies whose host and target platforms are the new derivation’s build platform. This means a `-1` host and `-1` target offset from the new derivation’s platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. @@ -236,13 +237,13 @@ The propagated equivalent of `depsTargetTarget`. This is prefixed for the same r ## Attributes {#ssec-stdenv-attributes} -### Variables affecting `stdenv` initialisation +### Variables affecting `stdenv` initialisation {#variables-affecting-stdenv-initialisation} #### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG} A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. -### Attributes affecting build properties +### Attributes affecting build properties {#attributes-affecting-build-properties} #### `enableParallelBuilding` {#var-stdenv-enableParallelBuilding} @@ -250,7 +251,7 @@ If set to `true`, `stdenv` will pass specific flags to `make` and other build to Unless set to `false`, some build systems with good support for parallel building including `cmake`, `meson`, and `qmake` will set it to `true`. -### Special variables +### Special variables {#special-variables} #### `passthru` {#var-stdenv-passthru} @@ -298,7 +299,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] The script will be run with `UPDATE_NIX_ATTR_PATH` environment variable set to the attribute path it is supposed to update. -::: note +::: {.note} The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running `git commit` or any other commands that cannot handle that. ::: @@ -314,7 +315,7 @@ Each phase can be overridden in its entirety either by setting the environment v There are a number of variables that control what phases are executed and in what order: -#### Variables affecting phase control +#### Variables affecting phase control {#variables-affecting-phase-control} ##### `phases` {#var-stdenv-phases} @@ -354,21 +355,22 @@ Additional phases executed after any of the default phases. The unpack phase is responsible for unpacking the source code of the package. The default implementation of `unpackPhase` unpacks the source files listed in the `src` environment variable to the current directory. It supports the following files by default: -#### Tar files +#### Tar files {#tar-files} These can optionally be compressed using `gzip` (`.tar.gz`, `.tgz` or `.tar.Z`), `bzip2` (`.tar.bz2`, `.tbz2` or `.tbz`) or `xz` (`.tar.xz`, `.tar.lzma` or `.txz`). -#### Zip files +#### Zip files {#zip-files} Zip files are unpacked using `unzip`. However, `unzip` is not in the standard environment, so you should add it to `nativeBuildInputs` yourself. -#### Directories in the Nix store +#### Directories in the Nix store {#directories-in-the-nix-store} These are simply copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`. Additional file types can be supported by setting the `unpackCmd` variable (see below). -#### Variables controlling the unpack phase +#### Variables controlling the unpack phase {#variables-controlling-the-unpack-phase} + ##### `srcs` / `src` {#var-stdenv-src} The list of source files or directories to be unpacked or copied. One of these must be set. @@ -405,7 +407,7 @@ The unpack phase evaluates the string `$unpackCmd` for any unrecognised file. Th The patch phase applies the list of patches defined in the `patches` variable. -#### Variables controlling the patch phase +#### Variables controlling the patch phase {#variables-controlling-the-patch-phase} ##### `dontPatch` {#var-stdenv-dontPatch} @@ -431,7 +433,7 @@ Hook executed at the end of the patch phase. The configure phase prepares the source tree for building. The default `configurePhase` runs `./configure` (typically an Autoconf-generated script) if it exists. -#### Variables controlling the configure phase +#### Variables controlling the configure phase {#variables-controlling-the-configure-phase} ##### `configureScript` {#var-stdenv-configureScript} @@ -491,7 +493,7 @@ Hook executed at the end of the configure phase. The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` simply calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing. -#### Variables controlling the build phase +#### Variables controlling the build phase {#variables-controlling-the-build-phase} ##### `dontBuild` {#var-stdenv-dontBuild} @@ -509,7 +511,7 @@ A list of strings passed as additional flags to `make`. These flags are also use makeFlags = [ "PREFIX=$(out)" ]; ``` -::: note +::: {.note} The flags are quoted in bash, but environment variables can be specified by using the make syntax. ::: @@ -545,7 +547,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled. -#### Variables controlling the check phase +#### Variables controlling the check phase {#variables-controlling-the-check-phase} ##### `doCheck` {#var-stdenv-doCheck} @@ -557,7 +559,7 @@ doCheck = true; in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doCheck` is set, as the newly-built program won’t run on the platform used to build it. -##### `makeFlags` / `makeFlagsArray` / `makefile` +##### `makeFlags` / `makeFlagsArray` / `makefile` {#makeflags-makeflagsarray-makefile} See the [build phase](#var-stdenv-makeFlags) for details. @@ -585,13 +587,13 @@ Hook executed at the end of the check phase. The install phase is responsible for installing the package in the Nix store under `out`. The default `installPhase` creates the directory `$out` and calls `make install`. -#### Variables controlling the install phase +#### Variables controlling the install phase {#variables-controlling-the-install-phase} ##### `dontInstall` {#var-stdenv-dontInstall} Set to true to skip the install phase. -##### `makeFlags` / `makeFlagsArray` / `makefile` +##### `makeFlags` / `makeFlagsArray` / `makefile` {#makeflags-makeflagsarray-makefile-1} See the [build phase](#var-stdenv-makeFlags) for details. @@ -624,7 +626,7 @@ The fixup phase performs some (Nix-specific) post-processing actions on the file - On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` in order to prevent unnecessary runtime dependencies. - It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`. -#### Variables controlling the fixup phase +#### Variables controlling the fixup phase {#variables-controlling-the-fixup-phase} ##### `dontFixup` {#var-stdenv-dontFixup} @@ -706,7 +708,7 @@ to `~/.gdbinit`. GDB will then be able to find debug information installed via ` The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`. -#### Variables controlling the installCheck phase +#### Variables controlling the installCheck phase {#variables-controlling-the-installcheck-phase} ##### `doInstallCheck` {#var-stdenv-doInstallCheck} @@ -742,7 +744,7 @@ Hook executed at the end of the installCheck phase. The distribution phase is intended to produce a source distribution of the package. The default `distPhase` first calls `make dist`, then it copies the resulting source tarballs to `$out/tarballs/`. This phase is only executed if the attribute `doDist` is set. -#### Variables controlling the distribution phase +#### Variables controlling the distribution phase {#variables-controlling-the-distribution-phase} ##### `distTarget` {#var-stdenv-distTarget} @@ -879,7 +881,7 @@ The most typical use of the setup hook is actually to add other hooks which are Packages adding a hook should not hard code a specific hook, but rather choose a variable *relative* to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an `n` dependency, then it only wants to accumulate flags from `n + 1` dependencies, as only those ones match the compiler’s target platform. The `hostOffset` variable is defined with the current dependency’s host offset `targetOffset` with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don’t care about the target platform, that means the setup hook can append to the right bash array by doing something like -```{.bash} +```bash addEnvHooks "$hostOffset" myBashFunction ``` @@ -887,47 +889,47 @@ The *existence* of setups hooks has long been documented and packages inside Nix First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using `stdenv.mkDerivation`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. -### `move-docs.sh` +### `move-docs.sh` {#move-docs.sh} This setup hook moves any installed documentation to the `/share` subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the `share` subdirectory. -### `compress-man-pages.sh` +### `compress-man-pages.sh` {#compress-man-pages.sh} This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages. -### `strip.sh` +### `strip.sh` {#strip.sh} This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages. -### `patch-shebangs.sh` +### `patch-shebangs.sh` {#patch-shebangs.sh} This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g `#!/bin/bash`). In Nix, we want an exact path to that interpreter to be used. This often replaces `/bin/sh` with a path in the Nix store. -### `audit-tmpdir.sh` +### `audit-tmpdir.sh` {#audit-tmpdir.sh} This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only. -### `multiple-outputs.sh` +### `multiple-outputs.sh` {#multiple-outputs.sh} This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See for more information. -### `move-sbin.sh` +### `move-sbin.sh` {#move-sbin.sh} This setup hook moves any binaries installed in the `sbin/` subdirectory into `bin/`. In addition, a link is provided from `sbin/` to `bin/` for compatibility. -### `move-lib64.sh` +### `move-lib64.sh` {#move-lib64.sh} This setup hook moves any libraries installed in the `lib64/` subdirectory into `lib/`. In addition, a link is provided from `lib64/` to `lib/` for compatibility. -### `move-systemd-user-units.sh` +### `move-systemd-user-units.sh` {#move-systemd-user-units.sh} This setup hook moves any systemd user units installed in the `lib/` subdirectory into `share/`. In addition, a link is provided from `share/` to `lib/` for compatibility. This is needed for systemd to find user services when installed into the user profile. -### `set-source-date-epoch-to-latest.sh` +### `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. -### Bintools Wrapper +### Bintools Wrapper {#bintools-wrapper} The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. @@ -937,7 +939,7 @@ A final task of the setup hook is defining a number of standard environment vari A problem with this final task is that the Bintools Wrapper is honest and defines `LD` as `ld`. Most packages, however, firstly use the C compiler for linking, secondly use `LD` anyways, defining it as the C compiler, and thirdly, only so define `LD` when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won’t override yet doesn’t want to use. The workaround is to define, just for the problematic package, `LD` as the C compiler. A good way to do this would be `preConfigure = "LD=$CC"`. -### CC Wrapper +### CC Wrapper {#cc-wrapper} The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper. @@ -971,11 +973,11 @@ The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, l Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable. -### teTeX / TeX Live +### teTeX / TeX Live {#tetex-tex-live} Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable. -### Qt 4 +### Qt 4 {#qt-4} Sets the `QTDIR` environment variable to Qt’s path. @@ -983,11 +985,11 @@ Sets the `QTDIR` environment variable to Qt’s path. Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf). -### GHC +### GHC {#ghc} Creates a temporary package database and registers every Haskell build input in it (TODO: how?). -### GNOME platform +### GNOME platform {#gnome-platform} Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in . @@ -1003,7 +1005,7 @@ By default `autoPatchelf` will fail as soon as any ELF file requires a dependenc The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. -### breakpointHook +### breakpointHook {#breakpointhook} This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`. @@ -1013,15 +1015,15 @@ nativeBuildInputs = [ breakpointHook ]; When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox. -::: note -::: title +::: {.note} +::: {.title} Caution with remote builds ::: This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`. ::: -### installShellFiles +### installShellFiles {#installshellfiles} This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. @@ -1047,61 +1049,61 @@ postInstall = '' ''; ``` -### libiconv, libintl +### libiconv, libintl {#libiconv-libintl} A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`. -### validatePkgConfig +### validatePkgConfig {#validatepkgconfig} The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables. -### cmake +### cmake {#cmake} Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. -### xcbuildHook +### xcbuildHook {#xcbuildhook} Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. -### Meson +### Meson {#meson} Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. -#### Variables controlling Meson +#### Variables controlling Meson {#variables-controlling-meson} -##### `mesonFlags` +##### `mesonFlags` {#mesonflags} Controls the flags passed to meson. -##### `mesonBuildType` +##### `mesonBuildType` {#mesonbuildtype} Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. -##### `mesonAutoFeatures` +##### `mesonAutoFeatures` {#mesonautofeatures} What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. -##### `mesonWrapMode` +##### `mesonWrapMode` {#mesonwrapmode} What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. -##### `dontUseMesonConfigure` +##### `dontUseMesonConfigure` {#dontusemesonconfigure} Disables using Meson’s `configurePhase`. -### ninja +### ninja {#ninja} Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. -### unzip +### unzip {#unzip} This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc. -### wafHook +### wafHook {#wafhook} Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. -### scons +### scons {#scons} Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. @@ -1119,7 +1121,7 @@ Both parameters take a list of flags as strings. The special `"all"` flag can be The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible. -### `format` +### `format` {#format} Adds the `-Wformat -Wformat-security -Werror=format-security` compiler options. At present, this warns about calls to `printf` and `scanf` functions where the format string is not a string literal and there are no format arguments, as in `printf(foo);`. This may be a security hole if the format string came from untrusted input and contains `%n`. @@ -1132,7 +1134,7 @@ This needs to be turned off or fixed for errors similar to: cc1plus: some warnings being treated as errors ``` -### `stackprotector` +### `stackprotector` {#stackprotector} Adds the `-fstack-protector-strong --param ssp-buffer-size=4` compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application). @@ -1143,7 +1145,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' ``` -### `fortify` +### `fortify` {#fortify} Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around. @@ -1164,7 +1166,7 @@ installwatch.c:3751:5: error: conflicting types for '__open_2' fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments ``` -### `pic` +### `pic` {#pic} Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible. @@ -1177,19 +1179,19 @@ ccbLfRgg.s: Assembler messages: ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' ``` -### `strictoverflow` +### `strictoverflow` {#strictoverflow} Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option `-fno-strict-overflow` makes gcc behave as if signed integer overflows were defined. This flag should not trigger any build or runtime errors. -### `relro` +### `relro` {#relro} Adds the `-z relro` linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the `bindnow` flag must also be disabled and incompatible programs typically fail with similar errors at runtime. -### `bindnow` +### `bindnow` {#bindnow} Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. @@ -1201,7 +1203,7 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. -### `pie` +### `pie` {#pie} Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack. diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index 21efe467b84..537d031bcdb 100644 --- a/doc/using/overlays.chapter.md +++ b/doc/using/overlays.chapter.md @@ -63,7 +63,7 @@ The second argument (`super`) corresponds to the result of the evaluation of the The value returned by this function should be a set similar to `pkgs/top-level/all-packages.nix`, containing overridden and/or new packages. -Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in . Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. +Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in. Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. ## Using overlays to configure alternatives {#sec-overlays-alternatives} diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index c1ab710e061..66e5103531a 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -48,17 +48,17 @@ In the above example, the `separateDebugInfo` attribute is overridden to be true The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`. -::: note -Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing). +::: {.note} +Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing). ::: ## <pkg>.overrideDerivation {#sec-pkg-overrideDerivation} -::: warning +::: {.warning} You should prefer `overrideAttrs` in almost all cases, see its documentation for the reasons why. `overrideDerivation` is not deprecated and will continue to work, but is less nice to use and does not have as many abilities as `overrideAttrs`. ::: -::: warning +::: {.warning} Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in `~/.config/nixpkgs/config.nix`. ::: @@ -81,8 +81,8 @@ In the above example, the `name`, `src`, and `patches` of the derivation will be The argument `oldAttrs` is used to refer to the attribute set of the original derivation. -::: note -A package's attributes are evaluated *before* being modified by the `overrideDerivation` function. For example, the `name` attribute reference in `url = "mirror://gnu/hello/${name}.tar.gz";` is filled-in *before* the `overrideDerivation` function modifies the attribute set. This means that overriding the `name` attribute, in this example, *will not* change the value of the `url` attribute. Instead, we need to override both the `name` *and* `url` attributes. +::: {.note} +A package's attributes are evaluated *before* being modified by the `overrideDerivation` function. For example, the `name` attribute reference in `url = "mirror://gnu/hello/${name}.tar.gz";` is filled-in *before* the `overrideDerivation` function modifies the attribute set. This means that overriding the `name` attribute, in this example, *will not* change the value of the `url` attribute. Instead, we need to override both the `name` *and* `url` attributes. ::: ## lib.makeOverridable {#sec-lib-makeOverridable} From adecb00f5a07ce3f5cc97e7ccf5d814f70f6704f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 Jun 2021 21:36:48 +0200 Subject: [PATCH 217/797] doc: Build as CommonMark MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were using Pandoc’s Markdown parser. This is non-standard and might cause issues when we finally switch to some other tool. Since RFC 0072 agreed on CommonMark, let’s switch to that. We will use some extensions to make the limited syntax bearable but these are official so they should be more portable. --- doc/Makefile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 7affbb0bb51..a208ce02f0c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,14 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' -not -name README.md))) +PANDOC ?= pandoc + +pandoc_media_dir = media +# TODO: Remove raw-attribute when we can get rid of DocBook altogether. +pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute +pandoc_flags = --extract-media=$(pandoc_media_dir) \ + --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ + -f commonmark$(pandoc_commonmark_enabled_extensions)+smart + .PHONY: all all: validate format out/html/index.html out/epub/manual.epub @@ -39,7 +48,7 @@ out/html/index.html: doc-support/result manual-full.xml style.css highlightjs mkdir -p out/html/highlightjs/ cp -r highlightjs out/html/ - cp -r media out/html/ + cp -r $(pandoc_media_dir) out/html/ cp ./overrides.css out/html/ cp ./style.css out/html/style.css @@ -54,7 +63,7 @@ out/epub/manual.epub: manual-full.xml doc-support/result/epub.xsl \ ./manual-full.xml - cp -r media out/epub/scratch/OEBPS + cp -r $(pandoc_media_dir) out/epub/scratch/OEBPS cp ./overrides.css out/epub/scratch/OEBPS cp ./style.css out/epub/scratch/OEBPS mkdir -p out/epub/scratch/OEBPS/images/callouts/ @@ -89,16 +98,12 @@ functions/library/generated: doc-support/result ln -rfs ./doc-support/result/function-docs functions/library/generated %.section.xml: %.section.md - pandoc $^ -t docbook \ - --extract-media=media \ - --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ - -f markdown+smart \ + $(PANDOC) $^ -t docbook \ + $(pandoc_flags) \ | cat > $@ %.chapter.xml: %.chapter.md - pandoc $^ -t docbook \ + $(PANDOC) $^ -t docbook \ --top-level-division=chapter \ - --extract-media=media \ - --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ - -f markdown+smart \ + $(pandoc_flags) \ | cat > $@ From 3c78ad2561a831dcbe6e193465f787019638d56b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Jun 2021 13:17:54 +0200 Subject: [PATCH 218/797] doc: Use markdown syntax for xrefs Syntax is taken from MyST: https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing --- doc/Makefile | 1 + .../coding-conventions.chapter.md | 4 ++-- .../contributing-to-documentation.chapter.md | 5 ++++ doc/contributing/quick-start.chapter.md | 2 +- doc/functions/library/attrsets.xml | 4 ++-- doc/labelless-link-is-xref.lua | 24 +++++++++++++++++++ doc/stdenv/cross-compilation.chapter.md | 4 ++-- doc/stdenv/multiple-output.chapter.md | 6 ++--- doc/stdenv/stdenv.chapter.md | 14 +++++------ doc/using/overlays.chapter.md | 2 +- 10 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 doc/labelless-link-is-xref.lua diff --git a/doc/Makefile b/doc/Makefile index a208ce02f0c..85d09f3ddc0 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -7,6 +7,7 @@ pandoc_media_dir = media pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute pandoc_flags = --extract-media=$(pandoc_media_dir) \ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ + --lua-filter=labelless-link-is-xref.lua \ -f commonmark$(pandoc_commonmark_enabled_extensions)+smart .PHONY: all diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 4fa88895484..e42ba512b98 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -6,7 +6,7 @@ - Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use `(setq-default indent-tabs-mode nil)` in Emacs. Everybody has different tab settings so it’s asking for trouble. -- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in . +- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [](#sec-package-naming). - Function calls with attribute set arguments are written as @@ -209,7 +209,7 @@ There are a few naming guidelines: - Dashes in the package name _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names. -- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c-0-9` and `json-c-0-11`. If there is an obvious “default” version, make an attribute like `json-c = json-c-0-9;`. See also +- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c-0-9` and `json-c-0-11`. If there is an obvious “default” version, make an attribute like `json-c = json-c-0-9;`. See also [](#sec-versioning) ## File naming and organisation {#sec-organisation} diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 44feac7fbf7..2f7ae32259c 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -47,6 +47,11 @@ Additionally, the following syntax extensions are currently used: - []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`. ``` +- []{#ssec-contributing-markup-automatic-links} + If you **omit a link text** for a link pointing to a section, the text will be substituted automatically. For example, `[](#chap-contributing)` will result in [](#chap-contributing). + + This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing). + - []{#ssec-contributing-markup-admonitions} **Admonitions**, set off from the text to bring attention to something. diff --git a/doc/contributing/quick-start.chapter.md b/doc/contributing/quick-start.chapter.md index 85c3897221e..96b30d3822c 100644 --- a/doc/contributing/quick-start.chapter.md +++ b/doc/contributing/quick-start.chapter.md @@ -9,7 +9,7 @@ To add a package to Nixpkgs: $ cd nixpkgs ``` -2. Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into `pkgs/development/libraries/pkgname`, while a web browser goes into `pkgs/applications/networking/browsers/pkgname`. See for some hints on the tree organisation. Create a directory for your package, e.g. +2. Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into `pkgs/development/libraries/pkgname`, while a web browser goes into `pkgs/applications/networking/browsers/pkgname`. See [](#sec-organisation) for some hints on the tree organisation. Create a directory for your package, e.g. ```ShellSession $ mkdir pkgs/development/libraries/libfoo diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 912d6d47798..ef132514da1 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -166,7 +166,7 @@ lib.attrsets.setAttrByPath [ "a" "b" ] 3 - Like except without a default, and it will throw if the value doesn't exist. + Like [](#function-library-lib.attrsets.attrByPath) except without a default, and it will throw if the value doesn't exist. @@ -1480,7 +1480,7 @@ lib.attrsets.zipAttrsWith - Merge sets of attributes and combine each attribute value in to a list. Similar to where the merge function returns a list of all values. + Merge sets of attributes and combine each attribute value in to a list. Similar to [](#function-library-lib.attrsets.zipAttrsWith) where the merge function returns a list of all values. diff --git a/doc/labelless-link-is-xref.lua b/doc/labelless-link-is-xref.lua new file mode 100644 index 00000000000..67569b02091 --- /dev/null +++ b/doc/labelless-link-is-xref.lua @@ -0,0 +1,24 @@ +local function starts_with(start, str) + return str:sub(1, #start) == start +end + +local function escape_xml_arg(arg) + amps = arg:gsub('&', '&') + amps_quotes = amps:gsub('"', '"') + amps_quotes_lt = amps_quotes:gsub('<', '<') + + return amps_quotes_lt +end + +function Link(elem) + has_no_content = #elem.content == 0 + targets_anchor = starts_with('#', elem.target) + has_no_attributes = elem.title == '' and elem.identifier == '' and #elem.classes == 0 and #elem.attributes == 0 + + if has_no_content and targets_anchor and has_no_attributes then + -- xref expects idref without the pound-sign + target_without_hash = elem.target:sub(2, #elem.target) + + return pandoc.RawInline('docbook', '') + end +end diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index b27e9cc6fea..53522962a5c 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -65,7 +65,7 @@ The exact schema these fields follow is a bit ill-defined due to a long and conv ### Theory of dependency categorization {#ssec-cross-dependency-categorization} ::: {.note} -This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to `mkDerivation`, see . For a description of how everything is implemented, see . +This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to `mkDerivation`, see [](#ssec-stdenv-dependencies). For a description of how everything is implemented, see [](#ssec-cross-dependency-implementation). ::: In this section we explore the relationship between both runtime and build-time dependencies and the 3 Autoconf platforms. @@ -158,7 +158,7 @@ One would think that `localSystem` and `crossSystem` overlap horribly with the t ### Implementation of dependencies {#ssec-cross-dependency-implementation} -The categories of dependencies developed in are specified as lists of derivations given to `mkDerivation`, as documented in . In short, each list of dependencies for "host → target" of "foo → bar" is called `depsFooBar`, with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `depsFooBar` is automatically taken from `pkgsFooBar`. (These `pkgsFooBar`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time. +The categories of dependencies developed in [](#ssec-cross-dependency-categorization) are specified as lists of derivations given to `mkDerivation`, as documented in [](#ssec-stdenv-dependencies). In short, each list of dependencies for "host → target" of "foo → bar" is called `depsFooBar`, with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `depsFooBar` is automatically taken from `pkgsFooBar`. (These `pkgsFooBar`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time. Now, for most of Nixpkgs's history, there were no `pkgsFooBar` attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just `buildPackages`, `pkgs`, and `targetPackages`. Those are now redefined as aliases to `pkgsBuildHost`, `pkgsHostTarget`, and `pkgsTargetTarget`. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant. diff --git a/doc/stdenv/multiple-output.chapter.md b/doc/stdenv/multiple-output.chapter.md index b8414614279..d04f83302ac 100644 --- a/doc/stdenv/multiple-output.chapter.md +++ b/doc/stdenv/multiple-output.chapter.md @@ -38,7 +38,7 @@ $ nix-env -iA nixpkgs.coreutils.info installs the `"out"` output (`coreutils.meta.outputsToInstall` is `[ "out" ]`) instead of the requested `"info"`. ::: -The only recourse to select an output with `nix-env` is to override the package’s `meta.outputsToInstall`, using the functions described in . For example, the following overlay adds the `"info"` output for the `coreutils` package: +The only recourse to select an output with `nix-env` is to override the package’s `meta.outputsToInstall`, using the functions described in [](#chap-overrides). For example, the following overlay adds the `"info"` output for the `coreutils` package: ```nix self: super: @@ -53,7 +53,7 @@ self: super: In the Nix language the individual outputs can be reached explicitly as attributes, e.g. `coreutils.info`, but the typical case is just using packages as build inputs. -When a multiple-output derivation gets into a build input of another derivation, the `dev` output is added if it exists, otherwise the first output is added. In addition to that, `propagatedBuildOutputs` of that package which by default contain `$outputBin` and `$outputLib` are also added. (See .) +When a multiple-output derivation gets into a build input of another derivation, the `dev` output is added if it exists, otherwise the first output is added. In addition to that, `propagatedBuildOutputs` of that package which by default contain `$outputBin` and `$outputLib` are also added. (See [](#multiple-output-file-type-groups).) In some cases it may be desirable to combine different outputs under a single store path. A function `symlinkJoin` can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.) @@ -70,7 +70,7 @@ outputs = [ "bin" "dev" "out" "doc" ]; Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main `out` output, as it catches any files that didn’t get elsewhere. ::: {.note} -There is a special handling of the `debug` output, described at . +There is a special handling of the `debug` output, described at [](#stdenv-separateDebugInfo). ::: ### “Binaries first” {#multiple-output-file-binaries-first-convention} diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 71eb991bbae..4daeaf7c8c2 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -39,9 +39,9 @@ stdenv.mkDerivation { } ``` -This attribute ensures that the `bin` subdirectories of these packages appear in the `PATH` environment variable during the build, that their `include` subdirectories are searched by the C compiler, and so on. (See for details.) +This attribute ensures that the `bin` subdirectories of these packages appear in the `PATH` environment variable during the build, that their `include` subdirectories are searched by the C compiler, and so on. (See [](#ssec-setup-hooks) for details.) -Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of *phases*, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see .) For instance, a package that doesn’t supply a makefile but instead has to be compiled "manually" could be handled like this: +Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of *phases*, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see [](#sec-stdenv-phases).) For instance, a package that doesn’t supply a makefile but instead has to be compiled "manually" could be handled like this: ```nix stdenv.mkDerivation { @@ -59,7 +59,7 @@ stdenv.mkDerivation { (Note the use of `''`-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of `"` and `\`, and because indentation is intelligently removed.) -There are many other attributes to customise the build. These are listed in . +There are many other attributes to customise the build. These are listed in [](#ssec-stdenv-attributes). While the standard environment provides a generic builder, you can still supply your own build script: @@ -116,9 +116,9 @@ On Linux, `stdenv` also includes the `patchelf` utility. ## Specifying dependencies {#ssec-stdenv-dependencies} -As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See for details. +As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See [](#ssec-setup-hooks) for details. -Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case. +Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see [](#chap-cross) for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case. The extension of `PATH` with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation’s build platform i.e. dependencies which run on the platform where the new derivation will be built. [^footnote-stdenv-native-dependencies-in-path] For each dependency \ of those dependencies, `dep/bin`, if present, is added to the `PATH` environment variable. @@ -911,7 +911,7 @@ This verifies that no references are left from the install binaries to the direc ### `multiple-outputs.sh` {#multiple-outputs.sh} -This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See for more information. +This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See [](#chap-multiple-output) for more information. ### `move-sbin.sh` {#move-sbin.sh} @@ -991,7 +991,7 @@ Creates a temporary package database and registers every Haskell build input in ### GNOME platform {#gnome-platform} -Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in . +Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in [](#sec-language-gnome). ### autoPatchelfHook {#setup-hook-autopatchelfhook} diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index 537d031bcdb..037580583b6 100644 --- a/doc/using/overlays.chapter.md +++ b/doc/using/overlays.chapter.md @@ -63,7 +63,7 @@ The second argument (`super`) corresponds to the result of the evaluation of the The value returned by this function should be a set similar to `pkgs/top-level/all-packages.nix`, containing overridden and/or new packages. -Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in. Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. +Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in [](#sec-modify-via-packageOverrides). Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. ## Using overlays to configure alternatives {#sec-overlays-alternatives} From 91fc48660666442120e014cf23c22c7d546fcf76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 21:05:31 +0200 Subject: [PATCH 219/797] python3Packages.pyhomematic: 0.1.72 -> 0.1.73 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 9bfa814894d..2784719ff12 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.72"; + version = "0.1.73"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a1d44103b90418d9c8cde4699a1c671d57d12469be23a45e93bfc00df28ef11b"; + sha256 = "sha256-KaeheCIJgAqC68rgE71b1sSatSH25phGk662fnuOOsk="; }; checkPhase = '' From 7d2e8e20439cc12718d4bbd9f30cbfa95cc2ea2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 23:38:30 +0000 Subject: [PATCH 220/797] bslizr: 1.2.14 -> 1.2.16 --- pkgs/applications/audio/bslizr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index 743f1080854..df81e0960b3 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bslizr"; - version = "1.2.14"; + version = "1.2.16"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BSlizr"; rev = version; - sha256 = "sha256-dut3I68tJWQH+X6acKROqb5HywufeBQ4/HkXFKsA3hY="; + sha256 = "sha256-5DvVkTz79CLvZMZ3XnI0COIfxnhERDSvzbVoJAcqNRI="; }; nativeBuildInputs = [ pkg-config ]; From bb2d32cab8ede34394774e9af6972970744c26cc Mon Sep 17 00:00:00 2001 From: Jeffrey Lau Date: Wed, 24 Feb 2021 19:02:23 +0800 Subject: [PATCH 221/797] rnp: init at 0.15.1 --- pkgs/tools/security/rnp/default.nix | 56 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/tools/security/rnp/default.nix diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix new file mode 100644 index 00000000000..3c60190f128 --- /dev/null +++ b/pkgs/tools/security/rnp/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, asciidoctor +, botan2 +, bzip2 +, cmake +, fetchFromGitHub +, gnupg +, gtest +, json_c +, pkg-config +, python3 +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rnp"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "rnpgp"; + repo = "rnp"; + rev = "v${version}"; + sha256 = "1l7y99rcss5w24lil6nqwr0dzh2jvq0qxmdvq7j5yx3fdssd5xsv"; + }; + + buildInputs = [ zlib bzip2 json_c botan2 ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DBUILD_SHARED_LIBS=on" + "-DBUILD_TESTING=on" + "-DDOWNLOAD_GTEST=off" + "-DDOWNLOAD_RUBYRNP=off" + ]; + + nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ]; + + # NOTE: check-only inputs should ideally be moved to checkInputs, but it + # would fail during buildPhase. + # checkInputs = [ gtest python3 ]; + + outputs = [ "out" "lib" "dev" ]; + + preConfigure = '' + echo "v${version}" > version.txt + ''; + + meta = with lib; { + homepage = "https://github.com/rnpgp/rnp"; + description = "High performance C++ OpenPGP library, fully compliant to RFC 4880"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ ribose-jeffreylau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19cbe826b9f..b05a700c9e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8314,6 +8314,8 @@ in rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnp = callPackage ../tools/security/rnp { }; + rnv = callPackage ../tools/text/xml/rnv { }; rosie = callPackage ../tools/text/rosie { }; From 26c487ee9941f0771f47f90f326c7f4a81e2d335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 5 Jun 2021 11:53:34 +0200 Subject: [PATCH 222/797] nixos-rebuild: document override-input --- nixos/doc/manual/man-nixos-rebuild.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index a5ea81bcdab..2e1069828c1 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -91,6 +91,10 @@ flake-uri + + input-name flake-uri + + From eb09c6f9530987a76e4d7961414b5dbfe4c42f05 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 6 Jun 2021 13:29:42 +0800 Subject: [PATCH 223/797] navit: remove --- .../misc/navit/CMakeLists.txt.patch | 13 --- pkgs/applications/misc/navit/default.nix | 90 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 pkgs/applications/misc/navit/CMakeLists.txt.patch delete mode 100644 pkgs/applications/misc/navit/default.nix diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/pkgs/applications/misc/navit/CMakeLists.txt.patch deleted file mode 100644 index 7f8a75f319b..00000000000 --- a/pkgs/applications/misc/navit/CMakeLists.txt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 763f75b..defa74a 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H) - CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) - CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H) - CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND) --CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD) -+CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD) - CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET) - CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM) - CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix deleted file mode 100644 index c041c296927..00000000000 --- a/pkgs/applications/misc/navit/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, fontconfig, freetype, imlib2 -, SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib -, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango -, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc -, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper -, qtquickcontrols, qtmultimedia, qtspeech, qtsensors -, qtlocation, qtdeclarative, qtsvg -, qtSupport ? false, qtbase #need to fix qt_qpainter -, sdlSupport ? true, SDL -, xkbdSupport ? true, xkbd -, espeakSupport ? true, espeak -, postgresqlSupport ? false, postgresql -, speechdSupport ? false, speechd ? null -}: - -assert speechdSupport -> speechd != null; - -with lib; -stdenv.mkDerivation rec { - pname = "navit"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "navit-gps"; - repo = "navit"; - rev = "v${version}"; - sha256 = "071drvqzxpxbfh0lf0lra5a97rv8ny40l96n9xl0dx0s8w30j61i"; - }; - - sample_map = fetchurl { - url = "http://www.navit-project.org/maps/osm_bbox_11.3,47.9,11.7,48.2.osm.bz2"; - name = "sample_map.bz2"; - sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d"; - }; - - patches = [ ./CMakeLists.txt.patch ]; - - NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL" - ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"); - - # we choose only cmdline and speech-dispatcher speech options. - # espeak builtins is made for non-cmdline OS as winCE - cmakeFlags = [ - "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=Release" - "-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE" - ]; - - buildInputs = [ - gtk2 fontconfig freetype imlib2 libGLU libGL freeimage - libxslt libXmu freeglut python gettext quesoglc gd - fribidi pcre dbus dbus-glib librsvg shapelib glib - cairo gdk-pixbuf pango atk - ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ] - ++ optional postgresqlSupport postgresql - ++ optional speechdSupport speechd - ++ optionals qtSupport [ - qtquickcontrols qtmultimedia qtspeech qtsensors - qtbase qtlocation qtdeclarative qtsvg - ]; - - nativeBuildInputs = [ makeWrapper pkg-config cmake patchelf bzip2 ]; - - # we dont want blank screen by defaut - postInstall = '' - # emulate DSAMPLE_MAP - mkdir -p $out/share/navit/maps/ - bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin" - ''; - - # TODO: fix upstream? - libPath = lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); - postFixup = - '' - find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \; - - wrapProgram $out/bin/navit \ - --prefix PATH : ${makeBinPath ( - optional xkbdSupport xkbd - ++ optional espeakSupport espeak - ++ optional speechdSupport speechd ) } - ''; - - meta = { - homepage = "https://www.navit-project.org"; - description = "Car navigation system with routing engine using OSM maps"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 89553642a2d..9415b6e24ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -482,6 +482,7 @@ mapAliases ({ mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 mysqlWorkbench = mysql-workbench; # added 2017-01-19 nagiosPluginsOfficial = monitoring-plugins; + navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07 ncat = nmap; # added 2016-01-26 netcat-openbsd = libressl.nc; # added 2018-04-25 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfdcf9bfe78..0e413d51eab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25657,8 +25657,6 @@ in navipowm = callPackage ../applications/misc/navipowm { }; - navit = libsForQt5.callPackage ../applications/misc/navit { }; - netbeans = callPackage ../applications/editors/netbeans { jdk = jdk11; }; From fc26b9020f4964ba7aa613651e114faa0f33107c Mon Sep 17 00:00:00 2001 From: illustris Date: Mon, 7 Jun 2021 11:06:21 +0530 Subject: [PATCH 224/797] chia: 1.1.5 -> 1.1.7 --- pkgs/applications/blockchains/chia/default.nix | 5 +++-- pkgs/development/python-modules/chiapos/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 09fe6d1b2dd..22bb3d445ad 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "ZUxWOlJGQpeQCtWt0PSdcbMackHdeuNFkxHvYDPcU8Y="; + sha256 = "05hcckkv3vhz172w9kp5lh4srakizx1l383dijs50vgx2bj30m8v"; }; patches = [ @@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography + dnspython keyrings-cryptfile pyyaml setproctitle diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 1faf5a94f8c..e0a86f499a2 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kJx57EtwPBrGMpjnSzeYYhWqc/g1N1Bg8slW5oZKjg8="; + sha256 = "09mwj9m9rcvcb3zn6v2xykgd4a9lpwl6c86nwl8d1iqr82gb5hb5"; }; patches = [ From 489c958e02db31793a73077ba2f0753d78d2685c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 7 Jun 2021 02:04:31 -0400 Subject: [PATCH 225/797] pythonPackages.lhapdf: init --- pkgs/development/libraries/physics/lhapdf/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 19e9f9d9ec8..143f72541b4 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2, makeWrapper }: +{ lib, stdenv, fetchurl, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python2 ]; + buildInputs = [ python ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35935450e2a..c6d4128719f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3840,6 +3840,10 @@ in { lexid = callPackage ../development/python-modules/lexid { }; + lhapdf = toPythonModule (pkgs.lhapdf.override { + inherit python; + }); + libagent = callPackage ../development/python-modules/libagent { }; pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; From 60331927f09a3f93803ab73a128a27cb780a9527 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 7 Jun 2021 02:05:20 -0400 Subject: [PATCH 226/797] lhapdf: build against python3 by default --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19cbe826b9f..3ffeecb2d40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30211,7 +30211,9 @@ in herwig = callPackage ../development/libraries/physics/herwig { }; - lhapdf = callPackage ../development/libraries/physics/lhapdf { }; + lhapdf = callPackage ../development/libraries/physics/lhapdf { + python = python3; + }; mela = callPackage ../development/libraries/physics/mela { }; From 99fcca7b6bc850e1c1c47e9fbad41fc3264170f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 7 Jun 2021 08:34:38 +0200 Subject: [PATCH 227/797] nixos/gnome: fix option label It is no longer GNOME 3. --- nixos/modules/services/x11/desktop-managers/gnome.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 2b2ee019aeb..b0859321a52 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -180,7 +180,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable Gnome 3 desktop manager."; + description = "Enable GNOME desktop manager."; }; sessionPath = mkOption { @@ -283,7 +283,7 @@ in (mkIf (cfg.enable || flashbackEnabled) { # Seed our configuration into nixos-generate-config system.nixos-generate-config.desktopConfiguration = ['' - # Enable the GNOME 3 Desktop Environment. + # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; '']; From 565cc2a0db6b14a90a8ee946dd7ea7f1388647f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 08:58:31 +0200 Subject: [PATCH 228/797] python3Packages.pyspnego: init at 0.1.6 --- .../python-modules/pyspnego/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/pyspnego/default.nix diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix new file mode 100644 index 00000000000..2f8e775e340 --- /dev/null +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pyspnego"; + version = "0.1.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jborean93"; + repo = pname; + rev = "v${version}"; + sha256 = "0pfh2x0539f0k2qi2pbjm64b2fqp64c63xxpinvg1yfaw915kgpb"; + }; + + propagatedBuildInputs = [ + cryptography + ]; + + checkInputs = [ + glibcLocales + pytest-mock + pytestCheckHook + ]; + + LC_ALL = "en_US.UTF-8"; + + pythonImportsCheck = [ "spnego" ]; + + meta = with lib; { + description = "Python SPNEGO authentication library"; + homepage = "Python SPNEGO authentication library"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9ba0532782..4d89276911c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6334,6 +6334,8 @@ in { pyspinel = callPackage ../development/python-modules/pyspinel { }; + pyspnego = callPackage ../development/python-modules/pyspnego { }; + pyspotify = callPackage ../development/python-modules/pyspotify { }; pysptk = callPackage ../development/python-modules/pysptk { }; From 52b3e47413be15d9798e78ef44d71e126f85c209 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 09:01:49 +0200 Subject: [PATCH 229/797] python3Packages.smbprotocol: init at 1.5.1 --- .../python-modules/smbprotocol/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/smbprotocol/default.nix diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix new file mode 100644 index 00000000000..517acd6f9cc --- /dev/null +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pyspnego +, pytest-mock +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "smbprotocol"; + version = "1.5.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jborean93"; + repo = pname; + rev = "v${version}"; + sha256 = "1ym0fvljbwgl1h7f63m3psbsvqm64fipsrrmbqb97hrhfdzxqxpa"; + }; + + propagatedBuildInputs = [ + cryptography + pyspnego + six + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "smbprotocol" ]; + + meta = with lib; { + description = "Python SMBv2 and v3 Client"; + homepage = "https://github.com/jborean93/smbprotocol"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d89276911c..cd657f8656c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7713,6 +7713,8 @@ in { smartypants = callPackage ../development/python-modules/smartypants { }; + smbprotocol = callPackage ../development/python-modules/smbprotocol { }; + smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; From 8d062c0eabcdd4cabaec739097d7bd8a3aec436a Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Mon, 7 Jun 2021 09:46:16 +0200 Subject: [PATCH 230/797] jotta-cli: 0.9.39536 -> 0.11.44593 --- pkgs/applications/misc/jotta-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index b34661e6eb8..08ca6563014 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.9.39536"; + version = "0.11.44593"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-JZtc6Si3ZQoRG3q+ctzPPQm7WbMYRailIuq/Y5Avd2s="; + sha256 = "1f06zmcpvm0f3phwc43ai6v4ykhkrd4f3br2j89nx9bfmj6ss2ic"; stripRoot = false; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad - $out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash + $out/bin/jotta-cli completion bash > $out/share/bash-completion/completions/jotta-cli.bash ''; meta = with lib; { From 9c0581a47afcaaf39db3c0be04553222d10b862a Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Mon, 24 May 2021 23:31:48 +0200 Subject: [PATCH 231/797] python3Modules.mahotas: 1.4.10 -> 1.4.11 also updates tests from nose to pytest --- .../python-modules/mahotas/default.nix | 30 +++++--- .../mahotas/disable-impure-tests.patch | 76 ------------------- 2 files changed, 20 insertions(+), 86 deletions(-) delete mode 100644 pkgs/development/python-modules/mahotas/disable-impure-tests.patch diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 818ff459985..707ad9f3c8f 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -1,26 +1,36 @@ -{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, lib, stdenv }: +{ buildPythonPackage, fetchFromGitHub, pillow, scipy, numpy, pytestCheckHook, imread, freeimage, lib, stdenv }: buildPythonPackage rec { pname = "mahotas"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "0fjiyl82wj1a6xzr9mss2y2rydl4zchl2cbdbg0jm0fcrs99q4hw"; + sha256 = "029gvy1fb855pvxvy8zwj44k4s7qpqi0161bg5wldfiprrysn1kw"; }; - # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed - patches = [ ./disable-impure-tests.patch ]; + propagatedBuildInputs = [ numpy imread pillow scipy freeimage ]; + checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ numpy imread pillow scipy ]; - checkInputs = [ nose ]; - - checkPhase= '' - python setup.py test + postPatch = '' + substituteInPlace mahotas/io/freeimage.py --replace "/opt/local/lib" "${freeimage}/lib" ''; + # tests must be run in the build directory + preCheck = '' + cd build/lib* + ''; + + # re-enable as soon as https://github.com/luispedro/mahotas/issues/97 is fixed + disabledTests = [ + "test_colors" + "test_ellipse_axes" + "test_normalize" + "test_haralick3d" + ]; + disabled = stdenv.isi686; # Failing tests meta = with lib; { diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch deleted file mode 100644 index f19bd329e66..00000000000 --- a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/mahotas/tests/test_colors.py b/mahotas/tests/test_colors.py -index 8a8183b..0d34c9f 100644 ---- a/mahotas/tests/test_colors.py -+++ b/mahotas/tests/test_colors.py -@@ -2,7 +2,9 @@ import mahotas - import numpy as np - from mahotas.tests.utils import luispedro_jpg - from mahotas.colors import rgb2xyz, rgb2lab, xyz2rgb, rgb2grey, rgb2sepia -+from nose.tools import nottest - -+@nottest - def test_colors(): - f = luispedro_jpg() - lab = rgb2lab(f) -diff --git a/mahotas/tests/test_features_shape.py b/mahotas/tests/test_features_shape.py -index 462f467..2381793 100644 ---- a/mahotas/tests/test_features_shape.py -+++ b/mahotas/tests/test_features_shape.py -@@ -2,6 +2,7 @@ import mahotas.features.shape - import numpy as np - import mahotas as mh - from mahotas.features.shape import roundness, eccentricity -+from nose.tools import nottest - - def test_eccentricity(): - D = mh.disk(32, 2) -@@ -29,6 +30,7 @@ def test_zeros(): - I[8:4:12] = 1 - assert eccentricity(I) == 0 - -+@nottest - def test_ellipse_axes(): - Y,X = np.mgrid[:1024,:1024] - Y = Y/1024. -diff --git a/mahotas/tests/test_moments.py b/mahotas/tests/test_moments.py -index 686c7c3..ba3487b 100644 ---- a/mahotas/tests/test_moments.py -+++ b/mahotas/tests/test_moments.py -@@ -1,6 +1,7 @@ - import numpy as np - import mahotas as mh - from mahotas.features.moments import moments -+from nose.tools import nottest - - def _slow(A, p0, p1, cm): - c0,c1 = cm -@@ -28,7 +29,7 @@ def test_against_slow(): - yield perform, 1, 2, (0, 0), A - yield perform, 1, 0, (0, 0), A - -- -+@nottest - def test_normalize(): - A,B = np.meshgrid(np.arange(128),np.arange(128)) - for p0,p1 in [(1,1), (1,2), (2,1), (2,2)]: -diff --git a/mahotas/tests/test_texture.py b/mahotas/tests/test_texture.py -index 7e101ba..af1305d 100644 ---- a/mahotas/tests/test_texture.py -+++ b/mahotas/tests/test_texture.py -@@ -2,7 +2,7 @@ import numpy as np - from mahotas.features import texture - import mahotas as mh - import mahotas.features._texture --from nose.tools import raises -+from nose.tools import raises, nottest - - def test__cooccurence(): - cooccurence = mahotas.features._texture.cooccurence -@@ -149,6 +149,7 @@ def test_float_haralick(): - A[2,2]=12 - texture.haralick(A) - -+@nottest - def test_haralick3d(): - np.random.seed(22) - img = mahotas.stretch(255*np.random.rand(20,20,4)) From 7fa45ea707d5f30a2823c8de595e5fa6a3611d9e Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Mon, 7 Jun 2021 14:12:53 +0530 Subject: [PATCH 232/797] xplr: 0.13.1 -> 0.14.0 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 6bd2c60b09b..fbd48287e32 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.13.1"; + version = "0.14.0"; src = fetchCrate { inherit pname version; - sha256 = "1aanw0l8b4ak0kikkixmb817qw48ypviq9dxdivzwc29rjvgp152"; + sha256 = "1cyybqb91n91h6nig7rxxxw9c7krz80jdfl25bdr7mlbzymssn0q"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "16iaj1pqvqwi0rq4k3lmqwd8skbjf55133ri69hj26gz88k4q43w"; + cargoSha256 = "1bj1rgsmkbby4ma325fhpb911bwabhd5bihyv9j0dfvgm1ffdm8a"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From 98f07d6cc5954d82d22ca40cba6fab69003d41d6 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 4 Jun 2021 18:08:09 +0200 Subject: [PATCH 233/797] nixos/grafana: Filter out duplicate plugins If the same plugin appears multiple times in `declarativePlugins`, for example due to being added both by a module and in user config, the build fails with an error message similar to ln: failed to create symbolic link 'grafana-worldmap-panel/glmqcj88zk2bz3mvdr3r7920wxg02qnq-grafana-worldmap-panel-0.3.2': Permission denied This is solved by removing all duplicates. --- nixos/modules/services/monitoring/grafana.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 4ebde6f9b10..1dd740014fa 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -337,11 +337,16 @@ in { defaultText = "pkgs.grafana"; type = types.package; }; + declarativePlugins = mkOption { type = with types; nullOr (listOf path); default = null; description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed."; example = literalExample "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]"; + # Make sure each plugin is added only once; otherwise building + # the link farm fails, since the same path is added multiple + # times. + apply = x: if isList x then lib.unique x else x; }; dataDir = mkOption { From 41387135ddb01d84049d1931292cacabbde54a34 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 4 Jun 2021 18:19:04 +0200 Subject: [PATCH 234/797] nixos/grafana: Add error handling to service script Without this, the services starts even if files are missing or prerequisite commands fail, which can lead to incorrect initial state. --- nixos/modules/services/monitoring/grafana.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 1dd740014fa..b243e24591e 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -640,20 +640,28 @@ in { QT_QPA_PLATFORM = "offscreen"; } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; script = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + ${optionalString (cfg.auth.google.clientSecretFile != null) '' - export GF_AUTH_GOOGLE_CLIENT_SECRET="$(cat ${escapeShellArg cfg.auth.google.clientSecretFile})" + GF_AUTH_GOOGLE_CLIENT_SECRET="$(<${escapeShellArg cfg.auth.google.clientSecretFile})" + export GF_AUTH_GOOGLE_CLIENT_SECRET ''} ${optionalString (cfg.database.passwordFile != null) '' - export GF_DATABASE_PASSWORD="$(cat ${escapeShellArg cfg.database.passwordFile})" + GF_DATABASE_PASSWORD="$(<${escapeShellArg cfg.database.passwordFile})" + export GF_DATABASE_PASSWORD ''} ${optionalString (cfg.security.adminPasswordFile != null) '' - export GF_SECURITY_ADMIN_PASSWORD="$(cat ${escapeShellArg cfg.security.adminPasswordFile})" + GF_SECURITY_ADMIN_PASSWORD="$(<${escapeShellArg cfg.security.adminPasswordFile})" + export GF_SECURITY_ADMIN_PASSWORD ''} ${optionalString (cfg.security.secretKeyFile != null) '' - export GF_SECURITY_SECRET_KEY="$(cat ${escapeShellArg cfg.security.secretKeyFile})" + GF_SECURITY_SECRET_KEY="$(<${escapeShellArg cfg.security.secretKeyFile})" + export GF_SECURITY_SECRET_KEY ''} ${optionalString (cfg.smtp.passwordFile != null) '' - export GF_SMTP_PASSWORD="$(cat ${escapeShellArg cfg.smtp.passwordFile})" + GF_SMTP_PASSWORD="$(<${escapeShellArg cfg.smtp.passwordFile})" + export GF_SMTP_PASSWORD ''} ${optionalString cfg.provision.enable '' export GF_PATHS_PROVISIONING=${provisionConfDir}; From bfa0dbbcc5ac2dfc1bf05d04d67ac54f698cfab4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 11:07:08 +0200 Subject: [PATCH 235/797] python3Packages.mypy-boto3-s3: 1.17.71 -> 1.17.88 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index af97c5e103f..bbbcc5a1492 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.17.71"; + version = "1.17.88"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn"; + sha256 = "sha256-ba7ohsScaag3tDnUbs1eWYO/YSWcgJlo9VpkdU40x5o="; }; propagatedBuildInputs = [ From 2094feb2e74deaf8edab85f31e7d8c2cccaf4f5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 11:07:11 +0200 Subject: [PATCH 236/797] python3Packages.mypy-boto3-builder: 4.12.0 -> 4.14.1 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 860646af9c6..0c871c90a3a 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "4.12.0"; + version = "4.14.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9"; + sha256 = "sha256-y55bPi70ldd528Olr2atXHm5JHiLNBZ396D9qwbBmkc="; }; propagatedBuildInputs = [ From 2b55f2a4383a6b269de43222dbc996b103563910 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 11:07:13 +0200 Subject: [PATCH 237/797] python3Packages.botocore: 1.20.52 -> 1.20.88 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index f34cc34334d..a3c77e1fab7 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.52"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.88"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-3V9YCOxIqZm5Y0s4etarehojuh+XEqh1Bm0jSAj4qmI="; + sha256 = "sha256-vJie2rUtR4iq3Y0a/5JfXGp8vGiQC/2443mWWurBcxc="; }; propagatedBuildInputs = [ From 037ce7a2fec73709c31051c7e2906e2a453801f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 11:07:16 +0200 Subject: [PATCH 238/797] python3Packages.boto3: 1.17.52 -> 1.17.88 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index afeefbdf55b..73cb44d0811 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.52"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.88"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-7WQMF8l68om+RpN0DBy/laRW6cSV45c6Htb1GjloRtI="; + sha256 = "sha256-pxXKbERX1W6j4+/em9yL5BwpsvKpBPvRK+/bnLXiieQ="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From df67ba8d83f27df262666282831c51d2b8fe5cbc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 11:07:43 +0200 Subject: [PATCH 239/797] awscli: 1.19.52 -> 1.19.88 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index c5b426e463b..885aaaa1214 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.52"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.88"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-keKyuNeDC/90pn89KjoDTO8AGsmI8nqfDNSeGyM6iHQ="; + sha256 = "sha256-LfWSE3dDTJ0BHcaaY49Nd9RAZgj5b++NFeYhkIfwQX0="; }; # https://github.com/aws/aws-cli/issues/4837 From 331a820362f3c9f336ced205ec1563bebe48aaf9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 11:14:11 +0200 Subject: [PATCH 240/797] python3Packages.s3transfer: 0.3.6 -> 0.4.2 --- pkgs/development/python-modules/s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 0ef7378fbf6..e41e4165b9c 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.3.6"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; }; propagatedBuildInputs = From efef092ba59259fb2654038bbd952baca5c8bab7 Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Fri, 4 Jun 2021 14:47:23 +0200 Subject: [PATCH 241/797] firefox-bin: Avoid including both the wrapped and unwrapped version when using nix run command. In order to make the man pages accessible, the previous code used nix-support/propagated-user-env-packages. However this file is also used to set the PATH when the application is executed with `nix run`, thus including the wrapped and the wrappee in the environment. Having the wrappee enumerated first in the environment caused `firefox` to default to the wrappee, and as such not being able to find a proper GTK. This was a source of failures while opening a file-picker. This change removes the code to propagate the wrappe in the environment, as the man pages are already linked in the wrapper output. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 793e8688a5f..13becfc4f62 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -303,10 +303,6 @@ let ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/* done - # For manpages, in case the program supplies them - mkdir -p $out/nix-support - echo ${browser} > $out/nix-support/propagated-user-env-packages - ######################### # # From 6b434d06a88112ed0dc7fa96375df603eaf1b0ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Jun 2021 09:47:42 +0000 Subject: [PATCH 242/797] dua: 2.12.1 -> 2.12.2 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index a7de0183b67..4090a0f5051 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.12.1"; + version = "2.12.2"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-ZJCixDh2+H+G+lVgxw9H61Xy4hMg+3MbhI+e7sU4GQU="; + sha256 = "sha256-0w9RKkoKWwPrVLkQieL69HIsSWbqS0vQesi7yijwXRw="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-rwgvyfjCBPe20xN6gNXBexjN/BwNhZjT1RtabKhCkJs="; + cargoSha256 = "sha256-JqOblCWJSKuTzE4XQzk5nCQL7NIwC5ZDhue1HA7JdzA="; doCheck = false; From 4317137dc88cef5d83798022a21b3feab24ae1db Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 7 Jun 2021 12:53:08 +0200 Subject: [PATCH 243/797] openimagedenoise: 1.3.0 -> 1.4.0 --- pkgs/development/libraries/openimagedenoise/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 61ffdcbb5ca..6547c321db7 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.3.0"; + version = "1.4.0"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-ls0F2D5pC+wqhQn1Zh8m8Q/KoK7rAkhKatTY9k+letQ="; + sha256 = "sha256-UsiZT3ufRVo1BQ/md/A3CXpUfMPrJR1DhZg9hrjOG2A="; }; nativeBuildInputs = [ cmake python3 ispc ]; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.leshainc ]; platforms = platforms.unix; + changelog = "https://github.com/OpenImageDenoise/oidn/blob/v${version}/CHANGELOG.md"; }; } From 04bdefc4b8ed0f563d0c3217e4b4930e6c11367a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Jun 2021 22:37:29 -0700 Subject: [PATCH 244/797] stdenv/native: fix bintools import --- pkgs/stdenv/native/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 010b4141e87..87862b84bc1 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -132,7 +132,7 @@ in inherit lib nativePrefix; bintools = import ../../build-support/bintools-wrapper { name = "bintools"; - inherit stdenvNoCC nativePrefix; + inherit lib stdenvNoCC nativePrefix; nativeTools = true; nativeLibc = true; }; From 8788cf16cd322bceb5f006bb3ff1f1cb1a80a991 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 5 Jun 2021 11:34:30 -0300 Subject: [PATCH 245/797] ocamlPackages.csexp: 1.4.0 -> 1.5.1 --- .../ocaml-modules/csexp/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 4bb83019dc5..664d9a773ab 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -2,23 +2,24 @@ buildDunePackage rec { pname = "csexp"; - version = "1.4.0"; - - useDune2 = true; - - minimumOCamlVersion = "4.02.3"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; - sha256 = "sha256-jj1vyofxAqEm3ui3KioNFG8QQ5xHIY38FJ1Rvz7fNk4="; + sha256 = "sha256-1gXkBl+pCliABEDvLzOi2TE5i/LCIGGorLffhFwKrAI="; }; - propagatedBuildInputs = [ result ]; + minimumOCamlVersion = "4.03"; + useDune2 = true; + + propagatedBuildInputs = [ + result + ]; meta = with lib; { - homepage = "https://github.com/ocaml-dune/csexp"; + homepage = "https://github.com/ocaml-dune/csexp/"; description = "Minimal support for Canonical S-expressions"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } From 61a374ac3a00185e35f5f60ba01f80f76d83420a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 13:41:33 +0200 Subject: [PATCH 246/797] python3Packages.parsel: fix build --- .../python-modules/parsel/default.nix | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 319f83f7275..423f4eb0293 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage +, cssselect , fetchPypi -, pytest -, pytestrunner , functools32 +, isPy27 +, lxml +, pytestCheckHook , six , w3lib -, lxml -, cssselect -, isPy27 }: buildPythonPackage rec { @@ -20,17 +19,47 @@ buildPythonPackage rec { sha256 = "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh"; }; - checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; + propagatedBuildInputs = [ + cssselect + lxml + six + w3lib + ] ++ lib.optionals isPy27 [ + functools32 + ]; - checkPhase = '' - py.test + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" ''; + disabledTests = [ + # Test are out-dated and are failing (AssertionError: Lists differ: ...) + # https://github.com/scrapy/parsel/pull/174 + "test_differences_parsing_xml_vs_html" + "test_nested_selectors" + "test_re" + "test_replacement_null_char_from_body" + "test_select_on_text_nodes" + "test_selector_get_alias" + "test_selector_getall_alias" + "test_selector_over_text" + "test_selectorlist_get_alias" + "test_selectorlist_getall_alias" + "test_slicing" + "test_text_pseudo_element" + ]; + + pythonImportsCheck = [ "parsel" ]; + meta = with lib; { homepage = "https://github.com/scrapy/parsel"; - description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors"; + description = "Python library to extract data from HTML and XML using XPath and CSS selectors"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; - } From 1dcba1771488099ae4a03cb56fcf7f480e9a49d1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Jun 2021 11:25:11 +0000 Subject: [PATCH 247/797] wrapBintoolsWith: fix final stage NetBSD Fixes "bintools" on NetBSD -- without this only the version in stdenv would work, not the one from the final stage. Andi tried to warn me about this[1]. Andi, I'm sorry for doubting you. [1]: https://github.com/NixOS/nixpkgs/pull/124499#discussion_r641949801 --- pkgs/build-support/bintools-wrapper/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index bf81d00e5ea..5d2f2f977a7 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -14,7 +14,9 @@ if libc == null then null else if stdenvNoCC.targetPlatform.isNetBSD then - if libc != targetPackages.netbsdCross.headers then + if !(targetPackages ? netbsdCross) then + netbsd.ld_elf_so + else if libc != targetPackages.netbsdCross.headers then targetPackages.netbsdCross.ld_elf_so else null From 5e10deb72abdefcbaaadc81c68d1030eb7ae7661 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 13:51:14 +0200 Subject: [PATCH 248/797] python3Packages.itemloaders: fix build --- .../python-modules/itemloaders/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index 107585f0416..e6098208033 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , w3lib , parsel , jmespath @@ -12,8 +12,7 @@ buildPythonPackage rec { pname = "itemloaders"; version = "1.0.4"; - - disabled = isPy27; + disabled = pythonOlder "3.6"; # Tests not included in PyPI tarball src = fetchFromGitHub { @@ -27,6 +26,14 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # Test are failing (AssertionError: Lists differ: ...) + "test_nested_css" + "test_nested_xpath" + ]; + + pythonImportsCheck = [ "itemloaders" ]; + meta = with lib; { description = "Base library for scrapy's ItemLoader"; homepage = "https://github.com/scrapy/itemloaders"; From 1c50387848bb0d24cb737390322761410b482667 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 08:04:43 -0300 Subject: [PATCH 249/797] ocamlPackages.repr: 0.2.1 -> 0.3.0 --- pkgs/development/ocaml-modules/repr/default.nix | 17 ++++++++--------- pkgs/development/ocaml-modules/repr/ppx.nix | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix index de6877ddd68..cd7e1e014e4 100644 --- a/pkgs/development/ocaml-modules/repr/default.nix +++ b/pkgs/development/ocaml-modules/repr/default.nix @@ -1,30 +1,29 @@ -{ lib, buildDunePackage, fetchurl, fmt, uutf, jsonm, base64, either }: +{ lib, buildDunePackage, fetchurl, base64, either, fmt, jsonm, uutf }: buildDunePackage rec { pname = "repr"; - version = "0.2.1"; - - minimumOCamlVersion = "4.08"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz"; - sha256 = "1cbzbawbn71mmpw8y84s1p2pbhc055w1znz64jvr00c7fdr9p8hc"; + sha256 = "sha256-2b0v5RwutvyidzEDTEb5p33IvJ+3t2IW+KVxYD1ufXQ="; }; + minimumOCamlVersion = "4.08"; useDune2 = true; propagatedBuildInputs = [ - fmt - uutf - jsonm base64 either + fmt + jsonm + uutf ]; meta = with lib; { description = "Dynamic type representations. Provides no stability guarantee"; homepage = "https://github.com/mirage/repr"; license = licenses.isc; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index a1112ef9ac7..7ef2c55c2c2 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, repr, ppxlib, ppx_deriving, alcotest, hex }: +{ buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: buildDunePackage { pname = "ppx_repr"; @@ -6,9 +6,9 @@ buildDunePackage { inherit (repr) src version useDune2; propagatedBuildInputs = [ - repr - ppxlib ppx_deriving + ppxlib + repr ]; doCheck = true; From 5a6ff6c275e4ded492a7af421a56eb32e4a66c5c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 7 Jun 2021 14:37:10 +0200 Subject: [PATCH 250/797] newsflash: fix xdg-open link --- .../applications/networking/feedreaders/newsflash/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index f93b8ed50b7..b5011c122d9 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -16,6 +16,7 @@ , glib-networking , librsvg , gst_all_1 +, xdg-utils }: stdenv.mkDerivation rec { @@ -78,6 +79,9 @@ stdenv.mkDerivation rec { sqlite webkitgtk + # open link in browser + xdg-utils + # TLS support for loading external content in webkitgtk WebView glib-networking From 475c007da0232769d26363545b0557c3056ebffa Mon Sep 17 00:00:00 2001 From: jakobrs Date: Fri, 7 Aug 2020 17:47:27 +0200 Subject: [PATCH 251/797] nixos/libvirtd: add assertion requiring polkit to be enabled --- nixos/modules/virtualisation/libvirtd.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 61ebc3ab8cf..f45f1802d91 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -155,6 +155,13 @@ in { config = mkIf cfg.enable { + assertions = [ + { + assertion = config.security.polkit.enable; + message = "The libvirtd module currently requires Polkit to be enabled ('security.polkit.enable = true')."; + } + ]; + environment = { # this file is expected in /etc/qemu and not sysconfdir (/var/lib) etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: From 7182afa8e4c1d316e8084fee28dc4d960fa8f0c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Jun 2021 13:44:17 +0000 Subject: [PATCH 252/797] i3-balance-workspace: 1.8.3 -> 1.8.4 --- pkgs/applications/window-managers/i3/balance-workspace.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index 18e9167227f..335b18d3eb8 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "i3-balance-workspace"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "1gndzrwff8gfdqjjxv4zf2h2k0x7y97w1c3mrjpihz8xd0hbnk4d"; + sha256 = "bb220eb373e290312b0aafe3d7b1cc1cca34c93189a4fca5bee93ef39aafbe3d"; }; propagatedBuildInputs = [ i3ipc ]; From eba5f5c1e5a61ef65a970c699b9f93aff87448bf Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 7 Jun 2021 15:55:58 +0200 Subject: [PATCH 253/797] Revert "nixos/wireless: make wireless.interfaces mandatory" This reverts commit 030a521adc9510207dd9f06b8d8b552ff7d999f9. --- nixos/doc/manual/release-notes/rl-2105.xml | 9 ------- .../services/networking/wpa_supplicant.nix | 27 ++++++++++++------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index bdc2386f24c..54abbb6e38e 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -181,15 +181,6 @@ GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. - - - Enabling wireless networking now requires specifying at least one network - interface using . - This is to avoid a race condition with the card initialisation (see - issue - #101963 for more information). - - If you are using to assign diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index d9308b37064..8a0685c3d96 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -40,7 +40,8 @@ in { default = []; example = [ "wlan0" "wlan1" ]; description = '' - The interfaces wpa_supplicant will use. + The interfaces wpa_supplicant will use. If empty, it will + automatically use all wireless interfaces. ''; }; @@ -219,14 +220,7 @@ in { }; config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.interfaces != []; - message = '' - No network interfaces for wpa_supplicant have been configured. - Please, specify at least one using networking.wireless.interfaces. - ''; - } - ] ++ flip mapAttrsToList cfg.networks (name: cfg: { + assertions = flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); @@ -261,7 +255,20 @@ in { then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi iface_args="-s -u -D${cfg.driver} ${configStr}" - args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" + ${if ifaces == [] then '' + for i in $(cd /sys/class/net && echo *); do + DEVTYPE= + UEVENT_PATH=/sys/class/net/$i/uevent + if [ -e "$UEVENT_PATH" ]; then + source "$UEVENT_PATH" + if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then + args+="''${args:+ -N} -i$i $iface_args" + fi + fi + done + '' else '' + args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" + ''} exec wpa_supplicant $args ''; }; From a5afb78b95c798500619098474759a9c229efc8a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 7 Jun 2021 21:03:01 +0700 Subject: [PATCH 254/797] acme: unstable-2020-12-27 -> unstable-2021-02-14 --- pkgs/development/compilers/acme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix index f8731f55471..cebcbf3b2fa 100644 --- a/pkgs/development/compilers/acme/default.nix +++ b/pkgs/development/compilers/acme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "acme"; - version = "unstable-2020-12-27"; + version = "unstable-2021-02-14"; src = fetchsvn { url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; - rev = "314"; - sha256 = "08zg26rh19nlif7id91nv0syx5n243ssxhfw0nk2r2bhjm5jrjz1"; + rev = "319"; + sha256 = "sha256-VifIQ+UEVMKJ+cNS+Xxusazinr5Cgu1lmGuhqj/5Mpk="; }; sourceRoot = "code-0-r${src.rev}/src"; From 1e1e19b6c7893e11f32f7de531348475f1975d7e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 7 Jun 2021 21:10:33 +0700 Subject: [PATCH 255/797] cc65: fix darwin build --- pkgs/development/compilers/cc65/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix index 03325d2fd60..502cecfa8cf 100644 --- a/pkgs/development/compilers/cc65/default.nix +++ b/pkgs/development/compilers/cc65/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv -, fetchFromGitHub -}: +{ lib, gccStdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "cc65"; version = "2.19"; @@ -13,10 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4"; }; - makeFlags = [ - "PREFIX=${placeholder "out"}" - "CC=${stdenv.cc.targetPrefix}cc" - ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { homepage = "https://cc65.github.io/"; @@ -56,6 +51,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } From 22ab1a4a00fca0d54e6f0ed4eb26a3dd8e873a13 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 7 Jun 2021 21:13:21 +0700 Subject: [PATCH 256/797] cc65: enable parallel building --- pkgs/development/compilers/cc65/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix index 502cecfa8cf..cb2410ba06a 100644 --- a/pkgs/development/compilers/cc65/default.nix +++ b/pkgs/development/compilers/cc65/default.nix @@ -13,6 +13,8 @@ gccStdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://cc65.github.io/"; description = "C compiler for processors of 6502 family"; From 5e10c9cdf77345dc530c900e56c40053c54d7142 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 5 Jun 2021 15:05:01 +0700 Subject: [PATCH 257/797] twtxt: reinit at 1.2.3 This should bring it in line with other package managers: https://repology.org/project/twtxt/versions --- .../applications/networking/twtxt/default.nix | 28 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index ff6e61c614f..27420f8bd33 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -1,23 +1,31 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildPythonApplication, aiohttp, python-dateutil, humanize, click, pytestCheckHook, tox }: -buildGoModule rec { +buildPythonApplication rec { pname = "twtxt"; - version = "0.1.0"; + version = "1.2.3"; src = fetchFromGitHub { - owner = "jointwt"; + owner = "buckket"; repo = pname; - rev = version; - sha256 = "15jhfnhpk34nmad04f7xz1w041dba8cn17hq46p9n5sarjgkjiiw"; + rev = "v${version}"; + sha256 = "sha256-AdM95G2Vz3UbVPI7fs8/D78BMxscbTGrCpIyyHzSmho="; }; - vendorSha256 = "1lnf8wd2rv9d292rp8jndfdg0rjs6gfw0yg49l9spw4yzifnd7f7"; + # Relax some dependencies + postPatch = '' + substituteInPlace setup.py \ + --replace 'aiohttp>=2.2.5,<3' 'aiohttp' \ + --replace 'click>=6.7,<7' 'click' \ + --replace 'humanize>=0.5.1,<1' 'humanize' + ''; - subPackages = [ "cmd/twt" "cmd/twtd" ]; + propagatedBuildInputs = [ aiohttp python-dateutil humanize click ]; + + checkInputs = [ pytestCheckHook tox ]; meta = with lib; { - description = "Self-hosted, Twitter-like decentralised microblogging platform"; - homepage = "https://github.com/jointwt/twtxt"; + description = "Decentralised, minimalist microblogging service for hackers"; + homepage = "https://github.com/buckket/twtxt"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11..21754656c2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9263,7 +9263,7 @@ in twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; - twtxt = callPackage ../applications/networking/twtxt { }; + twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; From 254a89e7d54c51c6e8f82f449714b2cbadb54e75 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 7 Jun 2021 23:24:10 +0900 Subject: [PATCH 258/797] isync: 1.4.1 -> 1.4.2 Fixes CVE-2021-3578: possible remote code execution https://sourceforge.net/p/isync/mailman/message/37297759/ --- pkgs/tools/networking/isync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index f6263f187bf..666e19ca81a 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd"; + sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r"; }; nativeBuildInputs = [ pkg-config perl ]; From 4b4df46bab73375bc297e2b3c4ede169de0e08e3 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Mon, 7 Jun 2021 07:44:10 -0700 Subject: [PATCH 259/797] clips: 6.31 -> 6.40 --- pkgs/development/interpreters/clips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index 64fd89008e3..2edeaf9e4e8 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.31"; + version = "6.40"; pname = "clips"; src = fetchurl { url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${ builtins.replaceStrings [ "." ] [ "" ] version }.tar.gz"; - sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6"; + sha256 = "1pr5l61zxf6kjs8b2b028g2aq45pigavwjmrf4l5mrdmlnk3fq5d"; }; postPatch = '' From 9815f9545ee5671f3f6e740ccdd98335d05455ab Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Mon, 7 Jun 2021 11:20:13 -0400 Subject: [PATCH 260/797] nixos/doc: add sourcehut to release notes --- .../manual/from_md/release-notes/rl-2111.section.xml | 10 +++++++++- nixos/doc/manual/release-notes/rl-2111.section.md | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 7ac120b693f..74bcf3483b2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -24,7 +24,7 @@
New Services - + geoipupdate, @@ -32,6 +32,14 @@ services.geoipupdate. + + + sourcehut, a + collection of tools useful for software development. Available + as + services.sourcehut. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 577d7592935..451d25a6ed9 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -14,6 +14,10 @@ In addition to numerous new and upgraded packages, this release has the followin database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). +* [sourcehut](https://sr.ht), a collection of tools useful for software + development. Available as + [services.sourcehut](options.html#opt-services.sourcehut.enable). + ## Backward Incompatibilities * The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0 From b21cebbfb22b532b0a4ed2580bd9d32889b145c0 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 7 Jun 2021 16:33:35 +0100 Subject: [PATCH 261/797] just: 0.9.1 -> 0.9.4 Skip run_shebang test as it randomly fails Add changelog Add myself as a maintainer --- pkgs/development/tools/just/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 247d055f578..dbd10772a62 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.1"; + version = "0.9.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY="; + sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE="; }; - cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY="; + cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { # USER must not be empty export USER=just-user export USERNAME=just-user + export JUST_CHOOSER="${coreutils}/bin/cat" # Prevent string.rs from being changed cp tests/string.rs $TMPDIR/string.rs @@ -38,22 +39,22 @@ rustPlatform.buildRustPackage rec { sed -i src/justfile.rs \ -i tests/*.rs \ -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \ - -e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g" + -e "s@/usr/bin/env@${coreutils}/bin/env@g" # Return unchanged string.rs cp $TMPDIR/string.rs tests/string.rs ''; - # Skip "edit" when running "cargo test", since this test case needs "cat" and "vim". - # Skip "choose" when running "cargo test", since this test case needs "fzf". - checkFlags = [ "--skip=choose" "--skip=edit" ]; + checkFlags = [ + "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched + "--skip=run_shebang" # test case very rarely fails with "Text file busy" + ]; meta = with lib; { - description = "A handy way to save and run project-specific commands"; homepage = "https://github.com/casey/just"; + changelog = "https://github.com/casey/just/blob/v${version}/CHANGELOG.md"; + description = "A handy way to save and run project-specific commands"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd jk ]; }; } From e0b49e5f538cc602b722d4f0c662878eca380ba0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 7 Jun 2021 16:23:47 +0200 Subject: [PATCH 262/797] python2Packages.ipdb: Fix build --- pkgs/development/python-modules/ipdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index fbdfd5b7900..b34aa13bbcf 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -3,21 +3,21 @@ , fetchPypi , ipython , isPyPy -, isPy27 , mock +, toml }: buildPythonPackage rec { pname = "ipdb"; version = "0.13.7"; - disabled = isPyPy || isPy27; # setupterm: could not find terminfo database + disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; sha256 = "178c367a61c1039e44e17c56fcc4a6e7dc11b33561261382d419b6ddb4401810"; }; - propagatedBuildInputs = [ ipython ]; + propagatedBuildInputs = [ ipython toml ]; checkInputs = [ mock ]; preCheck = '' From 7407133b8015c1e7768087e16f179b20097b9804 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 7 Jun 2021 17:07:17 +0100 Subject: [PATCH 263/797] terragrunt: 0.29.8 -> 0.29.9 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f1e23908723..2c3deff9f15 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.8"; + version = "0.29.9"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zHfY1pl9r9N1Jx9TzbOFYt2VR9hvHWcdFhPc36Q3apE="; + sha256 = "sha256-xgoKxA8lc72yhFVHeFkbF5j5/vGAd9TTaJ/aDEYL8Wg="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; From 4a2cbcfbb4e9563b81af2637ddaf4ff8cce97930 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 28 May 2021 23:44:43 +0200 Subject: [PATCH 264/797] neovim: add some tests To test the generated RC is included in the file and that we have the option not to wrap the RC. run: nix-build -A tests.vim --- pkgs/applications/editors/neovim/utils.nix | 2 + pkgs/applications/editors/neovim/wrapper.nix | 28 +++++---- pkgs/test/vim/default.nix | 66 ++++++++++++++++++-- pkgs/test/vim/neovim-override.vim | 7 +++ 4 files changed, 85 insertions(+), 18 deletions(-) create mode 100644 pkgs/test/vim/neovim-override.vim diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index ae814fa9b4e..c753d2cca2c 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -148,6 +148,7 @@ let , vimAlias ? false , viAlias ? false , configure ? {} + , extraName ? "" }: let /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ @@ -160,6 +161,7 @@ let extraPython3Packages = compatFun extraPython3Packages; inherit withNodeJs withRuby viAlias vimAlias; inherit configure; + inherit extraName; }; in assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 7fa15efd82c..07a1dad7c09 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -27,23 +27,24 @@ let # set to false if you want to control where to save the generated config # (e.g., in ~/.config/init.vim or project/.nvimrc) , wrapRc ? true + , neovimRcContent ? "" , ... }@args: let wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - # If configure != {}, we can't generate the rplugin.vim file with e.g - # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in - # the wrapper. That's why only when configure != {} (tested both here and - # when postBuild is evaluated), we call makeWrapper once to generate a - # wrapper with most arguments we need, excluding those that cause problems to - # generate rplugin.vim, but still required for the final wrapper. - finalMakeWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] - ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" args.neovimRcContent}" ] - ; + # If configure != {}, we can't generate the rplugin.vim file with e.g + # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in + # the wrapper. That's why only when configure != {} (tested both here and + # when postBuild is evaluated), we call makeWrapper once to generate a + # wrapper with most arguments we need, excluding those that cause problems to + # generate rplugin.vim, but still required for the final wrapper. + finalMakeWrapperArgs = + [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] + ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] + ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; @@ -116,7 +117,10 @@ let preferLocalBuild = true; nativeBuildInputs = [ makeWrapper ]; - passthru = { unwrapped = neovim; }; + passthru = { + unwrapped = neovim; + initRc = neovimRcContent; + }; meta = neovim.meta // { # To prevent builds on hydra diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index c809940fc4c..3bdc3234134 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,9 +1,12 @@ { vimUtils, vim_configurable, writeText, neovim, vimPlugins , lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable , neovim-unwrapped +, fetchFromGitLab +, pkgs }: let inherit (vimUtils) buildVimPluginFrom2Nix; + inherit (neovimUtils) makeNeovimConfig; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; @@ -16,27 +19,55 @@ let } ]; - nvimConfNix = neovimUtils.makeNeovimConfig { + nvimConfNix = makeNeovimConfig { inherit plugins; customRC = '' " just a comment ''; }; - wrapNeovim = suffix: config: + nvimConfDontWrap = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + wrapNeovim2 = suffix: config: wrapNeovimUnstable neovim-unwrapped (config // { extraName = suffix; - wrapRc = true; }); + + nmt = fetchFromGitLab { + owner = "rycee"; + repo = "nmt"; + rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; + sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; + }; + + runTest = neovim-drv: buildCommand: + pkgs.runCommandLocal "test-${neovim-drv.name}" ({ + nativeBuildInputs = [ ]; + meta.platforms = neovim-drv.meta.platforms; + }) ('' + source ${nmt}/bash-lib/assertions.sh + vimrc="${writeText "init.vim" neovim-drv.initRc}" + vimrcGeneric="$out/patched.vim" + mkdir $out + ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" + '' + buildCommand); + in -{ + pkgs.recurseIntoAttrs ( +rec { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; ### neovim tests ################## - nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; nvim_via_override = neovim.override { + extraName = "-via-override"; configure = { packages.foo.start = [ vimPlugins.ale ]; customRC = '' @@ -45,6 +76,29 @@ in }; }; + + # nixpkgs should detect that no wrapping is necessary + nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimConfNix; + + + # this will generate a neovimRc content but we disable wrapping + nvimDontWrap = wrapNeovim2 "-dont-wrap" (makeNeovimConfig { + wrapRc = false; + customRC = '' + " this shouldn't trigger the creation of an init.vim + ''; + }); + + nvim_dontwrap-test = runTest nvimDontWrap '' + ! grep "-u" ${nvimDontWrap}/bin/nvim + ''; + + nvim_via_override-test = runTest nvim_via_override '' + assertFileContent \ + "$vimrcGeneric" \ + "${./neovim-override.vim}" + ''; + ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { @@ -107,4 +161,4 @@ in test_nvim_with_remote_plugin = neovim.override { configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; }; -} +}) diff --git a/pkgs/test/vim/neovim-override.vim b/pkgs/test/vim/neovim-override.vim new file mode 100644 index 00000000000..34a1a8f1f43 --- /dev/null +++ b/pkgs/test/vim/neovim-override.vim @@ -0,0 +1,7 @@ +" configuration generated by NIX +set nocompatible + +set packpath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir +set runtimepath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir + +:help ale From b951fc0e94d198449d1cf0ca8071ff10ba5f76f4 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 8 Jun 2021 00:10:25 +0800 Subject: [PATCH 265/797] libime: 1.0.3 -> 1.0.7 --- pkgs/development/libraries/libime/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index f9fcdedf180..4f0caa7cc33 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -18,21 +18,21 @@ let url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; }; - dictVer = "20200715"; + dictVer = "20210402"; dict = fetchurl { url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; - sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3"; + sha256 = "sha256-gYz7tama5bQMJwe2FYc09KEBlkRIU0AMvWsUUFWS2A0="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.3"; + version = "1.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg="; + sha256 = "sha256-q/SXS6pT4vBkCkCTarPVHrZPXijYnc2t51YGRvzQ0FY="; fetchSubmodules = true; }; From acc122f4012e00bcbca8c3cacf8f3899d713081b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 7 Jun 2021 23:56:43 +0700 Subject: [PATCH 266/797] archivy: 1.1.4 -> 1.3.1 --- pkgs/applications/misc/archivy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 6af4f67d8c6..08d5524fc3a 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -21,11 +21,11 @@ buildPythonApplication rec { pname = "archivy"; - version = "1.1.4"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oSmwQcKvp9RABmc7aq6fdLOZapMauIi6+7azVTXVb30="; + sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM="; }; # Relax some dependencies From 46ac936b00b1a54a77ffa705c01842d3862f349b Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 8 Jun 2021 00:10:34 +0800 Subject: [PATCH 267/797] xcb-imdkit: 1.0.2 -> 1.0.3 This fixes an input issue with alacritty/xterm, see https://github.com/fcitx/fcitx5/issues/254 --- pkgs/development/libraries/xcb-imdkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index a3bcc822b36..b2e56c8193b 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8="; + sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU="; }; nativeBuildInputs = [ From 1be94227254e6529e20e0e3989264efdf979e183 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 8 Jun 2021 00:10:49 +0800 Subject: [PATCH 268/797] fcitx5-chinese-addons: 5.0.3 -> 5.0.6 --- pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 6d3952c9c22..3a4a38c6b70 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.3"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-chinese-addons"; rev = version; - sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c="; + sha256 = "sha256-+DhXFqUxECGZYHAmEw5cZJQnRHHgvT0nVVqY9DXgWBU="; }; cmakeFlags = [ From fbedf830ea5c666ad79ccd224b04dc6f5d406096 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 8 Jun 2021 00:13:41 +0800 Subject: [PATCH 269/797] fcitx5: fix update script --- pkgs/tools/inputmethods/fcitx5/update.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py index e3513c747fc..9f54e313fd3 100755 --- a/pkgs/tools/inputmethods/fcitx5/update.py +++ b/pkgs/tools/inputmethods/fcitx5/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests +#!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests from nix_prefetch_github import * import json @@ -12,8 +12,7 @@ REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-c OWNER = "fcitx" def get_latest_tag(repo, owner=OWNER): - r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo) - , auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265')) + r = requests.get('https://api.github.com/repos/{}/{}/tags'.format(owner,repo)) return r.json()[0].get("name") def main(): From 9d6ec2ea0fb85fd9e7f5bfb9eb7952af66e731a3 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 8 Jun 2021 01:23:39 +0800 Subject: [PATCH 270/797] rust-analyzer: 2021-05-31 -> 2021-06-07 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 066ecefaa14..8eca1fda2e5 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-05-31"; - cargoSha256 = "sha256-atfpcP3esMQQ2lOFTKksQH1nV78KAic51XZi+R++vHg="; + version = "2021-06-07"; + cargoSha256 = "sha256-TyoCu2Q4Tr2EIWxQcjSxASni4dkeEVsfrF5UN7IVxSs="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-v2zS9qnvNrImQ3UqU80YagwLJKkVxwvwMMISimFbMOI="; + sha256 = "sha256-f8jdBL42+bU8KKchkW4fF6+kDBjgpoOZyP5yOYsebBk="; }; buildAndTestSubdir = "crates/rust-analyzer"; From 445e3ce0e8c25017a058a1faa39fdd6648493731 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 7 Jun 2021 17:33:26 +0000 Subject: [PATCH 271/797] element: 1.7.29 -> 1.7.30 https://github.com/vector-im/element-web/blob/v1.7.30/CHANGELOG.md https://github.com/vector-im/element-desktop/blob/v1.7.30/CHANGELOG.md --- .../element/element-desktop-package.json | 9 +- .../element/element-desktop-yarndeps.nix | 920 +++--------------- .../element/element-desktop.nix | 4 +- .../element/element-web.nix | 4 +- 4 files changed, 133 insertions(+), 804 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 901e056025b..5293c55f127 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.29", + "version": "1.7.30", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -47,8 +47,9 @@ "electron-builder-squirrel-windows": "22.10.5", "electron-devtools-installer": "^3.1.1", "electron-notarize": "^1.0.0", - "eslint": "7.3.1", - "eslint-config-matrix-org": "^0.1.2", + "eslint": "7.18.0", + "eslint-config-google": "^0.14.0", + "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", @@ -67,7 +68,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "12.0.2", + "electronVersion": "12.0.9", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 7d26fbbbff7..258f5cb2dad 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -25,14 +25,6 @@ sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; }; } - { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; - }; - } { name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { @@ -41,14 +33,6 @@ sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } - { - name = "_babel_generator___generator_7.10.5.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz"; - sha1 = "1b903554bc8c583ee8d25f1e8969732e6b829a69"; - }; - } { name = "_babel_generator___generator_7.13.16.tgz"; path = fetchurl { @@ -57,14 +41,6 @@ sha1 = "0befc287031a201d84cdfc173b46b320ae472d14"; }; } - { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; - }; - } { name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; path = fetchurl { @@ -73,14 +49,6 @@ sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; }; } - { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; - }; - } { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { @@ -89,14 +57,6 @@ sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; }; } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; - }; - } { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; path = fetchurl { @@ -105,14 +65,6 @@ sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; }; } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; - }; - } { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { @@ -129,14 +81,6 @@ sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; }; } - { - name = "_babel_highlight___highlight_7.10.4.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; - }; - } { name = "_babel_highlight___highlight_7.13.10.tgz"; path = fetchurl { @@ -145,14 +89,6 @@ sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; }; } - { - name = "_babel_parser___parser_7.10.5.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz"; - sha1 = "e7c6bf5a7deff957cec9f04b551e2762909d826b"; - }; - } { name = "_babel_parser___parser_7.13.16.tgz"; path = fetchurl { @@ -169,14 +105,6 @@ sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; }; } - { - name = "_babel_template___template_7.10.4.tgz"; - path = fetchurl { - name = "_babel_template___template_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; - sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; - }; - } { name = "_babel_template___template_7.12.13.tgz"; path = fetchurl { @@ -193,22 +121,6 @@ sha1 = "c85415e0c7d50ac053d758baec98b28b2ecfeea3"; }; } - { - name = "_babel_traverse___traverse_7.10.5.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz"; - sha1 = "77ce464f5b258be265af618d8fddf0536f20b564"; - }; - } - { - name = "_babel_types___types_7.10.5.tgz"; - path = fetchurl { - name = "_babel_types___types_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz"; - sha1 = "d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"; - }; - } { name = "_babel_types___types_7.13.17.tgz"; path = fetchurl { @@ -233,6 +145,14 @@ sha1 = "231ac246c39d45b80e159bd21c3f9027dcaa10f5"; }; } + { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + }; + } { name = "_iarna_cli___cli_1.2.0.tgz"; path = fetchurl { @@ -529,14 +449,6 @@ sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; }; } - { - name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - path = fetchurl { - name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"; - }; - } { name = "_types_fs_extra___fs_extra_9.0.9.tgz"; path = fetchurl { @@ -553,22 +465,6 @@ sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } - { - name = "_types_json_schema___json_schema_7.0.5.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha1 = "dcce4430e64b443ba8945f0290fb564ad5bac6dd"; - }; - } - { - name = "_types_json5___json5_0.0.29.tgz"; - path = fetchurl { - name = "_types_json5___json5_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; - sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; - }; - } { name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { @@ -625,54 +521,6 @@ sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"; }; } - { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz"; - sha1 = "0f91aa3c83d019591719e597fbdb73a59595a263"; - }; - } - { - name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz"; - sha1 = "0ee21f6c48b2b30c63211da23827725078d5169a"; - }; - } - { - name = "_typescript_eslint_parser___parser_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz"; - sha1 = "3e9cd9df9ea644536feb6e5acdb8279ecff96ce9"; - }; - } - { - name = "_typescript_eslint_types___types_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_types___types_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz"; - sha1 = "09897fab0cb95479c01166b10b2c03c224821077"; - }; - } - { - name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz"; - sha1 = "66872e6da120caa4b64e6b4ca5c8702afc74738d"; - }; - } - { - name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz"; - sha1 = "ac0417d382a136e4571a0b0dcfe52088cb628177"; - }; - } { name = "JSONStream___JSONStream_1.3.5.tgz"; path = fetchurl { @@ -690,19 +538,19 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { - name = "acorn___acorn_7.3.1.tgz"; + name = "acorn___acorn_7.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; - sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } { @@ -745,14 +593,6 @@ sha1 = "18c5af38a111ddeb4f2697bd78d68abc1cabd706"; }; } - { - name = "ajv___ajv_6.10.2.tgz"; - path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; - }; - } { name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { @@ -777,6 +617,22 @@ sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; }; } + { + name = "ajv___ajv_6.10.2.tgz"; + path = fetchurl { + name = "ajv___ajv_6.10.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; + sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + }; + } + { + name = "ajv___ajv_8.5.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; + sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + }; + } { name = "ansi_align___ansi_align_2.0.0.tgz"; path = fetchurl { @@ -801,14 +657,6 @@ sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; }; } - { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; - }; - } { name = "ansi_regex___ansi_regex_2.1.1.tgz"; path = fetchurl { @@ -969,30 +817,6 @@ sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; }; } - { - name = "array_includes___array_includes_3.1.1.tgz"; - path = fetchurl { - name = "array_includes___array_includes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; - }; - } - { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; - }; - } - { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; - sha1 = "1c13f84a178566042dd63de4414440db9222e443"; - }; - } { name = "asap___asap_2.0.6.tgz"; path = fetchurl { @@ -1034,11 +858,11 @@ }; } { - name = "astral_regex___astral_regex_1.0.0.tgz"; + name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; }; } { @@ -1113,14 +937,6 @@ sha1 = "24390e6ad61386b0a747265754d2a17219de862c"; }; } - { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - path = fetchurl { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; - }; - } { name = "balanced_match___balanced_match_1.0.0.tgz"; path = fetchurl { @@ -1409,14 +1225,6 @@ sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; }; } - { - name = "chardet___chardet_0.7.0.tgz"; - path = fetchurl { - name = "chardet___chardet_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; - sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; - }; - } { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { @@ -1489,14 +1297,6 @@ sha1 = "6732d972979efc2ae444a1f08e08fa139c96a18e"; }; } - { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; - }; - } { name = "cli_table3___cli_table3_0.5.1.tgz"; path = fetchurl { @@ -1513,14 +1313,6 @@ sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; }; } - { - name = "cli_width___cli_width_3.0.0.tgz"; - path = fetchurl { - name = "cli_width___cli_width_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; - sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; - }; - } { name = "cliui___cliui_3.2.0.tgz"; path = fetchurl { @@ -1729,14 +1521,6 @@ sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; } - { - name = "contains_path___contains_path_0.1.0.tgz"; - path = fetchurl { - name = "contains_path___contains_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - } { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; path = fetchurl { @@ -1801,14 +1585,6 @@ sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } { name = "cross_spawn___cross_spawn_7.0.3.tgz"; path = fetchurl { @@ -1881,14 +1657,6 @@ sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; }; } - { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; - }; - } { name = "debug___debug_3.2.6.tgz"; path = fetchurl { @@ -2065,22 +1833,6 @@ sha1 = "d52e234815f1a07a59706e5f2a2fea71991cf784"; }; } - { - name = "doctrine___doctrine_1.5.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; - }; - } - { - name = "doctrine___doctrine_2.1.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; - }; - } { name = "doctrine___doctrine_3.0.0.tgz"; path = fetchurl { @@ -2321,14 +2073,6 @@ sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; }; } - { - name = "es_abstract___es_abstract_1.17.6.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.17.6.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; - sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; - }; - } { name = "es_abstract___es_abstract_1.16.3.tgz"; path = fetchurl { @@ -2385,14 +2129,6 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } - { - name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz"; - sha1 = "8695b858fcf40d28c1aedca181f700528c7b60c6"; - }; - } { name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; path = fetchurl { @@ -2402,115 +2138,19 @@ }; } { - name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; + name = "53000626a9256811f6b355de4eafeb5575bda7fc"; path = fetchurl { - name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz"; - sha1 = "b5d7e193e4f3fc5041905967b53c5ddd6924c793"; + name = "53000626a9256811f6b355de4eafeb5575bda7fc"; + url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/53000626a9256811f6b355de4eafeb5575bda7fc"; + sha1 = "12617a8105ab0ea2e7df2567928260a41ebffd58"; }; } { - name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { - name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz"; - sha1 = "fc1f13946d83766d6b83b0e67699e2071a56f417"; - }; - } - { - name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz"; - sha1 = "63e9401c7fac146804785f609e7df8f15b3e04eb"; - }; - } - { - name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz"; - sha1 = "1adff90e0716d439be471d192977f233de171a46"; - }; - } - { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; - }; - } - { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; - }; - } - { - name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; - path = fetchurl { - name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz"; - sha1 = "75a2413ffbf17e7be57458301c60291f2cfbf560"; - }; - } - { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; - path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"; - sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e"; - }; - } - { - name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; - path = fetchurl { - name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz"; - sha1 = "ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"; - }; - } - { - name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; - path = fetchurl { - name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz"; - sha1 = "92811e37191ecb0d29c0f0a0c9e5c943ee573821"; - }; - } - { - name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; - path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz"; - sha1 = "0590525e7eb83890ce71f73c2cf836284ad8c2f1"; - }; - } - { - name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; - path = fetchurl { - name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; - sha1 = "79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"; - }; - } - { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5"; - }; - } - { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; - sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; }; } { @@ -2538,35 +2178,27 @@ }; } { - name = "eslint___eslint_7.3.1.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz"; - sha1 = "76392bd7e44468d046149ba128d1566c59acbe19"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_6.8.0.tgz"; + name = "eslint___eslint_7.18.0.tgz"; path = fetchurl { - name = "eslint___eslint_6.8.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; - sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; + name = "eslint___eslint_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz"; + sha1 = "7fdcd2f3715a41fe6295a16234bd69aed2c75e67"; }; } { - name = "espree___espree_6.2.1.tgz"; + name = "espree___espree_7.3.1.tgz"; path = fetchurl { - name = "espree___espree_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; - sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; - }; - } - { - name = "espree___espree_7.2.0.tgz"; - path = fetchurl { - name = "espree___espree_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz"; - sha1 = "1c263d5b513dbad0ac30c4991b93ac354e948d69"; + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; }; } { @@ -2577,14 +2209,6 @@ sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; }; } - { - name = "esquery___esquery_1.0.1.tgz"; - path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; - }; - } { name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { @@ -2594,11 +2218,11 @@ }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -2617,6 +2241,14 @@ sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; }; } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { @@ -2665,14 +2297,6 @@ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } - { - name = "external_editor___external_editor_3.1.0.tgz"; - path = fetchurl { - name = "external_editor___external_editor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; - sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; - }; - } { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { @@ -2730,19 +2354,11 @@ }; } { - name = "figures___figures_3.2.0.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "figures___figures_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; - sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; - }; - } - { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -2786,19 +2402,19 @@ }; } { - name = "flat_cache___flat_cache_2.0.1.tgz"; + name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { - name = "flat_cache___flat_cache_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; - sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; }; } { - name = "flatted___flatted_2.0.1.tgz"; + name = "flatted___flatted_3.1.1.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; - sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; }; } { @@ -3369,6 +2985,14 @@ sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } { name = "import_lazy___import_lazy_2.1.0.tgz"; path = fetchurl { @@ -3441,22 +3065,6 @@ sha1 = "45ffe2f610a8ca134f2bd1db5637b235070f6cbe"; }; } - { - name = "inquirer___inquirer_7.3.2.tgz"; - path = fetchurl { - name = "inquirer___inquirer_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz"; - sha1 = "25245d2e32dc9f33dbe26eeaada231daa66e9c7c"; - }; - } - { - name = "internal_slot___internal_slot_1.0.2.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; - sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; - }; - } { name = "invert_kv___invert_kv_1.0.0.tgz"; path = fetchurl { @@ -3497,14 +3105,6 @@ sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; }; } - { - name = "is_callable___is_callable_1.2.0.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz"; - sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb"; - }; - } { name = "is_ci___is_ci_1.2.1.tgz"; path = fetchurl { @@ -3673,14 +3273,6 @@ sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; } - { - name = "is_regex___is_regex_1.1.0.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; - sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; - }; - } { name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; path = fetchurl { @@ -3697,14 +3289,6 @@ sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; } - { - name = "is_string___is_string_1.0.5.tgz"; - path = fetchurl { - name = "is_string___is_string_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; - }; - } { name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { @@ -3857,6 +3441,14 @@ sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; }; } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } { name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; path = fetchurl { @@ -3889,14 +3481,6 @@ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; } - { - name = "json5___json5_1.0.1.tgz"; - path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; - }; - } { name = "json5___json5_2.1.3.tgz"; path = fetchurl { @@ -3937,14 +3521,6 @@ sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; } - { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; - path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; - sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; - }; - } { name = "jszip___jszip_3.5.0.tgz"; path = fetchurl { @@ -4009,14 +3585,6 @@ sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; - }; - } { name = "levn___levn_0.4.1.tgz"; path = fetchurl { @@ -4225,6 +3793,14 @@ sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; }; } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } { name = "lodash.union___lodash.union_4.6.0.tgz"; path = fetchurl { @@ -4250,27 +3826,11 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; - }; - } - { - name = "lodash___lodash_4.17.19.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.19.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; - sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; - }; - } - { - name = "loose_envify___loose_envify_1.4.0.tgz"; - path = fetchurl { - name = "loose_envify___loose_envify_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -4593,14 +4153,6 @@ sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0"; }; } - { - name = "nice_try___nice_try_1.0.5.tgz"; - path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; - }; - } { name = "node_addon_api___node_addon_api_1.7.2.tgz"; path = fetchurl { @@ -4881,30 +4433,6 @@ sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; }; } - { - name = "object.assign___object.assign_4.1.0.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; - }; - } - { - name = "object.entries___object.entries_1.1.2.tgz"; - path = fetchurl { - name = "object.entries___object.entries_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; - sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; - }; - } - { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; - sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; - }; - } { name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; path = fetchurl { @@ -4913,14 +4441,6 @@ sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; } - { - name = "object.values___object.values_1.1.1.tgz"; - path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; - }; - } { name = "omggif___omggif_1.0.10.tgz"; path = fetchurl { @@ -4953,14 +4473,6 @@ sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; }; } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; - }; - } { name = "optionator___optionator_0.9.1.tgz"; path = fetchurl { @@ -5249,14 +4761,6 @@ sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; }; } - { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; - }; - } { name = "pkg_up___pkg_up_3.1.0.tgz"; path = fetchurl { @@ -5305,14 +4809,6 @@ sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; }; } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - } { name = "prepend_http___prepend_http_1.0.4.tgz"; path = fetchurl { @@ -5385,14 +4881,6 @@ sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; } - { - name = "prop_types___prop_types_15.7.2.tgz"; - path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; - }; - } { name = "proto_list___proto_list_1.2.4.tgz"; path = fetchurl { @@ -5529,14 +5017,6 @@ sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; }; } - { - name = "react_is___react_is_16.13.1.tgz"; - path = fetchurl { - name = "react_is___react_is_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; - }; - } { name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; path = fetchurl { @@ -5649,22 +5129,6 @@ sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; }; } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; - }; - } - { - name = "regexpp___regexpp_2.0.1.tgz"; - path = fetchurl { - name = "regexpp___regexpp_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; - sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; - }; - } { name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { @@ -5729,6 +5193,14 @@ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } { name = "require_main_filename___require_main_filename_1.0.1.tgz"; path = fetchurl { @@ -5761,14 +5233,6 @@ sha1 = "be0aa4c06acd53083505abb35f4d66932ab35d16"; }; } - { - name = "resolve___resolve_1.17.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; - }; - } { name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { @@ -5785,14 +5249,6 @@ sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; }; } - { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; - }; - } { name = "retry___retry_0.10.1.tgz"; path = fetchurl { @@ -5809,14 +5265,6 @@ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; } - { - name = "rimraf___rimraf_2.6.3.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; - }; - } { name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { @@ -5833,14 +5281,6 @@ sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; }; } - { - name = "run_async___run_async_2.4.1.tgz"; - path = fetchurl { - name = "run_async___run_async_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; - sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; - }; - } { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { @@ -5849,14 +5289,6 @@ sha1 = "e848396f057d223f24386924618e25694161ec47"; }; } - { - name = "rxjs___rxjs_6.6.0.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.6.0.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz"; - sha1 = "af2901eedf02e3a83ffa7f886240ff9018bbec84"; - }; - } { name = "safe_buffer___safe_buffer_5.2.0.tgz"; path = fetchurl { @@ -6009,14 +5441,6 @@ sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; }; } - { - name = "side_channel___side_channel_1.0.2.tgz"; - path = fetchurl { - name = "side_channel___side_channel_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; - sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; - }; - } { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { @@ -6034,11 +5458,11 @@ }; } { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; }; } { @@ -6257,22 +5681,6 @@ sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; }; } - { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; - sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; - }; - } { name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; path = fetchurl { @@ -6289,14 +5697,6 @@ sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; }; } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; - }; - } { name = "string_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { @@ -6410,11 +5810,11 @@ }; } { - name = "table___table_5.4.6.tgz"; + name = "table___table_6.7.1.tgz"; path = fetchurl { - name = "table___table_5.4.6.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; }; } { @@ -6537,14 +5937,6 @@ sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877"; }; } - { - name = "tmp___tmp_0.0.33.tgz"; - path = fetchurl { - name = "tmp___tmp_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; - }; - } { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; path = fetchurl { @@ -6585,38 +5977,6 @@ sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; } - { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; - }; - } - { - name = "tslib___tslib_1.13.0.tgz"; - path = fetchurl { - name = "tslib___tslib_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; - sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; - }; - } - { - name = "tslib___tslib_1.10.0.tgz"; - path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; - }; - } - { - name = "tsutils___tsutils_3.17.1.tgz"; - path = fetchurl { - name = "tsutils___tsutils_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; - }; - } { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -6641,22 +6001,6 @@ sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; }; } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - } - { - name = "type_fest___type_fest_0.11.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; - }; - } { name = "type_fest___type_fest_0.16.0.tgz"; path = fetchurl { @@ -6697,14 +6041,6 @@ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; } - { - name = "typescript___typescript_3.9.7.tgz"; - path = fetchurl { - name = "typescript___typescript_3.9.7.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; - sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; - }; - } { name = "uid_number___uid_number_0.0.6.tgz"; path = fetchurl { @@ -7097,14 +6433,6 @@ sha1 = "558328352e673b5bb192cf86500d60b230667d4b"; }; } - { - name = "write___write_1.0.3.tgz"; - path = fetchurl { - name = "write___write_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; - sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; - }; - } { name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 6642d4ca024..6424972cbf7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.29"; + version = "1.7.30"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-nCtgVVOdjZ/OK8gMInBbNeuJadchDYUO2UQxEmcOm4s="; + sha256 = "09k1xxmzqvw8c1x9ndsdvwj4598rdx9zqraz3rmr3i58s51vycxp"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 92f9fa0ab19..5baed75ba52 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.29"; + version = "1.7.30"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-wFC0B9v0V3JK9sLKH7GviVO/JEjePOJ06PwRq/MVqDE="; + sha256 = "1pnmgdyacxfk8hdf930rqqvqrcvckc3m4pb5mkznlirsmw06nfay"; }; installPhase = '' From 87f5e32e226d4443825643e8b1e62a9b252daae5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Jun 2021 10:41:14 -0700 Subject: [PATCH 272/797] anydesk: add pciutils The application will shell out to execute lspci --- pkgs/applications/networking/remote/anydesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 4a741ab2b16..890553b338e 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip -, lsb-release, freetype, fontconfig, polkit, polkit_gnome +, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils , pulseaudio }: let @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { $out/bin/anydesk wrapProgram $out/bin/anydesk \ - --prefix PATH : ${lib.makeBinPath [ lsb-release ]} + --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]} substituteInPlace $out/share/applications/*.desktop \ --subst-var out From a0e33e19b0b728ee73926feed7c5e2196eb0f131 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 7 Jun 2021 19:45:01 +0200 Subject: [PATCH 273/797] python2Packages.defusedxml: Allow build Build still works --- pkgs/development/python-modules/defusedxml/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index c39ca96bfe1..6ac1bab0845 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -1,14 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , python }: buildPythonPackage rec { pname = "defusedxml"; version = "0.7.1"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From f1ff32e49ad7b0d0f77929dd1cc684ae4c290957 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 7 Jun 2021 20:36:30 +0200 Subject: [PATCH 274/797] pythonPackages.injector: init at 0.18.4 --- .../python-modules/injector/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/injector/default.nix diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix new file mode 100644 index 00000000000..921db5d1a87 --- /dev/null +++ b/pkgs/development/python-modules/injector/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, typing-extensions }: + +buildPythonPackage rec { + pname = "injector"; + version = "0.18.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "10miwi58g4b8rvdf1pl7s7x9j91qyxxv3kdn5idzkfc387hqxn6f"; + }; + + propagatedBuildInputs = [ typing-extensions ]; + + doCheck = false; # No tests are available + pythonImportsCheck = [ "injector" ]; + + meta = with lib; { + description = "Python dependency injection framework, inspired by Guice"; + homepage = "https://github.com/alecthomas/injector"; + maintainers = [ maintainers.ivar ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35935450e2a..f2b11c2d01d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3400,6 +3400,8 @@ in { iniparse = callPackage ../development/python-modules/iniparse { }; + injector = callPackage ../development/python-modules/injector { }; + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; inquirer = callPackage ../development/python-modules/inquirer { }; From 2f3e0cf3bae57b35e6653aad0b32d6343ae197b8 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 7 Jun 2021 20:42:14 +0200 Subject: [PATCH 275/797] gwe: init at 0.15.3 --- pkgs/tools/misc/gwe/default.nix | 89 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 93 insertions(+) create mode 100644 pkgs/tools/misc/gwe/default.nix diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/tools/misc/gwe/default.nix new file mode 100644 index 00000000000..2eeb2f0d2c5 --- /dev/null +++ b/pkgs/tools/misc/gwe/default.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, fetchFromGitLab +, wrapGAppsHook +, makeWrapper +, pkg-config +, meson +, ninja +, cmake +, gobject-introspection +, desktop-file-utils +, python3 +, gtk3 +, libdazzle +, libappindicator-gtk3 +, libnotify +, nvidia_x11 + }: + +let + pythonEnv = python3.withPackages (pypkgs: with pypkgs; [ + injector + matplotlib + peewee + pynvml + pygobject3 + xlib + pyxdg + requests + rx + gtk3 + ]); +in stdenv.mkDerivation rec { + pname = "gwe"; + version = "0.15.3"; + + src = fetchFromGitLab { + owner = "leinardi"; + repo = pname; + rev = version; + sha256 = "1znd2g02j0klg8w6cgwvaxc8anan6sidadknl0vh9jxmzz75xp9z"; + }; + + prePatch = '' + patchShebangs scripts/{make_local_manifest,meson_post_install}.py + + substituteInPlace gwe/repository/nvidia_repository.py \ + --replace "from py3nvml import py3nvml" "import pynvml" \ + --replace "py3nvml.py3nvml" "pynvml" \ + --replace "py3nvml" "pynvml" + ''; + + nativeBuildInputs = [ + wrapGAppsHook + pkg-config + meson + ninja + cmake + gobject-introspection + desktop-file-utils + pythonEnv + ]; + + buildInputs = [ + gtk3 + libdazzle + libappindicator-gtk3 + libnotify + ]; + + postInstall = '' + mv $out/bin/gwe $out/lib/gwe-bin + + makeWrapper ${pythonEnv}/bin/python $out/bin/gwe \ + --add-flags "$out/lib/gwe-bin" \ + --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" \ + --prefix PATH : "${builtins.concatStringsSep ":" [ (lib.makeBinPath [ nvidia_x11 nvidia_x11.settings ]) "/run/wrappers/bin" ]}" \ + --unset "SHELL" \ + ''${gappsWrapperArgs[@]} + ''; + + meta = with lib; { + description = "System utility designed to provide information, control the fans and overclock your NVIDIA card"; + homepage = "https://gitlab.com/leinardi/gwe"; + platforms = platforms.linux; + license = licenses.gpl3Only; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19cbe826b9f..46c26d1223e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11153,6 +11153,10 @@ in gprolog = callPackage ../development/compilers/gprolog { }; + gwe = callPackage ../tools/misc/gwe { + nvidia_x11 = linuxPackages.nvidia_x11; + }; + gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { From e3d7328926bc7ceed29b6b605cba1cedcb380832 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 7 Jun 2021 20:09:06 +0200 Subject: [PATCH 276/797] pythonPackages.jupyter_core: Mark as disabled --- pkgs/development/python-modules/jupyter_core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index cff5dc194aa..cdd0485b684 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , ipython , traitlets , glibcLocales @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "jupyter_core"; version = "4.7.1"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; From 0ac806adebd4b6660217563fe6876f561067f47c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 7 Jun 2021 20:26:43 +0200 Subject: [PATCH 277/797] passExtensions.pass-checkup: 0.2.0 -> 0.2.1 --- .../security/pass/extensions/checkup.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/pkgs/tools/security/pass/extensions/checkup.nix index bafaabba843..5ae846d4a4b 100644 --- a/pkgs/tools/security/pass/extensions/checkup.nix +++ b/pkgs/tools/security/pass/extensions/checkup.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchFromGitHub -, curl, findutils, gnugrep, gnused }: +, curl, findutils, gnugrep, gnused, shellcheck }: -stdenv.mkDerivation rec { +let pname = "pass-checkup"; - version = "0.2.0"; + version = "0.2.1"; +in stdenv.mkDerivation { + inherit pname version; src = fetchFromGitHub { owner = "etu"; - repo = "pass-checkup"; + repo = pname; rev = version; - sha256 = "17fyf8zj535fg43yddjww1jhxfb3nbdkn622wjxaai2nf46jzh7y"; + sha256 = "18b6rx59r7g0hvqs2affvw0g0jyifyzhanwgz2q2b8nhjgqgnar2"; }; - patchPhase = '' + nativeBuildInputs = [ shellcheck ]; + + postPatch = '' substituteInPlace checkup.bash \ --replace curl ${curl}/bin/curl \ --replace find ${findutils}/bin/find \ @@ -21,13 +25,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + install -D -m755 checkup.bash $out/lib/password-store/extensions/checkup.bash + + runHook postInstall ''; meta = with lib; { description = "A pass extension to check against the Have I been pwned API to see if your passwords are publicly leaked or not"; homepage = "https://github.com/etu/pass-checkup"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.unix; }; From 70173c1519118a5ec79b8e7969b2f91c78e8c297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Mon, 7 Jun 2021 21:34:35 +0200 Subject: [PATCH 278/797] dino: 0.2.0 -> 0.2.1 Fixes https://nvd.nist.gov/vuln/detail/CVE-2021-33896. The current 9acb54df9254609f2fe4de83c9047d408412de28 patch landed in dino as 4592b72dfa324d8a4b9f8c25b359110889b2206c. Removing it from the patch list. --- .../networking/instant-messengers/dino/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d07b7d2912a..d4332c0265c 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -18,24 +18,15 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw"; + sha256 = "11m38syqzb1z92wmdaf45gryl6gjxwbcnk32j4p984ipqj2vdzd8"; }; - patches = [ - # Fixes https://github.com/dino/dino/issues/1010 (double' is not a supported generic type argument) - (fetchpatch { - name = "dino-vala-boxing.patch"; - url = "https://github.com/dino/dino/commit/9acb54df9254609f2fe4de83c9047d408412de28.patch"; - sha256 = "1jz4r7d8b1ljwgq846wihp864b6gjdkgh6fnmxh13b2i10x52xsm"; - }) - ]; - nativeBuildInputs = [ vala cmake From 47db174a3cdc93b8c9ce81dca47217c1ebd96146 Mon Sep 17 00:00:00 2001 From: Ashlynn Anderson Date: Mon, 7 Jun 2021 15:44:13 -0400 Subject: [PATCH 279/797] nixos/self-deploy: make nixAttribute nullable (#125617) Allows using a nix file that directly provides the derivation --- nixos/modules/services/system/self-deploy.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix index 3c82ed4fc59..33d15e08f4a 100644 --- a/nixos/modules/services/system/self-deploy.nix +++ b/nixos/modules/services/system/self-deploy.nix @@ -37,7 +37,9 @@ in }; nixAttribute = lib.mkOption { - type = lib.types.str; + type = with lib.types; nullOr str; + + default = null; description = '' Attribute of `nixFile` that builds the current system. From dff48ad4d1a03ed00dae76de6dbbb4eec1df8984 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Jun 2021 20:01:13 +0000 Subject: [PATCH 280/797] leptonica: 1.80.0 -> 1.81.0 --- pkgs/development/libraries/leptonica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 11f1c7fd9c6..363140b5f58 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.80.0"; + version = "1.81.0"; src = fetchurl { url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c"; + sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 4d7d58e142cfc7c9860a46f03caca98b70229f7d Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 7 Jun 2021 21:03:41 +0200 Subject: [PATCH 281/797] vscode-extensions.wix.vscode-import-cost: init at 2.15.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 9d21b057c8a..ff90ede5388 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1173,6 +1173,18 @@ let }; }; + wix.vscode-import-cost = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-import-cost"; + publisher = "wix"; + version = "2.15.0"; + sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + xaver.clang-format = buildVscodeMarketplaceExtension { mktplcRef = { name = "clang-format"; From dad1dd45a8782eba20deadb772a752eaa777ee3a Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 7 Jun 2021 21:11:42 +0200 Subject: [PATCH 282/797] vscode-extensions.johnpapa.vscode-peacock: init at 3.9.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ff90ede5388..d9ac9f19f37 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -668,6 +668,18 @@ let }; }; + johnpapa.vscode-peacock = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-peacock"; + publisher = "johnpapa"; + version = "3.9.1"; + sha256 = "1g7apzzgfm8s9sjavhwr8jpf9slhq8b9jfkww3q5n41mzzx8m94p"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-styled-components"; From 00e54055e1e7d3fbaacced361a8999a6e2ac8104 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 7 Jun 2021 01:18:01 +0000 Subject: [PATCH 283/797] envoy: 1.16.2 -> 1.17.3 --- pkgs/servers/http/envoy/default.nix | 33 +++++++++++++++++------------ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 57c0e22d8af..d26782560a4 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -3,7 +3,9 @@ , fetchFromGitHub , stdenv , cmake +, gn , go +, jdk , ninja , python3 , nixosTests @@ -15,8 +17,8 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.16.2"; - commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3"; + version = "1.17.3"; + commit = "46bf743b97d0d3f01ff437b2f10cc0bd9cdfe6e4"; }; in buildBazelPackage rec { @@ -26,7 +28,7 @@ buildBazelPackage rec { owner = "envoyproxy"; repo = "envoy"; rev = srcVer.commit; - hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ="; + hash = "sha256:09zzr4h3zjsb2rkxrvlazpx0jy33yn9j65ilxiqbvv0ckaralqfc"; extraPostFetch = '' chmod -R +w $out @@ -36,29 +38,29 @@ buildBazelPackage rec { ''; }; - patches = [ - # Quiche needs to be updated to compile under newer GCC. - # This is a manual backport of https://github.com/envoyproxy/envoy/pull/13949. - ./0001-quiche-update-QUICHE-tar-13949.patch - - # upb needs to be updated to compile under newer GCC. - # This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020. - ./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch - ]; postPatch = '' sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch + sed -i '/javabase=/d' .bazelrc + # Patch paths to build tools, and disable gold because it just segfaults. + substituteInPlace bazel/external/wee8.genrule_cmd \ + --replace '"''$$gn"' '"''$$(command -v gn)"' \ + --replace '"''$$ninja"' '"''$$(command -v ninja)"' \ + --replace '"''$$WEE8_BUILD_ARGS"' '"''$$WEE8_BUILD_ARGS use_gold=false"' ''; nativeBuildInputs = [ cmake python3 + gn go + jdk ninja ]; fetchAttrs = { - sha256 = "0q72c2zrl5vc8afkhkwyalb2h0mxn3133d4b9z4gag0p95wbwgc0"; + sha256 = "sha256:1cy2b73x8jzczq9z9c1kl7zrg5iasvsakb50zxn4mswpmajkbj5h"; dontUseCmakeConfigure = true; + dontUseGnConfigure = true; preInstall = '' # Strip out the path to the build location (by deleting the comment line). find $bazelOut/external -name requirements.bzl | while read requirements; do @@ -78,10 +80,14 @@ buildBazelPackage rec { >$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl >$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl >$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl + + # Remove Unix timestamps from go cache. + rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb} ''; }; buildAttrs = { dontUseCmakeConfigure = true; + dontUseGnConfigure = true; dontUseNinjaInstall = true; preConfigure = '' sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl @@ -98,7 +104,6 @@ buildBazelPackage rec { ''; }; - fetchConfigured = true; removeRulesCC = false; removeLocalConfigCc = true; removeLocal = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72a53a99cb4..d238973c554 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19098,7 +19098,10 @@ in engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; - envoy = callPackage ../servers/http/envoy { }; + envoy = callPackage ../servers/http/envoy { + go = go_1_15; + jdk = openjdk11; + }; etcd = callPackage ../servers/etcd { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; From 137fcc6cf048ec6a8ea8766af7636e9bdf32d063 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 7 Jun 2021 01:18:16 +0000 Subject: [PATCH 284/797] pomerium: 0.13.3 -> 0.14.4 --- pkgs/servers/http/pomerium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 0605a12eca4..036e44ca621 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -11,15 +11,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.13.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-g0w1aIHvf2rJANvGWHeUxdnyCDsvy/PQ9Kp8nDdT/0w="; + hash = "sha256:097csr8f43cn0iq030ajvvpwnwcfmjxyyk6pcisdy937axlrzska"; }; - vendorSha256 = "sha256-grihU85OcGyf9/KKrv87xZonX5r+Z1oHQTf84Ya61fg="; + vendorSha256 = "sha256:0n45xvwjiqyh41dsm4z1rnkgkycf5wfmacm804hqnd5rz7xk2shf"; subPackages = [ "cmd/pomerium" "cmd/pomerium-cli" From f18734f8b89764d21c7eb7c62014565e444cf981 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 7 Jun 2021 01:52:23 +0000 Subject: [PATCH 285/797] python3Packages.tensorflow: update hashes for fetchConfigured --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 522fd730127..bbdecc8bdcd 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -288,9 +288,9 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4" + "10m6qj3kchgxfgb6qh59vc51knm9r9pkng8bf90h00dnggvv8234" else - "0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45"; + "04a98yrp09nd0p17k0jbzkgjppxs0yma7m5zkfrwgvr4g0w71v68"; }; buildAttrs = { From 3d6fd379920bc9b906b60da3a17ad0a4d2d142c7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 7 Jun 2021 01:54:29 +0000 Subject: [PATCH 286/797] bazel-watcher: update hashes for fetchConfigured --- pkgs/development/tools/bazel-watcher/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 657704a653c..e10a455c090 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -56,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0rwwjjj6zaj4hdcbsbp0di53xn6203r2vgpddhdrp8iph9ab60cg"; + sha256 = "1j175z3d4fbi4pl35py7yjq7ywrvwin6id131jv32hx0ck4g1m46"; }; buildAttrs = { From 73d9da471bb444e2698b58fd1568d003a23159bd Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 5 Jun 2021 22:37:28 -0300 Subject: [PATCH 287/797] ocamlPackages.octavius: 0.2.0 -> 1.2.2 --- .../ocaml-modules/octavius/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index c71c8f35f4b..a4124df6664 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -1,24 +1,25 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "octavius is not available for OCaml ${ocaml.version}" else +buildDunePackage rec { + pname = "octavius"; + version = "1.2.2"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-octavius-0.2.0"; - src = fetchurl { - url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz"; - sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; + src = fetchFromGitHub { + owner = "ocaml-doc"; + repo = "octavius"; + rev = "v${version}"; + sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA="; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + minimumOCamlVersion = "4.03"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; - inherit (topkg) buildPhase installPhase; + doCheck = true; - meta = { + meta = with lib; { description = "Ocamldoc comment syntax parser"; homepage = "https://github.com/ocaml-doc/octavius"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = licenses.isc; + maintainers = with maintainers; [ vbgl ]; }; } From d56b1567ecc04287ea975e672dd0e3f72e913b0d Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Mon, 7 Jun 2021 23:27:37 +0200 Subject: [PATCH 288/797] nvimpager: 0.9 -> 0.10 (#126027) * nvimpager: 0.9 -> 0.10 Patch the makefile as it assumes it is run in a git checkout and not from an extracted tarball. * fixup: add comment about new subsitute command in preBuild * fixup: Fix definition of checkPhase --- pkgs/tools/misc/nvimpager/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 61f9e7262c9..e0798919886 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -1,36 +1,43 @@ { fetchFromGitHub , lib, stdenv , ncurses, neovim, procps -, pandoc, lua51Packages, util-linux +, scdoc, lua51Packages, util-linux }: stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "1xy5387szfw0bp8dr7d4z33wd4xva7q219rvz8gc0vvv1vsy73va"; + sha256 = "sha256-okYnPwuxU/syxcKIMUBc25r791D6Bug2w2axH4vvmAY="; }; buildInputs = [ ncurses # for tput procps # for nvim_get_proc() which uses ps(1) ]; - nativeBuildInputs = [ pandoc ]; + nativeBuildInputs = [ scdoc ]; makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ "nvimpager.configured" ]; + buildFlags = [ "nvimpager.configured" "nvimpager.1" ]; preBuild = '' patchShebangs nvimpager substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim' + # remove git command from makefile as we run from a tarball + # replace with actual timestamp of the commit + substituteInPlace makefile --replace '$(shell git log -1 --no-show-signature --pretty="%ct")' 1623019602 ''; doCheck = true; checkInputs = [ lua51Packages.busted util-linux neovim ]; - checkPhase = ''script -c "busted --lpath './?.lua' test"''; + checkPhase = '' + runHook preCheck + script -c "busted --lpath './?.lua' test" + runHook postCheck + ''; meta = with lib; { description = "Use neovim as pager"; From 1d1c6753c6fdbfb345743858131899d70431de84 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 3 Jun 2021 20:27:23 +0200 Subject: [PATCH 289/797] neovim: set packpath only if there are packages part of the work to automatically disable the generation of init.vim when unnecessary --- pkgs/misc/vim-plugins/vim-utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 1163f5dd9f0..5ca3aef2358 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -184,7 +184,7 @@ let rtpPath = "share/vim-plugins"; - nativeImpl = packages: lib.optionalString (packages != null) + nativeImpl = packages: (let link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); packageLinks = (packageName: {start ? [], opt ? []}: @@ -340,8 +340,8 @@ let entries = [ beforePlugins vamImpl - (nativeImpl packages) ] + ++ lib.optional (packages != null && packages != []) (nativeImpl packages) ++ lib.optional (pathogen != null) pathogenImpl ++ lib.optional (plug != null) plugImpl ++ [ customRC ]; From 3bc85d5ca1c71feb56b5b0d794d81a44deb0e7ea Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 7 Jun 2021 23:38:04 +0200 Subject: [PATCH 290/797] grafana-image-renderer: 2.1.0 -> 3.0.0 ChangeLog: https://github.com/grafana/grafana-image-renderer/releases/tag/v3.0.0 --- .../grafana-image-renderer/default.nix | 4 +- .../grafana-image-renderer/package.json | 1 + .../grafana-image-renderer/yarn.lock | 69 ++++++++++++++++--- .../grafana-image-renderer/yarn.nix | 64 ++++++++++++++--- 4 files changed, 117 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 27013c2a778..fab8d4b0096 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { name = "grafana-image-renderer"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-loWLbeu8h0fhMcUzmeYVSw4x6R0GVfqwb/vHwCNT/fM="; + sha256 = "sha256-wg+cMAMqj4JORh5LPJnNELgsJYAxVgz2YPOl87WWda4="; }; buildPhase = '' diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 36f9a329769..c1db7f86181 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -21,6 +21,7 @@ "@grpc/grpc-js": "^1.0", "@grpc/proto-loader": "^0.5.4", "@hapi/boom": "^9.1.0", + "chokidar": "^3.5.1", "eslint": "^7.13.0", "express": "^4.16.3", "express-prom-bundle": "^5.1.5", diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index cf769ed5920..80fd4569e69 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -373,6 +373,14 @@ any-observable@^0.3.0: resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== +anymatch@~3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -442,6 +450,11 @@ basic-auth@~2.0.1: dependencies: safe-buffer "5.1.2" +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + bintrees@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" @@ -480,7 +493,7 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1: +braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -557,6 +570,21 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chokidar@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -1281,6 +1309,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +fsevents@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -1327,7 +1360,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob-parent@^5.0.0, glob-parent@^5.1.0: +glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -1570,6 +1603,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-core-module@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" @@ -1604,7 +1644,7 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.0, is-glob@^4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== @@ -2046,7 +2086,7 @@ noop-logger@^0.1.1: resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= -normalize-path@^3.0.0: +normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -2229,9 +2269,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@0.1.7: version "0.1.7" @@ -2255,7 +2295,7 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -picomatch@^2.2.1, picomatch@^2.2.3: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== @@ -2492,6 +2532,13 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" @@ -3129,9 +3176,9 @@ wrappy@1: integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= ws@^7.2.3: - version "7.4.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" - integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== y18n@^5.0.5: version "5.0.8" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 53fbca36c22..7eb3a3bb8a7 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -457,6 +457,14 @@ sha1 = "af933475e5806a67d0d7df090dd5e8bef65d119b"; }; } + { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + }; + } { name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { @@ -553,6 +561,14 @@ sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a"; }; } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } { name = "bintrees___bintrees_1.0.1.tgz"; path = fetchurl { @@ -673,6 +689,14 @@ sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + }; + } { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { @@ -1473,6 +1497,14 @@ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -1801,6 +1833,14 @@ sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; }; } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } { name = "is_core_module___is_core_module_2.3.0.tgz"; path = fetchurl { @@ -2626,11 +2666,11 @@ }; } { - name = "path_parse___path_parse_1.0.6.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; }; } { @@ -2881,6 +2921,14 @@ sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } + { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + }; + } { name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { @@ -3658,11 +3706,11 @@ }; } { - name = "ws___ws_7.4.5.tgz"; + name = "ws___ws_7.4.6.tgz"; path = fetchurl { - name = "ws___ws_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; - sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; + name = "ws___ws_7.4.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; + sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; }; } { From 2c1951914f3e7c1f140acbd12889f1b919e6bc80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 00:18:25 +0200 Subject: [PATCH 291/797] python3Packages.georss-qld-bushfire-alert-client: 0.4 -> 0.5 --- .../georss-qld-bushfire-alert-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index f95e0a4702b..954e4a6237f 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; - version = "0.4"; + version = "0.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; rev = "v${version}"; - sha256 = "14k7q0ynray1fj0lhxvgxpbdh4pmsqqk9gzmv38p9i7ijx8h1sc8"; + sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; }; propagatedBuildInputs = [ From 7f6056dd78176d7b64f88b962b737e4c68bbe5b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 00:27:09 +0200 Subject: [PATCH 292/797] python3Packages.aio-georss-gdacs: 0.4 -> 0.5 --- pkgs/development/python-modules/aio-georss-gdacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 75894aa0e7a..6b6d295f8b8 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.4"; + version = "0.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "v${version}"; - sha256 = "0rcrhdpgj84hfifx9rzxz15ajzsk069iknb28gicw1cm1qv4vfxm"; + sha256 = "sha256-CIQoQRk5KIPEa/Y/7C1NPctuHvoiZ/o2bDa5YSWY+9M="; }; propagatedBuildInputs = [ From b2c045c07ba1ee30405e0854d4e8cc6cbb0fedb7 Mon Sep 17 00:00:00 2001 From: ZerataX Date: Tue, 8 Jun 2021 00:59:38 +0200 Subject: [PATCH 293/797] papermc: 1.16.5r488 -> 1.16.5r771 --- pkgs/games/papermc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index f5bf9573e6b..72612394fe2 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let mcVersion = "1.16.5"; - buildNum = "488"; + buildNum = "771"; jar = fetchurl { - url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "07zgq6pfgwd9a9daqv1dab0q8cwgidsn6sszn7bpr37y457a4ka8"; + url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; + sha256 = "1lmlfhigbzbkgzfq6knglka0ccf4i32ch25gkny0c5fllmsnm08l"; }; in stdenv.mkDerivation { pname = "papermc"; From bab9dcdaac3b3676e50e4cb1f97fdf786f402343 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Jun 2021 20:31:11 -0300 Subject: [PATCH 294/797] quickjs: 2020-11-08 -> 2021-03-27 --- .../interpreters/quickjs/default.nix | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index ac70a50eaa7..4bc0ec528a0 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -1,17 +1,37 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +, texinfo +}: stdenv.mkDerivation rec { pname = "quickjs"; - version = "2020-11-08"; + version = "2021-03-27"; - src = fetchurl { - url = "https://bellard.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f"; + src = fetchFromGitHub { + owner = "bellard"; + repo = pname; + rev = "b5e62895c619d4ffc75c9d822c8d85f1ece77e5b"; + hash = "sha256-VMaxVVQuJ3DAwYrC14uJqlRBg0//ugYvtyhOXsTUbCA="; }; makeFlags = [ "prefix=${placeholder "out"}" ]; enableParallelBuilding = true; + nativeBuildInputs = [ + texinfo + ]; + + postBuild = '' + (cd doc + makeinfo *texi) + ''; + + postInstall = '' + (cd doc + install -Dt $out/share/doc *texi *info) + ''; + doInstallCheck = true; installCheckPhase = '' PATH="$out/bin:$PATH" @@ -32,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small and embeddable Javascript engine"; homepage = "https://bellard.org/quickjs/"; - maintainers = with maintainers; [ stesie ]; + maintainers = with maintainers; [ stesie AndersonTorres ]; platforms = platforms.linux; license = licenses.mit; }; From eb61e1c2497d7e793a747a17f6e157ae1c8bc965 Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Mon, 7 Jun 2021 17:11:17 -0700 Subject: [PATCH 295/797] vimPlugins.vim-unicoder: init at 2019-04-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 12c6e885d7b..9b28224a310 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -8970,6 +8970,18 @@ final: prev: meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; + vim-unicoder = buildVimPluginFrom2Nix { + pname = "vim-unicoder"; + version = "2019-04-16"; + src = fetchFromGitHub { + owner = "arthurxavierx"; + repo = "vim-unicoder"; + rev = "a71fc3670f9337c56806fa9e8e97b7ea09fd5e39"; + sha256 = "1kcnxx909pdvrvk0kyz3h8f9szn6hmalm8qyakq3pv6dknlkwb0b"; + }; + meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1d43a2d8eae..c17da77231c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -25,6 +25,7 @@ andys8/vim-elm-syntax antoinemadec/coc-fzf ap/vim-css-color arcticicestudio/nord-vim +arthurxavierx/vim-unicoder artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim axelf4/vim-strip-trailing-whitespace From 2033f37fb284bd55159ea1650aa93a635caaffb3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 8 Jun 2021 03:47:26 +0300 Subject: [PATCH 296/797] steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0 --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index b501df598ef..ab2c19249aa 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20210317.0"; + version = "0.20210527.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "061z2r33n2017prmhdxm82cly3qp3bma2q70pqs57adl65yvg7vw"; + sha256 = "1880d1byn265w0vy5p98d8w8virnbywj707ydybj7rixhid2gzdc"; name = "scout-runtime-${version}.tar.gz"; }; From 03310df843a344215b45b2e8aef11ae9402a40e2 Mon Sep 17 00:00:00 2001 From: Luke Worth Date: Tue, 8 Jun 2021 10:40:10 +1000 Subject: [PATCH 297/797] nix-direnv: make flakes support optional `nix-direnv` depends on `nixUnstable` for flakes support, but that causes it to print a warning unless your user is trusted or the `experimental-features` setting is enabled. Neither of these are desirable (note that setting `experimental-features` in nix.conf causes warnings on `nixStable`). Since flakes are experimental, this commit makes `nixStable` the default and optionally allows `nixUnstable` with a new flag `enableFlakes`, prioritising a good experience for users not using experimental features. --- pkgs/tools/misc/nix-direnv/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 94ce54a2a9a..526efc65f6a 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }: +{ lib +, stdenv +, fetchFromGitHub +, gnugrep +, nixStable +, nixUnstable +, enableFlakes ? false +}: +let + nix = if enableFlakes then nixUnstable else nixStable; +in stdenv.mkDerivation rec { pname = "nix-direnv"; version = "1.2.6"; @@ -14,7 +24,7 @@ stdenv.mkDerivation rec { # Substitute instead of wrapping because the resulting file is # getting sourced, not executed: postPatch = '' - sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc + sed -i "1a NIX_BIN_PREFIX=${nix}/bin/" direnvrc substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" ''; From 621cda44c92408d9283efd023da349f22733c95e Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Sun, 6 Jun 2021 09:05:52 +0800 Subject: [PATCH 298/797] hime: unstable-2020-06-27 -> 0.9.11 --- pkgs/tools/inputmethods/hime/default.nix | 39 ++++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 988f8941d14..4c86fb04cf0 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -1,27 +1,40 @@ -{ -stdenv, fetchFromGitHub, pkg-config, which, gtk2, gtk3, qt4, qt5, libXtst, lib, +{ stdenv +, fetchFromGitHub +, pkg-config +, which +, gtk2 +, gtk3 +, qt4 +, qt5 +, libXtst +, lib +, libchewing +, unixtools +, anthy }: -# chewing and anthy do not work well -# so we do not enable these input method at this moment - -stdenv.mkDerivation { - name = "hime"; - version = "unstable-2020-06-27"; +stdenv.mkDerivation rec { + pname = "hime"; + version = "0.9.11"; src = fetchFromGitHub { + repo = pname; owner = "hime-ime"; - repo = "hime"; - rev = "c89751a58836906e6916355fd037fc74fd7a7a15"; - sha256 = "024w67q0clzxigsrvqbxpiy8firjvrqi7wbkkcapzzhzapv3nm8x"; + rev = "v${version}"; + sha256 = "sha256-fCqet+foQjI+LpTQ/6Egup1GzXELlL2hgbh0dCKLwPI="; }; - nativeBuildInputs = [ which pkg-config ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ]; + nativeBuildInputs = [ which pkg-config unixtools.whereis ]; + buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase libchewing anthy ]; preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; dontWrapQtApps = true; + postFixup = '' + hime_rpath=$(patchelf --print-rpath $out/bin/hime) + patchelf --set-rpath $out/lib/hime:$hime_rpath $out/bin/hime + ''; + meta = with lib; { homepage = "http://hime-ime.github.io/"; From eae65a197dc28c9eac6b6afad065d7853339ea6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 7 Jun 2021 14:21:15 +0200 Subject: [PATCH 299/797] beam/buildMix: pass on custom nativeBuildInputs 3bc80f19388a8b29b65c91fd4550f51cbc9a3a96 changed buildInputs to nativeBuildInputs, but broke specifying custom nativeBuildInputs. --- pkgs/development/beam-modules/build-mix.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 783ae34dcd3..728d249c97d 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -4,6 +4,7 @@ , version , src , buildInputs ? [ ] +, nativeBuildInputs ? [ ] , beamDeps ? [ ] , propagatedBuildInputs ? [ ] , postPatch ? "" @@ -23,7 +24,7 @@ let pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; - inherit version src buildInputs; + inherit version src; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; @@ -37,7 +38,8 @@ let addToSearchPath ERL_LIBS "$1/lib/erlang/lib" ''; - nativeBuildInputs = [ elixir hex ]; + buildInputs = buildInputs ++ [ ]; + nativeBuildInputs = nativeBuildInputs ++ [ elixir hex ]; propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; buildPhase = attrs.buildPhase or '' From 008453f7b2888dab0b7fbdec527e9102c7d52d71 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 8 Jun 2021 05:17:11 +0300 Subject: [PATCH 300/797] mpvScripts.youtube-quality: correct the pname --- pkgs/applications/video/mpv/scripts/youtube-quality.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/youtube-quality.nix b/pkgs/applications/video/mpv/scripts/youtube-quality.nix index 3c55a36d0a7..5301e4232a0 100644 --- a/pkgs/applications/video/mpv/scripts/youtube-quality.nix +++ b/pkgs/applications/video/mpv/scripts/youtube-quality.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation rec { - pname = "mpv-playlistmanager"; + pname = "mpv-youtube-quality"; version = "unstable-2020-02-11"; src = fetchFromGitHub { From fbfdc8fc0b9ad81115e86cc48f97dc666d57b444 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 6 Jun 2021 07:45:53 -0700 Subject: [PATCH 301/797] doc/functions/debug: convert to CommonMark --- doc/functions.xml | 2 +- doc/functions/debug.section.md | 5 +++++ doc/functions/debug.xml | 14 -------------- 3 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 doc/functions/debug.section.md delete mode 100644 doc/functions/debug.xml diff --git a/doc/functions.xml b/doc/functions.xml index e8ab8d97b91..f2d06402317 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -8,7 +8,7 @@ - + diff --git a/doc/functions/debug.section.md b/doc/functions/debug.section.md new file mode 100644 index 00000000000..b2d8589431a --- /dev/null +++ b/doc/functions/debug.section.md @@ -0,0 +1,5 @@ +# Debugging Nix Expressions {#sec-debug} + +Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions. + +In the `lib/debug.nix` file you will find a number of functions that help (pretty-)printing values while evaluation is running. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in `lib/debug.nix` for usage information. diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml deleted file mode 100644 index c27421f12e7..00000000000 --- a/doc/functions/debug.xml +++ /dev/null @@ -1,14 +0,0 @@ -
- Debugging Nix Expressions - - - Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions. - - - - In the lib/debug.nix file you will find a number of functions that help (pretty-)printing values while evaluation is runnnig. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in lib/debug.nix for usage information. - -
From 77cfa5fd07fb5c501b9510a4058a438de3acc620 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 3 Jun 2021 20:55:01 -0700 Subject: [PATCH 302/797] nixos/doc: convert boot problems section to CommonMark --- .../administration/boot-problems.section.md | 35 +++++ .../manual/administration/boot-problems.xml | 126 ----------------- .../manual/administration/troubleshooting.xml | 2 +- .../administration/boot-problems.section.xml | 127 ++++++++++++++++++ 4 files changed, 163 insertions(+), 127 deletions(-) create mode 100644 nixos/doc/manual/administration/boot-problems.section.md delete mode 100644 nixos/doc/manual/administration/boot-problems.xml create mode 100644 nixos/doc/manual/from_md/administration/boot-problems.section.xml diff --git a/nixos/doc/manual/administration/boot-problems.section.md b/nixos/doc/manual/administration/boot-problems.section.md new file mode 100644 index 00000000000..eb9209602a3 --- /dev/null +++ b/nixos/doc/manual/administration/boot-problems.section.md @@ -0,0 +1,35 @@ +# Boot Problems {#sec-boot-problems} + +If NixOS fails to boot, there are a number of kernel command line parameters that may help you to identify or fix the issue. You can add these parameters in the GRUB boot menu by pressing “e” to modify the selected boot entry and editing the line starting with `linux`. The following are some useful kernel command line parameters that are recognised by the NixOS boot scripts or by systemd: + +`boot.shell_on_fail` + +: Allows the user to start a root shell if something goes wrong in stage 1 of the boot process (the initial ramdisk). This is disabled by default because there is no authentication for the root shell. + +`boot.debug1` + +: Start an interactive shell in stage 1 before anything useful has been done. That is, no modules have been loaded and no file systems have been mounted, except for `/proc` and `/sys`. + +`boot.debug1devices` + +: Like `boot.debug1`, but runs stage1 until kernel modules are loaded and device nodes are created. This may help with e.g. making the keyboard work. + +`boot.debug1mounts` + +: Like `boot.debug1` or `boot.debug1devices`, but runs stage1 until all filesystems that are mounted during initrd are mounted (see [neededForBoot](#opt-fileSystems._name_.neededForBoot)). As a motivating example, this could be useful if you've forgotten to set [neededForBoot](options.html#opt-fileSystems._name_.neededForBoot) on a file system. + +`boot.trace` + +: Print every shell command executed by the stage 1 and 2 boot scripts. + +`single` + +: Boot into rescue mode (a.k.a. single user mode). This will cause systemd to start nothing but the unit `rescue.target`, which runs `sulogin` to prompt for the root password and start a root login shell. Exiting the shell causes the system to continue with the normal boot process. + +`systemd.log_level=debug` `systemd.log_target=console` + +: Make systemd very verbose and send log messages to the console instead of the journal. For more parameters recognised by systemd, see systemd(1). + +Notice that for `boot.shell_on_fail`, `boot.debug1`, `boot.debug1devices`, and `boot.debug1mounts`, if you did **not** select "start the new shell as pid 1", and you `exit` from the new shell, boot will proceed normally from the point where it failed, as if you'd chosen "ignore the error and continue". + +If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start rescue mode (described above). (Also note that since most units have a 90-second timeout before systemd gives up on them, the `agetty` login prompts should appear eventually unless something is very wrong.) diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml deleted file mode 100644 index e0f66284010..00000000000 --- a/nixos/doc/manual/administration/boot-problems.xml +++ /dev/null @@ -1,126 +0,0 @@ -
- Boot Problems - - - If NixOS fails to boot, there are a number of kernel command line parameters - that may help you to identify or fix the issue. You can add these parameters - in the GRUB boot menu by pressing “e” to modify the selected boot entry - and editing the line starting with linux. The following - are some useful kernel command line parameters that are recognised by the - NixOS boot scripts or by systemd: - - - - boot.shell_on_fail - - - - Allows the user to start a root shell if something goes wrong in stage 1 - of the boot process (the initial ramdisk). This is disabled by default - because there is no authentication for the root shell. - - - - - - boot.debug1 - - - - Start an interactive shell in stage 1 before anything useful has been - done. That is, no modules have been loaded and no file systems have been - mounted, except for /proc and - /sys. - - - - - - boot.debug1devices - - - - Like boot.debug1, but runs stage1 until kernel modules are loaded and device nodes are created. - This may help with e.g. making the keyboard work. - - - - - - boot.debug1mounts - - - - Like boot.debug1 or - boot.debug1devices, but runs stage1 until all - filesystems that are mounted during initrd are mounted (see - - ). As a motivating example, this could be useful if you've forgotten to set - - on a file system. - - - - - - boot.trace - - - - Print every shell command executed by the stage 1 and 2 boot scripts. - - - - - - single - - - - Boot into rescue mode (a.k.a. single user mode). This will cause systemd - to start nothing but the unit rescue.target, which - runs sulogin to prompt for the root password and start - a root login shell. Exiting the shell causes the system to continue with - the normal boot process. - - - - - - systemd.log_level=debug systemd.log_target=console - - - - Make systemd very verbose and send log messages to the console instead of - the journal. - - - - - For more parameters recognised by systemd, see - systemd - 1. - - - - Notice that for boot.shell_on_fail, - boot.debug1, boot.debug1devices, and - boot.debug1mounts, if you did not - select "start the new shell as pid 1", and you exit from - the new shell, boot will proceed normally from the point where it failed, as - if you'd chosen "ignore the error and continue". - - - - If no login prompts or X11 login screens appear (e.g. due to hanging - dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start - rescue mode (described above). (Also note that since most units have a - 90-second timeout before systemd gives up on them, the - agetty login prompts should appear eventually unless - something is very wrong.) - -
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml index 6496e7bde38..b055acadacf 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -8,7 +8,7 @@ This chapter describes solutions to common problems you might encounter when you manage your NixOS system. - + diff --git a/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/nixos/doc/manual/from_md/administration/boot-problems.section.xml new file mode 100644 index 00000000000..89871e7aeb6 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/boot-problems.section.xml @@ -0,0 +1,127 @@ +
+ Boot Problems + + If NixOS fails to boot, there are a number of kernel command line + parameters that may help you to identify or fix the issue. You can + add these parameters in the GRUB boot menu by pressing + e to modify the selected boot entry and editing the + line starting with linux. The following are some + useful kernel command line parameters that are recognised by the + NixOS boot scripts or by systemd: + + + + + boot.shell_on_fail + + + + Allows the user to start a root shell if something goes wrong + in stage 1 of the boot process (the initial ramdisk). This is + disabled by default because there is no authentication for the + root shell. + + + + + + boot.debug1 + + + + Start an interactive shell in stage 1 before anything useful + has been done. That is, no modules have been loaded and no + file systems have been mounted, except for + /proc and /sys. + + + + + + boot.debug1devices + + + + Like boot.debug1, but runs stage1 until + kernel modules are loaded and device nodes are created. This + may help with e.g. making the keyboard work. + + + + + + boot.debug1mounts + + + + Like boot.debug1 or + boot.debug1devices, but runs stage1 until + all filesystems that are mounted during initrd are mounted + (see + neededForBoot). + As a motivating example, this could be useful if you’ve + forgotten to set + neededForBoot + on a file system. + + + + + + boot.trace + + + + Print every shell command executed by the stage 1 and 2 boot + scripts. + + + + + + single + + + + Boot into rescue mode (a.k.a. single user mode). This will + cause systemd to start nothing but the unit + rescue.target, which runs + sulogin to prompt for the root password and + start a root login shell. Exiting the shell causes the system + to continue with the normal boot process. + + + + + + systemd.log_level=debug + systemd.log_target=console + + + + Make systemd very verbose and send log messages to the console + instead of the journal. For more parameters recognised by + systemd, see systemd(1). + + + + + + Notice that for boot.shell_on_fail, + boot.debug1, + boot.debug1devices, and + boot.debug1mounts, if you did + not select start the new + shell as pid 1, and you exit from the new + shell, boot will proceed normally from the point where it failed, as + if you’d chosen ignore the error and continue. + + + If no login prompts or X11 login screens appear (e.g. due to hanging + dependencies), you can press Alt+ArrowUp. If you’re lucky, this will + start rescue mode (described above). (Also note that since most + units have a 90-second timeout before systemd gives up on them, the + agetty login prompts should appear eventually + unless something is very wrong.) + +
From c682532fceff80170e427a4383ae6e474165dd2b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 6 Jun 2021 13:19:33 -0700 Subject: [PATCH 303/797] doc/functions/prefer-remote-fetch: convert to CommonMark --- doc/functions.xml | 2 +- doc/functions/prefer-remote-fetch.section.md | 17 ++++++++++++++++ doc/functions/prefer-remote-fetch.xml | 21 -------------------- 3 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 doc/functions/prefer-remote-fetch.section.md delete mode 100644 doc/functions/prefer-remote-fetch.xml diff --git a/doc/functions.xml b/doc/functions.xml index f2d06402317..dd91d705aa9 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -9,6 +9,6 @@ - + diff --git a/doc/functions/prefer-remote-fetch.section.md b/doc/functions/prefer-remote-fetch.section.md new file mode 100644 index 00000000000..8760c100224 --- /dev/null +++ b/doc/functions/prefer-remote-fetch.section.md @@ -0,0 +1,17 @@ +# prefer-remote-fetch overlay {#sec-prefer-remote-fetch} + +`prefer-remote-fetch` is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: + +```nix +self: super: + (super.prefer-remote-fetch self super) +``` + +A full configuration example for that sets the overlay up for your own account, could look like this + +```ShellSession +$ mkdir ~/.config/nixpkgs/overlays/ +$ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix < - prefer-remote-fetch overlay - - - prefer-remote-fetch is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: - -self: super: - (super.prefer-remote-fetch self super) - - A full configuration example for that sets the overlay up for your own account, could look like this - -$ mkdir ~/.config/nixpkgs/overlays/ -$ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF - self: super: super.prefer-remote-fetch self super -EOF - - -
From b689cc33bccf7e4020cb675ef6459209c2c7020f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 03:40:51 +0000 Subject: [PATCH 304/797] gdu: 5.0.1 -> 5.1.0 --- pkgs/tools/system/gdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 629085d346f..bff605dbcde 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-78eQinKR4w7K8MFd4uyj5IPkUs0Mz5XeO7JUG/1cKLw="; + sha256 = "sha256-OellGxW/2I/dKBxWgEv1Ta9OJ/2HUfDIzICQwvmjTCM="; }; - vendorSha256 = "sha256-9upXhTvQJ9oFfomgqja3SiifiZpl8RUQ85HwL9bDPlQ="; + vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; nativeBuildInputs = [ installShellFiles ]; From f5c5e33cc3db16cc116f00cb7cc58292d69428ec Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 8 Jun 2021 00:43:54 -0300 Subject: [PATCH 305/797] org-packages 2021-06-08 --- .../editors/emacs/elisp-packages/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 83c3a977273..b70032982c0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210519"; + version = "20210607"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210519.tar"; - sha256 = "14vchfg69wai1yxv1fzvjk185gnfr7d9qrdijf0qmbbr5znci8rf"; + url = "https://orgmode.org/elpa/org-20210607.tar"; + sha256 = "178z9bnzcdaymnwxf0kkw1yzlzkj5dmdjjwdklc9qb9iv6rckfji"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210519"; + version = "20210607"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210519.tar"; - sha256 = "0g765fsc7ssn779xnhjzrxy1sz5b019h7dk1q26yk2w6i540ybfl"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210607.tar"; + sha256 = "03liivgfcmp0lh6p57bh2gyn85n3sc4p91y374kq8kzc7fzrgzyr"; }; packageRequires = []; meta = { From 688a5b4c37e93e2c5cf782fa1d85bd588af52184 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 03:48:25 +0000 Subject: [PATCH 306/797] git-filter-repo: 2.29.0 -> 2.32.0 --- .../git-and-tools/git-filter-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index 864ef51a588..c67fb1532ab 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.29.0"; + version = "2.32.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb"; + sha256 = "sha256-CztFSyeKM9Bmcf0eSrLHH3vHGepd8WXPvcAACT+vFps="; }; buildInputs = [ pythonPackages.python ]; From 6089d43427b9e9591978ebbb09181255b0eeaaff Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 8 Jun 2021 00:45:01 -0300 Subject: [PATCH 307/797] melpa-packages 2021-06-08 --- .../elisp-packages/recipes-archive-melpa.json | 3644 ++++++++++------- 1 file changed, 2092 insertions(+), 1552 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 7675abd5028..1429040e415 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -198,11 +198,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210417, - 1134 + 20210605, + 1143 ], - "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", - "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" + "commit": "118ed7fc948b6d91eea727df35a1639521bf5fdb", + "sha256": "0qnsyvvb0knarvd4lvnzazf8y756iwx435zswym5lwsw5v847l8d" }, "stable": { "version": [ @@ -1036,15 +1036,15 @@ "version": [ 2, 4, - 0 + 1 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" } }, { @@ -1073,7 +1073,7 @@ "version": [ 2, 4, - 0 + 1 ], "deps": [ "dash", @@ -1083,8 +1083,8 @@ "s", "xcscope" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" } }, { @@ -1597,10 +1597,10 @@ }, { "ename": "acme-theme", - "commit": "0bf14d91ff89556671b175d5f7e71066f27cb73d", - "sha256": "0zsrqvhly3si2qkvc4rhki89r2z185l684wf7j9kx32fgaaqanac", + "commit": "1b9a64eee8e5b3f75f873654fd6102fc4aaf5e10", + "sha256": "09079yjzc9dk052r5fjq9sxps2yld6rl36k6f58xj2rvghzdsbwc", "fetcher": "github", - "repo": "ianpan870102/acme-emacs-theme", + "repo": "ianyepan/acme-emacs-theme", "unstable": { "version": [ 20210430, @@ -1855,6 +1855,24 @@ "sha256": "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7" } }, + { + "ename": "affe", + "commit": "84b0a313d4246b6e0c0541300a62c4ed37a71cbf", + "sha256": "1x0w6zl8ivv2lbj3qncqmvgh09p8q5zljhqxylsi3kc13xkv9d0p", + "fetcher": "github", + "repo": "minad/affe", + "unstable": { + "version": [ + 20210603, + 1139 + ], + "deps": [ + "consult" + ], + "commit": "dee51350e1d7d3cfbfb12069dea9246454a3df31", + "sha256": "1dpzwwbkwxmkh430hk3w9p6z1rwns5znzbar071h95gi7phyhm2x" + } + }, { "ename": "afternoon-theme", "commit": "583256b7fa48501c8bfad305d76d2e16b6441539", @@ -1918,18 +1936,23 @@ "annotation", "eri" ], - "commit": "ed6730a1717a0e3ddc25a75de0c2e109371391c7", - "sha256": "0zlx4xh5c5d88zfbbwd79qb56mrvd3fhgqd7r64p6gx9gfa6kbi5" + "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", + "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" }, "stable": { "version": [ 2, 6, 1, - 3 + 3, + 20210605 ], - "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", - "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" + "deps": [ + "annotation", + "eri" + ], + "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", + "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" } }, { @@ -2286,6 +2309,32 @@ "sha256": "0nffxpdm0sa7bynwi0rmlwpc4qmvbda5ankhzz7fmk4ap9fkjxv9" } }, + { + "ename": "alectryon", + "commit": "4f7b6099b9167840602515f10ab02e70defbee1e", + "sha256": "0q1dsnrjak49dlmwkns79n996ip6zsdsv4k2ifgd9r8fd9yxki22", + "fetcher": "github", + "repo": "cpitclaudel/alectryon", + "unstable": { + "version": [ + 20210518, + 1550 + ], + "deps": [ + "flycheck" + ], + "commit": "df5664e71c1026af4aaf69e6b227d427a728e7c6", + "sha256": "1czy3sbwm6lfrgdbj0y12q4n70w6zg8g3y27iz1zr4y20hhcp2zk" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "55fc849cdb7a05bbaab6f9359386d8830bdcfb87", + "sha256": "0v5jfmqcvridh8z7y8i5hklybfxicgmbnambi21ml34px3p9fldc" + } + }, { "ename": "alert", "commit": "113953825ac4ff98d90a5375eb48d8b7bfa224e7", @@ -2378,23 +2427,20 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210513, - 1918 + 20210603, + 1604 ], - "commit": "be99987eda1ba3fdc490984b207849689599b858", - "sha256": "0a0yva34hrz7d1zq9p6bn69ywc2zpi6zpwb2s5g1lbh23cihvi1g" + "commit": "facbde4a7be292bf9490932cbe403b443273f45d", + "sha256": "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g" }, "stable": { "version": [ - 4, + 5, 0, - 1 + 0 ], - "deps": [ - "memoize" - ], - "commit": "d363bb3e73909be013fcf35e1458bb654ec5bbaa", - "sha256": "0yh7gnv9xfqn8q4rzaa6wpyn9575vyfxy7d3afly2mqsb367fgm5" + "commit": "facbde4a7be292bf9490932cbe403b443273f45d", + "sha256": "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g" } }, { @@ -2504,8 +2550,21 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210505, - 840 + 20210605, + 1700 + ], + "deps": [ + "all-the-icons", + "ivy-rich" + ], + "commit": "e0eba9cb8f8c85c0b63434f6117f9fa232d8a890", + "sha256": "05a53s7v1vy688gwnn01p3flqlhznp2m0k1mg8ax4hjygyc05l8q" + }, + "stable": { + "version": [ + 1, + 5, + 1 ], "deps": [ "all-the-icons", @@ -2513,19 +2572,6 @@ ], "commit": "0138c7e7f3b7a6c09665e45a6dd2168359efd47c", "sha256": "0nbbkasbklxf62rx9mc5w37r014vdbbg3vm5dy03hxzvq3y1yrpn" - }, - "stable": { - "version": [ - 1, - 5, - 0 - ], - "deps": [ - "all-the-icons", - "ivy-rich" - ], - "commit": "7f8249ac92321a81d3db11e56888e569988b51d5", - "sha256": "1fwih9qidv0wkqrcsngcainw8b5bxcbk15g5a0p5dpl6hqcxj3rz" } }, { @@ -3146,18 +3192,19 @@ 20200914, 644 ], - "commit": "ed6730a1717a0e3ddc25a75de0c2e109371391c7", - "sha256": "0zlx4xh5c5d88zfbbwd79qb56mrvd3fhgqd7r64p6gx9gfa6kbi5" + "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", + "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" }, "stable": { "version": [ 2, 6, 1, - 3 + 3, + 20210605 ], - "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", - "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" + "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", + "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" } }, { @@ -3790,14 +3837,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20210216, - 926 + 20210527, + 1341 ], "deps": [ "spinner" ], - "commit": "969b49ef6c954a067b3cbca43a4cdc1c04b1a62a", - "sha256": "0cjygkddlla2ygiyn506mwqjfn52lqpwfbv1fbwcqljvfspc65am" + "commit": "d7c87812c205bc01c8c8a7ab02f201b6138c7e57", + "sha256": "08hjyxz187hc07d0g8s7z7d3pa2z9f8lwdzramki95gm27q08n4y" } }, { @@ -4413,6 +4460,38 @@ "sha256": "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28" } }, + { + "ename": "auth-source-keytar", + "commit": "4ba6f96ca2e20dcd75cf239370243bd8e484f851", + "sha256": "1wizylkfzsbkavqr7m88vnwgrikj8hd6v01x06k1c5kpwdggvyqv", + "fetcher": "github", + "repo": "emacs-grammarly/auth-source-keytar", + "unstable": { + "version": [ + 20210516, + 556 + ], + "deps": [ + "keytar", + "s" + ], + "commit": "9ecdd6226b50a1a04675b65589e6cc36fd3aea2c", + "sha256": "04vr0i4y9i96vm1pliac8snnvlwqzafy7xrq39wpvhvd99qr4845" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "deps": [ + "keytar", + "s" + ], + "commit": "6edf8ec86d74f1e9853da23052291cc28d2df8bc", + "sha256": "0vj2rfm516w9b4l0jwj6m9z1liqmddfmschsz2hc9i0zg1y312l5" + } + }, { "ename": "auth-source-kwallet", "commit": "047cc780e55a0f574afaf7fa0d94c31ed86cb57f", @@ -4421,11 +4500,20 @@ "repo": "vaartis/auth-source-kwallet", "unstable": { "version": [ - 20210421, - 1504 + 20210605, + 1032 ], - "commit": "c2abee6ada13d7332725bd700ad76da8aebea530", - "sha256": "1w43mlfslvmqabnm76j0bhkdsb4a2iwwidhm83qqrjpj08cq3ldj" + "commit": "053ed5e964acaf6f16a1708c36d812eeb7c1817d", + "sha256": "0jqn49wqhg3qh6m76zc65z37kaw562laifjjj8lhi9g3f86sldsp" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "1309cfcd00264a2bb8e0d1b435d4d03e3e02f314", + "sha256": "182wks10k0z1h24lkqx2rrs78f33rzarcq4s0r69cc6w67vj0fra" } }, { @@ -5094,14 +5182,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20210502, - 1103 + 20210522, + 612 ], "deps": [ "f" ], - "commit": "54a7f295e6b1eecbcc86741aaf5d72e404b43bce", - "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q" + "commit": "0dec9e632f1f3208f0da2f94b57efa1aae9ce2ab", + "sha256": "1isk9106lpdh45l41n2v8q8m9vcfb4biy9dv87rkks58nysrxy3z" }, "stable": { "version": [ @@ -5390,11 +5478,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20210507, - 1127 + 20210521, + 1051 ], - "commit": "2da6de854b07f696da0cbc9e6961b3d228295f5e", - "sha256": "14rqaf6gaxabz92s9cv9fm7pjhc2vm154yjyvj3phaj188nn298x" + "commit": "7b9b6517873c4d4d73e6e34ca56c54062db60759", + "sha256": "0vah74474x9wby36hxi7jpmlr3q1zra33lkidvxf4xh9nsliqnqn" } }, { @@ -5442,8 +5530,8 @@ "avy", "embark" ], - "commit": "a21e510bc63c8ddc98b2bb3e6fff38e9d7f41ca9", - "sha256": "13c8l2dafqn3xm0lgrn4agy2i7ycz8dxwvxdcdrbba1gdb8ivm2n" + "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", + "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" }, "stable": { "version": [ @@ -5928,30 +6016,6 @@ "sha256": "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l" } }, - { - "ename": "bang", - "commit": "d9830cce42339243091f4463490954a8a955c65f", - "sha256": "1dx1130095ij09ix20jyqradkjw9gpdfpw0d9f3krrx6xjqfn2sk", - "fetcher": "git", - "url": "https://git.sr.ht/~zge/bang", - "unstable": { - "version": [ - 20210405, - 1640 - ], - "commit": "b5252a77aed6d1c533367fde0f11d6901bf23d96", - "sha256": "1m0wmcm1akdk19vf132y1g6wjdx9kgschf66qgggd97gl50za5ab" - }, - "stable": { - "version": [ - 1, - 0, - 3 - ], - "commit": "e02338331463461a85144c0ce6b9b877bd3a7567", - "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639" - } - }, { "ename": "banner-comment", "commit": "4bb69f15cb6be38a86abf4d15450a29c9a819068", @@ -6192,26 +6256,26 @@ "repo": "jasonmj/battery-notifier", "unstable": { "version": [ - 20210517, - 1247 + 20210521, + 1238 ], "deps": [ "alert" ], - "commit": "d348b2b72cb19905e7831f40e6d94f873e1da6b9", - "sha256": "0amkrvb0i20jjclh091zkr2m5q92x6yjx8w68x8hzaa2qkabdbzf" + "commit": "ae2043db954e131d9de7347ab1a6107fd07e8893", + "sha256": "1w2cymf9yd3siijplb6vrcxwqhqsqii8bnxki7vqb1s16v7ciczz" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "alert" ], - "commit": "d348b2b72cb19905e7831f40e6d94f873e1da6b9", - "sha256": "0amkrvb0i20jjclh091zkr2m5q92x6yjx8w68x8hzaa2qkabdbzf" + "commit": "ae2043db954e131d9de7347ab1a6107fd07e8893", + "sha256": "1w2cymf9yd3siijplb6vrcxwqhqsqii8bnxki7vqb1s16v7ciczz" } }, { @@ -6246,11 +6310,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20210516, - 1724 + 20210605, + 906 ], - "commit": "56113b72d2016e9827e84a579abc700884590074", - "sha256": "1qck0qwzcjl90xsp5m1pi8x9jr8alwa4cm4yy45d5m5s3lhfd88b" + "commit": "667554f76696a3cbb50c4c01b121c1aef882195a", + "sha256": "169x8d52hkb30w2c4ww7lpipdin5406nm2i95fbbxs1sz1068b8r" } }, { @@ -6923,8 +6987,8 @@ "a", "pdf-tools" ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -6972,14 +7036,14 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210511, - 12 + 20210607, + 1230 ], "deps": [ "bibtex-completion" ], - "commit": "d994b7e34e39adcc069685220c7c3cb7516625b9", - "sha256": "1jxdfyf68d1gc240kzvllzlk7wzhsdg4m50r8g6m6a9xnyzi68ad" + "commit": "07a3c64b12673b722a21c932eb85c595dea0c863", + "sha256": "0afnb0aa3msnvg2p4pjdcliccsfhaa7pp7bx76h3sfvv4648kki5" }, "stable": { "version": [ @@ -7290,11 +7354,19 @@ "repo": "Wilfred/bison-mode", "unstable": { "version": [ - 20200226, - 47 + 20210527, + 717 ], - "commit": "675df47193accaf30ca44e142523b2b3bb122979", - "sha256": "08yg51pzpry5gy29fdbrrb7s5j5c5fxsrhgy0ncp0vl082fs1bv9" + "commit": "4f2e20394a475931409618c1635e9c9f1cf07d9c", + "sha256": "0rh4kjfapgnvv6yc3ps0n8y9nbrpdi5gs541j2axvqx97hhv8an9" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "1193903e36adf6770b673c3936ac0fbdac609b95", + "sha256": "0v1vqc22nfhq2c09j0xiyd0yplimf1gy3m5zlgl33dijhh6wxv8n" } }, { @@ -7891,29 +7963,28 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20210519, - 937 + 20210530, + 1158 ], "deps": [ "epkg", "magit" ], - "commit": "91668945db55e6c96940be1b49a868bd815b5e51", - "sha256": "1r2faskha94z55vs7kxj8pfdgw2yd0b3jl1h5higw9wjdwjwdzhb" + "commit": "e2263534e16ed8bbc935ee466f6ad2acbe9c603e", + "sha256": "169sdgi476hnxxv0s9qfi8cply9q7gb8i1hli4i74ynlrhc9wfq7" }, "stable": { "version": [ 3, - 1, - 2 + 2, + 0 ], "deps": [ - "dash", "epkg", "magit" ], - "commit": "3f9fc2281e9ae873873998782c98c57c5ebb0555", - "sha256": "1k889m4095lm97lphcwcrsl53vhgas7iha594mmk8cs7sm5csjy1" + "commit": "e2263534e16ed8bbc935ee466f6ad2acbe9c603e", + "sha256": "169sdgi476hnxxv0s9qfi8cply9q7gb8i1hli4i74ynlrhc9wfq7" } }, { @@ -8153,16 +8224,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20210405, - 430 + 20210603, + 802 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "e02ad2189c87da33f80bf4967a968772ce3e4431", - "sha256": "0vn53zlwmhi4d6i81840i9pmrs8w4j6az2p0b4hw99xvk68grfiz" + "commit": "cef26f2c063f2473af42d0e126c8613fe2f709e4", + "sha256": "094gbvpf9vy95ij7li9vb17nyhi1grh9mbv1csydb9y157baw03v" }, "stable": { "version": [ @@ -8398,6 +8469,21 @@ "sha256": "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq" } }, + { + "ename": "buffer-env", + "commit": "40651886215933432e77c680aea22bdee932fa9c", + "sha256": "18ab7jwr1w16vlgrgxsnb3dfvkfy9vs3szl9k9npckgzyar97y5m", + "fetcher": "github", + "repo": "astoff/buffer-env", + "unstable": { + "version": [ + 20210520, + 1616 + ], + "commit": "32c1cfdf06dfa7bdbd79aba8066064212672e755", + "sha256": "1mbrsakg7mbrr4szi7ha5hcfr88i79p5bn59dh7v6ywa357brmky" + } + }, { "ename": "buffer-flip", "commit": "3924870cac1392a7eaeeda34b92614c26c674d63", @@ -8476,6 +8562,39 @@ "sha256": "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c" } }, + { + "ename": "buffer-ring", + "commit": "f6a145814144e6386efa9f96b43cf81d59a1091f", + "sha256": "0ch8pgiq1d90d06zxa5xvkvy18nwxlp7mfaymd6ldq20vgks07x9", + "fetcher": "github", + "repo": "countvajhula/buffer-ring", + "unstable": { + "version": [ + 20210529, + 2059 + ], + "deps": [ + "dynaring", + "ht", + "s" + ], + "commit": "30572b4d8fff519c4996078a5ad743583fb22b0e", + "sha256": "1xg6kbjj4fccsr5awnh3ba9x33qznnala3kmnfwpmj94rd72whiy" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "dynaring", + "ht", + "s" + ], + "commit": "30572b4d8fff519c4996078a5ad743583fb22b0e", + "sha256": "1xg6kbjj4fccsr5awnh3ba9x33qznnala3kmnfwpmj94rd72whiy" + } + }, { "ename": "buffer-sets", "commit": "61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5", @@ -9075,6 +9194,21 @@ "sha256": "0ich78j49x3sl1jyvzynybw0lnhrhjfp4vadysxnzd5zs6vqxcad" } }, + { + "ename": "c-eval", + "commit": "0a62a92eb2142d0a08a18a966ee99fa62d1392af", + "sha256": "13rgaisjy6x3szknlp3f5ama3y9l5yhlx3q17kjzdv7bs56kzcbq", + "fetcher": "github", + "repo": "lassik/emacs-c-eval", + "unstable": { + "version": [ + 20210603, + 1716 + ], + "commit": "f79be8354a3c01fddbf38b731aa8934421cef22f", + "sha256": "1qpi5j2h9q4khp3kbk4ybsg4mp2cp5kws5fz7bjpxz4iz0s8mbx7" + } + }, { "ename": "c0-mode", "commit": "268115452d9c22a6f2627cec1eb122b47e85b88c", @@ -9446,21 +9580,21 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20210321, - 944 + 20210603, + 323 ], "deps": [ "dash", "s", "transient" ], - "commit": "a3b04c0c37b1e8ceff2472e21a3579e64e944528", - "sha256": "04fzskx066v5091467da3plsxkqx3acbaqmk282k8cdaxsnr4ifd" + "commit": "cb93563d0ec9e0c653210bc574f9546d1e7db437", + "sha256": "10dymcd17ili5r6ydiz7bj0q81y5fh0s1d64m4acfa8xfsi7zx55" }, "stable": { "version": [ 2, - 8, + 10, 0 ], "deps": [ @@ -9468,8 +9602,8 @@ "s", "transient" ], - "commit": "a62d7de582b16490b1af5add7b24a67022be531b", - "sha256": "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv" + "commit": "933140a3227ee61cfccf3cf0c567b5c9e64f1ded", + "sha256": "0s26a2fy1xldd0q57avds7zn0h7lkis2hjh9zmm1qhwn8409hys9" } }, { @@ -9673,6 +9807,21 @@ "sha256": "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd" } }, + { + "ename": "cargo-mode", + "commit": "48a13236086dad5b88834a27465bd77b1ee499b6", + "sha256": "1cpxhgxsnf6lmw8z2g1vxczs7pi9mk1xx1776726hajj4g8cx4p1", + "fetcher": "github", + "repo": "ayrat555/cargo-mode", + "unstable": { + "version": [ + 20210605, + 1003 + ], + "commit": "b98ea60ddec30eac174012671ee09e125748a193", + "sha256": "03vdinqm1hlbcflvks54ff9hqnjdzxih5bxnkm363s7mpr070d0d" + } + }, { "ename": "caroline-theme", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -9745,8 +9894,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210424, - 125 + 20210528, + 1605 ], "deps": [ "ansi", @@ -9757,8 +9906,8 @@ "s", "shut-up" ], - "commit": "81edfa78428fd2d9689507fd4d3b13c24cd99323", - "sha256": "071biqz1fv3rzjbn9xprpazk65xfl78hzhf2gdvz944pks3rhdfi" + "commit": "daee4bec9c7d96a165366f7edeaa4616837bf432", + "sha256": "062hsgb4315wvydygvygjywi4wp8xri3h0gj4n5dmy884578hhjl" }, "stable": { "version": [ @@ -9955,8 +10104,8 @@ 20210501, 820 ], - "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", - "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" + "commit": "ce0517127586e26f95f94f45d22a832f40a28321", + "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" } }, { @@ -10004,8 +10153,8 @@ 20200904, 1431 ], - "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", - "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" + "commit": "ce0517127586e26f95f94f45d22a832f40a28321", + "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" } }, { @@ -10274,8 +10423,8 @@ 20171115, 2108 ], - "commit": "0c6f3539677300e591c8a2877270776ee2ab1be2", - "sha256": "038r1zw52ip12r6iddhjy458gaapl5g9vfrz4hqw23r4cp5zgxgn" + "commit": "35b67c8380bb284c9c59914d967ee157a62311b8", + "sha256": "1579n0m13l7ghw5g4b0iffrcvgsh5pk3abk29rrskq736i0h007s" }, "stable": { "version": [ @@ -10393,16 +10542,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20210217, - 1848 + 20210529, + 1123 ], "deps": [ "dash", "posframe", "s" ], - "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298", - "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm" + "commit": "e16a01012545d378150432fa10684a2a7d1cc2d1", + "sha256": "1pj0l0jqgx3bixklllppgm6pwyfd0dc1ik5cs9x1azb1qdgf8kjs" }, "stable": { "version": [ @@ -10579,11 +10728,11 @@ "repo": "davep/cheat-sh.el", "unstable": { "version": [ - 20200226, - 1021 + 20210607, + 1307 ], - "commit": "52293c366044e44c8f6b648a312433345e4718ad", - "sha256": "098b70gvyr74ygzbpyfvpn2zzlij47bzvqqj89igh10s4lxj0lzb" + "commit": "33bae22feae8d3375739c6bdef08d0dcdf47ee42", + "sha256": "0blyhgdk0li5slkhlj689jdal6d1qr4g2acz8i0jm4kvgysjilb5" }, "stable": { "version": [ @@ -10717,11 +10866,11 @@ "repo": "sergiruiztrepat/chembalance", "unstable": { "version": [ - 20210504, - 1505 + 20210601, + 1653 ], - "commit": "80c8fd4c806366a4b75a27a656420e9e36316543", - "sha256": "0sshmw5ajfiff05000yhp4m3fyfdbhcqrm5crcqqw0cinvrfancn" + "commit": "ae36c823ca151f1dc6144ec96b2f5e98181c0dbb", + "sha256": "1n01h4lwfcm0skf0pgh7p87bmk4x3r6qsr5jcgm1ldafsx35x60g" } }, { @@ -10906,32 +11055,30 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210507, - 923 + 20210603, + 1656 ], "deps": [ "dash", - "literate-elisp", "seq", "ts" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", + "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" }, "stable": { "version": [ 0, - 7, + 8, 1 ], "deps": [ "dash", - "literate-elisp", "seq", "ts" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "e9164ecca1e2f43676e5a071aca7644177866deb", + "sha256": "0fp0p1sv7jpam2vbgkv2yg7lsdlxa02213ka06cn8rb54lw7k702" } }, { @@ -10974,26 +11121,26 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210514, - 827 + 20210603, + 1656 ], "deps": [ "chronometrist" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", + "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" }, "stable": { "version": [ 0, - 7, + 8, 1 ], "deps": [ "chronometrist" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "e9164ecca1e2f43676e5a071aca7644177866deb", + "sha256": "0fp0p1sv7jpam2vbgkv2yg7lsdlxa02213ka06cn8rb54lw7k702" } }, { @@ -11052,8 +11199,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210518, - 1038 + 20210524, + 832 ], "deps": [ "clojure-mode", @@ -11064,14 +11211,13 @@ "sesman", "spinner" ], - "commit": "eccfcea186c3560527fbfc98491b3ab9a3f1e16f", - "sha256": "09k5bhvq7ksjpkjr7fzrvfr6cf1wd3fh2m8bfb8y25hbg2nnyisk" + "commit": "8f51546c0efb36226c4bae7d65465b0e0aa8c06f", + "sha256": "0bn1k34a0dr85c0jj3cb3w8afbhb5iy7whdddkfpa5fkrhc77acf" }, "stable": { "version": [ 1, 1, - 0, 1 ], "deps": [ @@ -11083,8 +11229,8 @@ "sesman", "spinner" ], - "commit": "45f6125301fbbe69333dc450804ce8ecdd611539", - "sha256": "1kf4056bga3cr40mm812m21r9mi0r30gn9v3jil3q6yhb5bm1gcl" + "commit": "8b3dabeefa8a3352d7a30a9fd9027c05a4c4f6e2", + "sha256": "0psd8zrhs5w1cfmksd5sjgy9xzfs9i9zp55g97rp7zp6y5als0lx" } }, { @@ -11257,14 +11403,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210508, - 1616 + 20210601, + 801 ], "deps": [ "cl-lib" ], - "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", - "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" + "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", + "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" }, "stable": { "version": [ @@ -12191,26 +12337,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20200704, - 2124 + 20210530, + 1136 ], "deps": [ "emacsql-sqlite" ], - "commit": "1d5e9cbb69bc2992eaafa1bc084343efbd3e0c4c", - "sha256": "1s3pb8zn3ypc2pvkp7g7wvml02m06lk9d7c29pq1yqn9f5sisrcg" + "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", + "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "emacsql-sqlite" ], - "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78", - "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh" + "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", + "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" } }, { @@ -12337,8 +12483,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20210512, - 630 + 20210603, + 1522 ], "deps": [ "cl-lib", @@ -12346,8 +12492,8 @@ "s", "seq" ], - "commit": "89b03795a02dcbfb14046c97230e82736a02f874", - "sha256": "027j4dcvjvvnjh6aln8brmi8xny787n0y2ycrajx043zjmh6x0cg" + "commit": "9b1100bd8d65b961b7478f9c011f0f6eb8cfcdd9", + "sha256": "1lr9cz856hqb3qz5fq6qqc2a55mfgdrh451np5m2bf2ljw0d67nh" }, "stable": { "version": [ @@ -12374,17 +12520,17 @@ 20210104, 1831 ], - "commit": "d98a7cdb25611ed6f1e856fd4c4ff980225b89cd", - "sha256": "0hq8w46c0ldckh11cb61bzhqccjfhh11hadkmdahv8605q8y31nk" + "commit": "05d8a586fa4eb6256b8b80a0f7f084e8c5d3c8e6", + "sha256": "11vxpkf8y9n0kxyfgkbyrq76b0g4xjl2rriyj2d59s3xlx27gqjp" }, "stable": { "version": [ 3, 20, - 2 + 3 ], - "commit": "1ad4501ae97fb6c6deab096ff0ac7e03d554e26d", - "sha256": "0zr4zbbd1zng0v3mj8kql0ci2w18p4izjfq7hh6g5adq6l7ckfhm" + "commit": "13d112ea03f2b068da1f7ac3239a42a6cff94eda", + "sha256": "1rn9gzjcg1km9pbyipkfgzq8jvsmwwa2zkmra5yksfwq2094apnh" } }, { @@ -12536,11 +12682,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210111, - 744 + 20210529, + 1452 ], - "commit": "d03621b1033cc33054e30169517c57d020c13050", - "sha256": "0c2agyg28lqsmkkjcnhx8wdn531lh0zsy37q939wf231lpl4asvj" + "commit": "2e40770d7963dcbb52ac45dcd83c0537fda5e188", + "sha256": "1m6csmg7y99ihw6nhknnr6wqamf5y5j931gfbsrhbar2hh8wjx5m" } }, { @@ -12756,14 +12902,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20201216, - 2223 + 20210607, + 1842 ], "deps": [ "dash" ], - "commit": "ca52e957254a07411c06716d2155968375943a12", - "sha256": "01g1x652gckzhihgiqx7jx58fd0ilv0yialfh3f8l1fsqw6cggqc" + "commit": "fa42b60f9e84995a8109a49798c0b4c618fc1ed3", + "sha256": "12ybgh8yzi62lw0c7yakgvfdx45sr11szyqdlf58n2pbkz9sxkmv" }, "stable": { "version": [ @@ -12899,11 +13045,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20210107, - 2111 + 20210528, + 2344 ], - "commit": "1445a556af9da3681ae0e7e7242352e9fe39fe73", - "sha256": "1d6wxzw1wf378jzvlzfsdq5gqq2i196lr8dszj4df472vsiw1hqi" + "commit": "c1a1091e39ecd69822e1494d8b6f0bbcb21eb9b1", + "sha256": "01afmfisii9cyri198s2g9rivkisfn6d3g40nyi0sgsx14jbyddz" }, "stable": { "version": [ @@ -13343,11 +13489,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210516, - 211 + 20210606, + 135 ], - "commit": "5618f28d62cbbdcccdaee1b455fc6e9d1c8bff31", - "sha256": "00aiardy1k0fpjhx73mpyx4921zncx6avydvzh8rcn5w0p0zzx8p" + "commit": "e0f8c9ad754bdc2c02318f4baf433886c7aa83e3", + "sha256": "1wqwcggjzmqihdgs3bm23fbv2cxpbh9cjvnzgdj01vbgh4ccqkfh" }, "stable": { "version": [ @@ -13626,26 +13772,26 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20201121, - 1116 + 20210528, + 1311 ], "deps": [ "company" ], - "commit": "b089a1e645cd14971c93397549b237ef63495adf", - "sha256": "045na4qi4n4w8vibjnxqd308ksgazx9ziy5x7ir7b4cklvkifvml" + "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", + "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "company" ], - "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8", - "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45" + "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", + "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" } }, { @@ -14017,15 +14163,15 @@ "version": [ 1, 1, - 0 + 1 ], "deps": [ "cl-lib", "company", "irony" ], - "commit": "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7", - "sha256": "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a" + "commit": "9ca8f35ef268c0b0cffd49efa687685b373f09fe", + "sha256": "1d3jw0d4zymznri86a5iixyxnw16jzkkrbhrh657ys73189c1c73" } }, { @@ -14235,8 +14381,8 @@ "maxima", "seq" ], - "commit": "f92eafd716ae6e36665bbf027309477c2efa336d", - "sha256": "10a72c4v0v5c1npxq1fmglxjiczpf1x87jpd6523x337h054zgs0" + "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", + "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" }, "stable": { "version": [ @@ -14377,6 +14523,25 @@ "sha256": "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld" } }, + { + "ename": "company-org-block", + "commit": "564ba95530adedd74f24d329672de7df9cf7afd9", + "sha256": "1l29mz5y6ldrd9kcs7fxjd7chm1gbfbs9mcv3xsfgbcyhicqmrjf", + "fetcher": "github", + "repo": "xenodium/company-org-block", + "unstable": { + "version": [ + 20210607, + 1202 + ], + "deps": [ + "company", + "org" + ], + "commit": "e2742dea77b356ee11a1200263d48eed79f5fe43", + "sha256": "194kjkpaca7k60hxs96mah416fdn5mfbsa4wgrpc3cprlrbyp8jr" + } + }, { "ename": "company-php", "commit": "ac283f1b65c3ba6278e9d3236e5a19734e42b123", @@ -14400,15 +14565,15 @@ "version": [ 2, 4, - 0 + 1 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" } }, { @@ -15532,56 +15697,88 @@ }, { "ename": "consult", - "commit": "a0f3b8b11eb8f9adf182ab62fcb276b52bc26f19", - "sha256": "17zriam6hgz19ms78c9zh0hvb4b6h5hinrinbmbb2jcwi4cykxs3", + "commit": "5a141c728f28e53b9f92ccbbff07c2af1dde3706", + "sha256": "02z6h0x346230ayncsb8phks9mmjdq5mj9ja68380hl6gkic3407", "fetcher": "github", "repo": "minad/consult", "unstable": { "version": [ - 20210520, - 1824 + 20210606, + 1237 ], - "commit": "556ff4eb31eb1d00a2afdda6664d03b698264e3c", - "sha256": "0ss5idc0v5rn0hrbb07m8hdpcmggh46my8cciky98b9hdq3gch2v" + "commit": "ae905501bcdb8fdda0d10a0846d575fd2a38e6d7", + "sha256": "1jz4j27irxknfbcxsn8phhhaiwyc2z9gnyrj03ah1v57i0i9g79c" }, "stable": { "version": [ 0, - 7 + 8 ], - "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", - "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" + "commit": "e538f168d9d16c926d92c19d6131298962b778a9", + "sha256": "1460818fb6y086vgn1mzmrwhpa5jswlwi4v71zr86cg6y7yg4248" } }, { "ename": "consult-flycheck", - "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", - "sha256": "0gf7nb2zylmm53xszd53qp7byvlppd2j9lh61p8syanjssqy4j67", + "commit": "5a141c728f28e53b9f92ccbbff07c2af1dde3706", + "sha256": "1cwbm7qsni8ycasx2v20yd1749lmlhf98kz28i1p8m0yqkjc3my0", "fetcher": "github", - "repo": "minad/consult", + "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20210429, - 1158 + 20210530, + 202 ], "deps": [ "consult", "flycheck" ], - "commit": "556ff4eb31eb1d00a2afdda6664d03b698264e3c", - "sha256": "0ss5idc0v5rn0hrbb07m8hdpcmggh46my8cciky98b9hdq3gch2v" + "commit": "92b259e6a8ebe6439f67d3d7ffa44b7e64b76478", + "sha256": "15lihfdjdp5ynmq0g8wkq8dhb2jdlvfcqbb2ap588igi5vax3glz" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "consult", "flycheck" ], - "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", - "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" + "commit": "92b259e6a8ebe6439f67d3d7ffa44b7e64b76478", + "sha256": "15lihfdjdp5ynmq0g8wkq8dhb2jdlvfcqbb2ap588igi5vax3glz" + } + }, + { + "ename": "consult-ghq", + "commit": "513921c684fbab5ff57e47c509a89b15d7d3a5ce", + "sha256": "091018x5y28lbffjrb75a5r2cvprlhz0jdj371nlyvrpsdgdfs4f", + "fetcher": "github", + "repo": "tomoya/consult-ghq", + "unstable": { + "version": [ + 20210606, + 2047 + ], + "deps": [ + "affe", + "consult" + ], + "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", + "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + }, + "stable": { + "version": [ + 0, + 0, + 4 + ], + "deps": [ + "affe", + "consult" + ], + "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", + "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" } }, { @@ -15674,16 +15871,15 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210411, - 1305 + 20210605, + 1502 ], "deps": [ "consult", - "espotify", - "marginalia" + "espotify" ], - "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", - "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" + "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", + "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" } }, { @@ -16006,8 +16202,8 @@ "ivy", "swiper" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -16231,14 +16427,14 @@ "repo": "CsBigDataHub/counsel-fd", "unstable": { "version": [ - 20200902, - 2147 + 20210606, + 1724 ], "deps": [ "counsel" ], - "commit": "533d70f229abc73b013668bd03f7486effa1e369", - "sha256": "0iz0blxbi0zcilyg4a5aqzggy1b0rdygw5q45szp9hbzzqdb5wfg" + "commit": "e9513a3c7f6cdbdf038f951e828e631c0455e7d4", + "sha256": "005l1is12jq35nn1ap87a7p74qin26zpgbk599619lh9vai157ww" } }, { @@ -16860,6 +17056,33 @@ "sha256": "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0" } }, + { + "ename": "create-link", + "commit": "80b967b973240c5124957180819aeacac66271bb", + "sha256": "0ypj1sd9jabr5mmrpwibsahrchxs28kp4xv1yjk5pqwyz0r08a8b", + "fetcher": "github", + "repo": "kijimaD/create-link", + "unstable": { + "version": [ + 20210601, + 1327 + ], + "commit": "771a405e262c98b802e2c5302306aed802d8233e", + "sha256": "0kcv3jjygjvz75irjdddgakw8b0ckm5gqasrb2341zgqms7l9rfr" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "request", + "w3m" + ], + "commit": "fbc4e8eeec845f7d1610c52b81c0c7a4e961b991", + "sha256": "0h1ih1jsywhxhy91yjkz9464j79ma3mp73lxnfww71rwfd0wamyj" + } + }, { "ename": "creds", "commit": "81b032049ccc3837e8693f010b39716912f76bba", @@ -17827,8 +18050,8 @@ 20190111, 2150 ], - "commit": "940d80dcd5cbc8d55a0f9348d1a2472e9b8b7121", - "sha256": "00mhmfpp4vgfcvm6s7zbzxb0ayra1ghqvdhhqj6mzly15an85b40" + "commit": "7b018126aefb100a4f00aeba121688e8a168ee22", + "sha256": "0wxjnxic06kkdjlsd0r0afpms26rhdyskv2f4nj7gabiz1m341gm" }, "stable": { "version": [ @@ -18048,8 +18271,8 @@ "posframe", "s" ], - "commit": "434784654e26daa7a8512ed57907829a043592d3", - "sha256": "172z5qr7hwjsl9bhqzsgpgxslfxvrxvjlahwwfircrq1xqicvzlj" + "commit": "cc395e066755c7513d4862f5639f3d162b3bd30f", + "sha256": "0nmpldvkhgi668zpn5wym6rfvsdnib9ny2snzwsrrfgqa70lmky6" }, "stable": { "version": [ @@ -18266,8 +18489,8 @@ "repo": "bradyt/dart-server", "unstable": { "version": [ - 20190817, - 1254 + 20210501, + 1445 ], "deps": [ "cl-lib", @@ -18275,8 +18498,8 @@ "flycheck", "s" ], - "commit": "aba838e8ee2f30309f366e8a91c17616549003ce", - "sha256": "0lwss1s1n2kfy0i8nwwfmz5fnw137zkhjs6zv81piniad6hrmn1l" + "commit": "75562baf9a89b7e314bc2f795f6ecdc5d1f2cc8c", + "sha256": "06v4gbckfgdl7hbppgv15ynsxq37qqdw1h8yzicwjqgylma0if1y" }, "stable": { "version": [ @@ -18302,11 +18525,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210330, - 1544 + 20210602, + 1928 ], - "commit": "b9286a84975874b10493f1cb4ea051c501f51273", - "sha256": "13qmv5h2fvy1aqcc3xg7am3phpraw4jliz6qjcx0fjfshndkh5xl" + "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", + "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" }, "stable": { "version": [ @@ -18381,8 +18604,8 @@ "deps": [ "dash" ], - "commit": "b9286a84975874b10493f1cb4ea051c501f51273", - "sha256": "13qmv5h2fvy1aqcc3xg7am3phpraw4jliz6qjcx0fjfshndkh5xl" + "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", + "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" }, "stable": { "version": [ @@ -18744,15 +18967,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20210112, - 2013 + 20210522, + 348 ], "deps": [ "ccc", "cdb" ], - "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", - "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" + "commit": "ce0517127586e26f95f94f45d22a832f40a28321", + "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" } }, { @@ -19406,17 +19629,32 @@ }, { "ename": "devdocs", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "14vab71fy5i1ccmzgfdg37lfs1ix3qwhcyk9lvbahcmwnbnimlzm", + "commit": "19d1adfa91593cc32a3ce94d47f4c32102408488", + "sha256": "1hizgj4fn3m986ri6zhx0a2dp0qkvm24farb4gcwf19p3ii70470", "fetcher": "github", - "repo": "xuchunyang/DevDocs.el", + "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20170731, - 850 + 20210606, + 933 ], - "commit": "a2d51e824f0cc48a9dd611cc740bc8b86143e611", - "sha256": "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8" + "commit": "07fc164a680d02de2a7af983adb5e726cbfd7fc0", + "sha256": "1ldd4h9r7wiqgynxwlqf6hg5m2whzaczlhxmbch7i60rd72wwvrj" + } + }, + { + "ename": "devdocs-browser", + "commit": "6c13d0ea72261c4835b5f1983a1f3ee1e066f743", + "sha256": "0gqvjn0arrxdc7lbqrpak9l83ampsbdlbzmi1fk02i431yv89rpc", + "fetcher": "github", + "repo": "blahgeek/emacs-devdocs-browser", + "unstable": { + "version": [ + 20210601, + 1447 + ], + "commit": "d3702670eb361715e41440eb699523b3f4c60bee", + "sha256": "1mv0d67y6m1wi779lc0mnpylqiw3cnaj0rkj199fxh91nkc6vk27" } }, { @@ -19460,11 +19698,11 @@ "repo": "redguardtoo/dianyou", "unstable": { "version": [ - 20191120, - 39 + 20210525, + 1517 ], - "commit": "da7443a680bd8db75884355314e9352cd8c68d05", - "sha256": "099iiwp52rfnxgwhiaxdaridhcjdp3qchmskxmb1j5dz757c6w1c" + "commit": "f77d9e76be5d8022fa6ee5426144f13f38dd09f2", + "sha256": "08pwp1pv8c3klingl0qpymdh9ybqrjj47rdd191vhah2ahn5bs1g" }, "stable": { "version": [ @@ -19629,14 +19867,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210518, - 1621 + 20210523, + 11 ], "deps": [ "cl-lib" ], - "commit": "4f23c36da5bf102fcf6e7435fa79041feb7f1fbe", - "sha256": "1hpba4zznhkz2m9254h42ljccfd0kdz9lv1sjb4baq60f08lp5sj" + "commit": "d4340608c2d6d8b81aad8e690d0265799aba16f3", + "sha256": "1haqmaaj6ajqqfdni6gn3nmqaif8jqrpdnr84m3zjddsdw5zlcsk" }, "stable": { "version": [ @@ -19699,8 +19937,8 @@ "deps": [ "transient" ], - "commit": "fdb37bb696aaec6cb2bcece3760866760e68edc4", - "sha256": "1ig7hk9vhlym91gzk4s6h2a6aj425nln29m6f2hpq9jh3qicgh9i" + "commit": "96861493f95fe88118942bbe64954142250d6c24", + "sha256": "13dda1883pkji4nf44mx9xiys6rgirw12si9fnazsviiqycjaf1b" }, "stable": { "version": [ @@ -20021,8 +20259,8 @@ "deps": [ "treeview" ], - "commit": "1f88a9ddda0b431c79564f91d470e8e308ed3c32", - "sha256": "1pxkxlpbbm4si5z8gx7lbqaw2qvf6h3qc1qxsp6s47h10nrpi9kk" + "commit": "53dc9dae71d1be3a7a925332a53e72d2bd05366b", + "sha256": "0hgcargxbl58f4im57c1zqwnfxl52lfv78s8l69njjggvdki0hz1" } }, { @@ -20748,15 +20986,27 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210510, - 931 + 20210529, + 600 ], "deps": [ "ess", "ess-view-data" ], - "commit": "80a5f254fc9e0a8f022e429a53c3d8b1da26c4b8", - "sha256": "04jj3jpgvnvrn7r1z5y7ilh1hah2d6rb91m17ll45i20sakhp2xc" + "commit": "c865c34536d9c3140ce647f03c8b7498b46e935c", + "sha256": "0xca6kjr9qf7w9hz63hfai2hl055cdp5gm8nldr1xjv5gk42765h" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "ess", + "ess-view-data" + ], + "commit": "c865c34536d9c3140ce647f03c8b7498b46e935c", + "sha256": "0xca6kjr9qf7w9hz63hfai2hl055cdp5gm8nldr1xjv5gk42765h" } }, { @@ -20767,14 +21017,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210520, - 748 + 20210603, + 2349 ], "deps": [ "key-assist" ], - "commit": "1cd91779b99e3920f8c19ddb3bb84410284108c2", - "sha256": "1264ycfvy9cl71qgd8n7xp1xl0ngzdwq2agic5faf6jmqyg77ax7" + "commit": "43159042ca788be74c387cc59ba3fffc57079993", + "sha256": "01r6sk2zlj3mf39vczaybhpzzmv379vvi85mc4gygif24m102sg3" }, "stable": { "version": [ @@ -21730,14 +21980,14 @@ "repo": "emacs-pe/docker-tramp.el", "unstable": { "version": [ - 20170207, - 325 + 20210526, + 748 ], "deps": [ "cl-lib" ], - "commit": "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23", - "sha256": "1lgjvrss25d4hwgygr1amsbkh1l4kgpsdjpxxpyfgil1542haan1" + "commit": "aaee11cedf7b4c31700f24a1fd88dcef9c2a7c3d", + "sha256": "120sxrifn82hhrqhqdy0dhnni353vwzkkd5x7inqg1wpzsxjwhzl" }, "stable": { "version": [ @@ -21826,8 +22076,8 @@ "deps": [ "s" ], - "commit": "c14485468439056bcfc6a0862fe35fa8d787d34a", - "sha256": "198vqmhyasilxgz2lwn7y3a0g885ws3pyhvvj80wy7n4ml8mfdr4" + "commit": "f6dcb378bb69c23d58978d5bc1e37c4ae160d278", + "sha256": "055b24cskxp0wy74synnnsmfnzbavmazyackq0qfnfbkqryrzfml" }, "stable": { "version": [ @@ -21969,16 +22219,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210517, - 411 + 20210606, + 1532 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "3b393766f447f6ee9622161a86ae90766b42a395", - "sha256": "14c4fsgsvlvxw1g1d9lk244bpz0snk3gir8ndd5zrb14b2nllwzb" + "commit": "1660910b758251608c17e1a0e27ff862e345daab", + "sha256": "1apbh9kp1qk3klx65imbhmxxnf8ax0hzzcdwj4n6qpm7s6bk1gc3" }, "stable": { "version": [ @@ -22022,14 +22272,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210507, - 620 + 20210604, + 1922 ], "deps": [ "cl-lib" ], - "commit": "4d24728f11853b5bd231687ac3f7a95108688313", - "sha256": "0kws2305asszwjcc28zsbb6xwg25pxwabm5vml9jqk9w5f3ajl33" + "commit": "b2c0ea0f0778a6ea85b87e1b87916572e98e1fe7", + "sha256": "1rjhmjsszms4rlqq368f717ds4kmdjblkgd2ww830d7sy5h5rb6n" }, "stable": { "version": [ @@ -22172,11 +22422,11 @@ "repo": "gustavopuche/doxy-graph-mode", "unstable": { "version": [ - 20200807, - 646 + 20210604, + 723 ], - "commit": "2685c28e7a725614c23345195c3b85e505be2a1b", - "sha256": "0a4kil5v88wkki3r4jjc9ackv2z7ik0qgn4bdv75baskig8f8qjy" + "commit": "88af6ef4bc9c8918b66c7774f0a115b2addc310e", + "sha256": "0adis4gprh7gzi1nm274gqgzr794fsq4zfjfwz3nh96agc8h8g7j" } }, { @@ -22686,8 +22936,8 @@ 20210213, 757 ], - "commit": "03435a3608a703bac5b65bfa84c97d91dcc28a4f", - "sha256": "0ll1mc0vb81wkna70awgnw06q8xkjp0n2nmk997pjq8sm6d7prgm" + "commit": "ac3a66e0f7d3577b27cc5d5f2399163bfbe11828", + "sha256": "1grll7h2hv906bik224qn9fldmq4lhnlfcif1lg4grr3f4nhl1wc" }, "stable": { "version": [ @@ -22911,11 +23161,20 @@ "repo": "countvajhula/dynaring", "unstable": { "version": [ - 20210513, - 429 + 20210603, + 2331 ], - "commit": "2919e28d324f63a5ceb83adedd40ed41cb091911", - "sha256": "01n8afwpx0cq010b4j4w15kjk9cg9civffmz32wgiihmhpkkc0bq" + "commit": "d3cc361b70b5dc4542624ced9c326523939ca021", + "sha256": "02mz2dfqfycw64z2906f9dvl5x6qb53xbhkn3hf5205hcg58w5zh" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "d640a557e3e7197cebb56365ad3552ffda39b838", + "sha256": "1fd17xryl2pkdlalc9jgwdkgl2mgks83wh5s8wilvwb21y8g306l" } }, { @@ -23333,26 +23592,26 @@ "repo": "knu/easy-kill-extras.el", "unstable": { "version": [ - 20180920, - 1334 + 20210529, + 945 ], "deps": [ "easy-kill" ], - "commit": "b8ce8350cc86e0229f195082557970cd51def960", - "sha256": "1f8db92zzk8g8yyj0g334mdbgqmzrs8xamm1d24jai1289hm29xa" + "commit": "74e9d0fcafc38d5f24e6209671a552bc1ba5a867", + "sha256": "0yxfsp4zzzw9v4swgslsr4v35hs04sczskfyfdvw8wk0aahxcwrx" }, "stable": { "version": [ 0, 9, - 6 + 10 ], "deps": [ "easy-kill" ], - "commit": "b8ce8350cc86e0229f195082557970cd51def960", - "sha256": "1f8db92zzk8g8yyj0g334mdbgqmzrs8xamm1d24jai1289hm29xa" + "commit": "74e9d0fcafc38d5f24e6209671a552bc1ba5a867", + "sha256": "0yxfsp4zzzw9v4swgslsr4v35hs04sczskfyfdvw8wk0aahxcwrx" } }, { @@ -23419,14 +23678,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210505, - 1914 + 20210607, + 2206 ], "deps": [ "parsebib" ], - "commit": "0ed8c3cb1ccc130e9d4060d19e478474cdf3d6e0", - "sha256": "1i37hsgywhcrmsj0cmvs67hzknhx56wrs868k4rrs9cwgc2yf6j1" + "commit": "7e49d7e1eaeca755c0086a81967673eb5b45d175", + "sha256": "0n6p460nmy6h6sc29j1nmhb6zcbbk7qczab6pz96hyxp1cj9g5gy" }, "stable": { "version": [ @@ -24267,8 +24526,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210516, - 1044 + 20210526, + 1751 ], "deps": [ "eldoc", @@ -24277,8 +24536,8 @@ "project", "xref" ], - "commit": "1ac06d0bcc247fb19df6eceb57e2ea3d534806ec", - "sha256": "1arvfga8yhzr14bkfykivcrpzj94ai50rqjvz743wlm5xw295j45" + "commit": "e498cb171bb07ec36880a2494aafc8acb1cc34ca", + "sha256": "1q2rg6kk16h0wv70p2x1rg5cjmn0w0gc3phriwdd7iwn842dsrb7" }, "stable": { "version": [ @@ -24428,8 +24687,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210505, - 2237 + 20210522, + 1036 ], "deps": [ "anaphora", @@ -24440,8 +24699,8 @@ "websocket", "with-editor" ], - "commit": "a9903b3b6df26eb5603aa38960c6bd9d826cecb8", - "sha256": "0di5275avxmd014zhwj420zapwdy0a00lkrl8j362f636kwp9lir" + "commit": "09af85821e4fce64675d5287fe9f3a6847d1c5d2", + "sha256": "12b8idh2mpd37nrc8ricr4s4hz4wgnp7cy1298qcpxl00xx99dqw" }, "stable": { "version": [ @@ -24604,11 +24863,11 @@ "repo": "dimitri/el-get", "unstable": { "version": [ - 20200912, - 1653 + 20210606, + 911 ], - "commit": "d76ac84ae9670de7bf7725b362cafe86688771f9", - "sha256": "18x4qj75bh45b0dirp3jpw1zqni8xfqqh1q13q6b5ncy1nhvm4gl" + "commit": "52df810e538243d07f2a317ad36e351b440a75e0", + "sha256": "0s9107bss982v4njwkfyi4gismg402xcrqkq9c2hrwhyr6pny4w0" }, "stable": { "version": [ @@ -24908,11 +25167,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210513, - 1531 + 20210524, + 1611 ], - "commit": "78a1d616f6a4fe8033e425eeff19b1f21955dbd2", - "sha256": "0j5j6j2wlan73z7xpa3yhji2sgb6m1gayc9pwmxxkwqvjpngyc45" + "commit": "afe8f31e2b9f78d13b22a695b7cf9c373656b85e", + "sha256": "09yk4xvsdd5mvrzx4kdfyi2bkbdykjg80hcxvjamh967s6vinzjb" } }, { @@ -24957,11 +25216,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210516, - 2029 + 20210530, + 1641 ], - "commit": "006d2474a58ba7cb63911d5a9b8b9febba6593c7", - "sha256": "093r3dqbi7r3b35744pjbxcb39r1pk2qlqgf0j4kqmgby1xhjcjs" + "commit": "e9af76aa8fd9ce5b7010b7322a73341828cfe690", + "sha256": "1wryp568bl5p0s78va2pgh9aiskhphmva20zmk1jg0qjxim58grv" }, "stable": { "version": [ @@ -25255,11 +25514,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210309, - 2323 + 20210606, + 1130 ], - "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da", - "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567" + "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", + "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" }, "stable": { "version": [ @@ -25374,26 +25633,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210429, - 1337 + 20210605, + 2212 ], "deps": [ "elfeed" ], - "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", - "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" + "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", + "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" }, "stable": { "version": [ 0, 7, - 8 + 9 ], "deps": [ "elfeed" ], - "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", - "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" + "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", + "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" } }, { @@ -25411,8 +25670,8 @@ "elfeed", "simple-httpd" ], - "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da", - "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567" + "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", + "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" }, "stable": { "version": [ @@ -25436,11 +25695,11 @@ "repo": "lassik/elforth", "unstable": { "version": [ - 20210506, - 454 + 20210522, + 928 ], - "commit": "f01437c1461b03de6d7f2f5748beb996a9fa497c", - "sha256": "00904bawhskz88z8hicrhiq5lx92q0bilz5nawymqrbmwq54a17q" + "commit": "2d8540434a28e7edaa04a992c3c362832b2fd61e", + "sha256": "0p4d6blqa3g6mpbn00vqysshga4i93l2s6i7nm2ckg4zrrn27pl5" } }, { @@ -25803,8 +26062,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20210224, - 2314 + 20210525, + 152 ], "deps": [ "dash", @@ -25812,8 +26071,8 @@ "reformatter", "s" ], - "commit": "e9fcf9cc2779cf7f5ae7ee4be339164b26755c69", - "sha256": "05g3r5hc6slaca8g7n6i6bk9lpq9jsb2kv2q5v8nbz96abqg56zm" + "commit": "f2e2d0053f3272d9fc0c2e16c8d17d97724cf524", + "sha256": "1gaddxw63d5fna43d7kc3px9sbd2knbjga0lx2zz0lsbcjr54pzr" }, "stable": { "version": [ @@ -26487,11 +26746,11 @@ "stable": { "version": [ 1, - 3, - 2 + 4, + 0 ], - "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414", - "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha" + "commit": "53d257db92fb72ade8ea1b91dc6839c21563119e", + "sha256": "1qccz8z0410xhygrfy62h1j3553avdcb7m61ps6b6y74nz615l1r" } }, { @@ -26799,11 +27058,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210520, - 1753 + 20210607, + 1506 ], - "commit": "a21e510bc63c8ddc98b2bb3e6fff38e9d7f41ca9", - "sha256": "13c8l2dafqn3xm0lgrn4agy2i7ycz8dxwvxdcdrbba1gdb8ivm2n" + "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", + "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" }, "stable": { "version": [ @@ -26822,15 +27081,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210517, - 1319 + 20210525, + 1515 ], "deps": [ "consult", "embark" ], - "commit": "a21e510bc63c8ddc98b2bb3e6fff38e9d7f41ca9", - "sha256": "13c8l2dafqn3xm0lgrn4agy2i7ycz8dxwvxdcdrbba1gdb8ivm2n" + "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", + "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" }, "stable": { "version": [ @@ -26997,16 +27256,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210514, - 2034 + 20210607, + 1450 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "06ef243c5a7b60de92ba5503bb385191e35fe21c", - "sha256": "1lrrbkvazalqlbiykhf9qvzxx53z05yjpzf7p0wlzkhhhmp87pm7" + "commit": "c360a8934c1e07ddab4e12d28800d362d254ccbd", + "sha256": "02aikwki7932dldhnsq8ndca59spbc4g2kjfal3sw16lklfw0sfa" }, "stable": { "version": [ @@ -27747,27 +28006,26 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210227, - 1459 + 20210530, + 1147 ], "deps": [ "closql" ], - "commit": "245157564b9bd1575480044c8b24007b2090dacb", - "sha256": "1bdbwbrrz4brkmg50808vsj70d5yaxb1a71n014nx1a09wnw1hmj" + "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", + "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" }, "stable": { "version": [ 3, - 2, - 2 + 3, + 0 ], "deps": [ - "closql", - "dash" + "closql" ], - "commit": "ca211c5225aa550374d77629dd9b87e2b0b0d992", - "sha256": "1pxz611qb3m33r6343h0xhwqvvhjl131zyc2klplzgb23rkm8lk0" + "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", + "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" } }, { @@ -28004,11 +28262,11 @@ "repo": "kidd/erc-image.el", "unstable": { "version": [ - 20180522, - 1424 + 20210604, + 753 ], - "commit": "82fb3871f02e24b1e880770b9a3d187aab43d0f0", - "sha256": "1q8mkf612fb4fjp8h4kbr107wn083iqfdgv8f80pcmil8y33dw9i" + "commit": "883084f0801d46a5ccf183e51ae9a734755bbb97", + "sha256": "081c8pjmpwnmqah7dbpkj20bk7ln57g4n7c1zxzdlsz80pxnfay4" } }, { @@ -28385,18 +28643,19 @@ 20200914, 644 ], - "commit": "ed6730a1717a0e3ddc25a75de0c2e109371391c7", - "sha256": "0zlx4xh5c5d88zfbbwd79qb56mrvd3fhgqd7r64p6gx9gfa6kbi5" + "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", + "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" }, "stable": { "version": [ 2, 6, 1, - 3 + 3, + 20210605 ], - "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", - "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" + "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", + "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" } }, { @@ -28410,17 +28669,17 @@ 20210315, 1640 ], - "commit": "7d21e4b2ec7e6a5dc4a51f235a4a5b7d11f27f9b", - "sha256": "1k0qi9blvhayzbzr60g55lh8k7sgn9xbpnn6cb8i4km3470ihnwl" + "commit": "a8969ec16a91c0e1ac56a438d81069d288662518", + "sha256": "0wp6sf8rw73waws47av68d4sdd28qix74n53c4fpdc4c2xq3j3h6" }, "stable": { "version": [ 24, 0, - 1 + 2 ], - "commit": "ae4f8649c0ed90abf177124a5c974abf89dd70e3", - "sha256": "1j2y3m1k75c62gvhvj5f2jw3sijii1z8bjnk547w4ak4ldl60kfg" + "commit": "82f97b9d3d639ed87175aeed75747eb6594170ab", + "sha256": "065kc9p30jam23grpm7dwxjf76n6g1hzdrq9q1irr3qmw1rr0240" } }, { @@ -29159,8 +29418,8 @@ 20210405, 1808 ], - "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", - "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" + "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", + "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" } }, { @@ -29338,8 +29597,8 @@ "deps": [ "ess" ], - "commit": "554bdc7d6c7fafc5b8a886690970b5145276a3f5", - "sha256": "0v4cj8d44a52h3r8k4yhr84xalfwrkwpdn3c5m44x7xp36s6zgbn" + "commit": "f6731eb26dc0fc5b7ca1fa881a5f9100f8fcf494", + "sha256": "0pvjk5a5v03qnasqsja30bywb4c481x9agf1rfcwbqsva7p97wiy" }, "stable": { "version": [ @@ -29440,26 +29699,27 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20210326, - 1431 + 20210603, + 1412 ], "deps": [ "csv-mode", "ess" ], - "commit": "283251e8ac19ac0c0f89a4b0f0eb38482167e52b", - "sha256": "0kp94y27csj08868rbiwdfzgjx9q71j7d0whpqhsh27qhc189crq" + "commit": "845412ba57efab1a28fbaf0dcdbe76bdab03f828", + "sha256": "0m5wmxi4zq3xy9jsg7d2318iyn9g6fpzqiraq0810fbmrdl4dda4" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ + "csv-mode", "ess" ], - "commit": "99ddbceaa54941a5e8438eadb0210fd16470e581", - "sha256": "1crbrzphs49ghkx3rv952wbdv483rwfblryv8bx8lgpxv5gkar9w" + "commit": "845412ba57efab1a28fbaf0dcdbe76bdab03f828", + "sha256": "0m5wmxi4zq3xy9jsg7d2318iyn9g6fpzqiraq0810fbmrdl4dda4" } }, { @@ -29866,15 +30126,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210515, - 1807 + 20210527, + 2107 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "f0fdfef7703c814f9bb1bb2858d3cadc79fdcbdd", - "sha256": "1d3lnfyp7n1digldamddmxwlycm7xk5ljn5i9ngw59b936050lp6" + "commit": "ad47644eea5e351269f5bead18e713768d96f207", + "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" }, "stable": { "version": [ @@ -30068,15 +30328,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210519, - 524 + 20210607, + 1954 ], "deps": [ "annalist", "evil" ], - "commit": "d576c49e04da7cb9f773edaebdf540151883be4a", - "sha256": "05fig8a05rdd2cjq5pzqb9v51lwibyiflny2rfw226wn5m6f75af" + "commit": "86b02f84a8df0ddd6216cb85d49bedd6ee2ab747", + "sha256": "0vh0wdzz9idfinbfd3mynlp88lgq5j9wk8c3pc5a1is6g3jpj938" }, "stable": { "version": [ @@ -30769,11 +31029,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210512, - 1346 + 20210528, + 1009 ], - "commit": "9e7e96971900a2840fe2f7e8d6774c92fed2ccba", - "sha256": "04wyz472g4dlyyj7415s8wp4djaizrh7ncngqx8bl6zanksqyv56" + "commit": "c0f49e4e87300720b8e8a8296d92b8386956c7a2", + "sha256": "0ci3hjzgwayz9nvmwg5vbmvn80cz0lsppghi511cbr3cdf8xkkv4" }, "stable": { "version": [ @@ -30808,14 +31068,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210520, - 1300 + 20210605, + 431 ], "deps": [ "evil" ], - "commit": "d7a3e6ddec9d69978318901cf75b911085969fc0", - "sha256": "12jk8l5k8lbvvg2yapfbpq31dzl4icsmr16imz32bpr7b7vvar65" + "commit": "cd23a7b458d73dc49434a3cf90d3d0caceb5811d", + "sha256": "1naxciaq1ci1ajs4if45wjy5qf8bgkxazyvl1kywrj299wi2qdv9" }, "stable": { "version": [ @@ -31203,15 +31463,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20200531, - 1008 + 20210607, + 420 ], "deps": [ "cl-lib", "evil" ], - "commit": "6dcac7f2516c6137a2de532fc2c052f242559ee3", - "sha256": "1faimkch2s08kbrwh3j77y0n5inrjr7vphy0xdl402bv0d20h8nq" + "commit": "9bd7345476174dfc6eeaa700a505e45b155ddb83", + "sha256": "1p7v9pnbyc4mhpkvmyl9vr825grqnfyl0h203sbnb1vnw15bbnbp" }, "stable": { "version": [ @@ -31303,8 +31563,8 @@ "deps": [ "evil" ], - "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a", - "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg" + "commit": "4706987bc01a552343848da49b4951bd54374643", + "sha256": "0v2v58pchr5icdpvg4k6vblxhgjk09wi7f54hs1dj0f6rgvpxmx5" }, "stable": { "version": [ @@ -31394,8 +31654,8 @@ "deps": [ "evil" ], - "commit": "f0fdfef7703c814f9bb1bb2858d3cadc79fdcbdd", - "sha256": "1d3lnfyp7n1digldamddmxwlycm7xk5ljn5i9ngw59b936050lp6" + "commit": "ad47644eea5e351269f5bead18e713768d96f207", + "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" }, "stable": { "version": [ @@ -32337,11 +32597,11 @@ "repo": "ieure/exwm-mff", "unstable": { "version": [ - 20201003, - 1651 + 20210603, + 1723 ], - "commit": "0d428aca46b8c251dc04d412832e6e7b6e910872", - "sha256": "0g4jvnygcn91kzay0dvahkmf7813cizfc3lhyx1mvi6riz9li3l7" + "commit": "89206f2e3189f589c27c56bd2b6203e906ee7100", + "sha256": "0ipmapyd4jmpnk34wk9kfbvqnl04x74yg2pmj298wqa61ylw1n9j" }, "stable": { "version": [ @@ -32462,8 +32722,20 @@ "repo": "Wilfred/ez-query-replace.el", "unstable": { "version": [ - 20170814, - 1321 + 20210525, + 2222 + ], + "deps": [ + "dash", + "s" + ], + "commit": "3202cf4644ed3b6549284c3816b90bb230970a5b", + "sha256": "1xsvwf7g7c3v4p59svmahhn9pkr6zgp6vyr6dyvfy24mgaqw4jzv" + }, + "stable": { + "version": [ + 0, + 4 ], "deps": [ "dash", @@ -32677,19 +32949,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210427, - 2150 + 20210602, + 1952 ], - "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", - "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" + "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", + "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" }, "stable": { "version": [ 2, - 19 + 20 ], - "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", - "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" + "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", + "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" } }, { @@ -33030,11 +33302,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20210311, - 321 + 20210605, + 1057 ], - "commit": "7d18938751d047eef18bfb5975195419f0d1e2d3", - "sha256": "0182hg9iayz371lv4flls3gwsvn7bad027h5bn7lizvxxmgg3c6s" + "commit": "c223aee30af7dc7f52fb20045226ed9f49f4ec49", + "sha256": "14dzn3ggq8vb6qb5babngrpgsb29k6y8ficgzwwd9wfd5npynrpa" }, "stable": { "version": [ @@ -33473,8 +33745,8 @@ 20210426, 835 ], - "commit": "af56f75afc240d8121c8944a614a272be811830c", - "sha256": "151c9hvsb5bnprn7kf3g23igazkw9l7xvzizikifizfabay9wi2h" + "commit": "904225a3f89bbd3b44ea097a282ec6ca7945f7f1", + "sha256": "0bf3qnzhv7z71f4h9l0cq6mllkfmc81655qwbzakw3gqqmn8kyr3" }, "stable": { "version": [ @@ -34188,15 +34460,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20210324, - 1102 + 20210529, + 1253 ], "deps": [ "apel", "oauth2" ], - "commit": "ddf5b6eceb73d7dbf6ff3a2d5281a2957cc2b836", - "sha256": "1pf7jg0psirjm2s84hcmjxkhd5s8vlgprn1miykxks2yxkvk01xf" + "commit": "02735dede6603987e8309a76d0bc7a9ff9a5a227", + "sha256": "1jy2wsm1xc6iaxa449wwz14ky4yiaxd8g05ry59r9pf60cpxxy1h" } }, { @@ -34583,14 +34855,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210411, - 2342 + 20210605, + 1713 ], "deps": [ "flycheck" ], - "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", - "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" + "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", + "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" } }, { @@ -37083,8 +37355,8 @@ 20210411, 2342 ], - "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", - "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" + "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", + "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" } }, { @@ -38173,8 +38445,8 @@ 20210124, 1143 ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38201,8 +38473,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38233,8 +38505,8 @@ "flyspell-correct", "helm" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38265,8 +38537,8 @@ "flyspell-correct", "ivy" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38297,8 +38569,8 @@ "flyspell-correct", "popup" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38692,8 +38964,8 @@ 20191004, 1850 ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -38764,14 +39036,14 @@ }, { "ename": "forge", - "commit": "58c5ca46286712b2aa43e07bb5dcbc8b5eb321e8", - "sha256": "1ykpjgbi2yak9ww54wnm1gxj9zff2ggldg9msg3219r8frzjcnjv", + "commit": "6cee0395aa57874032cb75c9f3f71e62bd139235", + "sha256": "0a1yvdxx43zq9ivwmg34wyybkw4vhgzd2c54cchsbrbr972x9522", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20210507, - 1554 + 20210525, + 1345 ], "deps": [ "closql", @@ -38783,13 +39055,13 @@ "markdown-mode", "transient" ], - "commit": "37aa4e4b82a99246b3551daee6104dc1d192174a", - "sha256": "01z6mnl68lwm0nj0mbvns6xacfydadwcmjzfy3vnmj7hkcd9nynd" + "commit": "551e51511e25505d14e05699a1707fd57e394a9a", + "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ @@ -38797,14 +39069,13 @@ "dash", "emacsql-sqlite", "ghub", - "graphql", "let-alist", "magit", - "magit-popup", - "markdown-mode" + "markdown-mode", + "transient" ], - "commit": "f5fc99935e2059ddede9766ce4bb96d99dcd203b", - "sha256": "0jipyqj3r4gkdwpcy0m5ij7x510r2admi8fbzwfysqyrwahs60nv" + "commit": "551e51511e25505d14e05699a1707fd57e394a9a", + "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" } }, { @@ -38839,15 +39110,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210413, - 802 + 20210604, + 1107 ], "deps": [ "inheritenv", "language-id" ], - "commit": "eb5906c7070b667432194da3991daf21f24b516a", - "sha256": "02i9qijkwzwjcl52ivzhcjamsiygdxn62gdkb9v511036vv4dqff" + "commit": "82f68e5d1f0641d7a050db02ab2c0a7d3888f358", + "sha256": "0761qmkza4sbl1k0vj4q18zm9p148h7131dq46wwajyxbmrxlxja" }, "stable": { "version": [ @@ -38978,20 +39249,20 @@ }, { "ename": "fountain-mode", - "commit": "12589d1eb14bfc87d2e6f2a5ff8f5fb66b574a56", - "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840", + "commit": "27cc1d093ce12b559a4266184fb9077c9810d542", + "sha256": "1jmb5xm0d1wffw3gj0idv114dzs845n41312dvghv7bblbxyd7bj", "fetcher": "github", "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210516, - 1556 + 20210523, + 1327 ], "deps": [ "seq" ], - "commit": "faccbe3e1f02ed75745999a7f6f11a0fb855936a", - "sha256": "0jdszkbzwh3w3r1sf09h3g65q5b1gnwwd502423lgq80gabf3ni9" + "commit": "77f3ce6b646868210f91b6a80fcaaa77297ed341", + "sha256": "1f0mzrn237kv2p5bz58km4b7a46shzm1v7n4a6ksyfd3n7cqas85" }, "stable": { "version": [ @@ -39602,14 +39873,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20210506, - 1352 + 20210602, + 1531 ], "deps": [ "cl-lib" ], - "commit": "a456d86694067c04dcdff3e48d654ceed2c72465", - "sha256": "0vijg7ybg128p2zx1fr4fzgyrf3p5vbhssf8j1l9y7bkdq8i7smp" + "commit": "b989a860d1d6191bb9c5911ac77ed0931424eaeb", + "sha256": "1w0hyfspi3kahj2lk1bzj3ny3r8bb0cj4yfjizzbfc1pz9dlkpkp" }, "stable": { "version": [ @@ -40092,11 +40363,11 @@ "repo": "wavexx/gcode-mode.el", "unstable": { "version": [ - 20201218, - 2109 + 20210522, + 1025 ], - "commit": "a1e2c6cbf4e364991ab2209d5cd5a3b698d459d9", - "sha256": "0x6aqh415gbn9x7qyb74zmw5v1ghi7y0lknlbdccxx3j62fmmv8w" + "commit": "1f83845af4102efc5e5856b55bd5ad165b2f0cdd", + "sha256": "0lrsnl08npknif66chs3spy6pnblx3mbxxw1dii8a7zcj2s0ripv" } }, { @@ -40518,11 +40789,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20200813, - 1424 + 20210226, + 1419 ], - "commit": "d114bacfb12f9e66821254ff0a1fb85443700b24", - "sha256": "0m7jricw40h4r30kcg60dl2ybgrdbiglnb55lz3n70bc5nsx8dcd" + "commit": "0a227125a4112266c06ed7247de039090314b525", + "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" }, "stable": { "version": [ @@ -40667,8 +40938,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20210329, - 817 + 20210530, + 402 ], "deps": [ "dash", @@ -40676,8 +40947,8 @@ "magit", "s" ], - "commit": "6a90e7233dccc2f997af2cd5c896c8d72d3c3a76", - "sha256": "1nmgngxgzbp1l4av6vb6fgl2nbizsffv51qnki8yaycl1f3cmrg9" + "commit": "f1bdc47ab2bb29c2a0a385aaa9a5f0f6d543ffb5", + "sha256": "1qcw5kzcw9g41hqg0gnq3k6i4ygfgrlghadmfzdnf7dbk93ngl4g" } }, { @@ -40935,28 +41206,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210427, - 1239 + 20210531, + 2006 ], "deps": [ "let-alist", "treepy" ], - "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", - "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" + "commit": "e9a819c9c997b8e752eeb4a3fcd1a7b55ab8da47", + "sha256": "1c92q4hrax9gfrw35qi3slr7man006v5vqzp6hi2an5haw2cz4x2" }, "stable": { "version": [ 3, 5, - 2 + 3 ], "deps": [ "let-alist", "treepy" ], - "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", - "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" + "commit": "ae59388adbba32fa00e39f3323fe69367739ee6f", + "sha256": "1sn7rzfkm75vj3whhisrjk1s34lz6hc08hmf4nnznbdvyimnd013" } }, { @@ -41021,11 +41292,11 @@ "repo": "csrhodes/gift-mode", "unstable": { "version": [ - 20180530, - 1235 + 20210528, + 1459 ], - "commit": "b0441ae6e02f343be3b611a2d4b40495ecd932f0", - "sha256": "0dwpmvjsczcdzwhjvpfxrkfha513538z8wq3gr3l1zc1kdggx2bk" + "commit": "c93354e8fe1173b22f398f17b127875807f15b87", + "sha256": "1d974s7i2hi8yxdng2l02pfn2vkv65jzk5lm9p6if2myf5xbwis5" } }, { @@ -41301,29 +41572,30 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210512, - 1949 + 20210525, + 844 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" }, "stable": { "version": [ - 2, - 90, - 1 + 3, + 0, + 0 ], "deps": [ "dash", + "transient", "with-editor" ], - "commit": "791901b2f1d26fa0a383147fe77948a9abc753da", - "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4" + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -41528,8 +41800,8 @@ "f", "hydra" ], - "commit": "24360718c1666a246a39aadc8a251faa8578cc66", - "sha256": "129xv2ddgdkc9ipkxvwprkwp245x1zq2r75liv31x8x4g4i4305i" + "commit": "5b1191f79f1845d7144bd2a49ad25c49866456aa", + "sha256": "06ybkpaqicx3q5hdjz99v3isj1jhrpmg55wf054dzx6wpjy8na21" }, "stable": { "version": [ @@ -41704,14 +41976,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20200603, - 701 + 20210528, + 908 ], "deps": [ "transient" ], - "commit": "8d675750e921a047707fcdc36d84f8439b19a907", - "sha256": "1ppids836gdk5j8cli8wkzkjb85f4s1s550v5xpxyyq75rj1bnsr" + "commit": "3381797bcbf906b18dff654a2361032d2d01b4a3", + "sha256": "05pyjhi26charkjy0mhvigd72rvb4s1s8imycfynf0fmjy7f7n7x" }, "stable": { "version": [ @@ -41794,20 +42066,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20210426, - 2132 + 20210528, + 1854 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" } }, { @@ -41842,20 +42114,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20210426, - 2132 + 20210528, + 1856 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" } }, { @@ -42130,20 +42402,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20210426, - 2132 + 20210528, + 1856 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" } }, { @@ -42292,14 +42564,14 @@ "repo": "TxGVNN/gitlab-pipeline", "unstable": { "version": [ - 20210430, - 151 + 20210601, + 1339 ], "deps": [ "ghub" ], - "commit": "0a07b64e402fa1e25423f8f6ed38b35ff09159d9", - "sha256": "1611nday1mxkkjjwcz62bvl8863vlkl4bq4vf3wj6p237m4ai3ks" + "commit": "2404f9cf0a064aabea975adada250895c385e057", + "sha256": "00i6q4pggaq97xgvi2ifanh0lx8nq5gbi4r2gy596635x26a55zq" }, "stable": { "version": [ @@ -42732,11 +43004,11 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20210104, - 1052 + 20210526, + 1848 ], - "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", - "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" + "commit": "07a80272b86c081b40602ec0b080571f3269749d", + "sha256": "1d50b5vwnzca16g7hs2i0357lx9x5rvivdb5hdi0ngf6sb8d1afk" }, "stable": { "version": [ @@ -42857,11 +43129,11 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20210115, - 1107 + 20210604, + 720 ], - "commit": "52f05e7431b5ce5487e8a990eb2ad01cade973bc", - "sha256": "178b8l2f5ykrq1yllg9rmn1vsyp3aqslrga1gxx1rc4grx22x31z" + "commit": "09b9e96f8e0ab006d9cfe8f5ab000ce7e50ef4de", + "sha256": "0qsnfiqcivy7czg2j7kdsifz7p5nid1zvw6zdnaihghzdxa1w1ia" }, "stable": { "version": [ @@ -43031,30 +43303,6 @@ "sha256": "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3" } }, - { - "ename": "go-capf", - "commit": "be3dc9ae83c9d11a4f04f79775b17c5a2b86e96d", - "sha256": "0k6s65bf8iwkpr93agw9hqaxfckqi43lanffdic6j4vjrk4inlwz", - "fetcher": "git", - "url": "https://git.sr.ht/~zge/go-capf", - "unstable": { - "version": [ - 20200814, - 1046 - ], - "commit": "acc353135f390245453f0d90f5846f67b0a84952", - "sha256": "1hb8glprzpm94bsyx2mnv9w6b825y451agpqh2ry8ngydbc1llhi" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "de3b668b83a73da5ce189c536a58aa1d4f5d492c", - "sha256": "1y1dscqyd2jx5irj5pcy7sspzzp0nsy2j4zaqhln2snffpqa3hmf" - } - }, { "ename": "go-complete", "commit": "4df81abbf3b16f06fa327c1626bef1245ea77758", @@ -43610,11 +43858,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20201203, - 203 + 20210527, + 1257 ], - "commit": "ea63d0ad9816aa1c478c66bd1ff9978e8330d3cb", - "sha256": "0v3w3ffls9h4vpalmkvswsrdcny3z1g7p9gdp75lw6pc9xkmkgnz" + "commit": "7a9b7978057bf747ed06fa6c9d2f30047714aa05", + "sha256": "1wydx9ak09dfmvqvvkdd5zdzablj8rhisk3im1f41a4hgiba80hr" }, "stable": { "version": [ @@ -43833,20 +44081,20 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210520, - 431 + 20210607, + 339 ], - "commit": "60fd0a7a5d663150728027bfc4e7adb33970d277", - "sha256": "19apz49ba2cmlf449yc55s3150nrqhv5lajmw1rx36w0vbjkbyyn" + "commit": "b4233500bbbdb64758283ba8a4b7cef5a85181a2", + "sha256": "05k03bycwpgs9wf9rh4rxfp38lhzr46c8zpvkd5qr6zwb1nnvr00" }, "stable": { "version": [ 1, - 0, + 1, 1 ], - "commit": "c72aa45b69025c2ee2c62eeccdaf15117cffe10d", - "sha256": "02lcw836dkj0dlv5g2pgx68i6a93lazsy7vln46dm5dckficr9bs" + "commit": "61aa3b57d572e6a46a1415b66dbc4b80c33bfb73", + "sha256": "0zprygv94rp1hdq7qxcmp3ns04j6l28y9w5hp087mhfbr1v5y54m" } }, { @@ -44235,13 +44483,13 @@ "magit-popup", "s" ], - "commit": "13851af3d26288ec5760970b5b3ae3fd298d014d", - "sha256": "1ngl263wx18x3gw92i1rjffl6siacrvwbznmgv3793na96cvzs0f" + "commit": "da0ae769e70e1af16865c3fadb25e9132d089dc6", + "sha256": "09kdlz6h31yasi1rv7759m40zb12vj6llv70pqh9swrpii2nmdzp" }, "stable": { "version": [ 0, - 25, + 26, 0 ], "deps": [ @@ -44250,8 +44498,8 @@ "magit-popup", "s" ], - "commit": "bb0307eb84ae981cfca7fc8d680821a2c2be3c6d", - "sha256": "0jwfk4kqz8jzxlhdihb0wvyiza1zfwcwr2p9frk0cw50p6fjqbs6" + "commit": "34586b6650fb19689755570628a558ca9ea7946a", + "sha256": "0a7bnw01j4fbhga5x00v5bbk38j2q7mg7ablz6kswlmarqwr4fm6" } }, { @@ -44609,6 +44857,38 @@ "sha256": "0sp0skc1rnhi39szfbq1i99pdgd3bhn4c15cff05iqhjy2d4hniw" } }, + { + "ename": "graphql-doc", + "commit": "54bd4ea32fb912c51735243fa8f609890516fad9", + "sha256": "1szibk2ragp0pbbzw6bw1jmbpdbc6llj4cmd20wz8lvjwp3p1qss", + "fetcher": "github", + "repo": "ifitzpatrick/graphql-doc.el", + "unstable": { + "version": [ + 20210530, + 221 + ], + "deps": [ + "promise", + "request" + ], + "commit": "a60a646413fce528ecf42be3ee111b3f92d9f95b", + "sha256": "168yqaygyvrw05kip10azdcjsczahrsflg43vl6ki7ii6x595b5s" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "promise", + "request" + ], + "commit": "1623cdd887846057200579cfddc0fa1815d1af9c", + "sha256": "0nqx88ng72vvz1vl7hj1m77ncf9i0d4l3n1bab0kp90fmrgxa69p" + } + }, { "ename": "graphql-mode", "commit": "3850073e6706d4d8151bc6ab12963a19deae8be9", @@ -45040,14 +45320,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20210105, - 1136 + 20210606, + 1419 ], "deps": [ "autothemer" ], - "commit": "0013c68458ae62fe1dc4bbbb23f6a54a9d41e398", - "sha256": "197r166c4pj0kc2v65rip93pcmmnm4li2jvagvajblang1svr2v0" + "commit": "c2ae5e3fff39f78f23109d90fdf36b3b189df511", + "sha256": "1vx3grgnnb5mamig3cd882pvcbqpni3kglrjawgdc96wwiv1krbg" }, "stable": { "version": [ @@ -46255,16 +46535,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210520, - 1523 + 20210607, + 1026 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "2b60812516a0560ba5b2501771b53273a56c6488", - "sha256": "0z3axb0ql8cgzgqa5wa90y35vdwmq8qxlpzv3sw9ypmcgl652fy6" + "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", + "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" }, "stable": { "version": [ @@ -47163,14 +47443,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210519, - 1827 + 20210606, + 1857 ], "deps": [ "async" ], - "commit": "2b60812516a0560ba5b2501771b53273a56c6488", - "sha256": "0z3axb0ql8cgzgqa5wa90y35vdwmq8qxlpzv3sw9ypmcgl652fy6" + "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", + "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" }, "stable": { "version": [ @@ -48248,14 +48528,14 @@ "url": "https://framagit.org/steckerhalter/helm-google.git", "unstable": { "version": [ - 20180606, - 520 + 20210527, + 900 ], "deps": [ "helm" ], - "commit": "48e91a73d5f48c39d7a219022a24440cff548e1a", - "sha256": "05xj6bkr330glh56n8c63297zqh1cmlhxlyxpr04srjraifyzba1" + "commit": "27834161391c350ef790062391cb7eab1d59fb62", + "sha256": "1rb1pmzr6szg8jjm43dndnk99v4i5zb1wp24rs9w8zmhygdn8jf4" } }, { @@ -50768,14 +51048,14 @@ "repo": "emacs-helm/helm-wikipedia", "unstable": { "version": [ - 20200630, - 504 + 20210525, + 717 ], "deps": [ "helm" ], - "commit": "a6c8b1d1ab5dc0a69cb44bb5f3eb6792ef091147", - "sha256": "1him1sqdl15qfjqrkgmnhligwqc6a9liiqndssa1law3bd36c2jb" + "commit": "c242c74efaeda2ffbafd281ee6bceae1a42507bb", + "sha256": "17210p61q6g1rx8a3gacbrv69c4n92h5ajh28yw5ya23c275dnkb" } }, { @@ -52739,11 +53019,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20210520, - 2212 + 20210525, + 2259 ], - "commit": "09ec7a3da848f24d232578fc7e4ac5ff4a7736c7", - "sha256": "0kbvb71y2780ghy8pc4i8s0rf8kd58xfngbsqpjhl4ard2qvh9sp" + "commit": "9b4587417f2583c503f84f3b1e994d7934e57bdd", + "sha256": "1dpanfa8qpy9l2i2pw5w95lqsw06944qbcz8c9fgpj2s3nchhkpi" } }, { @@ -52857,11 +53137,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210325, - 2311 + 20210527, + 2324 ], - "commit": "81e6651203ef666af4ddc63dc726cfb1443fe16b", - "sha256": "0m7k91kwhy8v602li3rfzmcb4qb443w2iv8qh38ncsl0l6bsc982" + "commit": "4cad8a17f6c9d98a628d78fe358d589b03172b57", + "sha256": "0xwl0fycygzwsrv4vrph6q6hy0550j3z1ir9ahfc7fjl091k192x" } }, { @@ -52996,14 +53276,14 @@ "repo": "ieure/hyperspace-el", "unstable": { "version": [ - 20190908, - 550 + 20210603, + 1825 ], "deps": [ "s" ], - "commit": "a7ea085baf4a51cac0513cb57216677722938781", - "sha256": "004bdas6339af8zzb2agc27vb86wwbxxinp1n4fhswnlb2llr18c" + "commit": "c4c363c140250ba6b775516082063878975a6154", + "sha256": "13nvp7hzynrddws3x7f7p4529arn3m7km7ma4226mc7mbpfbjgi1" }, "stable": { "version": [ @@ -53311,11 +53591,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210520, - 2058 + 20210603, + 1343 ], - "commit": "99f7cf94f362d18b2f2716b431b9fcc64345c05b", - "sha256": "08ppnakyzxqx7cwr08rmgj2m5bh4w5ssqxxdz10gx8majgqrr6li" + "commit": "3bee30b374226deecde8a5cbbc6ca8471c303348", + "sha256": "1c7riqgm5fi13kb2k7qfykr0zsx3hkwyzgcxh4kqnd1y5w54pgs2" }, "stable": { "version": [ @@ -53334,27 +53614,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210304, - 1843 + 20210605, + 1658 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "759a63d373681e09d71e0f5522d063a811d7127e", - "sha256": "191cwfjrcv2yvgh0f6n0f2s64w6r2v19vvc41x4g1x48szzrzbg2" + "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", + "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "bc600ecb6e6134e98dfb67f10301bde5a4e07adf", - "sha256": "0j27iiwgzysd9ymb4nc0m1300sqz0gqmri7ky9zfgv2g5gpjs4w0" + "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", + "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" } }, { @@ -53544,29 +53824,27 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20210402, - 53 + 20210529, + 1318 ], "deps": [ - "cl-lib", "memoize", "seq" ], - "commit": "ba997f0cad2797453d0ecf1c754a45a53da140da", - "sha256": "01lrafc2gam4msgmwrwn375sfmwg7lj30hq2cjv0gsaxv669l0mk" + "commit": "49e7967ea8c0ab0a206b40d70fc19be115083fa1", + "sha256": "0amjz5l586w6qbhjr32gzcbg2d94k904h5is0030zgy2qswphnfn" }, "stable": { "version": [ 4, - 13 + 14 ], "deps": [ - "cl-lib", "memoize", - "s" + "seq" ], - "commit": "41b42779e22c064192b95e4de855ff7ebad45af6", - "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" + "commit": "c97f0d0c314fe4b49a3c1e58144e97c72926172c", + "sha256": "05s2a7ncw53w6713cqsr6n20ax2g99h4hr1qsp400l05vzp1m531" } }, { @@ -53918,11 +54196,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210402, - 854 + 20210606, + 1026 ], - "commit": "ff68c2065316aa5fb72662428f8d5812ec8da83a", - "sha256": "1c5qxms26q2pd5g7p8zayqbbgypjix5ayk074kk07a4km4wx31h8" + "commit": "94650d77719a554cdcebfc6e26a731de87e14483", + "sha256": "029z9j3anb948mbmh6ai8asxgfim8193ymm41c7crqzga9p4ivc7" }, "stable": { "version": [ @@ -54838,11 +55116,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20210427, - 1755 + 20210607, + 2336 ], - "commit": "92d5d122fa172bc49b5ec9ee1891aa9c84805c92", - "sha256": "1dn8wml7jwf3dx2nbkjpf2v6k88apiin8wqmz4yix5d2k3x2qm46" + "commit": "03dd9c9d4e3f94f5519a786804d3ef9d3a09ef9f", + "sha256": "1xjaqh3m32lbc6avccv5clz1q2ra4pcl58wwlzkg0yhkxn7r750i" }, "stable": { "version": [ @@ -55116,11 +55394,11 @@ "repo": "zonuexe/init-open-recentf.el", "unstable": { "version": [ - 20200321, - 737 + 20210528, + 1902 ], - "commit": "369304d6adb6875948c4534419c4f303ac23c4f6", - "sha256": "1i41xcjj0kdhn7m29jb5gq2j2cyxn424y4lwx6s3fjj1ckx808ii" + "commit": "c019ea85a9c589815b0af60153858d09bcef130e", + "sha256": "12jwz0ssfxz1z55fb7v978xz8pwnclnqnzq5pqggzb06zkfxx7iv" }, "stable": { "version": [ @@ -55706,15 +55984,15 @@ "stable": { "version": [ 1, - 4, + 5, 0 ], "deps": [ "cl-lib", "json" ], - "commit": "e630c497f973fa4d1f0fd0e0fd87fb9d18666986", - "sha256": "0n2nfcq58md1p2xdhq1smh8v7lsyj0ci7ma5xyd6bkg5rvhsh10i" + "commit": "b9c64abf81e73860e39ecd82dfa00cca90b53d99", + "sha256": "1ilvfqn7hzrjjy2zrv08dbdnmgksdgsmrdcvx05s8704430ag0pb" } }, { @@ -56016,11 +56294,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210518, - 1815 + 20210602, + 1349 ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -56047,8 +56325,8 @@ "avy", "ivy" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -56415,8 +56693,8 @@ "hydra", "ivy" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -56782,8 +57060,8 @@ "espotify", "ivy" ], - "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", - "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" + "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", + "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" } }, { @@ -57621,17 +57899,17 @@ }, { "ename": "jetbrains-darcula-theme", - "commit": "f4b9f64cae9ab15388352e0d93f34f7e73dbe201", - "sha256": "1d31aw9nmgj7m5hvj0qq290v1cfn12ljlvnc6f25g7003a68fv9z", + "commit": "e13051402c177efee0e9e3296f20beb1ec4a63fb", + "sha256": "0wfg2477mixndwhj9i1b6j9gl2avh9cyzapxdi0qpw862qk6g0fv", "fetcher": "github", - "repo": "ianpan870102/jetbrains-darcula-emacs-theme", + "repo": "ianyepan/jetbrains-darcula-emacs-theme", "unstable": { "version": [ - 20200927, - 1317 + 20210602, + 1430 ], - "commit": "b9b3c39743be5aeba17d4d8e5d379613451ddec6", - "sha256": "1j3dxj4cr26vir226zb84zn0jsjwnhz02xb60a69jv4k1wcl6bq9" + "commit": "f57c359044ff1fa90db62a60b6691ff8d65c82f3", + "sha256": "17wd6yzhjdw5j3bpn6bnga5nkwdnqgk8nprqiavsir4ghkzw2h46" }, "stable": { "version": [ @@ -58358,11 +58636,11 @@ "url": "https://gitea.petton.fr/nico/json-process-client.git", "unstable": { "version": [ - 20190827, - 1858 + 20210525, + 733 ], - "commit": "422606a7bf08d13646e3db4f6c2bddb69bd61dec", - "sha256": "16fyb0gwm4llwbmg12m4r9r8h540hcvhrsnlly6cry60h9p8dpc1" + "commit": "373b2cc7e3d26dc00594e0b2c1bb66815aad2826", + "sha256": "0f6vimdzg28j1jsr31ma0wf6y18jamv8znn4fwvf7pdd51hdn36x" }, "stable": { "version": [ @@ -58499,26 +58777,26 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20210407, - 2013 + 20210527, + 1557 ], "deps": [ "dash" ], - "commit": "9bb6f86dfe6418ccccb929e8a03fb4bb24a9ac0e", - "sha256": "1rx7kr4pdhrmpcm5rm0h9kawk7czgdy1w5z3w4a2jw0v442bhx44" + "commit": "54a89b0aaba7a68782008c5e1ab00d5ec757316a", + "sha256": "14nxfa91yg2243v4d5kvynp2645x3811ispmhmpgil3x9qbl9jg9" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dash" ], - "commit": "e93a1f55e5f9bc2b34b025c6f7a60a6f159268d1", - "sha256": "0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i" + "commit": "54a89b0aaba7a68782008c5e1ab00d5ec757316a", + "sha256": "14nxfa91yg2243v4d5kvynp2645x3811ispmhmpgil3x9qbl9jg9" } }, { @@ -59147,14 +59425,14 @@ "repo": "chenyanming/kana", "unstable": { "version": [ - 20201012, - 1415 + 20210531, + 1427 ], "deps": [ "dash" ], - "commit": "b93cdbf72a1c818d1a48530ef20c5dec64d7945e", - "sha256": "1ikpwghvqjf3bc60xmils2prx99lm1x326mw4gic8n7z9kasqizd" + "commit": "d3d550aad67ef8625b3860598bf3622f5b2a7d32", + "sha256": "0d5qnqhvnxw5009mq34jnnc19r01y4kz0ypnv1mby80g8jz2gl62" } }, { @@ -59229,15 +59507,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210507, - 1241 + 20210605, + 1117 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "4e46cc6c843d95427139f824f448f779be80fbc7", - "sha256": "1q3wa0i8ng2b0gsmpi9cvdr1h0ffs1pys95pgnxnsdw2cvlh4v6m" + "commit": "7eb08e47bc5f227c72c318ff327c689ab54a7620", + "sha256": "181vnz6ancqhb13w9890pbplnw6lzbzcx3xkg4li9fk10lab72zk" }, "stable": { "version": [ @@ -59571,20 +59849,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20210123, - 1149 + 20210521, + 828 ], - "commit": "a3a0798349adf3e33277091fa8dee63173b68edf", - "sha256": "08n4lfd6zb0qwpaw48q7p1mi6rn5rzja02113fphz7ra2kapbpva" + "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", + "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" }, "stable": { "version": [ 1, - 0, - 4 + 1, + 0 ], - "commit": "16d9961d15536054632be1eff75fd0fb1a4420f8", - "sha256": "1g9arjdhdpvsw47ny9gi5k758ya37yza4mr0rhbf02yvrqyfsrgr" + "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", + "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" } }, { @@ -59795,6 +60073,30 @@ "sha256": "191i2b2xx6180sly0dd6b1z6npsrzjqhxrbak9wm6yblx7alsgn2" } }, + { + "ename": "keytar", + "commit": "4ba6f96ca2e20dcd75cf239370243bd8e484f851", + "sha256": "1bm0kxrbkkk3c4zljf9azfm22msknkvrcns1j1r2hczjqdviay28", + "fetcher": "github", + "repo": "emacs-grammarly/keytar", + "unstable": { + "version": [ + 20210523, + 403 + ], + "commit": "8d2a5ec4a7fe766a62037b05f26a8f36fff45c06", + "sha256": "1rszkzpr22dy9yr54k2pz6p2j6lbgvy189f6ki8gmlsqzdyxmssk" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "17972320ef140bd56e551842d89f5d8c2d979f83", + "sha256": "06r84kcg7ig1xky01sa3kyw4iam5wzag4qpp2rm3q9rad246pjr0" + } + }, { "ename": "keyword-search", "commit": "8ecdc51938f2300bf005e2d1b1819e0fa59e0bd7", @@ -60014,8 +60316,8 @@ 20210318, 2106 ], - "commit": "28bfe768d8066b9b42d5e9081ba7318ae7ca5fbe", - "sha256": "13lsva3lk9wrwp03flvgh9fcazw99var1b25v1gv75yfhj0m9hyy" + "commit": "3894a454ee03ede25e920759e6ac2df040ff3431", + "sha256": "1crqrmzxhm21psv5mkbzn3h2syrgszx50i4kd4n92f56dq7s8i4b" }, "stable": { "version": [ @@ -60365,16 +60667,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20210519, - 642 + 20210604, + 909 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "d95e52547952743ebee1394223d2b202291deec0", - "sha256": "1c0lwdi1yin40q71vlfgf3iw0r1777whzlx79x9hnbgqavkq3xyw" + "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", + "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" }, "stable": { "version": [ @@ -60406,8 +60708,8 @@ "evil", "kubernetes" ], - "commit": "d95e52547952743ebee1394223d2b202291deec0", - "sha256": "1c0lwdi1yin40q71vlfgf3iw0r1777whzlx79x9hnbgqavkq3xyw" + "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", + "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" }, "stable": { "version": [ @@ -60557,16 +60859,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210508, - 1224 + 20210607, + 1851 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "635e974cb692973856a4d26093876f5ad2285d3a", - "sha256": "0c3fz2v3zyq6s1gzz2013yafdhg46lffr4w8hwhxmgpsci6vf3hd" + "commit": "9d6f4448347fcf48d0fed51eba16423c9254c212", + "sha256": "0kfivjdjhlrbrn1z6i51y36s6f4qj386iy1jpcbvv33xa0lh5ksi" }, "stable": { "version": [ @@ -60667,8 +60969,8 @@ "highlight", "math-symbol-lists" ], - "commit": "4d12e7dd4c26bc5dd7594fc519bdbcf36b02e2ed", - "sha256": "18my5kh5wga049ygdg4ri8qh5lvf1c6v174fy3h3z972w4apk21n" + "commit": "63796ccadcc9147c5badd9a87f626611f63e3c4c", + "sha256": "1iwgi7jm20qwxlfa7klkz5zmdfxa14psly6xsl29i37j9p6146sb" } }, { @@ -60749,6 +61051,24 @@ "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" } }, + { + "ename": "langtool-ignore-fonts", + "commit": "9792610d9325ce5f0cc7d07a621755d8fadd90c3", + "sha256": "1vivb57kyd3gnigf8j1xhnpn3d6jxcs5rb3699qyc18w1zk4y154", + "fetcher": "github", + "repo": "cjl8zf/langtool-ignore-fonts", + "unstable": { + "version": [ + 20210526, + 2340 + ], + "deps": [ + "langtool" + ], + "commit": "c3291c85b733b9047653cbb1f525655394610bdb", + "sha256": "1pmpnpbl1xanprmikawcy9v4441q3381mmyp1v0mgf0dyzg871m6" + } + }, { "ename": "language-detection", "commit": "ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765", @@ -61156,11 +61476,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210316, - 1822 + 20210603, + 1518 ], - "commit": "ab5cc26b56a6a53a3338ebfde17b746522c2c14c", - "sha256": "1ds545sh8hg2vg5l7fm4v6z31lzax14ivdni3a37278jfx82xxrx" + "commit": "af0d4d8daaa323c34502d3cbea85ec8f70b06c00", + "sha256": "0p4smpfld1ky07cy5qn8kqpbqw5ymrn8valkpx4c519lj6pb9rn6" }, "stable": { "version": [ @@ -61371,11 +61691,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20210209, - 4 + 20210527, + 1449 ], - "commit": "ac7e2887baebedd51afbadc9e4c6f7b59351b0bb", - "sha256": "0v6nw2yqy8lhwssq2myx91jjlsg8d97f60yhrpjk3qc62037q60b" + "commit": "b8ba2a0bf56b751f077f13137a1904d66061a4d0", + "sha256": "0cc9s00flbih3kkbkan7xfqlv5qq9j4cz52ljj4xyxbf51r2lh0z" } }, { @@ -61653,11 +61973,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20210507, - 1556 + 20210602, + 709 ], - "commit": "7a2a8c49fd17c43c276dbe0aa941fd676a54a5cf", - "sha256": "02i7d8lzalwv6xaja82gn48qkf9ks0xvnaqzl9qwxiw980545z0y" + "commit": "b8b5076d643046008ea1496559acdd4ddfdb649a", + "sha256": "16rfyjk0cp487ra6v5c1cmf106ixipr9b71zfp0bwm35wa2mvdic" }, "stable": { "version": [ @@ -61726,19 +62046,19 @@ "repo": "rvirding/lfe", "unstable": { "version": [ - 20201007, - 2214 + 20210603, + 1241 ], - "commit": "f762e9310390edb7a5a49d8d9dc22693fbcde973", - "sha256": "022bnn3ksaaihi3cnc7ib15ry2kydp4rjh1v25vym7vmfxlw9akz" + "commit": "1feb8af64c977946b6184b7d63b436c49dbeb52d", + "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" }, "stable": { "version": [ - 1, - 3 + 2, + 0 ], - "commit": "d8337516ab09edd4b281a27ac85684b81cdeb8bd", - "sha256": "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6" + "commit": "76eaf432f768b45393e404c1bd1861a08c19de3b", + "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" } }, { @@ -61809,11 +62129,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20201106, - 858 + 20210526, + 623 ], - "commit": "8d4d1d4f2924dc560bce1d79680df36dcc086d49", - "sha256": "0gk2y14lsfc9nw31xhrxqvlf834l8kyjnsqi7rhfk2sl6j1p669v" + "commit": "4a6da0f6ab9b43651f3fcc73412e3480b9403caa", + "sha256": "04ag7icqqdhz40fi91fx4bxx8j6vw2774gw1fbppbks3sasimyy0" }, "stable": { "version": [ @@ -61976,17 +62296,17 @@ 20210303, 1751 ], - "commit": "868a001dc06cd75342b30da53936ab2ed286872e", - "sha256": "0z2415smaclx4rip10hm8jmn7byswl4y41iijbl1ga78mhvd227l" + "commit": "be7ff92e4dfb06ed51baaa10157d9a1ee1cd666a", + "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" }, "stable": { "version": [ 0, - 16, - 1 + 17, + 0 ], - "commit": "79105db651ff2f920193e2a715caf2c40b2379ca", - "sha256": "0z2415smaclx4rip10hm8jmn7byswl4y41iijbl1ga78mhvd227l" + "commit": "ec97fdf14ce7a65398ecc2755654db46a3ef3b14", + "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" } }, { @@ -61997,27 +62317,28 @@ "repo": "jcs-elpa/line-reminder", "unstable": { "version": [ - 20210426, - 1859 + 20210531, + 743 ], "deps": [ "fringe-helper", "indicators" ], - "commit": "8c9f824b1dc67c8489afef05b06d9525b29dab00", - "sha256": "0qr7qvcl6rlsagim3y71im24z85l3f7cvj39r0g77mnhm733z9m3" + "commit": "1856034d0ed8ce41a29a1ea051184ee7c2f3e276", + "sha256": "0ni73ybrg21l63hs51pixkxf77bl288hzji03bm8v1hzsm72vxxs" }, "stable": { "version": [ 0, - 4, - 5 + 5, + 0 ], "deps": [ + "fringe-helper", "indicators" ], - "commit": "bc488bbdba2172629183891758cfa9466a64182f", - "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55" + "commit": "4d73b84a84227b01b7fbc6f717f6c380682cde2f", + "sha256": "0qkgmg60jfcwfsc693x9c066vgbclgqwzkqbmjrc32kcs57zhvni" } }, { @@ -62031,8 +62352,8 @@ 20180219, 1024 ], - "commit": "a49afb9c168eaf8aaaf94f0c631b7b74db9a1d82", - "sha256": "0213ppx15rdb5cxg7w8978880fzv3dh2m9p6idkmlfj7bndfd411" + "commit": "68e59d0fff1eb76c7b1a72c438f344c251115e81", + "sha256": "1ipqf3qfgzcrrp6xwgxb6wkk8a6ii5jx5im5gfhghdhy45z2m3ii" }, "stable": { "version": [ @@ -62299,11 +62620,11 @@ "repo": "lispunion/emacs-lisp-local", "unstable": { "version": [ - 20210307, - 1545 + 20210605, + 1347 ], - "commit": "3a3237a5c25db9526dfbe1b3ac1e7125f8f459b0", - "sha256": "1nm2kmilhk2hm9nfd1f6drhlpwkpk31s1072y8im16ci7i13lig4" + "commit": "22e221c9330d2b5dc07e8b2caa34c83ac7c20b0d", + "sha256": "10dflrabhn974k9lr4jvib5vs7v45hj9skryc4wjc09wzz5qphpk" }, "stable": { "version": [ @@ -62334,8 +62655,8 @@ }, { "ename": "lispy", - "commit": "29a704fede83b02e19c2ad213485f0f651931753", - "sha256": "1c8gz46ab5f07dljv2chr0i5lini81wl3zx4zw8xjysb4a5dp05v", + "commit": "45a02d8edf65ccf5929b8508294588507adaaf83", + "sha256": "0s0rjfy344pyxnbgmkbil38vy32iwkw3n50j30pl3ivnqm1wa3rz", "fetcher": "github", "repo": "abo-abo/lispy", "unstable": { @@ -62617,14 +62938,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20210324, - 1547 + 20210528, + 815 ], "deps": [ "s" ], - "commit": "211eec1e8b03503a53fa3eb4528375f36972f759", - "sha256": "1kawczbjdvjzyz3fflp1ij0vi9qcrl0yhrv7knx9j1zh187jp7z7" + "commit": "29bb40a7150b6cfe1a96948ae1f36e9c107eb759", + "sha256": "1dznafcfwmd52jakkzzk3dhji55aal7hsfkglr3051fz8pkz7xfx" } }, { @@ -62664,11 +62985,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20210424, - 918 + 20210605, + 1238 ], - "commit": "3e00b497711ac78f0ac26669e35f375451f6711a", - "sha256": "0gpg60xr86qx2ib5q9ig5pi9lmhk5vjsb7fh5g6kifvsch31cry3" + "commit": "41f0946037b50323901ce708c1af82e59a334433", + "sha256": "1hjb1f835xq5jgq4s0dpr85vs5cap001lxv9n02l198gb2qppq6k" }, "stable": { "version": [ @@ -62764,8 +63085,8 @@ 20210413, 205 ], - "commit": "a37f6b2394dcc2a848a055399dd45b052c9b707d", - "sha256": "0sbwva6asklx78wn1xcmxpr1758zwxncsl2gqn5x8f480bbafjbh" + "commit": "c191b149f93ed473f3900e506cfc762d53145237", + "sha256": "0likjz2q0pbs3cbqczdfhh6k0c1j8y6j32cxkcpjm9wakp1vzxq2" }, "stable": { "version": [ @@ -62875,26 +63196,26 @@ "url": "https://git.sr.ht/~tarsius/llama", "unstable": { "version": [ - 20210201, - 837 + 20210525, + 2005 ], "deps": [ "seq" ], - "commit": "f2f1476e88153b167bf4ce755f7455fcb3f98458", - "sha256": "0qnzbamf763h8fwjsn7i47a1amb8nixl25zw58jh4hhl470czi2f" + "commit": "2694b2aeb1c87bb2ad8b0f611ca438c30f5eaeae", + "sha256": "1xihy4xnvxvwwzy50z7msm9fkplsyy2kvi6zzlpgs8bad6aamg5f" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "seq" ], - "commit": "2027ce79165bf40314ad838c282920c53b5d7eae", - "sha256": "1jnll9xaxfwwvs0xjpdz8y6xlrsckm3a8ri5ml8k3fp81yby9as5" + "commit": "2694b2aeb1c87bb2ad8b0f611ca438c30f5eaeae", + "sha256": "1xihy4xnvxvwwzy50z7msm9fkplsyy2kvi6zzlpgs8bad6aamg5f" } }, { @@ -63329,6 +63650,40 @@ "sha256": "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x" } }, + { + "ename": "loopy", + "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", + "sha256": "1w4416vjbbba80bhcalpvr9ram1ijk3y9687525p3wicrfylx9s3", + "fetcher": "github", + "repo": "okamsn/loopy", + "unstable": { + "version": [ + 20210601, + 133 + ], + "commit": "50494b545b9a909fc6570216230beda1ebeedf36", + "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + } + }, + { + "ename": "loopy-dash", + "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", + "sha256": "0hk4c415wp4dqx1xjs246p8hqn15iamj8xiig2cla1f24zd7kd28", + "fetcher": "github", + "repo": "okamsn/loopy", + "unstable": { + "version": [ + 20210601, + 129 + ], + "deps": [ + "dash", + "loopy" + ], + "commit": "50494b545b9a909fc6570216230beda1ebeedf36", + "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + } + }, { "ename": "lorem-ipsum", "commit": "0c09f9b82430992d119d9148314c758f067832cd", @@ -63393,8 +63748,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210506, - 34 + 20210601, + 420 ], "deps": [ "dap-mode", @@ -63405,14 +63760,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", - "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" + "commit": "7ef909a1c9e0e1c924b43637899e0d53b0d1b00f", + "sha256": "1vsfs0jpk7fdfb3zmpxs3f7fy0s7d9b8jha5p7y6g0afhxz4iqn1" }, "stable": { "version": [ 1, 18, - 3 + 5 ], "deps": [ "dap-mode", @@ -63423,8 +63778,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", - "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" + "commit": "90a06dfc23750c3861628256a4af4e3b00b2e23d", + "sha256": "1cabxsz7gbjywhsqjqp32vdgycg2mq21mdxvwbfcs6k0cf319dwh" } }, { @@ -63435,15 +63790,15 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20210404, - 1717 + 20210529, + 621 ], "deps": [ "dash", "lsp-mode" ], - "commit": "1909466ee7f7f4aeef624acd10c710afe685ef8a", - "sha256": "0y5w97c37wj67mvwk23l4rq3i80fw82r758dsma6ly32h5xlsq8b" + "commit": "fa304ea402ac492e97bee14496a41afa8508cc5e", + "sha256": "0y0z4ind08jj93qsxgvi5zqa5f8lnamg8fv2dvkgipx1qvq25r4c" } }, { @@ -63486,8 +63841,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210418, - 1806 + 20210523, + 403 ], "deps": [ "grammarly", @@ -63496,8 +63851,8 @@ "request", "s" ], - "commit": "aff219380a7d192a37c8c25823b6bfc816bae825", - "sha256": "0ghqmay00r7lfmqx57r5kkldkgr4r20fb5xqh3i440wjdw8m3i3p" + "commit": "f34f0d50a91a82ab9c49e2cf5ddcb42a98cc2ede", + "sha256": "1hqilkbxa63gkl6sc8km6j0m4lxindf184c1zl91h4sfh4kg67zb" }, "stable": { "version": [ @@ -63657,14 +64012,14 @@ "repo": "fredcamps/lsp-jedi", "unstable": { "version": [ - 20210419, - 2007 + 20210602, + 1925 ], "deps": [ "lsp-mode" ], - "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a", - "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485" + "commit": "ab265f7fb26f4fa0385158a9f9d3649b606d2e23", + "sha256": "013vmhcxz7648jxxhk69rr0v5br2839517l72fwzk770l02mc6si" }, "stable": { "version": [ @@ -63687,28 +64042,28 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20210329, - 1551 + 20210530, + 2152 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d", - "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw" + "commit": "d4a7a27d6ac7c6831b4f493dd89f82fa0c75bdf5", + "sha256": "1rkf2ibjilf023fv68ql4bray8bdnl2biq5zmn1qk5pdp988iq4j" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d", - "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw" + "commit": "d4a7a27d6ac7c6831b4f493dd89f82fa0c75bdf5", + "sha256": "1rkf2ibjilf023fv68ql4bray8bdnl2biq5zmn1qk5pdp988iq4j" } }, { @@ -63719,26 +64074,56 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20210110, - 1914 + 20210607, + 1206 ], "deps": [ "lsp-mode" ], - "commit": "5fc536f24dc659f998bc673129d9e7c4b20d297c", - "sha256": "1k34zpg6f3i1pb68zh6fc7azd4hmbclnjpad1893q2zhqwxqdwz8" + "commit": "a5de6b7166935af4a1e05d254fc1a44600518066", + "sha256": "0i5mbz7mwnax7jwv9c1bkwp5jwqrvwvh51fgwkmnz0kpjxhzfpsm" }, "stable": { "version": [ - 1, - 3, + 2, + 0, 0 ], "deps": [ "lsp-mode" ], - "commit": "969846d5d0c9a9d1fc8deae30a0f664607f06e72", - "sha256": "1dz9yib9g7a5b1yipxjc6mqq9ffkpkm2icpj6xzanfdnc1ymj7c9" + "commit": "1c60c2d331baf778bd8a3ac9d5688516398ae323", + "sha256": "1nm03yn02ja867d9ba3n980v86kcd5varzng1lhzv7fr7akv5j13" + } + }, + { + "ename": "lsp-ltex", + "commit": "47faf55fd4876b28258173b7012eb413ab69a1be", + "sha256": "063yy68sy05gzcfp5bsk0mjh7g9x76r1c0qx0i8zw3r2a50g6llq", + "fetcher": "github", + "repo": "emacs-languagetool/lsp-ltex", + "unstable": { + "version": [ + 20210405, + 1702 + ], + "deps": [ + "lsp-mode" + ], + "commit": "0fd8baec7e5f92d74b8b80d02c926d32332d86bd", + "sha256": "04jx5bknns1fyany1x8wzs6yx9qxzwrwj8m1iardxy8la3jp6ncd" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "lsp-mode" + ], + "commit": "5546970c7949d498947e4b6a281707feb2aee928", + "sha256": "0s7v43jmpbjjxvfp9s51kc5d9mk3kf5mwvc4iwbvrzpi0ar4vfdy" } }, { @@ -63749,8 +64134,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210426, - 739 + 20210529, + 752 ], "deps": [ "dap-mode", @@ -63762,8 +64147,8 @@ "scala-mode", "treemacs" ], - "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba", - "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s" + "commit": "4c11fe47ef3c71a2fc7cd67a055ea0bc5883a0c6", + "sha256": "16laslmvsamvcn58gsi6hfs53p12q0nz7zx993ipa2xhy6n04hcg" }, "stable": { "version": [ @@ -63793,8 +64178,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210520, - 1557 + 20210605, + 1854 ], "deps": [ "dash", @@ -63804,8 +64189,8 @@ "markdown-mode", "spinner" ], - "commit": "98284ed3ee58277b956579586b1ab3d4e2ff581d", - "sha256": "0841f90fzazdzs17b1v8dal3cz0w3a77hi8dbszsl96fgyy1gz0a" + "commit": "7b75d6bf01bed9ccb108cf1406d0e2af29d7e39b", + "sha256": "1lbb3bpizibpnw77bgdf8j2303gwh2133n8s518frmz6gcb7kz8s" }, "stable": { "version": [ @@ -63961,8 +64346,8 @@ "ht", "lsp-mode" ], - "commit": "e986eeb15d1b3bf0f8c59be71684eac0d3894de5", - "sha256": "05y3rhhcm7i230if0n17yqdn0jz4mz3g98h5wgg6s3bdn3kjlckn" + "commit": "71a79760938d2132923fbff58dc25301892b1654", + "sha256": "0si9qca8lml2hd8zj420dmks4cwzfidq14h3xfczhvrshhsc0mny" } }, { @@ -63979,8 +64364,8 @@ "deps": [ "lsp-mode" ], - "commit": "5856c08d6393c10951f39b993a8d7bf2d506b44f", - "sha256": "0m55i7w1am55c7p35il3i06d4za8z5qamfwb8nki5zhiacw26bkw" + "commit": "4eb78c43046fceb53a66ccd24c85601bdb87ed17", + "sha256": "10d949gb3v7flnkb5khk11dcmfnlr4h02yfj8g3b0ihr1zr7c958" }, "stable": { "version": [ @@ -64062,8 +64447,8 @@ "deps": [ "lsp-mode" ], - "commit": "aafa9878a3df2f08e5a9c846d91fd53350ce3c99", - "sha256": "1la4mfaykd6vi7d0nw45a2ia8zwr8xflqhc4a9rmdl8biyrp47kj" + "commit": "ae4aa8705cc3a27ed86f1e7ee04d5c8f0522d8c0", + "sha256": "0q3dji9qy0aj7ai43xjcpb4hy6kvscrpr8r5cb9137g34zc0pd9x" } }, { @@ -64074,14 +64459,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210508, - 454 + 20210605, + 315 ], "deps": [ "lsp-mode" ], - "commit": "7156fcd0d8beea0536c2830399631cd189ee4038", - "sha256": "0lvsdnn48z379cj553vwng6hsp9mnmy03qgxbnnamw5d0lkvfp9i" + "commit": "77ebadcb7decd953c069b421a7ab18188295e4b6", + "sha256": "0s34djc945zbzykazrd7k8gizbfws3xp8rjdbnplg4996k1c71n1" } }, { @@ -64102,8 +64487,8 @@ "lsp-mode", "treemacs" ], - "commit": "b07868740d6f7d364e496048cee00bce10a6ab33", - "sha256": "1g8qkk6g67myz8rjvwa7iysrj0xpf0kcwrcdvf4dkc3rgh3kzm2v" + "commit": "f360d54fa68a00baec228d9582bc67c1a327d757", + "sha256": "0wbni6njz98c23pns4wxg4mq26zrvpyxh0qcz0a4l46zdn1962vm" }, "stable": { "version": [ @@ -64130,16 +64515,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210520, - 1518 + 20210604, + 1158 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "bd94da9348d9b4e814fdb55dae061826f48ffde9", - "sha256": "0y97i8yyvkyf7alfs27jkij6kjg9l47spxkdzm11abkb14z5gpr5" + "commit": "c4ffa7abf6706d591300c608c51d2b72178848ad", + "sha256": "1qr7is4k5w6dcfkcvg7crna6r26lqmb02v08i3yggq09qd01c08g" }, "stable": { "version": [ @@ -64236,6 +64621,21 @@ "sha256": "09zvn5fgjy27rmxziylvl83zdqmwa1jjndxmxhgsyh9mklisz32p" } }, + { + "ename": "lux-mode", + "commit": "ca88d6e55ea272698f26e6d8ff66a3e57b7689ee", + "sha256": "0n0964gr5cac6k0zwfi9slyh2gsccmp7kipvjarvsj5nhx8khxb2", + "fetcher": "github", + "repo": "hawk/lux", + "unstable": { + "version": [ + 20210607, + 1130 + ], + "commit": "b5391e8dc088d95d8f131f49982d5c7cbaa23677", + "sha256": "08bfjg51ydznfk8w7hwznzyybl42mqa5l0pvb4xapqcq2na3d3yf" + } + }, { "ename": "lv", "commit": "5114349617617673d5055fe28cb8f8c86cf41f83", @@ -64596,40 +64996,40 @@ }, { "ename": "magit", - "commit": "15a5916ec8e9062e41b1dd7d4f5535a86c2170a3", - "sha256": "1bcv0yv5l51j3xyli9rq3zqjkf0b9w7yd0kykfmy1dp1hx39qf8r", + "commit": "4158066a2c75cf0bff128bd2dc1073472c32b1f4", + "sha256": "1hrh90qd47s6q6grr6rp2y7kfqq8bzhdfpyq2saihrric91s1rqz", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20210519, - 2015 + 20210531, + 1524 ], "deps": [ "dash", "git-commit", + "magit-section", "transient", "with-editor" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" }, "stable": { "version": [ - 2, - 90, - 1 + 3, + 0, + 0 ], "deps": [ - "async", "dash", - "ghub", "git-commit", - "magit-popup", + "magit-section", + "transient", "with-editor" ], - "commit": "791901b2f1d26fa0a383147fe77948a9abc753da", - "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4" + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -64640,28 +65040,28 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20210512, - 405 + 20210525, + 2331 ], "deps": [ "cl-lib", "magit" ], - "commit": "d48fc38da0ed8c79a02591c5393aaef55498a988", - "sha256": "0qsnrwji66b0bwrgp1kj3b2mqq5vwphcs95mzk2y7xr75fwnvcbw" + "commit": "17e5e60b59eac3cf5938c1b22c29458c0d694b0a", + "sha256": "0ak4chfn95p2vj3y0wiyimj609a4jfzrfpsc1kn0is1jv3dlkl6c" }, "stable": { "version": [ 1, - 7, - 1 + 8, + 0 ], "deps": [ "cl-lib", "magit" ], - "commit": "21cb2927d672cc6bf631d8373a361b1766ccf004", - "sha256": "07r0d2i1hws63wfv1jys63r3lmrl4ywwi76gi7srwhzhqdr1af0n" + "commit": "17e5e60b59eac3cf5938c1b22c29458c0d694b0a", + "sha256": "0ak4chfn95p2vj3y0wiyimj609a4jfzrfpsc1kn0is1jv3dlkl6c" } }, { @@ -64890,26 +65290,26 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20210512, - 408 + 20210525, + 2326 ], "deps": [ "magit" ], - "commit": "04633693d1e902d54d19d404e96201637714361d", - "sha256": "1knm30fzh7lri89gl8scimb5gf3rzbnr7x033zzn12v9w8i3dchy" + "commit": "cf3b4646aa0205e8d7f47e45165fe6403d6440f5", + "sha256": "1j96vg9kc03vxxq4r5a7v4di88pvbb5i01n8js06lgs9qzl097k7" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "magit" ], - "commit": "5b45efa65317886640c339d1c71d2b9e00e98b77", - "sha256": "02597aq00fq7b9284kq7s55ddrjb6xhh1l280gq3czi75658d3db" + "commit": "cf3b4646aa0205e8d7f47e45165fe6403d6440f5", + "sha256": "1j96vg9kc03vxxq4r5a7v4di88pvbb5i01n8js06lgs9qzl097k7" } }, { @@ -64952,15 +65352,28 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210124, - 1829 + 20210525, + 814 ], "deps": [ "libgit", "magit" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + }, + "stable": { + "version": [ + 3, + 0, + 0 + ], + "deps": [ + "libgit", + "magit" + ], + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -65022,14 +65435,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20200217, - 1202 + 20210607, + 1635 ], "deps": [ "magit" ], - "commit": "876c780bdb676b6ece64861704e199b94f33cf71", - "sha256": "0wkjh9s67vs90lysdx3gjyrax9mlbzfvs563pzr6ab3l4p5pgnsw" + "commit": "5cd99a6336ad4b60e9e8ce766b8a9c0395289775", + "sha256": "17s5268kcqhgd141fvjqnn2wrny7v03yz940k2whr383l1253k6v" } }, { @@ -65108,23 +65521,26 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210224, - 1417 + 20210525, + 844 ], "deps": [ "dash" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" }, "stable": { "version": [ - 2, - 90, - 1 + 3, + 0, + 0 ], - "commit": "791901b2f1d26fa0a383147fe77948a9abc753da", - "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4" + "deps": [ + "dash" + ], + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -65191,26 +65607,26 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20210512, - 407 + 20210525, + 2329 ], "deps": [ "magit" ], - "commit": "d8609cb28d0411edf40031c1a551d64f383fac51", - "sha256": "1l3wqrv3338w7lgmpqpqqmc3wwh0dhl76nmfqlp8xjf44r3is2v7" + "commit": "fef1b7772fe192c434089b67644ff93765e384d4", + "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "magit" ], - "commit": "4273bfab1d2b620d68d890fbaaa78c56cf210059", - "sha256": "0d1cn0nshxnvgjvl9j7wsai75pvsxmrmkdj57xdpyggwxgcpl1m4" + "commit": "fef1b7772fe192c434089b67644ff93765e384d4", + "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" } }, { @@ -65906,19 +66322,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210518, - 1405 + 20210605, + 1213 ], - "commit": "624028c69b55deb3387452b9eeabe9cb963bd2a4", - "sha256": "1z9s6n0d03l7cpz7x50jjcqdpyhjy4ifc3wqsv3snv54rz68gpwq" + "commit": "4c6272ffc4836de052c8b06f681b0e700cb01602", + "sha256": "0l4sl4w4yq3hkpvvw7w1mh046f95bkg1c3av07kwk9cm038rwhvg" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "5126ba6244e13e3e2cf608e7f3955377bcbd8c04", - "sha256": "07vfidgq9am07zz2ydhdifmp4jmgs9jn5l1nfqiyp16sd1br6czj" + "commit": "ca9a5e35913569d66d34193a87d8511b2bb9d2b2", + "sha256": "1lisns2vghmqlg8wiv6jy15cfgnc8j83khz0vfnmrjwgcmjw3bbz" } }, { @@ -66026,11 +66442,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210504, - 249 + 20210530, + 1825 ], - "commit": "9977753eebe3f5cca7ab85b18a7c719fdb0b7654", - "sha256": "0aaj4bdl7cks06kx0jbhw0rvcwl2g68wyniy344fz2dzwwmp7acf" + "commit": "58f2d22526ac1e4abd4ee1afff8624d2dd3123d3", + "sha256": "1k17zpx05yafxfsw89dlkymqc5xajzv28qby12kdhwwlsbarqvd0" }, "stable": { "version": [ @@ -66509,15 +66925,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20210520, - 2021 + 20210526, + 1525 ], "deps": [ "s", "test-simple" ], - "commit": "f92eafd716ae6e36665bbf027309477c2efa336d", - "sha256": "10a72c4v0v5c1npxq1fmglxjiczpf1x87jpd6523x337h054zgs0" + "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", + "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" }, "stable": { "version": [ @@ -66947,16 +67363,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210511, - 314 + 20210606, + 1056 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "bfe4a67b6f3ea14dcc9140e16731f45afb64faf0", - "sha256": "13w54vpv5y4mxvrzc36f6vciq5sjxxmfj7k0d81svpjywz9cd12r" + "commit": "1cf2508f8e95311aa9ca405f899c3596cf8c2bc7", + "sha256": "12xzq9sxczjppqpx75bny2dp647m3f9ww6zf9a22rgmmspzkk5cx" } }, { @@ -67307,8 +67723,8 @@ 20210422, 326 ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "543813e0acceb55653d876302a5d5741879fb717", + "sha256": "1w0pfz5dbhqglb5w3c2g4ww2c32nbsir8gqnsh69pa43h9q1msz1" }, "stable": { "version": [ @@ -67384,11 +67800,11 @@ "repo": "sggutier/mexican-holidays", "unstable": { "version": [ - 20200622, - 132 + 20210604, + 1421 ], - "commit": "5b5dd6e71505e8938bac9e9733b30bd394631923", - "sha256": "04d4148nq3lmrpkxvzzkn88j30iv2l2466ps035x7v8hc83wxnjw" + "commit": "8e28907ea69f2c0ed9aad9f3b99664ca147379d0", + "sha256": "0mly44x0nq26pw8v98k3nnlc8ca1mn20jcqj5k5gzdbp6k49lkxa" } }, { @@ -67399,8 +67815,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20210130, - 2016 + 20210606, + 1501 ], "deps": [ "cider", @@ -67410,8 +67826,8 @@ "projectile", "s" ], - "commit": "a49731f39020b7c7626ba12e4c7b2f1c17a69341", - "sha256": "13m1qym94qvy197ngd8lyn8nzfsbxbr5ss29mkbvaidhi13jdrwa" + "commit": "ddba1d60d6729bbeeefd0f76dac4e6c20e848f67", + "sha256": "1c454baagnvbg79yia5vwk51n0fp031rz0xhgawk70lrfjbc8256" }, "stable": { "version": [ @@ -67821,14 +68237,11 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20201204, - 1051 + 20210603, + 2150 ], - "deps": [ - "dash" - ], - "commit": "4a81446e13f5bfb514e593d0e1c5253a60113301", - "sha256": "19gwv9dn6g3jv12qq1h4fal2adsawrszyfkd62x99rlfa81ixg6d" + "commit": "aed285155dc8f073d766e752520ec599e77ce8b7", + "sha256": "1qxszcx9n1yfc9j9ihvrdwb57n19w03600z3v4z2ybxap1y0nq3v" }, "stable": { "version": [ @@ -67965,11 +68378,11 @@ "repo": "ayrat555/mix.el", "unstable": { "version": [ - 20210105, - 1821 + 20210605, + 1015 ], - "commit": "39a7d3e35769086c0008389b3975dd90b91b657c", - "sha256": "0f74wb9f1j47qc0xhhn23i8nrsyznhngwvdrg62ixdzdz9z0z5hh" + "commit": "bfe61ed4e7dd8cfc0bb2603fbac3eb44b32438bf", + "sha256": "0wfjgkz08zsdl24b71x7ync05qnnh46grs8ahdn8s9j35q9kxqvf" } }, { @@ -68014,6 +68427,30 @@ "sha256": "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk" } }, + { + "ename": "mlscroll", + "commit": "7f37b0e3fb8ee6770ea9320ce759bf8cf2ba2292", + "sha256": "1a0n6jxx0a71yjrdlly0bckly5pkz5mlqg5x9cmvq687mqv7mhkc", + "fetcher": "github", + "repo": "jdtsmith/mlscroll", + "unstable": { + "version": [ + 20210601, + 2158 + ], + "commit": "db502020ffe6bc65576b93527a20c0bf3df562da", + "sha256": "0gw6xw38x8h72gbvhmddgzijs4xvkrgs6c7v552db56hrlsj9lhp" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "5811cb564727f74eb0c8b8b075e6dc982e6ac5f6", + "sha256": "1wj71kz9zdp1rb2lmxrfrrwjg7wb4yjgsaqmhv2l4hyq97pzr0nm" + } + }, { "ename": "mmm-jinja2", "commit": "721b9a6f16fb8efd4d339ac7953cc07d7a234b53", @@ -68320,20 +68757,20 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20201118, - 1530 + 20210525, + 2014 ], - "commit": "1848f94fe7bb7a0a11e976d1d64922a5b69a5cfc", - "sha256": "1jlcrymj1ssfrnz017916bm32918wkypzz0m57xixmng06x375g2" + "commit": "41184eb66a3205abcc32a885780004207df86dbd", + "sha256": "0qnrvddbka8klmihfaydpkwrigrjmbabxnm0vkybdqwzx619hwyi" }, "stable": { "version": [ 1, - 3, - 0 + 4, + 1 ], - "commit": "6d2c9c14f6a3835f4d54091ea241fd436da18ef0", - "sha256": "0y5bkbl6achfdpk4pjyan2hy8y45mvhrzwkf1mz5j4lwr476g18l" + "commit": "41184eb66a3205abcc32a885780004207df86dbd", + "sha256": "0qnrvddbka8klmihfaydpkwrigrjmbabxnm0vkybdqwzx619hwyi" } }, { @@ -68455,20 +68892,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210520, - 1651 + 20210607, + 917 ], - "commit": "334a472a1d132bb748b8c9cb607dffe596144251", - "sha256": "0f7q05n4nd1rj2g0gzj06aav3ilv699czadbgj5g1jsjxq5g1i7g" + "commit": "a2c8796fcbcbdd332165e02476c6de5799996d31", + "sha256": "0p9yzj70kx3s740dl7k3vwwkr1g9zxsirwl83n1nvswc4csgv20j" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "69248a97c9da98de786891215ab6baafcc44a55d", - "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj" + "commit": "15c973f716378084a937e777f86182741fd9b697", + "sha256": "0p9yzj70kx3s740dl7k3vwwkr1g9zxsirwl83n1nvswc4csgv20j" } }, { @@ -68802,20 +69239,20 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20210114, - 850 + 20210522, + 1100 ], - "commit": "2a29baa0cb6e364c5acbbf590a6d7c936c4378ae", - "sha256": "0l6cgr2969flhkdkiycqppvblpsn0qkdp19r406jpqbc1ql394lj" + "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", + "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" }, "stable": { "version": [ 0, 5, - 4 + 5 ], - "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", - "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" + "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", + "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" } }, { @@ -69161,8 +69598,8 @@ 20210306, 1053 ], - "commit": "3b3068e924e17f8820a35899f105f2ef838d0535", - "sha256": "0bsxy0v7mm153wxwhwbm039fbfhr9l0xa5sgz9l7gdzkwsxmcbna" + "commit": "d031469630c70188c20598c0f3a3c3c46c6c7a14", + "sha256": "13mbkpzfdy136y5w6ns73qy1fsxwqzsvnnfcid2x7rrrqbxrcm5r" }, "stable": { "version": [ @@ -69713,15 +70150,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20210228, - 1556 + 20210601, + 1402 ], "deps": [ + "esxml", "ht", "xwidgets-reuse" ], - "commit": "1a0ceeb874e2a56b3ebe06c8375221031bb90a5c", - "sha256": "0v7d899pvpwvvp9x0yaskhjf1c6bjmqajk2mclfkykadrh89z61j" + "commit": "c7f2398612218407e72b174f02b26cf2916eba22", + "sha256": "0irvzwfrrqzk8pcq1m3w9s21v2y0h6f5jrvsv88knz0ki1bdkbai" }, "stable": { "version": [ @@ -69818,14 +70256,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20200913, - 8 + 20210604, + 140 ], "deps": [ "dash" ], - "commit": "508b524aa880e0ca6695f0d5543ee7659f2dea7c", - "sha256": "0g5ja8ra6kyfpvkavy9diiwjasc4v2z80yi98kahi5nckfp90kvc" + "commit": "948ee25878c509d0f9ba8715b209eae79143b76e", + "sha256": "0lgp64pgblidm4jyr3wlv5xq2x81znzi0xvqm8h0f8af9jzl2b38" } }, { @@ -70211,8 +70649,8 @@ 20181002, 1617 ], - "commit": "ffa40235b7dabb6c6c165f64f32a963cde8031f0", - "sha256": "0ximk0aan7jqn5x7fk4pj35bxhi6zaspvyxrmac9kxaiz8znwffr" + "commit": "223723d9ceeb2878b884e83abb8ca74ad2e42081", + "sha256": "1sl7kfg5w73cw9mv4x1m497dg27h42zgx2ywl4s8fmx2k9f2pq1q" } }, { @@ -71197,6 +71635,20 @@ ], "commit": "a968a923aad07ab15fb35deb79ac95581a427b4c", "sha256": "1mb55bbsb32gxms488pjw9fsqiic2qfmwkhm3pwcgy194723vcaa" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "company", + "f", + "markdown-mode", + "s" + ], + "commit": "3f86d26fb2006e82c673a5bf122594820a4842d8", + "sha256": "0xsljyirv7iwfclxzlj8h274pps02ni3bdwwlpjcmffz8v1fh3l5" } }, { @@ -71469,8 +71921,8 @@ 20181024, 1439 ], - "commit": "c573f6b8b23593f46a08616b76325d3ce0175002", - "sha256": "05kicpy4higgdhxbsn7a15cgv85xbwwaf5nzy7pxjk4yg4wvpd7v" + "commit": "8fa4d05fea5140f80ff5f4629d19c6ce0d6f5cca", + "sha256": "0dn53fjq4dl8szpjqxn91md0xvr4sa458j1p0w8vgskc0iibzn4c" }, "stable": { "version": [ @@ -71568,11 +72020,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210124, - 204 + 20210523, + 326 ], - "commit": "0023fc5b100ec0c939ffe699d1a7d1afcf1f417a", - "sha256": "1fjf16dah95i3vlxk63rlixskgq18kn69fyg6dgpiw7pm98kjviy" + "commit": "e4844f7a711c8d7dceb82b6b841a1e8485e12586", + "sha256": "0g05qa926xkayd79n2zi9ypd4m5245jjxwv2vp4hqn2cl76pnpak" }, "stable": { "version": [ @@ -71860,14 +72312,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210124, - 1559 + 20210605, + 1753 ], "deps": [ "cl-lib" ], - "commit": "57357e15643158b4e0d9b3b4f70a82f5fc73178a", - "sha256": "1kbbbx1agzcxc5n1b6cavdx3wjxz6mgi9rafja8mk8cyaaiz0rkd" + "commit": "a6c8e0575766eb573a7add103836d578bd205962", + "sha256": "1r8rarcp0q0rl19kc6q7lll0djkvf3iw17rrsjswsq3z9fyq8iyr" }, "stable": { "version": [ @@ -71905,16 +72357,15 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20190202, - 1634 + 20210606, + 2050 ], "deps": [ - "cl-lib", "dash", "request" ], - "commit": "ebc6a4a1cc56c01d2bb882e4a40934a6a1f4e9ca", - "sha256": "04zhhz8v6bx627g1vhvd0s8bl5g3d6a1mfgf7pb13627npsvbrdx" + "commit": "e2a4870fd5f8e37956d9317b74317d99f17b87ad", + "sha256": "1djlfvnmzcjva1s4pjhr4hhmqmd30mm48933lpgy3pnwp7gq910x" } }, { @@ -72166,11 +72617,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210515, - 1210 + 20210605, + 1839 ], - "commit": "ff07183a02a480b36e70284289607c1315ac3db7", - "sha256": "10mx3vj7aqa646r0f308f7rr67v9zss6x5z4dpibmx5bhl5zz8r4" + "commit": "6f0f83660e222cfdd05b05ad134763a7ab26f097", + "sha256": "0rs37inh95c1r91mjjwf1kssmxq8mliblzvdjypijps13fxk7m60" }, "stable": { "version": [ @@ -72350,15 +72801,15 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200812, - 1850 + 20210601, + 1122 ], "deps": [ "jest", "transient" ], - "commit": "26d5cf79dfd1a2a74a66c44de129483d26354345", - "sha256": "0akjjb5xqpzg784qi6hbjfjm335mixqszzrxwz69ggl50iy9s6rk" + "commit": "d14d654c025d8f75f678503c98cd8682e69341cd", + "sha256": "0a54s7l01z5s5vasysxfysnzc2smn6r5pq01a6a3vqyaq3hz4khi" }, "stable": { "version": [ @@ -72670,28 +73121,27 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210510, - 1558 + 20210523, + 1746 ], "deps": [ "dash", "s" ], - "commit": "01c067e1b83175cb3f03c2061528393166173012", - "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" + "commit": "dcbc06429084e209f081a8c6318b46c1c9ff7309", + "sha256": "0bggm5ssxpj49km8q8z9hj351garl1xydz1dya7r0yvz12y6wn5g" }, "stable": { "version": [ 0, - 3, - 0 + 4 ], "deps": [ "dash", "s" ], - "commit": "01c067e1b83175cb3f03c2061528393166173012", - "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" + "commit": "b8efad7723a0c1d5738d74c7ce56ea962726a74f", + "sha256": "11y73fwn4ca6pll5vb1p04l08z48kj2ldks3qavqj4pamdcm698d" } }, { @@ -73546,14 +73996,14 @@ "repo": "Lompik/ob-nim", "unstable": { "version": [ - 20170809, - 1830 + 20210601, + 1807 ], "deps": [ "cl-lib" ], - "commit": "bf1642cb93f0a898804dc13fd9408d2964403bd2", - "sha256": "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s" + "commit": "6fd060a3ecd38be37e4ec2261cd65760a3c35a91", + "sha256": "12sinii7i917v1f3czvmc0rrwk3ksr1ls7wv4yvv9f8jdkzr0msm" } }, { @@ -73966,11 +74416,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20201204, - 945 + 20210601, + 901 ], - "commit": "a948866021f86461d3b6259b6cdc3506d31d3011", - "sha256": "1790c3hymn91nr03y1ragq703cj18877r8g233f27i0cz6gnbbqh" + "commit": "be14af363e9338e86173c2d96732f59b3c76e73e", + "sha256": "10q2xd4mqdi9h6dbjfx5081l8sc025rgkxsz9hwm93yrb5xw1rwd" }, "stable": { "version": [ @@ -74163,26 +74613,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210512, - 1429 + 20210521, + 1311 ], "deps": [ "org-re-reveal" ], - "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", - "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" + "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", + "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" }, "stable": { "version": [ 3, 20, - 0 + 1 ], "deps": [ "org-re-reveal" ], - "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", - "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" + "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", + "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" } }, { @@ -74878,11 +75328,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210518, - 1413 + 20210603, + 1335 ], - "commit": "9637d7fd59f76a5b6d37470b1543ab827a0f9b8d", - "sha256": "0741jyin11dwf52srgjgw4xk581p16bwslzrq7qsnx4h4fnagarg" + "commit": "e85084e733d6eb50893974fc5fd569b944a5010c", + "sha256": "1lmjmp0iwp8n9nrqvygav7y2fxxwqpv4kk2wy2gg4bi056arbx5a" }, "stable": { "version": [ @@ -75041,15 +75491,26 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20201220, - 2144 + 20210603, + 1352 ], "deps": [ - "ox-slimhtml", "request" ], - "commit": "efa9e3aa2d768c00440f745192aba6672b28d086", - "sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b" + "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", + "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "request" + ], + "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", + "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" } }, { @@ -75060,14 +75521,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210516, - 1936 + 20210605, + 904 ], "deps": [ "org" ], - "commit": "9fcf2486e70362d9fbdd40f3eae26ee0c04f13a9", - "sha256": "0gfwhnz3ir0c7ah1v6ahg54a6vjyjmbybgg9w232jz3hhjsqyk9y" + "commit": "cf87546d6458d36492a89661a1e097e5596aa26a", + "sha256": "18p8s0syqhqpk21ylbk8np3srknhi4ckxfxn7i4jkscsy8282lcb" } }, { @@ -76003,6 +76464,21 @@ "sha256": "0cw8903nw0mrn9kppwlypsb6h9m54zrb6y969yj0gnkza6gqy36c" } }, + { + "ename": "org-gamedb", + "commit": "ca995957e201a1df81839ac326807d789f05a5e1", + "sha256": "0r6m78spjfk8vpgki747al3klms1g9ql9b7spvirlqykaw9nmrb6", + "fetcher": "github", + "repo": "repelliuss/org-gamedb", + "unstable": { + "version": [ + 20210525, + 2338 + ], + "commit": "f283b6f6a7e8ad090405be57202caa3d3c424447", + "sha256": "1sxjxh4yrb7zf4k17sa2wyxsf70krl3mg1jp6qs8qn37gyn2x3d4" + } + }, { "ename": "org-gcal", "commit": "d97c701819ea8deaa8a9664db1f391200ee52c4f", @@ -76165,21 +76641,21 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210320, - 1023 + 20210326, + 1711 ], "deps": [ "dash", "org" ], - "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6", - "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h" + "commit": "2cb87624238281b438cda67ed375c56403524489", + "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" }, "stable": { "version": [ 1, 6, - 0 + 1 ], "deps": [ "dash", @@ -76221,8 +76697,22 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210517, - 1508 + 20210602, + 358 + ], + "deps": [ + "dash", + "org", + "s" + ], + "commit": "40716a4cfd36304b4a16977020b1e82870faec15", + "sha256": "1wncx69rqlvx9pnr5mlwn9i00nrfhi1icxv0zpc7z2kzf03wn930" + }, + "stable": { + "version": [ + 7, + 2, + 1 ], "deps": [ "dash", @@ -76231,20 +76721,6 @@ ], "commit": "1ee39e4f8616199ad8e5cb6b2d6b410e75857ecd", "sha256": "06mf8s68mw6fcdpvdddcvy2x8z6zyisfvgh4sdrpz2z5j03v7qd7" - }, - "stable": { - "version": [ - 7, - 1, - 7 - ], - "deps": [ - "dash", - "org", - "s" - ], - "commit": "47805bb8dc681872f3ad5dc74711938978d5c7f2", - "sha256": "0iiw798clq6hmml6fs60wwd38c4rzvxrdv4xr57innj06cja4dvy" } }, { @@ -76304,16 +76780,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210514, - 1352 + 20210527, + 1629 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "21364700245acd2fe7a15f389db15370f0b67a02", - "sha256": "1h1fadjhvv2f6l4sk9b8mxpacxb82jnppbd6j4np4g4jcbc54ijx" + "commit": "a01f0453667f9baccf0b8a514e9c9f0a9fb9fb6e", + "sha256": "1gn2sflvcc4gvgci3m12d16mjrwxywrd8vvrs7s87k0cf7yl74vf" }, "stable": { "version": [ @@ -76344,8 +76820,8 @@ "deps": [ "org" ], - "commit": "043bb9e26f75066dc1787cdc9265daca7a14dd4e", - "sha256": "0x4fvxdrllih2n643v3wgq0rl72dyhk11xqi2l1h718iaz4kqi5i" + "commit": "5f253a880e1919ef4b98f0d91f271a8b522eaae5", + "sha256": "1cirbb5x29qnf59qkcfsjw467xx02vl4f17iqd4qqxwaarwkyq30" }, "stable": { "version": [ @@ -77612,15 +78088,15 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20201128, - 706 + 20210531, + 1929 ], "deps": [ "dash", "org" ], - "commit": "be24274dd62cd3c586cbea99c8f73db251bf319d", - "sha256": "1kjydjj2bwrvvckxh1c31gk1h09j876jg7rbyv0jb0kzfim79d2j" + "commit": "e7a7109e4c34811d471bf685b710234564a556f6", + "sha256": "10p35q5l9racfqp92xcqard7n75gpqw6l5zjgbybswnkzvdjzd8c" }, "stable": { "version": [ @@ -77723,16 +78199,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210507, - 2051 + 20210602, + 2113 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "80a86980801ff233d7c12ae9efef589ffa53df67", - "sha256": "0sm4l32xscpq9hmilj0srqh7vij5x3602h1f0yh9wmckz9jq4f4w" + "commit": "f7b5be2ce0b43dd4d842484fc0ec37fdc8526907", + "sha256": "1cqx2izzchwd6yi0gmskdb0kiqjwk2m7rgk074bzzq0dzbpl180j" }, "stable": { "version": [ @@ -77758,8 +78234,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20210517, - 1731 + 20210521, + 1055 ], "deps": [ "dash", @@ -77769,8 +78245,8 @@ "s", "simple-httpd" ], - "commit": "ea4082f54af14cb692d6eb7f8f085971ebdca69d", - "sha256": "0dnnawh248mnjw7j0zwck0fxfhk828a9xbx5r1xizqmh50qv65mm" + "commit": "a0f82bf41e318d4ef606a26f54054262ed6c3441", + "sha256": "06j8wabbxay9h8ca4pbv5xgjygfzbb3kbk4icni3lrfj6izsp3i4" }, "stable": { "version": [ @@ -77921,8 +78397,8 @@ "org-super-agenda", "s" ], - "commit": "67fe1b5c6c879e14d34c34eec2190e9719046b6c", - "sha256": "00danbc1w5wd3gj0sdas26ip3lyxcsapq9ly4kbaprrxbf187b56" + "commit": "1b37069e47d1ea4745eacdf2dec2bdad756ee235", + "sha256": "0sf406dz4mkpaqaql3z8xs6jcksxasa5j7xkk79a9xnbanaxhzaq" }, "stable": { "version": [ @@ -78106,11 +78582,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210329, - 848 + 20210606, + 1806 ], - "commit": "c000cdff0cf3c10ac756bd7c5b5729965cfce876", - "sha256": "0vff4wh9vlkzix47kxqxabcl29glnxbmmpmppkp6cfk42zb6sw1g" + "commit": "0bd38b604405ba8e6ba00dd32ce4773eb02eb901", + "sha256": "1d9kdcdiz600swcy318hd56l751w2qyafdibnkzfkhjzw63c2hwh" }, "stable": { "version": [ @@ -78331,15 +78807,15 @@ "repo": "stardiviner/org-tag-beautify", "unstable": { "version": [ - 20210304, - 1124 + 20210527, + 1130 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "e655ced70140cbec8fe12f9207614ca2b3a6c37c", - "sha256": "0853avvi2qpr19ca6c9ix8ls7r2r5v5f38nzkr4lbindmmxl6kpv" + "commit": "20193bf9b07efba03fdd5ffb2852cd43fcd88051", + "sha256": "0diccvg4gx9djayihd1hp39q5n2s8cahck93s5r58vk0d4jlcyyk" } }, { @@ -78712,8 +79188,8 @@ 20210414, 1844 ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -78850,7 +79326,7 @@ "stable": { "version": [ 2, - 4, + 5, 4 ], "deps": [ @@ -78901,8 +79377,8 @@ "metaweblog", "xml-rpc" ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "543813e0acceb55653d876302a5d5741879fb717", + "sha256": "1w0pfz5dbhqglb5w3c2g4ww2c32nbsir8gqnsh69pa43h9q1msz1" }, "stable": { "version": [ @@ -79141,28 +79617,28 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20210512, - 1945 + 20210525, + 1956 ], "deps": [ "magit", "org" ], - "commit": "043db4f0957416652f872ca18289ef00b9474963", - "sha256": "1rybcybb4xb6wsfhh772mapggabn14i7ca2fl30qkzyc5qmhc3s9" + "commit": "26242895ef1642bf30c63683fb224fdba25e0853", + "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" }, "stable": { "version": [ 1, - 6, - 3 + 7, + 0 ], "deps": [ "magit", "org" ], - "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646", - "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481" + "commit": "26242895ef1642bf30c63683fb224fdba25e0853", + "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" } }, { @@ -79173,8 +79649,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20210512, - 2014 + 20210525, + 1957 ], "deps": [ "forge", @@ -79182,14 +79658,14 @@ "org", "orgit" ], - "commit": "cfca04232337cb9ad62ffd9929d964ff6b8e8754", - "sha256": "1gvpccxxxhkddfjvgsbxrxqsvman0d6ndkimy9nsz8flzwb8g5gm" + "commit": "ea2a1cf9d337901b413e9df258b8e07af55c00f6", + "sha256": "07ia3b6bfilnpify93kq5g10xhh794v5pmc9cmmb312c3qyqi7b4" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "forge", @@ -79197,8 +79673,8 @@ "org", "orgit" ], - "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1", - "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz" + "commit": "ea2a1cf9d337901b413e9df258b8e07af55c00f6", + "sha256": "07ia3b6bfilnpify93kq5g10xhh794v5pmc9cmmb312c3qyqi7b4" } }, { @@ -79446,8 +79922,8 @@ 20210507, 1619 ], - "commit": "71216d56575da602ec713bf1bbe75c92606c1049", - "sha256": "1qfgfkww6v0glpnqdx3a6qixr63vbcvkby7ccw8qzpyb9bpar9g2" + "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6", + "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6" }, "stable": { "version": [ @@ -79755,20 +80231,20 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20210214, - 1715 + 20210530, + 1259 ], - "commit": "bb6db842e4fc2ed4d635001938ebafe93925f48c", - "sha256": "0h54wdsh6g0wmqf356s6br08hq29p6cdrsd14q9w6qaxhmfzbs7m" + "commit": "942bd43ea7099984e9ebccf48db70af345d4b6bf", + "sha256": "0xnzwb1ybhq38qgd3ml18565bbagfx6yzcfndc5d4ll7bzij6jbh" }, "stable": { "version": [ 0, 2, - 3 + 4 ], - "commit": "a34602b59063dd22ca6877466b85b2728f03c242", - "sha256": "1k3zfcmlwfby7yixjdxfynhys2kyhggg0n3d251a9frzrkyg6gxb" + "commit": "942bd43ea7099984e9ebccf48db70af345d4b6bf", + "sha256": "0xnzwb1ybhq38qgd3ml18565bbagfx6yzcfndc5d4ll7bzij6jbh" } }, { @@ -80059,8 +80535,8 @@ "deps": [ "org" ], - "commit": "a79dc519cd28c000ebca4254a4744ce2b9b82168", - "sha256": "1ffpslv58kzw9nhrfv2cp42vq0pdx5gm1bk20g6k697ijiz1r1jj" + "commit": "545d2e1547fdc48a5757152d19233effa11d9ee2", + "sha256": "1mv0x345rn85cyq0qm4kz22ymxbaa4r9lhnp7n2d2cp0cn23m9zv" }, "stable": { "version": [ @@ -80098,15 +80574,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20210323, - 2145 + 20210528, + 2059 ], "deps": [ "htmlize", "org" ], - "commit": "2095537695135c7f1bc19db043925eb7d482907b", - "sha256": "0pingsmmdpw9g88rri7rkw8ajp1f982vx9rh97nfn51ppr94ihbw" + "commit": "05a14d56bbffe569d86f20b49ae31ed2ac7d1101", + "sha256": "14z5pghli7d3rkq3xmbjpssskx3zgwqwypb59wcprkyw8pl66rfp" } }, { @@ -80237,8 +80713,8 @@ "deps": [ "org" ], - "commit": "600a44cdd7caf0944c3b849d65e46580105f0375", - "sha256": "1jflz2a6hhdrnsnxdbh2y8ysw37za8d974513ak2w41w4k5k6xji" + "commit": "074c3abf0a6aa5d671da1a39a20137140ba41d24", + "sha256": "1a134x8pmgas5k1m769clk3yhrzdh4n0cwmh23bf22avk6n3bz8z" }, "stable": { "version": [ @@ -80547,14 +81023,14 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20201205, - 721 + 20210529, + 1012 ], "deps": [ "org" ], - "commit": "de78970b85dfd342b49f9956f350c6f7d0a13050", - "sha256": "1fggy2b6yklgm66zmyqcmib0aklilh99f51vxyifrhjlsrvinz1v" + "commit": "7e69c04626f8d35756f3b049bd7836fb751f7734", + "sha256": "14hdjkyyh4714vsc4amkdfhdda94gpaz7hy702ygmyfx0il1v92a" } }, { @@ -80565,14 +81041,14 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20210430, - 1212 + 20210604, + 1436 ], "deps": [ "org-msg" ], - "commit": "1e730396b8b7aa5101b3e3f538d6d4c15514f415", - "sha256": "1firb26xnci1qprb4v4p3cp9vnmmp5bvsm3154gy0n2jr0hzvbjj" + "commit": "9354a9687f7175d26c854204878b2fe545c069b5", + "sha256": "15jqcwmcpcb8vczzd50jasz46db9667yqcmzd4v4ahnxhvvb2vfb" }, "stable": { "version": [ @@ -81072,15 +81548,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210511, - 2055 + 20210528, + 2348 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", - "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" + "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", + "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" }, "stable": { "version": [ @@ -81103,14 +81579,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210110, - 2231 + 20210530, + 319 ], "deps": [ "package-lint" ], - "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", - "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" + "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", + "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" }, "stable": { "version": [ @@ -81124,6 +81600,21 @@ "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" } }, + { + "ename": "package-loading-notifier", + "commit": "9d7c94da6374291527055e47dcbf55cc7a6edf39", + "sha256": "0ha47s60dkbi7n2a6ynnva6nh3fl7dyv7c7hkjr8d1lcc2jpdi8d", + "fetcher": "github", + "repo": "tttuuu888/package-loading-notifier", + "unstable": { + "version": [ + 20210603, + 1138 + ], + "commit": "8fd10303e19a2a1e8b5544ce8c34c8466af5d08a", + "sha256": "11d9mc9ca9bn9x3by8fqcan2c8wn85d8xnmkfvzxcmw7dz87kis2" + } + }, { "ename": "package-safe-delete", "commit": "61b961211276bd95655b6a0967eda5037a3d240b", @@ -81539,8 +82030,8 @@ 20200510, 5 ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -82618,15 +83109,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20210511, - 1739 + 20210531, + 1613 ], "deps": [ "let-alist", "tablist" ], - "commit": "d262cf9e19d57c6567e06e51d109150c20753839", - "sha256": "0bls4kh7qv5wkjmxizj7rwn2kby0awg1fzkra3fkmg9xbvqzm7qh" + "commit": "5f77dae43eb8f71e52e10ba8cf994883f74c3fb7", + "sha256": "0hzqcnxi66d0c3dq7y3dn28f3yri4zcx46yylhy0xnm3f1yja0rm" }, "stable": { "version": [ @@ -82955,6 +83446,24 @@ "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g" } }, + { + "ename": "persp-mode-project-bridge", + "commit": "fa5d72aad13e1f7e1863deb5487a6ebc9eb09e1f", + "sha256": "0h7k03z91h7qx0kgdy5nam886730w9llmrbaajcz801892ddkn3a", + "fetcher": "github", + "repo": "CIAvash/persp-mode-project-bridge", + "unstable": { + "version": [ + 20210524, + 656 + ], + "deps": [ + "persp-mode" + ], + "commit": "c8a2b76c4972c1e00648def5a9b59a2942bd462a", + "sha256": "1fzvz7f86azffyqrqx3jiwj54b739p2adb5yp9cilbfwkkqyff0v" + } + }, { "ename": "persp-mode-projectile-bridge", "commit": "2c049b0067b70577511114dc8abac0a00a9e0588", @@ -83017,14 +83526,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210401, - 1950 + 20210523, + 2254 ], "deps": [ "cl-lib" ], - "commit": "dd2a380ac71edf1321a6462f14668baf99879e80", - "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6" + "commit": "b37c6756700a167742c8ab06fa5a850d9d94f4bd", + "sha256": "1ciab9xz4lbnnnx9407bagyf10dv6h9nalzm2wj6w6x7kckb4105" }, "stable": { "version": [ @@ -83936,11 +84445,11 @@ "repo": "EricCrosson/pine-script-mode", "unstable": { "version": [ - 20210514, - 1232 + 20210605, + 1527 ], - "commit": "cb88aa6eb15c2bf52814b712e4b09ceb1e13ea25", - "sha256": "0vfrcy4vkbfa24f0a5n2q93vpbvqww4chbfyzpcrkwgclp07g53x" + "commit": "e465c0264958cbed0fb29dad2b30b9f18fbf1064", + "sha256": "0crc2q5mzflyz13zx0ghsf2kdmj67lcqb2vnnsw0z2sk7wafrz2i" }, "stable": { "version": [ @@ -84218,10 +84727,10 @@ }, { "ename": "plain-theme", - "commit": "d4bd77883375b229e344384e42c3603ca096891c", - "sha256": "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8", + "commit": "d25eb506b358a3c89c950e66200ea52fe3ca9133", + "sha256": "16i60lp0af15sw4fbsj37yd4hs6i212smili9mjaqgiai7wxqv4f", "fetcher": "github", - "repo": "yegortimoshenko/plain-theme", + "repo": "abelianring/plain-theme", "unstable": { "version": [ 20171124, @@ -85273,11 +85782,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20210413, - 2004 + 20210521, + 1131 ], - "commit": "b50ec54097d279bde6567ee3ba8a22471f466ec0", - "sha256": "0q2vjvz72m3nrnpck4hl059cjgcf2jdw2rl9h8fxyvbllyj0733f" + "commit": "7d1f822f0833b43326cc9253dc8a3e267ad4b376", + "sha256": "15gyqf9vs3yxls8l830ik5rdhvd0wiybqpi0yxnfpd6g9pcajm6w" }, "stable": { "version": [ @@ -85476,11 +85985,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20210326, - 2042 + 20210602, + 847 ], - "commit": "096078acea59df6109906641e9dd44893ed4f6a2", - "sha256": "1cvb40ad3zazfqjzwqgz4bnn9a2pl8yi52b0qfd56ccp32b24n91" + "commit": "2be084a77cc2bc79ea7dc23edada161f4ff6dfdb", + "sha256": "118sbcm6qavckxva81vamrs98dj38yv0qccqqj4p3a4q7brfi8cw" } }, { @@ -85736,11 +86245,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210423, - 220 + 20210604, + 647 ], - "commit": "739d8fd1081bdd0d20dee9e437d64df58747b871", - "sha256": "1hapg4dwrpa1ffkx8s3pialkh9zsh3r5jxk076c750k9rdwl3q4m" + "commit": "3257a52e3599bc1d5c9a4b646d36d7a49b0dd025", + "sha256": "13p7122100ywg6dc32wq0hvcn52x8djxq6vgcmdpdsdy7k4fkxwc" }, "stable": { "version": [ @@ -85831,14 +86340,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20210428, - 1229 + 20210527, + 1953 ], "deps": [ "cl-lib" ], - "commit": "346de84be53cae3663b4e2512222c279933846d4", - "sha256": "00yy96a1rqcpbkvbn1hmb1pz5i7l0pwb2bqyxcc8qry7rkmvw7gy" + "commit": "cfba2aa9cfa190e7720900f01a946e1e78aac7e2", + "sha256": "1ljyp3a1dhak2h89yabjpf88037c7yhk4naxach1p86x3brwk68q" }, "stable": { "version": [ @@ -86087,15 +86596,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20210313, - 1047 + 20210606, + 1152 ], "deps": [ "iter2", "nvm" ], - "commit": "5232b886bb6a4fb3848d63db1bcfcb30487a180f", - "sha256": "0sbka039sccqip36y98s1b5z6rd5w5q0jzl5kbdq4wmzi7j823ri" + "commit": "e38d21a885e234af9ea6b03f499c487175570571", + "sha256": "1c7n43xi1sjprqn0xhd1hfdr39ipqiw1r8w76qbm3xx04h9bccy8" }, "stable": { "version": [ @@ -86652,26 +87161,26 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210503, - 738 + 20210607, + 1513 ], "deps": [ "pkg-info" ], - "commit": "35c6f9898272796694d04ab4fc4fbc85751e6b44", - "sha256": "0lxmd139aj42r1gyiw2hgr9riww7fdifngzmgy4k2946j3vr7ilc" + "commit": "155fdb44176347c9599357c7935993033260a930", + "sha256": "040g4frdjabpa8ddhag81dx3kphh5kp3iv34x4zsbkhb6gryd5zf" }, "stable": { "version": [ 2, - 3, + 4, 0 ], "deps": [ "pkg-info" ], - "commit": "18f694931f0afe8b33e34731914e8bae81107b55", - "sha256": "0jgnj5il4ynbqgpvy41y6xwwdwnd8m7vsx2f8y8dlwnczr0a022r" + "commit": "bbb7b8d4c498e88046e4e6227990626f2b5dbe1b", + "sha256": "0w2s1mxbi8qqv0k34q0jj368n0p764rz72grdzzrmdlc96bbd03s" } }, { @@ -87063,11 +87572,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210512, - 556 + 20210607, + 1422 ], - "commit": "632297dd0ab35a42ed6eac163dcaca1e71fcd83b", - "sha256": "0gzggng9iq62qlyzx0v6f586qfqvwibpz7jp7ar8r3wz32h95vjm" + "commit": "bc86736abb728ec0d28abc90ef0adae21d29a66a", + "sha256": "00cga3n9nj2xa3ivb0fdkkdx3k11fp4879y188738631yd1x2lsa" }, "stable": { "version": [ @@ -87170,17 +87679,17 @@ 20200619, 1742 ], - "commit": "96ccf402fe8e62649f2be48a05944d552701aa5f", - "sha256": "031rag0y1k2f0mxjsvblnhib6qh2sxqbq85bcv8bbvb18j6k7rp9" + "commit": "4644980d818ec9d987f74c74b1a1d45de9ab01fd", + "sha256": "1mzblak9s46wsfh3l1798k9pjwbddnz030y0cfx831lfpr20227b" }, "stable": { "version": [ 3, 17, - 0 + 2 ], - "commit": "652d99a8ee8aa6b801e11977951fbf444cfccc8f", - "sha256": "18w8v2djl5fjhivc09w6ilc5npgacdxqn962q6vl5awc50crkgs3" + "commit": "70db61a91bae270dca5db2f9837deea11118b148", + "sha256": "08a7rnflhklbabqm5yyz2nwyzzfbh24miiy3wsxphaanjz4xr6yi" } }, { @@ -87482,26 +87991,26 @@ "repo": "hlissner/emacs-pug-mode", "unstable": { "version": [ - 20180513, - 2126 + 20210503, + 147 ], "deps": [ "cl-lib" ], - "commit": "685fd3414d89736bf232f5d1a6bed9e0353b98fe", - "sha256": "06qy9bgizc68k57avrbcl2qd2kyb8s17gr6rvxdbjknk6i55dgp4" + "commit": "d08090485eb8c0488a7d2fbf63680dc0880c7d2f", + "sha256": "1f6bhdr1a72x94dlz2i1fwwln8crc2mbpc2iq23hvsbsfmj7xfzp" }, "stable": { "version": [ 1, 0, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "96718f802dad3acd5a3f770b1452b81e39f77d92", - "sha256": "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023" + "commit": "d08090485eb8c0488a7d2fbf63680dc0880c7d2f", + "sha256": "1f6bhdr1a72x94dlz2i1fwwln8crc2mbpc2iq23hvsbsfmj7xfzp" } }, { @@ -88024,15 +88533,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210513, - 450 + 20210607, + 427 ], "deps": [ "async", "xr" ], - "commit": "924167a356ee4355e39461ea62c7dbd1eac45fc3", - "sha256": "01p8427w6a6kw5xbkyl8wgzj4xg6k7a3acisrp986c94zwi091ml" + "commit": "eaf331f67ad3d6ea5b63c92bcd0cfc0134466b53", + "sha256": "0prrkn2yaj6wm2hn17jgfxb1vz58mdm3ivmqsncrfhl1vdll73jm" }, "stable": { "version": [ @@ -88194,17 +88703,17 @@ 20210411, 1931 ], - "commit": "55d3cb79d846d093dba5a351d87803ad5e9b05bf", - "sha256": "11ji3q2zm60454x6awgp3pvkxbfbvcm725zffmi837x675rqydg6" + "commit": "6c7bc2b576a705fcc7bc52494163e9a1a240ea80", + "sha256": "1m4swr0v998c6iq589mzx6glq7g2gc109469wcsjyi9j4cv7qgkr" }, "stable": { "version": [ 2, 8, - 2 + 3 ], - "commit": "091cb92314dc701f10390136da78fbbb362e892e", - "sha256": "13qiv3v8yc2b7sfvizlnx6xcam7yjicdkfjw00q50s5xqmali22p" + "commit": "735c958d3b36fb5d343b7bcb81b1055a430cb042", + "sha256": "1m8f8qv88bvqbviszwf0n4ch5dpyqa33067ampy706cpg7mwjvn0" } }, { @@ -88445,14 +88954,14 @@ "repo": "wyuenho/emacs-python-isort", "unstable": { "version": [ - 20210509, - 1532 + 20210603, + 2153 ], "deps": [ "reformatter" ], - "commit": "4ba3dd75e7dd9f953d8b7c0b9c4c6d1b1c263047", - "sha256": "0lnl4byf93ibl2g353z9pzarvqwc1q732fz5gj11gv4yfp8p6xif" + "commit": "339814df22b87eebca02137e581f65d6283fce97", + "sha256": "094nqaf60cw3kch2hka5jbbrc5b6v3z6np98w3y6690yxwx7wmz4" }, "stable": { "version": [ @@ -88475,11 +88984,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210408, - 800 + 20210601, + 1845 ], - "commit": "710ffadeb43136d400de0a4c9e4a94c8b7ff36f0", - "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0" + "commit": "198ba8e15e848825b2215e9fc363f06d8c173a28", + "sha256": "1z6vnbnqvn20gs131d0rjncr4nk11amahvmfaffkhiwmpsl1b3gv" }, "stable": { "version": [ @@ -88630,11 +89139,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20201227, - 1623 + 20210527, + 829 ], - "commit": "9b3678bc29192d2dba64df90fbdb17393ef8d877", - "sha256": "1pxinj6gc0mga0sl7y5ys3xsy94c33cbgahw418c36lhj8xxx21n" + "commit": "045ff9476dac26086a04538d9b7ba186aa8f0fd1", + "sha256": "1y5jqqqh0df75qydw3h7rx24pv5z628ci8ymdksn5khl1qp5041x" }, "stable": { "version": [ @@ -89119,15 +89628,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210517, - 1613 + 20210604, + 1431 ], "deps": [ "faceup", "pos-tip" ], - "commit": "abd59fd4538f09fb201957d87887e58e377f0255", - "sha256": "1vs4yxxca8r7n4cjgsfzljj0kb3b3h7nl5k4yqvc8r0q0rrhyn4d" + "commit": "4b46a818c08820e04d25df7fe830e80ea82e1126", + "sha256": "0kr1sd819rvyfw34g6sqcnygkllcx07ccc5zc773kn0ngiqd0zvn" } }, { @@ -89746,8 +90255,8 @@ "deps": [ "yasnippet" ], - "commit": "9d0a1bb90ac36c689cded48b661e81d4544fd719", - "sha256": "15vnybyvz18scladfqy1qj6vrwx1ac38ra8ymdg938aayvl57354" + "commit": "969c21734dab638057fe9e284f6a51edcc3407c9", + "sha256": "0sdh2qaa6fb11y3h8xy0f6frisan2bkxrk68r89bq875g21z8jfr" }, "stable": { "version": [ @@ -89837,16 +90346,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20210516, - 1047 + 20210522, + 2151 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "cde79dd47f25617959c6cfa059e198a565b91f77", - "sha256": "1rpc0viymnm5jdrl16nmvsz0y8wnca03l0nhllwidyvazbf4x5zl" + "commit": "7a70b27614c488be274898d0141ec82feb3a8d5a", + "sha256": "116f94sslg1cd5cy5w25ygazdwrrlh85pfib7692a180vk6kz8g6" }, "stable": { "version": [ @@ -90417,8 +90926,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20210301, - 2307 + 20210603, + 2305 ], "deps": [ "ht", @@ -90426,8 +90935,8 @@ "promise", "request" ], - "commit": "196200eeccc4e821c5200c2e04429aeaafe4d536", - "sha256": "06q6vb0gxq323zhrq3im7xadgxgb9b8h0bxqak8xfmcnny0mcjlr" + "commit": "1a6eaf3d1a5e44205399526c0f425281b8d9ccc3", + "sha256": "070zghnrh4ywndk6bz1vd750g2nxj4rd42gphymyz8x7kazqqh1j" } }, { @@ -91936,14 +92445,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210520, - 1124 + 20210608, + 17 ], "deps": [ "inf-ruby" ], - "commit": "c9cb1abcc4caca7aa89aa61e648d323117d49d88", - "sha256": "1yhwlz60wqw08z04fz0rybgbh6g609pbl9n857i1cvmrhm38k3f5" + "commit": "bcddba77ba11b46f94730708fff2215f4b620428", + "sha256": "04az3rk7h606pv2l16wf2bmad9nqb7nx6r7cwap90dvnfjn56a3y" }, "stable": { "version": [ @@ -92593,11 +93102,11 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20210323, - 1742 + 20210529, + 1505 ], - "commit": "92b70a1ed0aa9bdbed3915efe47b3ba92fe2cb74", - "sha256": "1jvclzlr9lhvb05zdnqw2l3y2m1nca2m5z8m1a7rmq9bk1wwl4pa" + "commit": "ce2d69feeffb9ef9815ef5b5e32f236763197a10", + "sha256": "132gsmgqnfzx8q0f4gchjzhm3wqm5frjrsb8q9cmqsa5y2g7qjmf" } }, { @@ -92608,11 +93117,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20210308, - 453 + 20210522, + 243 ], - "commit": "e5ee96c50c350cf860982b7b5deff1ed8d488c8a", - "sha256": "0g60kk49dbn331z06gpi3c8pqjsb780iwd07bl87bgbcxcpa2fg9" + "commit": "767eea8928b92da032aca7c8a429b1cced46781d", + "sha256": "0pdjhvma0hsd8slz240bavpyzvn9mdna7lsrd1ddw3nf8xjibczq" } }, { @@ -92796,11 +93305,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20210507, - 646 + 20210523, + 757 ], - "commit": "b44321c6fbbfc53e211083dfa565525e79f596c6", - "sha256": "0gwf9a4cgpl3agggaj8x6r5hmq88wghzvyh69shc378n564n1cq5" + "commit": "ab6417d8e546f1836618ee72d074ec65431ebc80", + "sha256": "1yy0jr7n55qbraxif2zhgmyr31jd5sd62jyhd3cg327vl5ga1ajg" } }, { @@ -92811,11 +93320,11 @@ "repo": "magnars/s.el", "unstable": { "version": [ - 20180406, - 808 + 20210603, + 736 ], - "commit": "3a5166c81ac9e50eaccf5490c5c632f93452287e", - "sha256": "131z1g43xh6z20069s6lccm08srwhwgpbiwb7fp2h29pxp41g30z" + "commit": "e1710af8d058faca32529d1129deb5d57871385a", + "sha256": "1zm9zqa1479kn74a1hbs7jc8rli7vzz5hk8k2rqpi34yf569yjhj" }, "stable": { "version": [ @@ -93231,8 +93740,8 @@ 20200830, 301 ], - "commit": "34389b16731dbde58e9597047e2111d587ce4fcf", - "sha256": "073g3132h64afzl0jcxl84n60ajb7p5y547rp4349c0zlsk3fwg0" + "commit": "393a5f2be890c1e90b3d5f331ce1bf34dad09742", + "sha256": "16y5njqb9v58fmsp9nn38wvzx71jgy0di2m8933a8dkirddi324v" } }, { @@ -93723,6 +94232,21 @@ "sha256": "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9" } }, + { + "ename": "sculpture-themes", + "commit": "408a269ccf0d938c3248880c5220b5b0b979f271", + "sha256": "1zyiki3raldp4wnhjsnfc5rzs6pycbagfp7qjjjxz1qgqig36wbw", + "fetcher": "github", + "repo": "t-e-r-m/sculpture-themes", + "unstable": { + "version": [ + 20210530, + 624 + ], + "commit": "1da2b3501f3732b4a58d28b502e356226a43a96f", + "sha256": "198rjkyv876h7mbs73h8dq4lx5xhl66p7xrpvb23v0vk4vw0q5vz" + } + }, { "ename": "sdcv", "commit": "173e233b2dacaaf54d92f3bcc06e54d068520dd4", @@ -94035,11 +94559,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210520, - 1825 + 20210530, + 245 ], - "commit": "a922b19f715ad6d046072a35a3df5ac5e4ed73d3", - "sha256": "1n5qf7lh4q0j9yxxxzfx5y2dlcdni3k7bwbf7d3gp5byl46as92z" + "commit": "a19bbe94de492bf504399c093cfc5695eb630fa8", + "sha256": "0jhc0qn3q7npsixj1b1cmplxdvpy30745h32y0ybyydahqc3yc30" }, "stable": { "version": [ @@ -94123,15 +94647,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20210214, - 853 + 20210529, + 1313 ], "deps": [ "apel", "flim" ], - "commit": "20d75302509b5fba9849e74b61c1ce93e5819864", - "sha256": "14qy9k64fi8asd4ka9hv5v0aa7mkdnx6252n02gldg760janr7xl" + "commit": "95259568446f32c1af56dfc27e3614815322a1bf", + "sha256": "09xld1vpxdz1kvw039g7hk89p2d8pi95j9hgls6iviwzs6ni41yl" } }, { @@ -94243,15 +94767,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210420, - 1527 + 20210521, + 1050 ], "deps": [ "dash", "edit-indirect" ], - "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928", - "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr" + "commit": "900fdc33b647e92d0f464872da1b12d724de7d43", + "sha256": "1ji8qjg3qsxprsqjp4hks999f0rfqnl3nyj08hr4vra5nqk6x4cg" }, "stable": { "version": [ @@ -94722,14 +95246,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20210328, - 1533 + 20210523, + 1821 ], "deps": [ "transient" ], - "commit": "70ae6071478f3e451ed9318d67a5d024c01235e0", - "sha256": "1fw2qn88b84v0fkaigyyipyvvhhllkw1s1h6fgv2xl2h19i8r0gd" + "commit": "08277b6c30568adfbe438c9f2a1d6c3db4b7ebeb", + "sha256": "1n0nc3g57kl5d4zh0k0gis70kd05yb2pv7kw8akmdp9q7hxs6m93" } }, { @@ -94940,11 +95464,11 @@ "repo": "deech/shen-elisp", "unstable": { "version": [ - 20180915, - 2028 + 20210530, + 349 ], - "commit": "73b74c8d6e3a2ea34b667d177d9f130765bfe501", - "sha256": "1ym048cmkghx373fb7n5m6r73q5nfa62m10mqr4nzhsizgyzdbrn" + "commit": "dabb829d0d86f454ceb3b0846cdfc11af1f91cc7", + "sha256": "1h7v3bbljkw7lsxz4ijvw47c6fj070j0p268v4il2xh2mzw1nhjm" }, "stable": { "version": [ @@ -95034,11 +95558,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210329, - 149 + 20210606, + 124 ], - "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", - "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" + "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", + "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" } }, { @@ -95566,14 +96090,14 @@ "repo": "vapniks/simple-call-tree", "unstable": { "version": [ - 20180224, - 2056 + 20210608, + 33 ], "deps": [ "anaphora" ], - "commit": "20059eb5549408def76aeb03d0d20839903dedef", - "sha256": "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h" + "commit": "d776c801d773e535d1647524e2c4f63b200d8ef1", + "sha256": "1jh1h09l4vkzj40l8nskkilbggfl889l3rhi8b70jm4yvmk9np62" } }, { @@ -96321,11 +96845,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210303, - 1148 + 20210604, + 937 ], - "commit": "5966d68727898fa6130fb6bb02208f70aa8d5ce3", - "sha256": "00yk9g0gi4gsa99n2gsq41mkwgvmih52mngmk4g8ajzxsv0pbwq0" + "commit": "c783ba6576b554f3fc15a70bf30d225f277d1863", + "sha256": "1lwghrqw81dr7mhx8i92nn4xhamnpqwdvmzx1lg1fzy7g5qx7fl6" }, "stable": { "version": [ @@ -96773,11 +97297,11 @@ "url": "https://git.genehack.net/genehack/smart-tab.git", "unstable": { "version": [ - 20200416, - 2228 + 20210530, + 1743 ], - "commit": "67bf4f93f8afca61a3dc4f6c7a34b0b8ca9ede21", - "sha256": "1ws49lbafch1rb6g0j9k5h30c9shk3vvqhbjkf4qvhaqii94lgml" + "commit": "2f1b4073904805c8454ebc9bc967b23836a2d577", + "sha256": "0fflc9f3gwf1kl3rplfb4dr10j167l85z2hwy77b4gbjzd7lp502" } }, { @@ -96829,15 +97353,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210330, - 850 + 20210529, + 1129 ], "deps": [ "cl-lib", "dash" ], - "commit": "25f4d6d1b732f4deabf922059d22a0a7dc04bd0a", - "sha256": "0jaa81fk6376fpxx6k4c9nsv0dhsyk23v9c5jbhkqj3zkf1dcj4x" + "commit": "911cc896a0f2eb8b5fbdd6fc8331523ad9889a3a", + "sha256": "12g7q86ncawikvxr87p7vda21pbfiwi3kr3rgkm7b1lx3zabwcai" }, "stable": { "version": [ @@ -97015,6 +97539,25 @@ "sha256": "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr" } }, + { + "ename": "smithers", + "commit": "147ae745350bd331d43c5a29e2cc4b56481c66a8", + "sha256": "07hv94qgkxxbanx0v7x7m18cy7f2jxraqyc83xycizlq4dx1k2vh", + "fetcher": "gitlab", + "repo": "mtekman/smithers.el", + "unstable": { + "version": [ + 20210531, + 2232 + ], + "deps": [ + "dash", + "org" + ], + "commit": "db9ed12a8d2c131b6d37b4e7aff01b8e3cec81a6", + "sha256": "1rk1x096akhn5rip8vp2lf0yyyybqwq3w75vkmkg4dcb9cbrwz1q" + } + }, { "ename": "sml-basis", "commit": "043c253879bbc159c4867e58d4741ba2e9b8bb91", @@ -97322,15 +97865,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210515, - 1542 + 20210605, + 1242 ], "deps": [ "dash", "s" ], - "commit": "e42d88b1b1c121b0bcfa1869c3338d7b159172a3", - "sha256": "1cxgyd0pssx9n1kh0b5pi4pz0ws3rq8dyg0vfidih36vglg0dplx" + "commit": "54005eb19dfab02f38074e696fa8d247b59a2ad8", + "sha256": "18ynqkf98rjyzl48l5399g49x9gdmsj0wyc4jp7mly7xrv51zblx" } }, { @@ -97506,26 +98049,26 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20210327, - 2155 + 20210601, + 1921 ], "deps": [ "cl-lib" ], - "commit": "9d143db85428c5a7798e429f3b8abd2bf3f80747", - "sha256": "1g5cph02m07dxpmzd72xrzm56l62zdngis6xgz385zdfj67vi9a2" + "commit": "2298fd806d28daf511eb7836b23775e7df1f65e2", + "sha256": "1jfl0nhnv3ljagdlpsi2d7mhcrm8rww8crnhzad5zimzwc48nlcq" }, "stable": { "version": [ - 1, - 1, - 2 + 2, + 0, + 0 ], "deps": [ "cl-lib" ], - "commit": "4ac324ccb0b751be80ce64449553462eafab4f32", - "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps" + "commit": "59efa9c52ec407161f741e67071813c3c1901680", + "sha256": "0aigavrqfi2dy4q5vrfs48n5k7839gqnafq7mp14cmcbrzcwadrd" } }, { @@ -97753,35 +98296,6 @@ "sha256": "18cwii9h2planb9bgrih4hkz2cqinbl8wq5sal4b8kwnaq07bbw7" } }, - { - "ename": "sos", - "commit": "e8acf595ef51c928b4b41a9fea171fbfd40c080d", - "sha256": "1sny4wa2746fi9p18js0y9fm2f9ix7yblqyqa36ibkfj4b50hvxi", - "fetcher": "github", - "repo": "emacsattic/sos", - "unstable": { - "version": [ - 20141215, - 403 - ], - "deps": [ - "org" - ], - "commit": "1573adca912b88b5010d99a25c83a5b2313bd39c", - "sha256": "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "org" - ], - "commit": "c3906ca6872f460c0bdd276410519308626313f1", - "sha256": "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1" - } - }, { "ename": "sotclojure", "commit": "3a2ccef8af91eada4449d9cd4bda6bd28272722e", @@ -98291,11 +98805,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20200706, - 1236 + 20210607, + 2032 ], - "commit": "058f91b4d1b0350221218656202ea80cd6827d65", - "sha256": "0c9k68mnwm7hhd9mj6f3p8k83kmd67rgzcr27791mnjfkhipynvb" + "commit": "2ffae385139936a03e1d1a96993d3bf5f9509bbf", + "sha256": "1kwg74qy66kwhsl2pqn4cvkrqrfdvyyaz13h4h1bqpxckb1dc05z" } }, { @@ -98921,11 +99435,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20210201, - 1444 + 20210601, + 1247 ], - "commit": "760dc6cb854383ab087d9b924de7273deddefe6a", - "sha256": "15anfzsfgddrlskppk068dzlz4zkg7xyk9727a7hwg4845126q6w" + "commit": "58dd21cd63e4a2eed15e0082c2547069363f107b", + "sha256": "128ri2g7jjgpacvaxhwwv4f2h3kdzf5vv3p01yqbs23m8mri8d9w" }, "stable": { "version": [ @@ -98968,11 +99482,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210504, - 632 + 20210528, + 2053 ], - "commit": "ce69158f5efb3040a00e89ffef0d1931e5038f53", - "sha256": "1sfrp9iwrinx1q9hm6rdb1gayn4jhqsh00c3yzg83wbdw1vl8vpw" + "commit": "c4ff94490dd8124e633f907f94955b30b7a4d8d4", + "sha256": "065n3x1mzhjgkyvy5j3fgqa75npxqp1dq05xgac9pqgcr2j09mi6" }, "stable": { "version": [ @@ -100503,14 +101017,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210509, - 1535 + 20210521, + 1319 ], "deps": [ "ivy" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -100840,8 +101354,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210505, - 11 + 20210528, + 406 ], "deps": [ "evil", @@ -100853,8 +101367,8 @@ "seq", "undo-tree" ], - "commit": "5649ff2b7c0547e20adc7d32243f5b5ef99ddf54", - "sha256": "05vx9470prpqj54bq90alzgq7pnf1bap7wn5j21n02hrbp647jmv" + "commit": "1b6466e75295bbf7847253dfb6bf580b1c68eb9f", + "sha256": "1rbb7zl45x9xkf05601j05vq3f3hj0nh3rbv16a3n8d0ab5qnvhr" }, "stable": { "version": [ @@ -101232,11 +101746,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210519, - 922 + 20210525, + 2204 ], - "commit": "97272ee04dbcf11341f18845c743e355ca514a87", - "sha256": "1kr4n7jzqps1zchhczrdqycvj6gfrb25g2rhjg78wifhd8rsj6wj" + "commit": "2196e76cb6f11e6ae0f35ac8259dfb755ea60336", + "sha256": "1xifgdwqpf0ccmdxhdr9zxzqsa769984xs4343v657171f53flz4" } }, { @@ -101247,14 +101761,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210515, - 2206 + 20210526, + 2044 ], "deps": [ "s" ], - "commit": "dacbebb1c4afc7d8572b9801dc7efb156afbb968", - "sha256": "084i2sjzjchn9hylbg7hk5b06a8wac46n2w90fh41wqzdkpagk7r" + "commit": "63af8dced377a346b4559145b2e6e1767263f916", + "sha256": "16628wjk14h99z9i822xjv8fkxra6n65nafm3cr3ci86qd00j7a2" } }, { @@ -101573,20 +102087,20 @@ "deps": [ "cider" ], - "commit": "331e14b838a42adebbd325f80f60830fa0915d76", - "sha256": "1jpig982z0lbbnv2167q4lfv8dhhpg698gi6i7184lrjxr7dxqw7" + "commit": "82f343bac637e62f31152d72086c7facd4dfea27", + "sha256": "0bdai4gwz8nyc26gmb10z6pq6r2gw04iflzsc476xrp56d2abgbc" }, "stable": { "version": [ 2, - 0, - 3 + 3, + 0 ], "deps": [ "cider" ], - "commit": "ce85fd9bcd008031a605ea8913577f452b49e352", - "sha256": "06dm6gdh10jbmyjr0y96s06qi3k12phq522pviis68qm7v2ryr47" + "commit": "5da72b601cb9f052f35e88c41f1a18b326c03791", + "sha256": "1hhwyh4qkmhc303sf4qsarpczyqihh45z2xb96m2ra5zlqnklcpp" } }, { @@ -101716,15 +102230,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210511, - 1722 + 20210607, + 1622 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "bc57c9e27a8c8c82d17cf2a2131e386494d49a1f", - "sha256": "0v9297syqz42fah5ng90a26b16wq1xvm4nh5cqphx4dgb31q2s08" + "commit": "0fcca201db99fbe93e8b0fd404dc00fd55cd658a", + "sha256": "0nqx5sddfa9442dgsssp022rfarznnq69gclj4h5kk726rkf9cid" }, "stable": { "version": [ @@ -102173,11 +102687,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20201230, - 1219 + 20210605, + 1453 ], - "commit": "cb561b5feb37a03a1c35708c3eebf9b51b01f7a0", - "sha256": "02vmy0xbssqvs97f7ypmk50hiyb7qdsbrmmnlf3mlm55c2abk73s" + "commit": "e0e89344624fadf080f6770132ebdd7991355fdd", + "sha256": "11hvyvnbr6skw6czwk8gjw9v08azf8s2kafqh5jb1nlznfghcr11" }, "stable": { "version": [ @@ -102807,18 +103321,18 @@ 20200212, 1903 ], - "commit": "9f15dc7bd57833ba9168551c85ede1d5e7036264", - "sha256": "05gg1634dkl1fbl9v8izln32ak188x4b4gxp4qaapm9dlpqp9rld" + "commit": "a67ce1533462256ff418027a3aa56516a1139d02", + "sha256": "0f20x4bklq32lcwa2ihnlnb6ri884xx7dyhg62yqz9y4w8filhhv" }, "stable": { "version": [ 2021, - 5, - 17, + 6, + 7, 0 ], - "commit": "4c4030f0f99458ff151652d8c8c41f0655dfc2d9", - "sha256": "0wqff7q9xkr0h9xp8f9fj7zmqqpz55p11z20q49h6rfqbwyi95wh" + "commit": "ec71afa89573c92de4a2a2ab87a51bd9021f5819", + "sha256": "0h3b89nb8sshhc52fxsgpdiqr85mfg1rpzp69qmiiwx1yz0b66wi" } }, { @@ -103115,6 +103629,21 @@ "sha256": "1jbmc356cqmjann2wdjnikyb0l136lpjka6bjim0rjhipdnw2acn" } }, + { + "ename": "timu-spacegrey-theme", + "commit": "1bebe80350df731711bc526ca9fe942410211220", + "sha256": "1hl91gdj52zp8w4c6zp4bzkizj3x7ssr6wl465qq3fw1k5wp8l7n", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-spacegrey-theme", + "unstable": { + "version": [ + 20210607, + 1412 + ], + "commit": "34a4499fac484c369774e356373b1f4994d65176", + "sha256": "11cjyiwi87rv9lj09810aazxgphdhpxpfhbhzr64176vqgmb8khr" + } + }, { "ename": "tinkerer", "commit": "8a28e1dfe987287bac7c45f83ae6e754bc13e345", @@ -103750,11 +104279,11 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20201101, - 1045 + 20210528, + 754 ], - "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", - "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" + "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", + "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" }, "stable": { "version": [ @@ -103809,11 +104338,11 @@ "repo": "raghavgautam/tramp-hdfs", "unstable": { "version": [ - 20201001, - 2022 + 20210526, + 339 ], - "commit": "822c7b8a5bfca97544817d04e8a4ff1ffbaf4267", - "sha256": "0kxxdpmr9h0kqsylh8aj8m5arwf4m5yrkcadjssa76drhdlhcirl" + "commit": "aa93bdbb3d5619c262ce53af1981edcd2a0705e5", + "sha256": "1ar1565qhw6wx76p5p7dyb5k0lplnfbf866x2mc6kn9vydmb29za" } }, { @@ -103857,20 +104386,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210426, - 2141 + 20210530, + 2252 ], - "commit": "6ceddc4d8c7a3c13d78c459213c796d2c19234c6", - "sha256": "0dhz5ca9i83vgi3pvkbvwanxbi1ibzwbmnhm8ymxdvzn508rlswl" + "commit": "a96818c93a10d9ef9bb14e5c0b9fdc1a808b13b9", + "sha256": "1mvccsfalnr4ybsgqazxcw62vfhigxg61y6v98k2fqncnmsbripa" }, "stable": { "version": [ 0, 3, - 2 + 4 ], - "commit": "162698aa9d40ecafefcb1af7bdf602954d766970", - "sha256": "1766hdqzg95k62nqhadfv502mpnjlx1l59ppqmc6r0las82dc6a8" + "commit": "b47e9d7d769437e279628d801a95c173c4ff26b4", + "sha256": "16z0j69sk7k51sd1vri3y2v0xjj0w7wpf5mmwnsxp8y6d3m0yjbv" } }, { @@ -104231,8 +104760,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210518, - 2056 + 20210606, + 1918 ], "deps": [ "ace-window", @@ -104244,8 +104773,8 @@ "pfuture", "s" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104281,8 +104810,8 @@ "all-the-icons", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" } }, { @@ -104300,8 +104829,8 @@ "evil", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104324,14 +104853,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210605, + 1118 ], "deps": [ "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104362,8 +104891,8 @@ "pfuture", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104395,8 +104924,8 @@ "persp-mode", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104428,8 +104957,8 @@ "perspective", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" } }, { @@ -104447,8 +104976,8 @@ "projectile", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104548,10 +105077,10 @@ }, { "ename": "tron-legacy-theme", - "commit": "975e93e060f50a1fd00a6ba1566a9386271bdfd6", - "sha256": "08cfhnkb62121h6dksw9c0d38vxm38dfbfww7c8kj491is0w63f4", + "commit": "f217fe20e19e1c3e249857c4fdde7a7cfde76c36", + "sha256": "1xy6n2rdga2if1slkqs6xdl2h8kf8h92xb03a3k99gznmgxdzcxw", "fetcher": "github", - "repo": "ianpan870102/tron-legacy-emacs-theme", + "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ 20210420, @@ -104785,14 +105314,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210320, - 1929 + 20210605, + 1629 ], "deps": [ "caml" ], - "commit": "37a673020152ae0dbcaa250118b155d84e448f68", - "sha256": "0b9bnfwcnxkwjrdb4vm7y8wznqz4z990pv1s473gs97l7p04b1j9" + "commit": "24c1a1adbe51d93f681e72442fa73f885eb33776", + "sha256": "1cp6g117kfmwfqb7sq4y4jx8ggp29f4hz2kz5g3355s8zhjlld2y" }, "stable": { "version": [ @@ -105343,28 +105872,28 @@ "repo": "undercover-el/undercover.el", "unstable": { "version": [ - 20210123, - 2157 + 20210602, + 2119 ], "deps": [ "dash", "shut-up" ], - "commit": "c36a7366aa080558125fa651ed6a28d5df735b37", - "sha256": "0qji4738q0yx2n0xrpk12q2akx8rgsvpfgnnfxrnk8xiywjfrqwz" + "commit": "1d3587f1fad66a747688f36636b67b33b73447d3", + "sha256": "0qmvyy3xg5qi7ws8zcs934d6afsappr1a6pgfp796xpa9vdr4y6j" }, "stable": { "version": [ 0, 8, - 0 + 1 ], "deps": [ "dash", "shut-up" ], - "commit": "0bc3583065e49647db47d8a595fec13cb517d12f", - "sha256": "19d3373fy635vbfwr1yhxirwqn68qzny9byv74smxws4ly04mr02" + "commit": "1d3587f1fad66a747688f36636b67b33b73447d3", + "sha256": "0qmvyy3xg5qi7ws8zcs934d6afsappr1a6pgfp796xpa9vdr4y6j" } }, { @@ -106345,14 +106874,14 @@ "repo": "diml/utop", "unstable": { "version": [ - 20210404, - 318 + 20210607, + 1941 ], "deps": [ "tuareg" ], - "commit": "711c24661ce625070f8981fab9c6f31ce72b0a52", - "sha256": "0xwc14blqzrsyp7mzza0vavbp622a86bz9na8dks5zir2fgmmaxm" + "commit": "bac3946079a98df00f31656dc10c6c9f1a8bc422", + "sha256": "1wbmr0n384501i97x0akcfwcigklwqgwvhdwgxw6zxxn5wdg60b2" }, "stable": { "version": [ @@ -107039,11 +107568,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210429, - 2113 + 20210525, + 2135 ], - "commit": "a6e46f436495fb54ba57832450995425ad8dbc26", - "sha256": "0zm3ks1j60vdm9fqspa06fcgcz5mmz1pz4fgr21q001bi3wg8vfq" + "commit": "9e3e8a1edd82f7d056d3744f9e40cf8a5bac4ecc", + "sha256": "1kjzglpyrf1vbsb5gjcwmi5b38fvn5rx95yc8fwbizgisx70abkc" }, "stable": { "version": [ @@ -107658,11 +108187,11 @@ "repo": "blak3mill3r/vmd-mode", "unstable": { "version": [ - 20200727, - 701 + 20210524, + 27 ], - "commit": "31655a41caf006c3dd64d6e57f6c4488098f8bce", - "sha256": "1pnx977pm305kr0zakwy1wkdfpk09rilwx8rmai4459lyz0sa8j9" + "commit": "b2bdf2ab54f8fc37780e6b473e4ad69c0e9ff4a6", + "sha256": "0wraiy5v0h1j4i31fr1b83k613c01pajq2436f93r485c2529pzp" } }, { @@ -107796,17 +108325,17 @@ }, { "ename": "vscode-dark-plus-theme", - "commit": "0e7e489ea5cee3b1d2b6b5295cf95f3e1d9d6c60", - "sha256": "001xhi87dsh75sd0vg26v4w78rf1p8bhj1zhn3w7j255817xvcgd", + "commit": "f2397ff679c9f3b03bdead7b31a0dabc1e2f8d97", + "sha256": "0pwmv26cassw5d5h8p82i6jm8vd85m1ffb7i31w72w1s8x5y3j31", "fetcher": "github", - "repo": "ianpan870102/vscode-dark-plus-emacs-theme", + "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210430, - 819 + 20210530, + 629 ], - "commit": "24c4cb28042b3b9cc8f4e5294d7597f986aa6fae", - "sha256": "0b85sm6n2ahyyj220k5mqd5ar3x8204p0cfxjyhlk2f989jvfm3i" + "commit": "961c8c1fdd7eb874d4e2ce386d5e6d1f318b5b72", + "sha256": "1dga7yhb5pnqj5d86pvzbabrq05xj1ppx6g0hinhm8z6m8h6y540" }, "stable": { "version": [ @@ -107856,14 +108385,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210518, - 1528 + 20210531, + 1453 ], "deps": [ "vterm" ], - "commit": "d726b54332b591ed05a89f1bd765960dd49d9a59", - "sha256": "03mcblwwfsa5d8k6xdfjzz5hp767j3p0ng3s113i2vylq4r27jav" + "commit": "afe60b814d9d045b968f4a464bbedb241b35392b", + "sha256": "007spqyc474k8fxi6l3s0jh8dg18d9b07wvz3lvbyrgdqwdw2a0p" } }, { @@ -108077,11 +108606,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210507, - 231 + 20210606, + 2300 ], - "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", - "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" + "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", + "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" } }, { @@ -108725,14 +109254,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210430, - 2251 + 20210526, + 129 ], "deps": [ "templatel" ], - "commit": "11ec801222eeb468878e6585efb55721592dbfe8", - "sha256": "01ipk5fwx5phsd6kr7kvdckhd19hly4szwlwl1a0jaxy0ab6iv54" + "commit": "ffea6a93f5d35fed8532f1187463a27eb46bff0a", + "sha256": "185crf3dgfqjq58s2bvdmvff5vmy73v4m4l2d17iwjyw3ifji5a8" }, "stable": { "version": [ @@ -108911,11 +109440,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210518, - 1738 + 20210530, + 1418 ], - "commit": "7e9b8d930b22900030f76b1e109ce64eb275b793", - "sha256": "06qimv5pxyz6rqz7v5fjkji3ay2cxs7h9bqf2y2jxpy6zsdy851m" + "commit": "a56c56de048900409d271f91fd08a408fd9bf32e", + "sha256": "0nblkcz52qvfkf4q3yb7drv0rbpkqgzv3clwb6vkvwz13s29b6my" } }, { @@ -109085,11 +109614,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210407, - 28 + 20210601, + 252 ], - "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199", - "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb" + "commit": "fc29864395fdaf688e2ef5111831663bad89a020", + "sha256": "1adv32z8dmpygbrk14l1pj2535c10ncv8znfzgi1s908ds20kad1" }, "stable": { "version": [ @@ -109418,15 +109947,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20210126, - 405 + 20210602, + 1459 ], "deps": [ "org", "wikinfo" ], - "commit": "2eb31ab00e4c8ad53dc15234f29527b9f0f54d71", - "sha256": "0sghvnvbbv3d7kdvcv2dbbzbv38b3jjzbrhjv6fn5lynyr929vqr" + "commit": "3aecd23e68b9117a03c65fafa85a0805b58609d1", + "sha256": "0m1fj06x9r941k2842v2091xbff89wp704ifrcdgb6zbksx5d8i2" } }, { @@ -109837,23 +110366,20 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20210427, - 1244 + 20210524, + 1654 ], - "commit": "86bdff68a106bc9d383fdab3bbf1ad4b703a52f0", - "sha256": "1rk8vza2g8gxybhjk10xj3pw9whc80cs9qv4avyv926g7dw60as9" + "commit": "5519b6a67ecd66865b4fdd5447425eee900c54f4", + "sha256": "1bmvkrfnjzrf0ch2mh75cv784mzs64i4f44l91xysapjqv46lfqn" }, "stable": { "version": [ 3, 0, - 2 + 4 ], - "deps": [ - "async" - ], - "commit": "6735180e73e787b79535c245b162249b70dbf841", - "sha256": "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k" + "commit": "5519b6a67ecd66865b4fdd5447425eee900c54f4", + "sha256": "1bmvkrfnjzrf0ch2mh75cv784mzs64i4f44l91xysapjqv46lfqn" } }, { @@ -109943,23 +110469,19 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20210514, - 349 + 20210527, + 2320 ], - "commit": "c377a673c86cdedd5d48418caf8f1ce621aca767", - "sha256": "10ms0cqxvicjs9lsbiy8h0hphx2dikr6bf1npybqwi7g643f2jzk" + "commit": "0f43fe46d4ab098c18a90b9df18cb96bab8e4a35", + "sha256": "0im6a1nr75mgz13zjavwycd5zsm5ysz5flbsmka7i8bkn2js1fm1" }, "stable": { "version": [ - 2, - 4 + 3, + 0 ], - "deps": [ - "s", - "seq" - ], - "commit": "3d881793521c5618cdb0968a85879e0e49da7fca", - "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf" + "commit": "ee4d2b75fd99bac3de40675b0a0e03529718f59f", + "sha256": "0n8h84whsh0aph8xhn9plprix9f6bysgvarz2anz7kwns19js6s4" } }, { @@ -111438,20 +111960,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210424, - 2033 + 20210604, + 1500 ], - "commit": "d0abc17e3ddf42624d87fa6d2d3e1ba1dd175035", - "sha256": "19937d26gvj5ir1absb8rxyv35ac85xwvgb0nqcldmnqxqa2h66p" + "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", + "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 2 ], - "commit": "d8ac09e8cad7f67339e19c53e77da1cd0ff98d36", - "sha256": "0wkrvhb5yhb38sf7w1njxij1x0pfxp56hn97j2bk4w58dz94fxir" + "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", + "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" } }, { @@ -111462,26 +111984,26 @@ "repo": "knu/yaml-imenu.el", "unstable": { "version": [ - 20201023, - 1524 + 20210530, + 251 ], "deps": [ "yaml-mode" ], - "commit": "fa37d9bf8a09af144980a42cc22891b1555a12ae", - "sha256": "08v2wxdcp5f43vl8976bn3lsiqkaph4driczgc0bw9p495fljb2p" + "commit": "01741205fb33d2ed511502d1cd65a711e07a3117", + "sha256": "1z8yzi322y8wnvci77xp7fb7x5l3z8zy1ng4zaa1z856va8x2971" }, "stable": { "version": [ 1, 0, - 2 + 3 ], "deps": [ "yaml-mode" ], - "commit": "fa37d9bf8a09af144980a42cc22891b1555a12ae", - "sha256": "08v2wxdcp5f43vl8976bn3lsiqkaph4driczgc0bw9p495fljb2p" + "commit": "01741205fb33d2ed511502d1cd65a711e07a3117", + "sha256": "1z8yzi322y8wnvci77xp7fb7x5l3z8zy1ng4zaa1z856va8x2971" } }, { @@ -112467,15 +112989,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210520, - 724 + 20210602, + 841 ], "deps": [ "ace-window", "deft" ], - "commit": "bf46e764ed799d08e27c84e2c79cc643cab61322", - "sha256": "0x930i82090nfypm2qm60fx50y2ixv2b9szzz1ab07bb42ikpic2" + "commit": "b71f24d382887aeefde9c47fb6aa521d0ebeb806", + "sha256": "09wy2gllacry2n0cp52fakaa36lnd1mnbb26zysdjxh0429siy4a" }, "stable": { "version": [ @@ -112529,11 +113051,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20210412, - 1428 + 20210605, + 513 ], - "commit": "2d0eb23e6b5c12b946f12c23803157605c90f02f", - "sha256": "0lpsqclk37nx8i9jfskbnvxrhvh6vaflgh63xijhv9ajx2iwpw0r" + "commit": "0babe7ec524f59d57c01e2fc66294d1afa01f5eb", + "sha256": "0balv7ggz10izjw7r6z9vx17qq88229jdzpsjas6z37gk61bfngk" } }, { @@ -112991,6 +113513,24 @@ "sha256": "1nn6dvzcayh6nv6xn3siv09iixc5c3gy9c8y1fdwzq81yny9l2fr" } }, + { + "ename": "zprint-format", + "commit": "54457e29def6ecfdf96f599e6a007f5ebee485b9", + "sha256": "1flb1i5byp6s8fj1vpgm5wc43f8hld7rg940m20a40ysr1x35szk", + "fetcher": "github", + "repo": "dpassen/zprint-format", + "unstable": { + "version": [ + 20210602, + 146 + ], + "deps": [ + "reformatter" + ], + "commit": "6051a5709ea6182974d7239f26e04c9731e04447", + "sha256": "1in5cyrj0kn1fdfcw7iaxhsxx5hn3r3r0aiida8p9dvkx8kq540l" + } + }, { "ename": "zprint-mode", "commit": "188d40daec1ff86dcfa807a91eb77a1281de3951", From 43fa96215e2e683d6c5d17503067e535e2f5a1d3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 8 Jun 2021 00:45:38 -0300 Subject: [PATCH 308/797] elpa-packages 2021-06-08 --- .../emacs/elisp-packages/elpa-generated.nix | 148 ++++++++++++------ 1 file changed, 104 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8012d85137e..39a14ab0330 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -238,10 +238,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.11"; + version = "13.0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.11.tar"; - sha256 = "0sy4f1n38q58vyzw5l0f80ci3j99rb25gbwj0frl0pglfmgzl44k"; + url = "https://elpa.gnu.org/packages/auctex-13.0.12.tar"; + sha256 = "0fx3l6yyq63mlnapxiqpdhi5l314r3aj63404nly6hcdvc28g9nm"; }; packageRequires = [ emacs ]; meta = { @@ -636,6 +636,21 @@ license = lib.licenses.free; }; }) {}; + consult = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "consult"; + ename = "consult"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-0.8.tar"; + sha256 = "0vkq8dsj6k3gsdhiyg6ccv49fqgjw6f0db4wjsvm5zbkadjvlm86"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult.html"; + license = lib.licenses.free; + }; + }) {}; context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "context-coloring"; @@ -816,6 +831,21 @@ license = lib.licenses.free; }; }) {}; + devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "devdocs"; + ename = "devdocs"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/devdocs-0.1.tar"; + sha256 = "1ps2jpp1ckq9839l63p6npqrf85b8zb5akwvjvv7fkm8nvspdkil"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devdocs.html"; + license = lib.licenses.free; + }; + }) {}; dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: elpaBuild { pname = "dict-tree"; @@ -906,16 +936,16 @@ license = lib.licenses.free; }; }) {}; - dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + dismal = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dismal"; ename = "dismal"; - version = "1.5"; + version = "1.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dismal-1.5.tar"; - sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476"; + url = "https://elpa.gnu.org/packages/dismal-1.5.2.tar"; + sha256 = "0pl5cnziilm4ps1xzh1fa8irazn7vcp9nsxnxcvjqbkflpcpq5c7"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/dismal.html"; license = lib.licenses.free; @@ -985,10 +1015,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.22"; + version = "0.6.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.22.tar"; - sha256 = "0dljl21n6508c7ash7l6zgxhpn2wdfzga0va63d4k9nwnqmkvsgz"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.23.tar"; + sha256 = "0j3jvy9s606qjqcmcjzgck3dp8bhpgly2g00wnswzcgk4makdzld"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1045,10 +1075,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210512"; + version = "20210607"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210512.tar"; - sha256 = "0dj49lpqv5vsx02h8mla8cmv5cr5f2qbz74f9dn8q4adpzxsajin"; + url = "https://elpa.gnu.org/packages/eev-20210607.tar"; + sha256 = "0avd58m8630s4d3ys9g84csscdmf2y1swwwkgzjkrrq8q0j5yd3l"; }; packageRequires = [ emacs ]; meta = { @@ -1241,10 +1271,10 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.9.6"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.6.tar"; - sha256 = "0ljav8g1npg0a36x1xxpfs2gvk622fh3si95s3w2vmwa27ynirzj"; + url = "https://elpa.gnu.org/packages/excorporate-1.0.0.tar"; + sha256 = "1g0wc2kp15ra323b4rxvdh58q9c4h7m20grw6a0cs53m7l9xi62f"; }; packageRequires = [ cl-lib @@ -1742,10 +1772,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.2.tar"; - sha256 = "1mfjppv33cb5f5f6cc1486msxjxfjnnkryc1yax43k6fgzjr0j4h"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.3.tar"; + sha256 = "01yq1skc6rm9yp80vz2fhh9lbkdb9nhf57h424mrkycdky2w50mx"; }; packageRequires = [ emacs ]; meta = { @@ -1987,10 +2017,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.4.4"; + version = "4.4.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.4.4.tar"; - sha256 = "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1"; + url = "https://elpa.gnu.org/packages/leaf-4.4.8.tar"; + sha256 = "0h0ksmgrhn29ci6z8y54dbbzcqlvfs1ra0kmf226gz0dqzk45vb3"; }; packageRequires = [ emacs ]; meta = { @@ -2118,6 +2148,21 @@ license = lib.licenses.free; }; }) {}; + marginalia = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "marginalia"; + ename = "marginalia"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/marginalia-0.6.tar"; + sha256 = "05pwaz9643shxnv63l6r9m2c0qf1nc1hy6jiqw01bkvvgg8g4jag"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/marginalia.html"; + license = lib.licenses.free; + }; + }) {}; markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "markchars"; @@ -2276,10 +2321,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-1.3.2.tar"; - sha256 = "085zi3ckf4s1kjskqb04b78rgrhbdhrrp74yksb5w0hl58bd8rsc"; + url = "https://elpa.gnu.org/packages/modus-themes-1.4.0.tar"; + sha256 = "0ssckl06jk08vaq4g7sxpzvc3ybm339fzbn9qw21w82v1l60rzpm"; }; packageRequires = [ emacs ]; meta = { @@ -2784,10 +2829,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.2.tar"; - sha256 = "19a1dkjyw9m74aamyqrsvzrdwshngqpmjzdngx6v5nifvcilrlnk"; + url = "https://elpa.gnu.org/packages/posframe-1.0.3.tar"; + sha256 = "0c3lnrydsysv8j25brgc0cckf1hz54yhkginncmw81y1ia43rqmx"; }; packageRequires = [ emacs ]; meta = { @@ -2844,10 +2889,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.7.6"; + version = "3.7.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.7.6.tar"; - sha256 = "1crimmvyppjmds9shfvxy9j5zi3mk133bv5av0fgicm7ddkivksr"; + url = "https://elpa.gnu.org/packages/pyim-3.7.9.tar"; + sha256 = "00ff1izdwcy53dcwpdn18wwndnw2jsw4bhg8gkqaa60xm468xzkl"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3336,6 +3381,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; + sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "shell-command-plus"; @@ -3734,10 +3794,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.4"; + version = "2.5.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.4.tar"; - sha256 = "0yk4ckk45gkjp24nfywz49j8pazq33m6pga3lirb5h6zc8an5z24"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.5.tar"; + sha256 = "1dclxffynfacvwi2scpda35sxjb42603yyf2p0477qa9b0i4xha0"; }; packageRequires = [ emacs ]; meta = { @@ -3779,10 +3839,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.2"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.2.tar"; - sha256 = "10zqa245dn6z689z7ap6nx6q9s95whzgybpwl2slpmnawxix2q6i"; + url = "https://elpa.gnu.org/packages/transient-0.3.4.tar"; + sha256 = "1m71w52cr8f9wm6lybfa003w408lkrl6q9whs53hpp3pl5phhfvb"; }; packageRequires = [ emacs ]; meta = { @@ -3970,10 +4030,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.10.tar"; - sha256 = "07bzhxgp3k6q4wl9ijhx4vg8diinn782xhr8axn790a5vj199j78"; + url = "https://elpa.gnu.org/packages/vertico-0.11.tar"; + sha256 = "0hzwddkac85i449173az8crlksj9ivrqf969r81kbr45ksgr1ij6"; }; packageRequires = [ emacs ]; meta = { @@ -4093,10 +4153,10 @@ elpaBuild { pname = "webfeeder"; ename = "webfeeder"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/webfeeder-1.1.1.tar"; - sha256 = "09caj12hfdfhlbcsmjyhw728w1f7yq13hdslh793yvfqv83ipvc4"; + url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar"; + sha256 = "1l128q424qsq9jv2wk8cv4zli71rk34q5kgwa9axdz0d27p9l6v4"; }; packageRequires = [ emacs ]; meta = { From 69eec4f26a8109109f98d7715b9fb77f7751163c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 8 Jun 2021 00:47:01 -0300 Subject: [PATCH 309/797] elpa-generated.nix bugfix: erase redundant, outdated shell-command-plus --- .../emacs/elisp-packages/elpa-generated.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 39a14ab0330..946cef998c1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -3396,21 +3396,6 @@ license = lib.licenses.free; }; }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.1.0.tar"; - sha256 = "1jyrnv89989bi03m5h8dj0cllsw3rvyxkiyfrh9v6gpxjwfy8lmq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; From 045afcce0fb910e02f23dbbe28ef0ec728128d4c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 8 Jun 2021 00:51:23 -0300 Subject: [PATCH 310/797] melpa-packages: edit a comment --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 9e7662fe490..5e1485ea42b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -8,7 +8,7 @@ To update the list of packages from MELPA, 2. Check for evaluation errors: env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages -3. Run `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` +3. Run `git commit -m "melpa-packages $(date -Idate)" recipes-archive-melpa.json` ## Update from overlay From 988be6309a1bf9b1231a05fcb4457478bd9d6f22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 04:07:22 +0000 Subject: [PATCH 311/797] gobgp: 2.27.0 -> 2.28.0 --- pkgs/tools/networking/gobgp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 942df983fcd..96f806aad39 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; + sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; From 7e6ec758ab040ea502d4dfec0fd825f146c38dd4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 04:11:29 +0000 Subject: [PATCH 312/797] gobgpd: 2.27.0 -> 2.28.0 --- pkgs/servers/misc/gobgpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index c747e5266a0..450e454374f 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; + sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; From 91953dbf607bee5508c8de785f42e01fe7339346 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 04:33:22 +0000 Subject: [PATCH 313/797] gpg-tui: 0.3.0 -> 0.4.0 --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 756dff04c91..8b45a675b1f 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-5vhFgJZY1yaYFPS2qvrYGX3xyT0PbRKW2jmR4gz12Co="; + sha256 = "sha256-5noaBfOpUck8+FQQDohKfThN3jJ9ogvZ8iMdySlwENE="; }; - cargoSha256 = "sha256-g38L/FgqAsFh/ECZnNkJVCC/44z5VW3WK8mgIEEy7BQ="; + cargoSha256 = "sha256-OMbyoAVKnnLbFSO7gqxjBXmIjJg4K2ioE0ClYu9UyW4="; nativeBuildInputs = [ gpgme # for gpgme-config From 6749372e17dbd47985ee55f2e6effc4153bdccc9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Jun 2021 19:42:42 -0300 Subject: [PATCH 314/797] edbrowse: 3.7.7 -> 3.8.0 --- .../editors/edbrowse/0001-small-fixes.patch | 20 +++++ .../applications/editors/edbrowse/default.nix | 78 ++++++++++++++----- 2 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/editors/edbrowse/0001-small-fixes.patch diff --git a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch b/pkgs/applications/editors/edbrowse/0001-small-fixes.patch new file mode 100644 index 00000000000..433b884cc5d --- /dev/null +++ b/pkgs/applications/editors/edbrowse/0001-small-fixes.patch @@ -0,0 +1,20 @@ +diff -Naur source.old/src/makefile source/src/makefile +--- source.old/src/makefile 1969-12-31 21:00:01.000000000 -0300 ++++ source/src/makefile 2021-06-07 18:58:48.851231787 -0300 +@@ -101,14 +101,14 @@ + + # need packages nodejs and libnode-dev + js_hello_v8 : js_hello_v8.cpp +- g++ -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 ++ $(CXX) -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 + + HELLOEXTRA = stringfile.o messages.o msg-strings.o startwindow.o ebrc.o format.o http.o isup.o fetchmail.o sendmail.o plugin.o buffers.o dbstubs.o html.o decorate.o html-tidy.o css.o + js_hello_moz : js_hello_moz.o $(HELLOEXTRA) jseng-moz.o + $(CC) js_hello_moz.o $(HELLOEXTRA) jseng-moz.o $(LDFLAGS) -lmozjs-$(SMV) -lstdc++ -o $@ + + js_hello_quick : js_hello_quick.c +- gcc $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick -L/usr/local/lib/quickjs -lquickjs -lm -ldl -lpthread -latomic ++ $(CC) $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick $(QUICKJS_LDFLAGS) -lm -lpthread + + hello: js_hello_duk js_hello_v8 js_hello_moz js_hello_quick + diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 86cc81a58c2..5b37b86556b 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,41 +1,79 @@ -{ lib, stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }: +{ lib +, stdenv +, fetchFromGitHub +, curl +, duktape +, html-tidy +, openssl +, pcre +, perl +, pkg-config +, quickjs +, readline +, which +}: stdenv.mkDerivation rec { pname = "edbrowse"; - version = "3.7.7"; + version = "3.8.0"; - buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; + src = fetchFromGitHub { + owner = "CMB"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU="; + }; + + nativeBuildInputs = [ + pkg-config + which + ]; + buildInputs = [ + curl + duktape + html-tidy + openssl + pcre + perl + quickjs + readline + ]; + + patches = [ + # Fixes some small annoyances on src/makefile + ./0001-small-fixes.patch + ]; postPatch = '' - for i in ./tools/*.pl - do - substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl" + substituteInPlace src/makefile --replace\ + '-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs' + for i in $(find ./tools/ -type f ! -name '*.c'); do + patchShebangs $i done ''; makeFlags = [ "-C" "src" - "prefix=${placeholder "out"}" + "PREFIX=${placeholder "out"}" ]; - src = fetchFromGitHub { - owner = "CMB"; - repo = "edbrowse"; - rev = "v${version}"; - sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf"; - }; meta = with lib; { + homepage = "https://edbrowse.org/"; description = "Command Line Editor Browser"; longDescription = '' - Edbrowse is a combination editor, browser, and mail client that is 100% text based. - The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html. - This program was originally written for blind users, but many sighted users have taken advantage of the unique scripting capabilities of this program, which can be found nowhere else. - A batch job, or cron job, can access web pages on the internet, submit forms, and send email, with no human intervention whatsoever. - edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. - ''; + Edbrowse is a combination editor, browser, and mail client that is 100% + text based. The interface is similar to /bin/ed, though there are many + more features, such as editing multiple files simultaneously, and + rendering html. This program was originally written for blind users, but + many sighted users have taken advantage of the unique scripting + capabilities of this program, which can be found nowhere else. A batch + job, or cron job, can access web pages on the internet, submit forms, and + send email, with no human intervention whatsoever. edbrowse can also tap + into databases through odbc. It was primarily written by Karl Dahlke. + ''; license = licenses.gpl1Plus; - homepage = "https://edbrowse.org/"; maintainers = with maintainers; [ schmitthenner vrthra equirosa ]; platforms = platforms.linux; }; } +# TODO: send the patch to upstream developers From ea8ebdb04473b0e3f68e674503f962cdd255b7e2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 06:16:57 -0300 Subject: [PATCH 315/797] ocamlPackages.cairo2: 0.6.1 -> 0.6.2 --- .../ocaml-modules/cairo2/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 020006b19c5..0a9922f6788 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,18 +1,17 @@ -{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator -, pkg-config, cairo -}: +{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo }: buildDunePackage rec { pname = "cairo2"; - version = "0.6.1"; - - useDune2 = true; + version = "0.6.2"; src = fetchurl { url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; - sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i"; + sha256 = "sha256-a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4="; }; + minimalOCamlVersion = "4.02"; + useDune2 = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo dune-configurator ]; @@ -20,7 +19,7 @@ buildDunePackage rec { # https://github.com/Chris00/ocaml-cairo/issues/19 || lib.versionAtLeast ocaml.version "4.10"); - meta = { + meta = with lib; { homepage = "https://github.com/Chris00/ocaml-cairo"; description = "Binding to Cairo, a 2D Vector Graphics Library"; longDescription = '' @@ -29,7 +28,7 @@ buildDunePackage rec { the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. ''; - license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ jirkamarsik vbgl ]; + license = licenses.lgpl3; + maintainers = with maintainers; [ jirkamarsik vbgl ]; }; } From be01320a6c39867eac0a20b4dfe04680d3b1ce26 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 7 Jun 2021 16:01:52 +0200 Subject: [PATCH 316/797] nixos/wireless: only warn for no interfaces A hard failure breaks the NixOS installer, which can't possibly know the interface names in advance. --- .../modules/services/networking/wpa_supplicant.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 8a0685c3d96..c0a4ce40760 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -42,6 +42,11 @@ in { description = '' The interfaces wpa_supplicant will use. If empty, it will automatically use all wireless interfaces. + + The automatic discovery of interfaces does not work reliably on boot: + it may fail and leave the system without network. When possible, specify + a known interface name. + ''; }; @@ -225,6 +230,14 @@ in { message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); + warnings = + optional (cfg.interfaces == [] && config.systemd.services.wpa_supplicant.wantedBy != []) + '' + No network interfaces for wpa_supplicant have been configured: the service + may randomly fail to start at boot. You should specify at least one using the option + networking.wireless.interfaces. + ''; + environment.systemPackages = [ package ]; services.dbus.packages = [ package ]; From 123968867615fe1f85b97b2d18f70f4d12fb5cc4 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 8 Jun 2021 14:20:38 +0800 Subject: [PATCH 317/797] perlPackages.XSParseKeyword: init at 0.06 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7b0c8b5fe9a..330c29269db 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23939,6 +23939,21 @@ let }; }; + XSParseKeyword = buildPerlModule { + pname = "XS-Parse-Keyword"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.06.tar.gz"; + sha256 = "0nnr8akkxb2h2y3d5r51pr84vvxkq89ynmi9azkbnn79jmbcbgvq"; + }; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "XS functions to assist in parsing keyword syntax"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; version = "0.10"; From c5bff358e90389c33ce3cfb23facc5e660fe82b8 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 8 Jun 2021 08:15:23 +0200 Subject: [PATCH 318/797] buildah: 1.21.0 -> 1.21.1 Signed-off-by: Sascha Grunert --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 86aef4de9b8..e3828eb7f14 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-uNb5HCEft1vXASli+2zdKWzFzsAlI9/ILBWa7OQZBwE="; + sha256 = "sha256-Wes52lTcv3Jb6gJeUS6fmf4Nee3qEcc3SibaTFvQ8sQ="; }; outputs = [ "out" "man" ]; From b30d8c49e83aab896aa7468aa9585f50f4877c63 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 8 Jun 2021 08:48:51 +0200 Subject: [PATCH 319/797] phpPackages.composer: 2.1.1 -> 2.1.2 https://github.com/composer/composer/releases/tag/2.1.2 --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index f749ddf8cc4..b86980031fb 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.1"; + version = "2.1.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1ki106973q74inwgd4hjmml905rqg82808qq4wiysrkr7mzmfnj4"; + sha256 = "0gd4hxkxdds3nxpbcd38chrkijha31p6nygdq3f73mbb984h3v1d"; }; dontUnpack = true; From 45096ecfdc369b91c35fbcec16973533f626d1ca Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 8 Jun 2021 09:26:38 +0200 Subject: [PATCH 320/797] eid-mw: 5.0.21 -> 5.0.23 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index e07ea1a3337..2be480db93d 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.0.21"; + version = "5.0.23"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh"; + sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d"; repo = "eid-mw"; owner = "Fedict"; }; From 45a26e22a6ef794c22b434edaaa8dbdf557657a5 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 6 Jun 2021 12:39:43 -0700 Subject: [PATCH 321/797] libimagequant: Disable SSE on non-X86 architectures --- pkgs/development/libraries/libimagequant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index ad1df00c250..bc649241872 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs ./configure ''; - configureFlags = lib.optionals stdenv.isAarch64 [ "--disable-sse" ]; + configureFlags = lib.optionals (!stdenv.isi686 && !stdenv.isx86_64) [ "--disable-sse" ]; meta = with lib; { homepage = "https://pngquant.org/lib/"; From d29130cf2356858576f3b5592a8cbf8b535991a0 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 8 Jun 2021 09:51:02 +0200 Subject: [PATCH 322/797] eid-mw: use more specific license --- pkgs/tools/security/eid-mw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 2be480db93d..a2a6caf2b11 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. Also requires a running pcscd service and compatible card reader. From 9520e7721ac9e605b7d1677aaaaf7052eaa81b98 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 8 Jun 2021 10:53:00 +0300 Subject: [PATCH 323/797] =?UTF-8?q?agate:=203.0.3=20=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/gemini/agate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 5585926da58..07f1d3587b1 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0sh9OuX52kvhTt681uZesOUttrxH8ZMxn6mTILQDQuU="; + sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA="; }; - cargoSha256 = "sha256-JBmSa2sc/eor0bCcIMhGGLmcJN+wCloP0Ao9DBybQbc="; + cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 67f1128a6a663bec3d35ce3a5af92454cf3f9c8b Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 8 Jun 2021 10:24:42 +0200 Subject: [PATCH 324/797] cypress: 7.4.0 -> 7.5.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 9b84f9897fa..287709bbbad 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.4.0"; + version = "7.5.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1xhjmn6cwpdph12k4gbl2f1v72bp689779l5i16i90i01m31kwjp"; + sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj"; }; passthru.updateScript = ./update.sh; From f622e5fdfc168a94a3c9e4f170f3a2298c2e7145 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 09:09:38 +0000 Subject: [PATCH 325/797] chamber: 2.10.0 -> 2.10.1 --- pkgs/tools/admin/chamber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 8396540cd27..4a26603a134 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "4G/QGoztpcLIspHxD5G+obG5h05SZek4keOJ5qS3/zg="; + sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y="; }; CGO_ENABLED = 0; - vendorSha256 = "XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; + vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; From 81ea9c837b41a0cdccd52200a31de56c8fa2ad6d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 18:54:37 +0200 Subject: [PATCH 326/797] all-cabal-hashes: 2021-06-02T14:32:36Z -> 2021-06-06T15:18:11Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 7c4e3b9a869..0ba838bda4a 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "9be76e8f01853e5a2f0600107c9b50d12a17581b", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9be76e8f01853e5a2f0600107c9b50d12a17581b.tar.gz", - "sha256": "0sy8lx04yb9lk9liscqr44z7lzzq67w3zmkq78a0yv37jadb557k", - "msg": "Update from Hackage at 2021-06-02T14:32:36Z" + "commit": "d1a32be92531e75b1acae3126313cdc013951965", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d1a32be92531e75b1acae3126313cdc013951965.tar.gz", + "sha256": "190m9drzg7rgkjpimlgvl8hsv2g1jg0m0fdgy8xkrh7xr1vjxxgz", + "msg": "Update from Hackage at 2021-06-06T15:18:11Z" } From d7b18cba1ac7982c88e0f2d2641f18c8417e28c9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 20:15:00 +0200 Subject: [PATCH 327/797] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1715 ++++++++++++++--- 1 file changed, 1430 insertions(+), 285 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 459821f253f..d7aa37d59c8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1551,8 +1551,8 @@ self: { }: mkDerivation { pname = "BiobaseBlast"; - version = "0.3.1.0"; - sha256 = "153bxf221jga58ibxgd660465klbqj49qr3rk6ni77v7sb4qgrg0"; + version = "0.3.3.0"; + sha256 = "11xxm3s6pyy68as6pd3iwfq2dmbgvj2w238jg969fza8vj22xcdb"; libraryHaskellDepends = [ aeson attoparsec base binary BiobaseENA BiobaseTypes BiobaseXNA bytestring cereal containers deepseq directory file-embed lens @@ -1587,8 +1587,8 @@ self: { }: mkDerivation { pname = "BiobaseENA"; - version = "0.0.0.1"; - sha256 = "0wkfaxrv4s34amjjl02q0si5nvs18f74z9dxp5r024fd42g3fdka"; + version = "0.0.0.2"; + sha256 = "0v999rs3bj4mkbrxsgz0nnqh1pzf7pgxm94519hqjfph5r6yw7nd"; libraryHaskellDepends = [ base BiobaseTypes bytestring containers directory file-embed lens megaparsec mtl text vector vector-th-unbox @@ -1639,18 +1639,24 @@ self: { "BiobaseFasta" = callPackage ({ mkDerivation, base, BiobaseTypes, bytestring, DPutils, filepath - , lens, QuickCheck, resourcet, streaming, streaming-bytestring - , string-conversions, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, tasty-silver, tasty-th, text + , lens, optparse-applicative, QuickCheck, resourcet, streaming + , streaming-bytestring, string-conversions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-silver, tasty-th, text }: mkDerivation { pname = "BiobaseFasta"; - version = "0.3.0.1"; - sha256 = "11vwvqln5jv4k97miyjgqs3yckm8fhyclclhfxq473i4g22amjyh"; + version = "0.4.0.1"; + sha256 = "1l5185nsq59jgnpx1r0j5r07a5fqz8f5q2xyxvhwbqan51w51ph6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base BiobaseTypes bytestring DPutils lens resourcet streaming streaming-bytestring string-conversions ]; + executableHaskellDepends = [ + base BiobaseTypes bytestring DPutils lens optparse-applicative + resourcet streaming streaming-bytestring string-conversions + ]; testHaskellDepends = [ base BiobaseTypes bytestring DPutils filepath lens QuickCheck resourcet streaming streaming-bytestring string-conversions tasty @@ -1822,30 +1828,31 @@ self: { "BiobaseTypes" = callPackage ({ mkDerivation, aeson, attoparsec, base, bimaps, binary , bytestring, cereal, cereal-text, cereal-vector, containers - , data-default, deepseq, ForestStructures, hashable, intern, lens - , mtl, primitive, PrimitiveArray, QuickCheck, SciBaseTypes - , streaming, string-conversions, tasty, tasty-quickcheck, tasty-th - , text, text-binary, utf8-string, vector, vector-binary-instances - , vector-th-unbox + , data-default, deepseq, DPutils, ForestStructures, hashable + , intern, lens, mtl, primitive, PrimitiveArray, QuickCheck + , SciBaseTypes, streaming, string-conversions, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, text-binary, utf8-string + , vector, vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.2.0.1"; - sha256 = "1ygyq169dcz1bswppljkskvqamvvs61n8fwyyplyf4348i1v938i"; + version = "0.2.1.0"; + sha256 = "0gm5nlh8xbww614386vhm2lz118w9c6lcj3pbx5k256mzm7j5yba"; libraryHaskellDepends = [ aeson attoparsec base bimaps binary bytestring cereal cereal-text - cereal-vector containers data-default deepseq ForestStructures - hashable intern lens mtl primitive PrimitiveArray QuickCheck - SciBaseTypes streaming string-conversions text text-binary - utf8-string vector vector-binary-instances vector-th-unbox + cereal-vector containers data-default deepseq DPutils + ForestStructures hashable intern lens mtl primitive PrimitiveArray + QuickCheck SciBaseTypes streaming string-conversions text + text-binary utf8-string vector vector-binary-instances + vector-th-unbox ]; testHaskellDepends = [ aeson attoparsec base bimaps binary bytestring cereal cereal-text - cereal-vector containers data-default deepseq ForestStructures - hashable intern lens mtl primitive PrimitiveArray QuickCheck - SciBaseTypes streaming string-conversions tasty tasty-quickcheck - tasty-th text text-binary utf8-string vector - vector-binary-instances vector-th-unbox + cereal-vector containers data-default deepseq DPutils + ForestStructures hashable intern lens mtl primitive PrimitiveArray + QuickCheck SciBaseTypes streaming string-conversions tasty + tasty-hunit tasty-quickcheck tasty-th text text-binary utf8-string + vector vector-binary-instances vector-th-unbox ]; description = "Collection of types for bioinformatics"; license = lib.licenses.bsd3; @@ -1872,36 +1879,36 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bimaps, binary , BiobaseENA, BiobaseTypes, bytes, bytestring, cereal , cereal-vector, cmdargs, containers, csv, data-default, deepseq - , file-embed, ForestStructures, hashable, lens, mtl, primitive - , PrimitiveArray, QuickCheck, split, tasty, tasty-quickcheck - , tasty-th, text, tuple, vector, vector-binary-instances - , vector-th-unbox + , DPutils, file-embed, ForestStructures, hashable, lens, mtl + , primitive, PrimitiveArray, QuickCheck, split, tasty + , tasty-quickcheck, tasty-th, text, tuple, vector + , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.11.0.0"; - sha256 = "1yrq14mv5bbw6drlpk2cf6incdg2wqw3i0zgdd0vpfmxbwr3wjl4"; + version = "0.11.1.1"; + sha256 = "0ws9x3z5ljgm7hnz290yhzm3ijksd6dr4m0drj1lxhchdfmwfy1m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes bytestring cereal cereal-vector containers csv data-default deepseq - file-embed ForestStructures hashable lens mtl primitive + DPutils file-embed ForestStructures hashable lens mtl primitive PrimitiveArray QuickCheck split text tuple vector vector-binary-instances vector-th-unbox ]; executableHaskellDepends = [ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes bytestring cereal cereal-vector cmdargs containers csv data-default - deepseq file-embed ForestStructures hashable lens mtl primitive - PrimitiveArray QuickCheck split text tuple vector + deepseq DPutils file-embed ForestStructures hashable lens mtl + primitive PrimitiveArray QuickCheck split text tuple vector vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes bytestring cereal cereal-vector containers csv data-default deepseq - file-embed ForestStructures hashable lens mtl primitive + DPutils file-embed ForestStructures hashable lens mtl primitive PrimitiveArray QuickCheck split tasty tasty-quickcheck tasty-th text tuple vector vector-binary-instances vector-th-unbox ]; @@ -1977,8 +1984,8 @@ self: { }: mkDerivation { pname = "BlastHTTP"; - version = "1.4.1"; - sha256 = "1h7bj9a6qfzwlclr39dvbcz4r8l8s7n53z6ir8wff5ssq2wvq4qd"; + version = "1.4.2"; + sha256 = "1ndg24w4qcs7f6ak8qcgfp04mippz2vxpcxwpnsaghyxvpbxqbw6"; libraryHaskellDepends = [ base BiobaseBlast BiobaseFasta bytestring conduit either-unwrap HTTP http-conduit hxt mtl network transformers zip-archive @@ -3327,6 +3334,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "Color_0_3_2" = callPackage + ({ mkDerivation, base, colour, criterion, data-default-class + , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test + , QuickCheck, random, vector + }: + mkDerivation { + pname = "Color"; + version = "0.3.2"; + sha256 = "1v5x32jas70sfqy90brjqlfsy816ar9mcbr3i1lviqivzq7agshk"; + libraryHaskellDepends = [ base data-default-class deepseq vector ]; + testHaskellDepends = [ + base colour doctest hspec HUnit JuicyPixels massiv massiv-test + QuickCheck random vector + ]; + benchmarkHaskellDepends = [ base colour criterion deepseq random ]; + description = "Color spaces and conversions between them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Combinatorrent" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, cereal , containers, deepseq, directory, filepath, hopenssl, hslogger @@ -4066,28 +4093,25 @@ self: { }: mkDerivation { pname = "DPutils"; - version = "0.1.0.0"; - sha256 = "153g1rr13jjwqkvfj85nwjhaa0zq8khn24n3dib80nyk0scd4w62"; + version = "0.1.1.0"; + sha256 = "1kvj6zkj8r7qp1zvqz68fflxcal3w4qi1y8a70bm6qq5d83ivnd4"; libraryHaskellDepends = [ - attoparsec base bytestring containers criterion kan-extensions lens - mtl parallel pipes pipes-bytestring pipes-parse primitive - QuickCheck smallcheck streaming streaming-bytestring stringsearch - tasty tasty-quickcheck tasty-smallcheck tasty-th transformers + attoparsec base bytestring containers kan-extensions lens mtl + parallel pipes pipes-bytestring pipes-parse primitive QuickCheck + smallcheck streaming streaming-bytestring stringsearch transformers vector ]; testHaskellDepends = [ - attoparsec base bytestring containers criterion kan-extensions lens - mtl parallel pipes pipes-bytestring pipes-parse primitive - QuickCheck smallcheck streaming streaming-bytestring stringsearch - tasty tasty-quickcheck tasty-smallcheck tasty-th transformers - vector + attoparsec base bytestring containers kan-extensions lens mtl + parallel pipes pipes-bytestring pipes-parse primitive QuickCheck + smallcheck streaming streaming-bytestring stringsearch tasty + tasty-quickcheck tasty-smallcheck tasty-th transformers vector ]; benchmarkHaskellDepends = [ attoparsec base bytestring containers criterion kan-extensions lens mtl parallel pipes pipes-bytestring pipes-parse primitive QuickCheck smallcheck streaming streaming-bytestring stringsearch - tasty tasty-quickcheck tasty-smallcheck tasty-th timeit - transformers vector + timeit transformers vector ]; description = "utilities for DP"; license = lib.licenses.bsd3; @@ -11661,6 +11685,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_5_1" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover + , JuicyPixels + }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.5.1"; + sha256 = "1kgb2l6ymhjr7wq93jpdhxy3k4i7jz0rz256phz10ycdpyvdbjpq"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -14103,8 +14145,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "1.2.0"; - sha256 = "1fwbzdj7cn96fbq4vsp4582p317qw3piy237vxf79d0wmdp006zn"; + version = "2.1.0"; + sha256 = "0ila2yrdva18y20wm533hkqmmb2mrh1j212jp2ck6p6yiwam687j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring extra mwc-random ]; @@ -15960,8 +16002,8 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.10.1.0"; - sha256 = "1qjld82q0fdaav6y9ky0bkmqjxvv48502zd3s9i1b72wn436zhib"; + version = "0.10.1.1"; + sha256 = "114d41g28i8iah5gpb1377rzfmbcsfay9gr9dhhyyj4dqrpdn1df"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq DPutils hashable hashtables lens log-domain mtl OrderedBits @@ -17826,28 +17868,26 @@ self: { }) {}; "SciBaseTypes" = callPackage - ({ mkDerivation, aeson, base, binary, cereal, deepseq, hashable - , lens, log-domain, mtl, QuickCheck, semirings, tasty + ({ mkDerivation, aeson, base, binary, cereal, deepseq, DPutils + , hashable, lens, log-domain, mtl, QuickCheck, semirings, tasty , tasty-quickcheck, tasty-th, vector, vector-th-unbox }: mkDerivation { pname = "SciBaseTypes"; - version = "0.1.0.0"; - sha256 = "1c0cgzxhamgswn1zhrarbx5vrmzl160nk8dadzi6mphwd2rv6lfr"; - revision = "1"; - editedCabalFile = "025v2s4097mzqyf5bzzz2xnxcc4nckcvaz72pnrxs3d8bbszd26i"; + version = "0.1.1.0"; + sha256 = "12k2arn3qbgfa8bc344vv02smqj3yd6rqhnpfib3yi43nkbaazqa"; libraryHaskellDepends = [ - aeson base binary cereal deepseq hashable lens log-domain mtl - semirings vector vector-th-unbox + aeson base binary cereal deepseq DPutils hashable lens log-domain + mtl semirings vector vector-th-unbox ]; testHaskellDepends = [ - aeson base binary cereal deepseq hashable lens log-domain mtl - QuickCheck semirings tasty tasty-quickcheck tasty-th vector + aeson base binary cereal deepseq DPutils hashable lens log-domain + mtl QuickCheck semirings tasty tasty-quickcheck tasty-th vector vector-th-unbox ]; benchmarkHaskellDepends = [ - aeson base binary cereal deepseq hashable lens log-domain mtl - semirings vector vector-th-unbox + aeson base binary cereal deepseq DPutils hashable lens log-domain + mtl semirings vector vector-th-unbox ]; description = "Base types and classes for statistics, sciences and humanities"; license = lib.licenses.bsd3; @@ -18224,16 +18264,16 @@ self: { }) {}; "Shpadoinkle" = callPackage - ({ mkDerivation, base, category, containers, ghcjs-dom, jsaddle - , jsaddle-warp, text, transformers, unliftio, wai, wai-app-static - , warp + ({ mkDerivation, base, containers, deepseq, ghcjs-dom, jsaddle + , jsaddle-warp, mtl, text, transformers, unliftio, wai + , wai-app-static, warp }: mkDerivation { pname = "Shpadoinkle"; - version = "0.3.0.0"; - sha256 = "083ly6xpdcf7wgrb3shcw26zk0d8rm8issyvki1rwvd29rwj0k41"; + version = "0.3.2.0"; + sha256 = "1an13ybgayp532vx040bhjccg3kb429zrcrhc38bkvbs6475y3bz"; libraryHaskellDepends = [ - base category containers ghcjs-dom jsaddle jsaddle-warp text + base containers deepseq ghcjs-dom jsaddle jsaddle-warp mtl text transformers unliftio wai wai-app-static warp ]; description = "A programming model for declarative, high performance user interface"; @@ -18242,17 +18282,17 @@ self: { "Shpadoinkle-backend-pardiff" = callPackage ({ mkDerivation, base, compactable, containers, exceptions - , file-embed, ghcjs-dom, jsaddle, lens, monad-control, mtl, random - , semialign, Shpadoinkle, text, these, transformers-base, unliftio + , file-embed, ghcjs-dom, jsaddle, monad-control, mtl, random + , Shpadoinkle, text, transformers-base, unliftio }: mkDerivation { pname = "Shpadoinkle-backend-pardiff"; - version = "0.3.0.0"; - sha256 = "1m12m4qbivh0srdzwzcqr8s6s1hi1blk3x15ljv5c9viriznfy6z"; + version = "0.3.0.1"; + sha256 = "1ghj2464pq36paf3z56hc7q0p2nkfgwqjvfa3yymwfr2xdachqwd"; libraryHaskellDepends = [ base compactable containers exceptions file-embed ghcjs-dom jsaddle - lens monad-control mtl random semialign Shpadoinkle text these - transformers-base unliftio + monad-control mtl random Shpadoinkle text transformers-base + unliftio ]; description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; license = lib.licenses.bsd3; @@ -18260,17 +18300,17 @@ self: { }) {}; "Shpadoinkle-backend-snabbdom" = callPackage - ({ mkDerivation, base, exceptions, file-embed, ghcjs-dom, jsaddle - , monad-control, mtl, Shpadoinkle, text, transformers-base - , unliftio + ({ mkDerivation, base, containers, exceptions, file-embed + , ghcjs-dom, jsaddle, monad-control, mtl, Shpadoinkle, text + , transformers-base, unliftio }: mkDerivation { pname = "Shpadoinkle-backend-snabbdom"; - version = "0.3.0.1"; - sha256 = "0452znn1q558n1dy52j493y7f9lml57cnqbmdmqv28zq12sxpypm"; + version = "0.3.0.2"; + sha256 = "1hqbfsjlvrkfjf16r5f1jr7fxbki559mbxksqviba80b94wn34ld"; libraryHaskellDepends = [ - base exceptions file-embed ghcjs-dom jsaddle monad-control mtl - Shpadoinkle text transformers-base unliftio + base containers exceptions file-embed ghcjs-dom jsaddle + monad-control mtl Shpadoinkle text transformers-base unliftio ]; description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; license = lib.licenses.bsd3; @@ -18282,8 +18322,8 @@ self: { ({ mkDerivation, base, compactable, Shpadoinkle, text }: mkDerivation { pname = "Shpadoinkle-backend-static"; - version = "0.2.0.0"; - sha256 = "0kxfsm4g6mwwcrpq8bm83v32jpp97bsvl6ay0ynnmss0yf70ymmi"; + version = "0.2.0.1"; + sha256 = "1lcly4kb6im7m1y25209s7wxdvisc0nyfa33a3fjf078ambqpai1"; libraryHaskellDepends = [ base compactable Shpadoinkle text ]; description = "A backend for rendering Shpadoinkle as Text"; license = lib.licenses.bsd3; @@ -18294,8 +18334,8 @@ self: { ({ mkDerivation, aeson, base, jsaddle, lens, text, unliftio }: mkDerivation { pname = "Shpadoinkle-console"; - version = "0.0.1.3"; - sha256 = "0zkiv0h37a3x3569xfvfzdy0dywxhcfx12jddqf9bpfyqsxmf42a"; + version = "0.0.1.4"; + sha256 = "1agvyr8785y9dmhdcm36mhvg3lq2ksqly38asb7pb8xynhlvllbk"; libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; description = "Support for the native browser console"; license = lib.licenses.bsd3; @@ -18319,8 +18359,8 @@ self: { }: mkDerivation { pname = "Shpadoinkle-developer-tools"; - version = "0.0.0.1"; - sha256 = "14lcmxkaxsa42dcyn13cb83lfw48n7139gvppsngzrbn1w9lwrl0"; + version = "0.0.0.2"; + sha256 = "1lcz9xlqxzzv8gq31jcd1lw5l8dw14ixkcg14kq73p0418lwm06z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18343,8 +18383,8 @@ self: { }: mkDerivation { pname = "Shpadoinkle-disembodied"; - version = "0.0.0.1"; - sha256 = "0hiwiv4l1k1al0d9fjk48fay6c33shf213yc9blwm15mfj5kh77c"; + version = "0.0.0.2"; + sha256 = "1r96j6lx5k28m0wc4x0pdf81zzml6ppdaw5ywdlv85yxcmv1wxsd"; libraryHaskellDepends = [ base directory filepath servant Shpadoinkle Shpadoinkle-backend-static Shpadoinkle-html Shpadoinkle-router text @@ -18389,29 +18429,53 @@ self: { "Shpadoinkle-html" = callPackage ({ mkDerivation, base, bytestring, compactable, containers - , ghcjs-dom, jsaddle, lens, raw-strings-qq, regex-pcre, Shpadoinkle - , stm, template-haskell, text, time, transformers, unliftio + , directory, ghcjs-dom, jsaddle, lens, process, raw-strings-qq + , regex-pcre, Shpadoinkle, stm, template-haskell, text, time + , transformers, unliftio }: mkDerivation { pname = "Shpadoinkle-html"; - version = "0.3.0.0"; - sha256 = "17n675m9gqfhi2rd8c60bcbljd4nknfrwb02zlw9jwgj1kv7l06k"; + version = "0.3.0.2"; + sha256 = "1wi1b4vnag530iz8xzqih1phwgpr96yv3brizmn6yj9j8d0bf5qz"; libraryHaskellDepends = [ - base bytestring compactable containers ghcjs-dom jsaddle lens - raw-strings-qq regex-pcre Shpadoinkle stm template-haskell text - time transformers unliftio + base bytestring compactable containers directory ghcjs-dom jsaddle + lens process raw-strings-qq regex-pcre Shpadoinkle stm + template-haskell text time transformers unliftio ]; description = "A typed, template generated Html DSL, and helpers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; + "Shpadoinkle-isreal" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, process, random, servant, servant-server + , text, time, warp + }: + mkDerivation { + pname = "Shpadoinkle-isreal"; + version = "0.0.0.2"; + sha256 = "1mvc5q5rvsgvgind9pv7389908ikb80qa704vwrzqb2wg2ir5g78"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq random servant + servant-server text time + ]; + executableHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath process + random servant servant-server text time warp + ]; + description = "Isreal Swan will make a snowman for you!"; + license = lib.licenses.gpl3Plus; + }) {}; + "Shpadoinkle-lens" = callPackage ({ mkDerivation, base, lens, Shpadoinkle, text }: mkDerivation { pname = "Shpadoinkle-lens"; - version = "0.0.0.3"; - sha256 = "1310ipmw2z8gdnvaqx1bydvc4p1iyhc7xv31vwbx2aszhmi873kq"; + version = "0.0.0.4"; + sha256 = "16lkkyjlxczdcdb8wwj4jvkhi9wsr9d9h5ih6kjdxd9r2qn4zi84"; libraryHaskellDepends = [ base lens Shpadoinkle text ]; description = "Lens combinators for Shpadoinkle applications"; license = lib.licenses.bsd3; @@ -18427,8 +18491,8 @@ self: { }: mkDerivation { pname = "Shpadoinkle-router"; - version = "0.3.0.0"; - sha256 = "1wdr71khi7nmyz4ksf7hy6ya470687wmv4x7bvv7qq2z2dsy5ns2"; + version = "0.3.0.1"; + sha256 = "0xy09nklsjypaw2dmzl4dzdkrhdlzip2jw41mj1vm7xdvas7i7f1"; libraryHaskellDepends = [ aeson base bytestring compactable exceptions ghcjs-dom http-api-data http-media http-types jsaddle jsaddle-warp lens @@ -18445,8 +18509,8 @@ self: { ({ mkDerivation, base, lens, Shpadoinkle, streaming, text }: mkDerivation { pname = "Shpadoinkle-streaming"; - version = "0.0.0.1"; - sha256 = "1bvrkyj9l8asczfamw26x1hwj8bcxr7812zjm1m91jg4xzipayv2"; + version = "0.0.0.2"; + sha256 = "1i86299ss25xd1swxd4rz9k5mvxqzhnafiylaawan2fbp2xwqkq2"; libraryHaskellDepends = [ base lens Shpadoinkle streaming text ]; description = "Integration of the streaming library with Shpadoinkle continuations"; license = lib.licenses.bsd3; @@ -18455,20 +18519,21 @@ self: { }) {}; "Shpadoinkle-template" = callPackage - ({ mkDerivation, base, file-embed, html-parse, Shpadoinkle - , Shpadoinkle-backend-static, template-haskell, text + ({ mkDerivation, base, directory, file-embed, html-entities + , html-parse, process, Shpadoinkle, Shpadoinkle-backend-static + , template-haskell, text }: mkDerivation { pname = "Shpadoinkle-template"; - version = "0.0.0.1"; - sha256 = "1iyxb0hnyfcb4fipwrvzr03g3rai5lc5k7sysrd691l0dsh2jill"; + version = "0.0.0.2"; + sha256 = "1alhlc4w9xcyzan0sbsanip3q0yw9pjg094linwwavb211wbcdkj"; libraryHaskellDepends = [ - base html-parse Shpadoinkle Shpadoinkle-backend-static - template-haskell text + base directory html-entities html-parse process Shpadoinkle + Shpadoinkle-backend-static template-haskell text ]; testHaskellDepends = [ - base file-embed html-parse Shpadoinkle Shpadoinkle-backend-static - template-haskell text + base directory file-embed html-entities html-parse process + Shpadoinkle Shpadoinkle-backend-static template-haskell text ]; description = "Read standard file formats into Shpadoinkle with Template Haskell"; license = lib.licenses.bsd3; @@ -18476,19 +18541,20 @@ self: { }) {}; "Shpadoinkle-widgets" = callPackage - ({ mkDerivation, aeson, base, compactable, containers - , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck - , quickcheck-classes, quickcheck-classes-base, Shpadoinkle - , Shpadoinkle-html, stm, template-haskell, text, unliftio + ({ mkDerivation, aeson, attoparsec, base, bytestring, compactable + , containers, edit-distance, either, email-validate, hspec, jsaddle + , mtl, QuickCheck, quickcheck-classes, quickcheck-classes-base + , servant, Shpadoinkle, Shpadoinkle-html, stm, template-haskell + , text, transformers, unliftio }: mkDerivation { pname = "Shpadoinkle-widgets"; - version = "0.2.0.0"; - sha256 = "0q82m3gffcw89xyl0h9ayp2v4k9l1zwpnlpq7kvirl1ahhp2iypy"; + version = "0.2.0.1"; + sha256 = "11ncdip5f01d8ng1rgpprl0adrgca19mww86hybckg8v9lxvyfgc"; libraryHaskellDepends = [ - aeson base compactable containers edit-distance email-validate - jsaddle mtl Shpadoinkle Shpadoinkle-html stm template-haskell text - unliftio + aeson attoparsec base bytestring compactable containers + edit-distance either email-validate jsaddle mtl servant Shpadoinkle + Shpadoinkle-html stm template-haskell text transformers unliftio ]; testHaskellDepends = [ base containers hspec QuickCheck quickcheck-classes @@ -20665,8 +20731,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.5"; - sha256 = "1gar1xb7hbc452ck8351wikvryradna9bpphzd9kqwk0kx76nl3n"; + version = "0.5.1"; + sha256 = "13savwlcdpvskir5v8yb019cxszrsjrkyisws0w8ddc94a3c9x2c"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21818,17 +21884,17 @@ self: { "Z-Botan" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, ghc-prim, hspec - , hspec-discover, HUnit, integer-gmp, QuickCheck + , hspec-discover, HUnit, integer-gmp, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, Z-Data, Z-IO }: mkDerivation { pname = "Z-Botan"; - version = "0.3.1.0"; - sha256 = "0920pzs9q105h32d7yp83bblhq0id5vzzw3d2pysg4dd127933xc"; + version = "0.4.0.0"; + sha256 = "0jlw9wk8yhgsqjn3grzkq2a1p90dil1ayx30cvg85c2y96j5x8jn"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - base ghc-prim integer-gmp scientific stm time Z-Data Z-IO + base ghc-prim integer-gmp primitive scientific stm time Z-Data Z-IO ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ @@ -21847,8 +21913,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.3.0"; - sha256 = "1y8vgz3jps2vsg5ay9s792knfyk5cvc6549q5li51jaqibsrw99m"; + version = "0.8.5.0"; + sha256 = "1ib9lhhjymr4020yqrc318xqp7swr17iiczpb18d061ngcw8xi90"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -32676,8 +32742,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.1.2.0"; - sha256 = "1vginzc90xl8fs1pr9qvw7fjj207vjb1k3rxa341hq7q5pri2y3d"; + version = "0.1.3.0"; + sha256 = "1pw0vqx1y3zgq303gdgd3vkz95mqrv8hl0pfkw6kyc49hj7l864y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -42191,6 +42257,41 @@ self: { license = lib.licenses.gpl3Only; }) {inherit (pkgs) snappy;}; + "biscuit-haskell" = callPackage + ({ mkDerivation, async, attoparsec, base, base16-bytestring, base64 + , bytestring, cereal, containers, libsodium, mtl + , parser-combinators, primitive, protobuf, random, regex-tdfa + , tasty, tasty-hunit, template-haskell, text, th-lift-instances + , time, validation-selective + }: + mkDerivation { + pname = "biscuit-haskell"; + version = "0.1.0.0"; + sha256 = "0h37sl493ribsvqw98xy4g9vii3xc3ap6vvjffn7xg29b62s0lrx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base base16-bytestring base64 bytestring cereal + containers libsodium mtl parser-combinators primitive protobuf + random regex-tdfa template-haskell text th-lift-instances time + validation-selective + ]; + executableHaskellDepends = [ + async attoparsec base base16-bytestring base64 bytestring cereal + containers libsodium mtl parser-combinators primitive protobuf + random template-haskell text th-lift-instances time + validation-selective + ]; + testHaskellDepends = [ + async attoparsec base base16-bytestring base64 bytestring cereal + containers libsodium mtl parser-combinators primitive protobuf + random tasty tasty-hunit template-haskell text th-lift-instances + time validation-selective + ]; + description = "Library support for the Biscuit security token"; + license = lib.licenses.bsd3; + }) {}; + "bisect-binary" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hashable , haskeline, integer-logarithms, optparse-applicative, process @@ -44117,8 +44218,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.3.1.0"; - sha256 = "035lrn1j6hrvl5vs5k0q1hb3zwbqh5bvxmfxvjvv9lncv8iy2nd9"; + version = "0.3.2.0"; + sha256 = "1rg9gsrkwnpabrpgl0xh0z9wa1gkqi5vgxpfg7lfz6jcb72qsas6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47097,8 +47198,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "1.1.0.1"; - sha256 = "1vj17x2czfks5bdns8181iw7rbfghk9pgx5f75xwzn9p6xycg9hy"; + version = "1.1.1"; + sha256 = "0yy9hd8yhpi175fgnp8cd4h0bifx2zvy82jmbkd28kpbgw6b49vi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52254,6 +52355,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "cdar-mBound_0_1_0_4" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, integer-gmp + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "cdar-mBound"; + version = "0.1.0.4"; + sha256 = "1p7ri7vfvj3ym0038aq12szs6jgdkq8a4730i67appv9lmxgycfn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers deepseq integer-gmp ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Exact real arithmetic using Centred Dyadic Approximations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cdeps" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion , directory, filepath, hspec, optparse-applicative, text @@ -54905,7 +55028,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "citeproc_0_4" = callPackage + "citeproc_0_4_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -54914,8 +55037,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.4"; - sha256 = "0ca6xyv0pa0w10pzn7zmpvg6583xjs8ffj16ykkrw9gjd4nlginh"; + version = "0.4.0.1"; + sha256 = "13hgbcbr7jbyfbxp8fsc43c2wq4fhlbxzqwh1plfkdi5n9bif1lv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59258,6 +59381,8 @@ self: { pname = "compact"; version = "0.2.0.0"; sha256 = "0xv24vd2h76928355rr8gzdbkyn2j17yf6wjyghnzw7qyhsbb9h3"; + revision = "1"; + editedCabalFile = "1013dkawaw3c6hvlfn9x584pq8z65fvbnp79dl6ll6r0a75rivvm"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -62772,6 +62897,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "containers-good-graph" = callPackage + ({ mkDerivation, array, base, containers, deepseq }: + mkDerivation { + pname = "containers-good-graph"; + version = "0.6.4.1"; + sha256 = "1bv4v8q9gi1fa46c3pqj0kyl28kbyn55i038d0fxqbi225pdhhan"; + libraryHaskellDepends = [ array base containers deepseq ]; + testHaskellDepends = [ array base containers deepseq ]; + description = "Data.Graph, but it doesn't suck!"; + license = lib.licenses.bsd3; + }) {}; + "containers-unicode-symbols" = callPackage ({ mkDerivation, base, base-unicode-symbols, containers }: mkDerivation { @@ -73590,6 +73727,62 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "dhall_1_39_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mmorph, mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.39.0"; + sha256 = "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge text + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text @@ -73614,6 +73807,29 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "dhall-bash_1_0_37" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.37"; + sha256 = "0gm6zamh8kgrc2d00cjf2ijb49ic3z6rlk0ngmig8hckmsy63w1d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text + ]; + description = "Compile Dhall to Bash"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "dhall-check" = callPackage ({ mkDerivation, base, containers, dhall, directory, filepath , fsnotify, text, trifecta @@ -73635,17 +73851,15 @@ self: { "dhall-docs" = callPackage ({ mkDerivation, base, bytestring, containers, cryptonite, dhall - , directory, doctest, file-embed, filepath, foldl, lens-family-core - , lucid, megaparsec, memory, mmark, mtl, optparse-applicative, path - , path-io, pretty, prettyprinter, tasty, tasty-hunit, tasty-silver - , text, transformers, turtle + , directory, doctest, file-embed, filepath, foldl, hashable + , lens-family-core, lucid, megaparsec, memory, mmark, mtl + , optparse-applicative, path, path-io, pretty, prettyprinter, tasty + , tasty-hunit, tasty-silver, text, transformers, turtle }: mkDerivation { pname = "dhall-docs"; - version = "1.0.5"; - sha256 = "00s1vhwilnr6hvv56w98kc1md08lw6v80v8a7yhwrmg9qggwdc12"; - revision = "1"; - editedCabalFile = "0y8a02jxz5cap0q4b2106ck4av7haxqlv5vjhm0nmrsq10cl4nss"; + version = "1.0.6"; + sha256 = "004n8kh8riw67aqwp6z9199jwv2c9r1dbkg92s71vd9zc04wxljv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73657,7 +73871,8 @@ self: { executableHaskellDepends = [ base dhall ]; testHaskellDepends = [ base bytestring containers dhall directory doctest filepath foldl - path path-io pretty tasty tasty-hunit tasty-silver text turtle + hashable path path-io pretty tasty tasty-hunit tasty-silver text + turtle ]; description = "Generate HTML docs from a dhall package"; license = lib.licenses.bsd3; @@ -73729,6 +73944,37 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "dhall-json_1_7_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal + , base, bytestring, containers, dhall, exceptions, filepath + , lens-family-core, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit + , tasty-silver, text, unordered-containers, vector + }: + mkDerivation { + pname = "dhall-json"; + version = "1.7.7"; + sha256 = "163600cr04a5c9gjqg0846wwjp4wl61yhfg80zvsadkaq5zfzlll"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty aeson-yaml base bytestring containers dhall + exceptions filepath lens-family-core optparse-applicative + prettyprinter scientific text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring dhall exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + aeson base bytestring dhall tasty tasty-hunit tasty-silver text + ]; + description = "Convert between Dhall and JSON or YAML"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -73780,16 +74026,45 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "dhall-lsp-server_1_0_15" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, dhall, dhall-json, directory, doctest, filepath + , haskell-lsp, haskell-lsp-types, hslogger, hspec, lens, lsp-test + , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter + , QuickCheck, rope-utf16-splay, tasty, tasty-hspec, text + , transformers, unordered-containers, uri-encode + }: + mkDerivation { + pname = "dhall-lsp-server"; + version = "1.0.15"; + sha256 = "0bq6k92g22vdym9zyj95gx052yyzvgr1jv7yszlcj8p5angbxdqy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default dhall + dhall-json directory filepath haskell-lsp hslogger lens megaparsec + mtl network-uri prettyprinter rope-utf16-splay text transformers + unordered-containers uri-encode + ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ + base directory doctest filepath haskell-lsp-types hspec lsp-test + QuickCheck tasty tasty-hspec text + ]; + description = "Language Server Protocol (LSP) server for Dhall"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.20"; - sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; - revision = "2"; - editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx"; + version = "1.1.21"; + sha256 = "0yqqjq8yqswcaiqrrgx37rlwvxgciwhvird34hsaq4fr3kbjgv4h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73812,10 +74087,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.4"; - sha256 = "0yr7z17dvmr1zipk29fmzm46myxxsz514587n6a7h00c56dyvnc3"; - revision = "1"; - editedCabalFile = "1y08jxg51sbxx0i7ra45ii2v81plzf4hssmwlrw35l8n5gib1vcg"; + version = "1.0.5"; + sha256 = "10gvkw2rdmz7pgr9675xqnhkgi8pwjid77mwsriid81d703z2b6j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73835,8 +74108,8 @@ self: { }: mkDerivation { pname = "dhall-openapi"; - version = "1.0.0"; - sha256 = "1dg1hj8yfm08bzzirzg6cq26vkxv6i86rrf96a73pb1hpz3jjq7j"; + version = "1.0.1"; + sha256 = "1n34amb97dqpvz0s3mhqb46gjq1ix1gicsq700z6v6y7xssrgbz2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73855,19 +74128,16 @@ self: { "dhall-recursive-adt" = callPackage ({ mkDerivation, base, data-fix, dhall, either, hedgehog - , neat-interpolation, recursion-schemes, tasty, tasty-hedgehog - , tasty-hunit + , recursion-schemes, tasty, tasty-hedgehog, tasty-hunit, yasi }: mkDerivation { pname = "dhall-recursive-adt"; - version = "0.1.0.0"; - sha256 = "01wk6xsakbhsx14s59f0rj32mlccgxgc29a3n5d3b923yd5w64zm"; - revision = "1"; - editedCabalFile = "0gj4dsl70wjn4bpi62dqcqc9y9wwj2c9w6rai620ps4ykg36pygb"; + version = "0.1.0.1"; + sha256 = "09s3m86vflj5im2walab8d0wpvihsvxc5mzy55m10pfzr3gxsd11"; libraryHaskellDepends = [ base data-fix dhall recursion-schemes ]; testHaskellDepends = [ - base dhall either hedgehog neat-interpolation recursion-schemes - tasty tasty-hedgehog tasty-hunit + base dhall either hedgehog recursion-schemes tasty tasty-hedgehog + tasty-hunit yasi ]; description = "Convert recursive ADTs from and to Dhall"; license = lib.licenses.cc0; @@ -73952,6 +74222,36 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "dhall-yaml_1_2_7" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall + , dhall-json, exceptions, HsYAML, HsYAML-aeson + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , tasty, tasty-expected-failure, tasty-hunit, text, vector + }: + mkDerivation { + pname = "dhall-yaml"; + version = "1.2.7"; + sha256 = "17fpxjlhmjnra92l8iv4k40bxbx1plmhkijf6axxkjyhfh0ax303"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson + optparse-applicative text vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring dhall dhall-json exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring dhall dhall-json tasty tasty-expected-failure + tasty-hunit text + ]; + description = "Convert between Dhall and YAML"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -74475,6 +74775,8 @@ self: { pname = "diagrams-lib"; version = "1.4.4"; sha256 = "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy"; + revision = "1"; + editedCabalFile = "1c7kpnbvxwdcmk5znqyig3l6s986ppj168ck5v72dfbp8cjvwa8i"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -76077,8 +76379,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.7"; - sha256 = "0nby3267nhdgc8692k5c28yy0a2bzvl84dn54sg25j6nchzs991g"; + version = "1.8.8"; + sha256 = "0fvj9m59gsdicl061xlkqq8hrwsksyrysjdh5ijbv8gaql99k17v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84453,8 +84755,8 @@ self: { pname = "equational-reasoning"; version = "0.7.0.0"; sha256 = "0l6gyq43byh6cy2pblb9a4qjy7w5k9maa97c076dxlsf53myj01h"; - revision = "1"; - editedCabalFile = "1a8dw9givg0przqrm33kkmff9r0fdv1ih6ik3dqa99ww71cc8q66"; + revision = "2"; + editedCabalFile = "0zlcd62kapcybli65w47mb1kg5fnyzgdnf7kr8y8qgslg0lidzpp"; libraryHaskellDepends = [ base containers template-haskell th-desugar void ]; @@ -87152,6 +87454,8 @@ self: { pname = "exp-extended"; version = "0.2"; sha256 = "14bz6wfzd8b51s09d2psg5hv5zq4f8lplgx0yvd3n0z704x3mcy6"; + revision = "1"; + editedCabalFile = "1kzrlr1j6xfm8r9j1iz9vp2c7x72gmmqzmki1ypxaawdzibyfysl"; libraryHaskellDepends = [ base ]; description = "floating point with extended exponent range"; license = lib.licenses.bsd3; @@ -87468,6 +87772,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "express_0_1_14" = callPackage + ({ mkDerivation, base, leancheck, template-haskell }: + mkDerivation { + pname = "express"; + version = "0.1.14"; + sha256 = "19sjh12sjpxhk7wg2b3abga7bpk6ckry19zi58imqmy8xbh6ds39"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base leancheck ]; + description = "Dynamically-typed expressions involving applications and variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "expression-parser" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96985,6 +97303,23 @@ self: { license = lib.licenses.asl20; }) {}; + "fusion-plugin_0_2_3" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , fusion-plugin-types, ghc, syb, time, transformers + }: + mkDerivation { + pname = "fusion-plugin"; + version = "0.2.3"; + sha256 = "1lklrd3afvm8fwd14yiavx5h8zxjkn2k2vqnxbqwcakcnljxrfyq"; + libraryHaskellDepends = [ + base containers directory filepath fusion-plugin-types ghc syb time + transformers + ]; + description = "GHC plugin to make stream fusion more predictable"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "fusion-plugin-types" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -120993,19 +121328,20 @@ self: { "hasklepias" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, flow, hspec - , interval-algebra, QuickCheck, safe, text, time + , interval-algebra, lens, lens-aeson, QuickCheck, safe, text, time , unordered-containers, vector, witherable }: mkDerivation { pname = "hasklepias"; - version = "0.7.1"; - sha256 = "1w6gs3n1g12sw2w72l04l27na3kgmyqsip8d53wpmslqwccr6blc"; + version = "0.8.3"; + sha256 = "01lq7q9gq7b5zi2bwlc6wpj914l660cl5wlvbznimhfnkr1aqrgm"; libraryHaskellDepends = [ - aeson base bytestring containers flow interval-algebra QuickCheck - safe text time unordered-containers vector witherable + aeson base bytestring containers flow interval-algebra lens + lens-aeson QuickCheck safe text time unordered-containers vector + witherable ]; testHaskellDepends = [ - aeson base bytestring containers flow hspec interval-algebra + aeson base bytestring containers flow hspec interval-algebra lens QuickCheck text time unordered-containers vector ]; description = "Define features from events"; @@ -128280,6 +128616,26 @@ self: { broken = true; }) {}; + "hindley-milner-type-check" = callPackage + ({ mkDerivation, base, containers, data-fix, deepseq + , deriving-compat, dlist, mtl, prettyprinter, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "hindley-milner-type-check"; + version = "0.1.0.0"; + sha256 = "0ym8jchjx6n9i6n76b852s511n0vafz8ixr22zx7lrzqi9ax4ayz"; + libraryHaskellDepends = [ + base containers data-fix deepseq deriving-compat dlist mtl + prettyprinter text + ]; + testHaskellDepends = [ + base containers data-fix prettyprinter tasty tasty-hunit text + ]; + description = "Type inference for Hindley-Milner based languages"; + license = lib.licenses.mit; + }) {}; + "hinduce-associations-apriori" = callPackage ({ mkDerivation, base, containers, deepseq, hinduce-missingh , parallel, vector @@ -135969,6 +136325,30 @@ self: { broken = true; }) {}; + "hscdio" = callPackage + ({ mkDerivation, base, base-compat, bitwise, bytestring, c2hs, cdio + , containers, directory, hedgehog, hedgehog-classes, HUnit, mtl + , text, vector + }: + mkDerivation { + pname = "hscdio"; + version = "0.1.0.0"; + sha256 = "0lwyy8x5zrdl0mg7siclagic7xg2iywapwkdk8kcz3ksdsir7xpd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bitwise bytestring containers mtl text vector + ]; + librarySystemDepends = [ cdio ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base base-compat bytestring directory hedgehog hedgehog-classes + HUnit text + ]; + description = "Haskell bindings to the libcdio disc-reading library"; + license = lib.licenses.gpl3Plus; + }) {cdio = null;}; + "hscharm" = callPackage ({ mkDerivation, base, random, random-shuffle }: mkDerivation { @@ -159959,6 +160339,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "leancheck_0_9_10" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.9.10"; + sha256 = "0d35w3y309fw3bkaj6fxyl67k4cp32mp003l44m3m2z2fvq08cdn"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "leancheck-enum-instances" = callPackage ({ mkDerivation, base, enum-types, leancheck }: mkDerivation { @@ -160949,8 +161342,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.1.0"; - sha256 = "03h7fk37rrxpnxfpckpfi5k3v7ch4v5vn601m9lj9shbs26h1cdx"; + version = "1.5.2.0"; + sha256 = "0mkr8ng7i4cli8wscqy2l8112nr7wdg8dh32li354fvahmv6i4si"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161379,24 +161772,24 @@ self: { "libarchive" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal , composition-prelude, cpphs, criterion, deepseq, dir-traverse - , directory, dlist, filepath, hspec, libarchive, mtl + , directory, dlist, filepath, hspec, hspec-core, libarchive, mtl , pathological-bytestrings, tar, tar-conduit, temporary , unix-compat }: mkDerivation { pname = "libarchive"; - version = "3.0.2.1"; - sha256 = "16h5pw49g9nc4aq7g8hwj1bq1raf1jas09xcsk99sylssvf2yf43"; + version = "3.0.2.2"; + sha256 = "1i3zrby1pmlm7dwv1xra9xmlv4a30cgmbwz5zygdyw1mwy4y9wnh"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl unix-compat ]; libraryPkgconfigDepends = [ libarchive ]; - libraryToolDepends = [ c2hs ]; + libraryToolDepends = [ c2hs cpphs ]; testHaskellDepends = [ base bytestring composition-prelude dir-traverse directory filepath - hspec mtl pathological-bytestrings temporary + hspec hspec-core mtl pathological-bytestrings temporary ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ @@ -162678,6 +163071,22 @@ self: { broken = true; }) {}; + "lifx-lan" = callPackage + ({ mkDerivation, base, binary, bytestring, composition, containers + , extra, monad-loops, mtl, network, random, safe, text, time + }: + mkDerivation { + pname = "lifx-lan"; + version = "0.1.0.2"; + sha256 = "0kk89h1jxz7djxcxz4scwk33r9y1raq8mskypcyx93hzs0f1b4y1"; + libraryHaskellDepends = [ + base binary bytestring composition containers extra monad-loops mtl + network random safe text time + ]; + description = "LIFX LAN API"; + license = lib.licenses.bsd3; + }) {}; + "ligature" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -164745,6 +165154,31 @@ self: { license = lib.licenses.mit; }) {}; + "literatex_0_1_0_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit + , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc + , unliftio + }: + mkDerivation { + pname = "literatex"; + version = "0.1.0.1"; + sha256 = "0nig3k78h86b80hsfqm04g9jc24lsicbw2pc3wnvxfs3nhkmhl0b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit text ttc unliftio + ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative ttc + ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit text ttc unliftio + ]; + description = "transform literate source code to Markdown"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "little-earley" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -164758,19 +165192,19 @@ self: { }) {}; "little-logger" = callPackage - ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, tasty - , tasty-hunit, text, unliftio-core + ({ mkDerivation, base, co-log, co-log-core, directory, microlens + , mtl, tasty, tasty-hunit, temporary, text, unliftio-core }: mkDerivation { pname = "little-logger"; - version = "0.3.1"; - sha256 = "0iqnidlv7r2kw6764aq3dlvxbmvm1c7qk8jkgbhbpm5g07k97c68"; + version = "0.3.2"; + sha256 = "0pwywpxdladsaprdzw856njcn42js7l73f361m0w3gd86xprwm8y"; libraryHaskellDepends = [ base co-log co-log-core microlens mtl text unliftio-core ]; testHaskellDepends = [ - base co-log co-log-core microlens mtl tasty tasty-hunit text - unliftio-core + base co-log co-log-core directory microlens mtl tasty tasty-hunit + temporary text unliftio-core ]; description = "Basic logging based on co-log"; license = lib.licenses.bsd3; @@ -166637,6 +167071,8 @@ self: { pname = "long-double"; version = "0.1.1"; sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g"; + revision = "1"; + editedCabalFile = "0831x773ypp0lv14cgh6vr7rzbyvrjsvw99c40z41fr8bhdw2x4j"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = lib.licenses.bsd3; @@ -170360,6 +170796,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "massiv_0_6_1_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions + , mersenne-random-pure64, primitive, QuickCheck, random, scheduler + , splitmix, template-haskell, unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.6.1.0"; + sha256 = "0j3br93kxxyb1q5mdf440f8l8d2lc0gi9vhc3h3ri94ls4ix099v"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions primitive scheduler + unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels @@ -179066,8 +179524,8 @@ self: { }: mkDerivation { pname = "mp"; - version = "1.1.0"; - sha256 = "1msy52c1702q16pmbzc69iyj7bj9xdh4c72d15sigblh9hwvipmm"; + version = "1.2.0"; + sha256 = "0jn987fg2kah3m39rdgnkmqy940ks2c8f2ld8lrj8k2zyjbgls5b"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -180434,12 +180892,12 @@ self: { }) {}; "multi-except" = callPackage - ({ mkDerivation, base, dlist, hspec, semigroupoids }: + ({ mkDerivation, base, dlist-nonempty, hspec, semigroupoids }: mkDerivation { pname = "multi-except"; - version = "0.2.1.0"; - sha256 = "0ai19lk32wbpsmwxig5wzc7iqi81h0mxpykrmfw05vv4zwjqiqfz"; - libraryHaskellDepends = [ base dlist semigroupoids ]; + version = "0.3.0.0"; + sha256 = "1zk8cihmv5dimdhld0h0h622zsvn71rdbhslj4b8dh3dv4qdfji0"; + libraryHaskellDepends = [ base dlist-nonempty semigroupoids ]; testHaskellDepends = [ base hspec semigroupoids ]; description = "Multiple Exceptions"; license = lib.licenses.mit; @@ -191215,6 +191673,21 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry_0_7_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events + , hashable + }: + mkDerivation { + pname = "opentelemetry"; + version = "0.7.0"; + sha256 = "10k9if33ydjc099mgjvgglp6fcmrz0zxpv6khwkhra6lcz35mylv"; + libraryHaskellDepends = [ + base bytestring exceptions ghc-trace-events hashable + ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentelemetry-extra" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, clock , containers, directory, exceptions, filepath, gauge @@ -191251,6 +191724,43 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry-extra_0_7_0" = callPackage + ({ mkDerivation, async, base, binary, bytestring, clock, containers + , directory, exceptions, filepath, generic-arbitrary, ghc-events + , hashable, hashtables, http-client, http-client-tls, http-types + , hvega, jsonifier, opentelemetry, process, QuickCheck + , quickcheck-instances, random, scientific, splitmix, stm, tasty + , tasty-bench, tasty-discover, tasty-hunit, tasty-quickcheck, text + , text-show, typed-process, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-extra"; + version = "0.7.0"; + sha256 = "11lwhm3rpajmch7kjb4qwngram5ka8fbd3c0mxszlf4a9dlqag32"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring clock containers directory exceptions + filepath ghc-events hashable http-client http-client-tls http-types + jsonifier opentelemetry random scientific splitmix stm text + text-show unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers directory exceptions + filepath hashtables http-client http-client-tls hvega opentelemetry + process text typed-process + ]; + testHaskellDepends = [ + base bytestring generic-arbitrary ghc-events hashable opentelemetry + QuickCheck quickcheck-instances splitmix tasty tasty-discover + tasty-hunit tasty-quickcheck text text-show unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentelemetry-http-client" = callPackage ({ mkDerivation, base, http-client, http-types, opentelemetry, text }: @@ -191292,6 +191802,33 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry-lightstep_0_7_0" = callPackage + ({ mkDerivation, async, base, bytestring, clock, containers + , exceptions, filepath, ghc-events, http-client, http-client-tls + , http-types, network, opentelemetry, opentelemetry-extra + , scientific, splitmix, stm, text, typed-process + , unordered-containers + }: + mkDerivation { + pname = "opentelemetry-lightstep"; + version = "0.7.0"; + sha256 = "1yd6gzhwwmjjh41ipz2kifzpn7hha9nli3war2rqdjvhj349lrw8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring exceptions http-client http-client-tls + http-types network opentelemetry opentelemetry-extra scientific stm + text unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers exceptions filepath + ghc-events http-client http-types opentelemetry opentelemetry-extra + splitmix text typed-process unordered-containers + ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentelemetry-wai" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai @@ -191306,6 +191843,21 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry-wai_0_7_0" = callPackage + ({ mkDerivation, base, bytestring, http-types, opentelemetry, text + , wai + }: + mkDerivation { + pname = "opentelemetry-wai"; + version = "0.7.0"; + sha256 = "09mh8kfh49vx2gascwwmzs4s649sm5i90nsifp76kjvg1nvqhd1m"; + libraryHaskellDepends = [ + base bytestring http-types opentelemetry text wai + ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -191549,8 +192101,8 @@ self: { }: mkDerivation { pname = "opentracing"; - version = "0.1.0.0"; - sha256 = "0j791hv525mcskqmji3f9n8v803pailm8jrl336pxzdh3iacqvsl"; + version = "0.2.0"; + sha256 = "1yl3hhg32npj4ncqc9j5gl2jikzvczkpnrwp124nk45mzi13aszq"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring case-insensitive clock containers http-types iproute lens mtl mwc-random network @@ -191565,8 +192117,8 @@ self: { ({ mkDerivation, base, http-client, lens, mtl, opentracing, text }: mkDerivation { pname = "opentracing-http-client"; - version = "0.1.0.0"; - sha256 = "1jzdnlk2cacmymjkcfx4n569n6gqy6kwzh9dxrgjnagwh3jqk7q3"; + version = "0.2.0"; + sha256 = "19mwl69ggyd7zf1dvx5yjzsq5mlw5l94h989hgwc4ryvp8zqwv4n"; libraryHaskellDepends = [ base http-client lens mtl opentracing text ]; @@ -191576,18 +192128,18 @@ self: { "opentracing-jaeger" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable - , http-client, http-types, lens, mtl, network, opentracing - , QuickCheck, safe-exceptions, text, thrift, unordered-containers - , vector + , http-client, http-types, lens, mtl, network, opentracing, pinch + , QuickCheck, safe-exceptions, text, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "opentracing-jaeger"; - version = "0.1.0.0"; - sha256 = "1yr9vhbpqq12hj9blv3v1wc26n9qsp0g7pjngxh0k1zcv759s1k0"; + version = "0.2.0"; + sha256 = "0ffcbmg8qzvyhm7vzk2zkk5czli4ndrp18cc328i7600gzv1gr81"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types lens mtl - network opentracing QuickCheck safe-exceptions text thrift - unordered-containers vector + network opentracing pinch QuickCheck safe-exceptions text + unordered-containers vector vector-instances ]; description = "Jaeger backend for OpenTracing"; license = lib.licenses.asl20; @@ -191598,8 +192150,8 @@ self: { ({ mkDerivation, base, lens, opentracing, text, wai }: mkDerivation { pname = "opentracing-wai"; - version = "0.1.0.0"; - sha256 = "1m68l4gxpyl81yhkd209kdgzydzyg632x8gl2jh3l4k83ysdg545"; + version = "0.2.0"; + sha256 = "178xxgg0rw94gld5jlvix6czsvg66q60h06nj2b1x7rnd0pjryc6"; libraryHaskellDepends = [ base lens opentracing text wai ]; description = "Middleware adding OpenTracing tracing for WAI applications"; license = lib.licenses.asl20; @@ -191609,8 +192161,8 @@ self: { ({ mkDerivation, aeson, base, opentracing, text }: mkDerivation { pname = "opentracing-zipkin-common"; - version = "0.1.0.0"; - sha256 = "00pg2k0v685gc4fmrcb464fapvpz8lw0249n6gmi2zkhpw8frnm0"; + version = "0.2.0"; + sha256 = "0yngiz8135v844wcx28izwhx18iz06di3dl8bm5xqh47ir43wdw6"; libraryHaskellDepends = [ aeson base opentracing text ]; description = "Zipkin OpenTracing Backend Commons"; license = lib.licenses.asl20; @@ -191619,17 +192171,17 @@ self: { "opentracing-zipkin-v1" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable , http-client, http-types, iproute, lens, opentracing - , opentracing-zipkin-common, QuickCheck, text, thrift - , unordered-containers, vector + , opentracing-zipkin-common, pinch, QuickCheck, text + , unordered-containers, vector, vector-instances }: mkDerivation { pname = "opentracing-zipkin-v1"; - version = "0.1.0.0"; - sha256 = "0mw6x9jqh42ymn1a3maq47mw1mbzki5lv1axapqkhkx0w13824pp"; + version = "0.2.0"; + sha256 = "15n9m7affy81fr80zw7l54lch7gr6bvhcqpga797x7rvdxqqjv9j"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types iproute - lens opentracing opentracing-zipkin-common QuickCheck text thrift - unordered-containers vector + lens opentracing opentracing-zipkin-common pinch QuickCheck text + unordered-containers vector vector-instances ]; description = "Zipkin V1 backend for OpenTracing"; license = lib.licenses.asl20; @@ -191643,8 +192195,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v2"; - version = "0.1.0.0"; - sha256 = "0rmrlx2g228p4ys95d4zqc0l56a62avsawq320g4n9i2g0hrl5n4"; + version = "0.2.0"; + sha256 = "1ykssjhknfyiw02abjpz38zmlw8l03zb8c3y3ic5njmsg23nxfzb"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring exceptions http-client http-types lens opentracing opentracing-zipkin-common text @@ -192571,8 +193123,8 @@ self: { }: mkDerivation { pname = "ordinal"; - version = "0.4.0.5"; - sha256 = "0m073n6yln9rfdzlkwd10fl04b725h3hpybz01r0wiyw4bfv2n3b"; + version = "0.4.0.6"; + sha256 = "0zpqhyn8f2iphgz2746fxsjk817ly8q6s4dz6129jrrd25v3kdc7"; libraryHaskellDepends = [ base containers data-default QuickCheck regex template-haskell text time vector @@ -192619,17 +193171,19 @@ self: { "org-mode" = callPackage ({ mkDerivation, base, containers, filepath, hashable, megaparsec - , parser-combinators, tasty, tasty-hunit, text + , parser-combinators, tasty, tasty-hunit, text, time }: mkDerivation { pname = "org-mode"; - version = "1.1.1"; - sha256 = "0kbfgafv3xkgczz27ap7xyqfvvn8a6sizc9h3ylklc8qrw38n149"; + version = "2.0.0"; + sha256 = "17yn9si0mxyydjgv40q6rc5nw579kswlx69ycyinhdx0q34ds7rl"; libraryHaskellDepends = [ base containers filepath hashable megaparsec parser-combinators - text + text time + ]; + testHaskellDepends = [ + base megaparsec tasty tasty-hunit text time ]; - testHaskellDepends = [ base megaparsec tasty tasty-hunit text ]; description = "Parser for Emacs org-mode files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -192641,8 +193195,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.6.0"; - sha256 = "0qkar6cwmz67zm2jlah1yi004vap8d136167qwvm485cpd3vwxz7"; + version = "1.6.1"; + sha256 = "0fkwwwrmfq22g1yak9srmlbq5yixf4kdwfapq0dyr8f3pqaglf1v"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -194806,6 +195360,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_2_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.2.2"; + sha256 = "05ykb6jn19jiakrn6mdcz3gyc6v6hkg3r8drwxncf04syz0l60mm"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -195384,8 +195980,8 @@ self: { ({ mkDerivation, base, containers, extensible-exceptions, random }: mkDerivation { pname = "parallel-io"; - version = "0.3.4"; - sha256 = "10bglxm685pljh0i896zrgs6g3iz0n7gl1qslvfn63pjxgvz5v2a"; + version = "0.3.5"; + sha256 = "0b67rjz80n58grz7hcb1lvk15lmww41967kv7f85vlpacfykng49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196913,6 +197509,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-io_1_6_3" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.6.3"; + sha256 = "1dnc48hf8x83p0jy05qi8j8gmfmsy50swnql9ssdv74lsryp615n"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base directory exceptions filepath hspec path transformers + unix-compat + ]; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-like" = callPackage ({ mkDerivation, base, path }: mkDerivation { @@ -196952,6 +197569,20 @@ self: { license = lib.licenses.asl20; }) {}; + "path-text-utf8_0_0_1_8" = callPackage + ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: + mkDerivation { + pname = "path-text-utf8"; + version = "0.0.1.8"; + sha256 = "1xi60cw75qzhb03z2a66xfxgr17xz39bdk7wmjc7yprqy0v016jj"; + libraryHaskellDepends = [ + base bytestring path safe-exceptions text + ]; + description = "Read and write UTF-8 text files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-utils" = callPackage ({ mkDerivation, base, exceptions, path, split, text }: mkDerivation { @@ -199118,6 +199749,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-mtl_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers + , monad-logger, mtl, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, resource-pool, resourcet + , tasty, tasty-golden, tasty-hunit, text, transformers, unliftio + , unliftio-core, unliftio-pool + }: + mkDerivation { + pname = "persistent-mtl"; + version = "0.2.2.0"; + sha256 = "0z78xs1gi45i3a9q28yr7jpsdsbzfqjahch3m27gygkja9dgm438"; + libraryHaskellDepends = [ + base conduit containers mtl persistent resource-pool resourcet text + transformers unliftio unliftio-core unliftio-pool + ]; + testHaskellDepends = [ + base bytestring conduit containers monad-logger persistent + persistent-postgresql persistent-sqlite persistent-template + resource-pool resourcet tasty tasty-golden tasty-hunit text + unliftio + ]; + description = "Monad transformer for the persistent API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, http-api-data, HUnit @@ -200294,8 +200951,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.6.3.0"; - sha256 = "1hc1wmq2syvi0xsbkrm52hd5k8j2kk80n45695zd85fqwbayhj2c"; + version = "0.7.0.0"; + sha256 = "16a8b5xpdrayfh03czs0nb1xz6kn95rr4k4dim5viqjxpc9f0zbn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200461,8 +201118,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.2.1.0"; - sha256 = "0bz5lyl75i143crva3piz4005k81ia26rj455cgbgz3yknj3qpaf"; + version = "0.3.0.0"; + sha256 = "15k2nij8rpf1yvm5kjgkrvx1y4zlfskxfdxjbjirmaidamr2ha6d"; libraryHaskellDepends = [ base heaps mmsyn2-array parallel phonetic-languages-constraints-array @@ -200483,8 +201140,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.1.2.0"; - sha256 = "1k65ynaz2mh35nqsf3izqq0lxqbkyj24i1g3r3gbfpbkajdhqz0v"; + version = "0.2.0.0"; + sha256 = "15ngw29ffsyp7j71rpyllfyifvqybgpb5mh2cfgi1vscl8c6zydl"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics subG ]; @@ -200499,13 +201156,13 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.1.2.0"; - sha256 = "1vlzgcq8pv22m9pxwx0p1xss9zzlvwap11gn88pdgn0zgkhcsm0b"; + version = "0.2.0.0"; + sha256 = "1k1id4dz0siz3qqax738k4k2dfj68slph4yy8ad6f4r9fink9jqr"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base ]; - description = "Generalization of the functionality of the phonetic-languages-simplified-properties-array"; + description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; }) {}; @@ -206149,19 +206806,19 @@ self: { , quickcheck-assertions, quickcheck-instances, resource-pool , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th , template-haskell, text, th-lift, th-lift-instances, time - , transformers, transformers-base, transformers-compat, type-fun + , transformers, transformers-base, transformers-compat }: mkDerivation { pname = "postgresql-query"; - version = "3.8.1"; - sha256 = "09lld8fibwn0brszpz040pr8q7b5wrpc9fzdw8pwf7gfsb02wvx1"; + version = "3.8.2"; + sha256 = "1vcfs5yg9ab0axdm661kjpsfxii7h3s8rrq38kgc68vhr280m110"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset inflections monad-control monad-logger mtl postgresql-simple resource-pool semigroups template-haskell text th-lift th-lift-instances time transformers transformers-base - transformers-compat type-fun + transformers-compat ]; testHaskellDepends = [ attoparsec base generic-arbitrary postgresql-simple QuickCheck @@ -209027,8 +209684,8 @@ self: { pname = "process"; version = "1.6.11.0"; sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd"; - revision = "1"; - editedCabalFile = "136mp45m1jh27yayb0gx4giybp6imh7hbr774fsb2m9vj2l52b27"; + revision = "2"; + editedCabalFile = "1yz98g78syad217c816q5rrdb7w93lpsp3pcc4djsy050w9ji56n"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -219631,6 +220288,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex-tdfa_1_3_1_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, mtl, parsec, regex-base, text, utf8-string + }: + mkDerivation { + pname = "regex-tdfa"; + version = "1.3.1.1"; + sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi"; + libraryHaskellDepends = [ + array base bytestring containers mtl parsec regex-base text + ]; + testHaskellDepends = [ + array base bytestring containers directory filepath mtl regex-base + text utf8-string + ]; + description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-tdfa-pipes" = callPackage ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base , regex-tdfa @@ -221472,6 +222149,39 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "req_3_9_1" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, exceptions, hspec + , hspec-core, hspec-discover, http-api-data, http-client + , http-client-tls, http-types, modern-uri, monad-control, mtl + , QuickCheck, retry, template-haskell, text, time, transformers + , transformers-base, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "req"; + version = "3.9.1"; + sha256 = "0468ah4142jrqp5l3pw4izrw6f6kznisan888b30jhif4c6xncr0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection exceptions http-api-data http-client + http-client-tls http-types modern-uri monad-control mtl retry + template-haskell text time transformers transformers-base + unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-client http-types modern-uri monad-control mtl + QuickCheck retry template-haskell text time unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh @@ -224756,6 +225466,8 @@ self: { pname = "rounded"; version = "1.1"; sha256 = "0hja4ak3qd80zg996jwyi1kndj2vfsp10vwr4wyrcvppzl4gj4a0"; + revision = "1"; + editedCabalFile = "02zrazan3ljalfy1cnr3d0cdw7n426k5wg5xkifk87vb8ds2wx1j"; libraryHaskellDepends = [ base ghc-prim hgmp long-double reflection ]; @@ -225212,8 +225924,8 @@ self: { pname = "rss"; version = "3000.2.0.7"; sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym"; - revision = "1"; - editedCabalFile = "0ql1ffjw0g1sdyz9icin4cq86i5b9ljzhvpivfbbyaipg2nc9z0s"; + revision = "3"; + editedCabalFile = "02jbnl7y76ahjdj2bciyjwgcglfs7sy60733z5c8610rk34f99dy"; libraryHaskellDepends = [ base HaXml network network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = lib.licenses.publicDomain; @@ -231460,6 +232172,8 @@ self: { pname = "servant-auth"; version = "0.4.0.0"; sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; + revision = "2"; + editedCabalFile = "0mbx44l1jnvfvppv6diiixqx5rdkb68djxl36m5sd12qz6rqmcx0"; libraryHaskellDepends = [ aeson base jose lens servant text unordered-containers ]; @@ -231534,8 +232248,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "5"; - editedCabalFile = "1113d9hczzksy5bqf8pfriz9x158xr4a3p5na8p83vl46ddad82y"; + revision = "7"; + editedCabalFile = "10178ahxq36l9mik7dcn1c1f97fpp8b4r7xiqwiv21llp95s7cqp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -231598,6 +232312,8 @@ self: { pname = "servant-auth-server"; version = "0.4.6.0"; sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; + revision = "2"; + editedCabalFile = "1vf0mnbq0wmwha3aa2fn593dwibaw00l4agspgvchx7574jyr5wp"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -231622,6 +232338,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; + revision = "2"; + editedCabalFile = "0b8fawx2wv9zshn9i4abnwy4lgf3fkhbhm8bhfpgm9d867dx21y4"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -232131,6 +232849,8 @@ self: { pname = "servant-docs"; version = "0.11.8"; sha256 = "0zbsv75zyfg44l4822qnmvw2naxcxwgnpzc55jnvz766l2dydjrb"; + revision = "1"; + editedCabalFile = "0bfhypzm02aqwckjrvjmhvf602di0pmp4r0rjbfcraxzvkrzm6qv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232380,8 +233100,8 @@ self: { pname = "servant-foreign"; version = "0.15.3"; sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413"; - revision = "1"; - editedCabalFile = "0d9h941g7ja73g10az13pad9rjlp126b662f71q7c8yd6kh4jl9r"; + revision = "2"; + editedCabalFile = "1fdbxyyp2h5gcighjrww2mbg8z6givmhx2in8293kw58w7y2im0i"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -232635,6 +233355,8 @@ self: { pname = "servant-js"; version = "0.9.4.2"; sha256 = "15n5s3i491cxjxj70wa8yhpipaz47q46s04l4ysc64wgijlnm8xy"; + revision = "1"; + editedCabalFile = "0lka70i2qjjj9x8i1ilsfgqq5hwdlrcyd2cj1qcpyhj85c9anxl3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232850,6 +233572,68 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-multipart_0_12_1" = callPackage + ({ mkDerivation, base, bytestring, directory, http-types, lens + , resourcet, servant, servant-docs, servant-foreign + , servant-multipart-api, servant-server, string-conversions, tasty + , tasty-wai, text, wai, wai-extra + }: + mkDerivation { + pname = "servant-multipart"; + version = "0.12.1"; + sha256 = "1p55kb3zhq25ncp7wimhggssn68abfgsnlldk13rk1iajaj6y8y5"; + libraryHaskellDepends = [ + base bytestring directory lens resourcet servant servant-docs + servant-foreign servant-multipart-api servant-server + string-conversions text wai wai-extra + ]; + testHaskellDepends = [ + base bytestring http-types servant-server string-conversions tasty + tasty-wai text + ]; + description = "multipart/form-data (e.g file upload) support for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "servant-multipart-api" = callPackage + ({ mkDerivation, base, bytestring, servant, text, transformers }: + mkDerivation { + pname = "servant-multipart-api"; + version = "0.12.1"; + sha256 = "1gifa9g7ggs0plzffrd9a8j24dmqvgbkkdkfzyy7mpmwrjqw7mcj"; + libraryHaskellDepends = [ + base bytestring servant text transformers + ]; + description = "multipart/form-data (e.g file upload) support for servant"; + license = lib.licenses.bsd3; + }) {}; + + "servant-multipart-client" = callPackage + ({ mkDerivation, array, base, bytestring, http-client, http-media + , network, random, servant, servant-client, servant-client-core + , servant-multipart, servant-multipart-api, servant-server, text + , warp + }: + mkDerivation { + pname = "servant-multipart-client"; + version = "0.12.1"; + sha256 = "07haaf9nq96lfv2dhqf4319vl321f53v0mypbbg3swzb6rrfkw9h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring http-media random servant servant-client-core + servant-multipart-api text + ]; + executableHaskellDepends = [ + base bytestring http-client network servant servant-client + servant-client-core servant-multipart servant-multipart-api + servant-server warp + ]; + description = "multipart/form-data (e.g file upload) support for servant"; + license = lib.licenses.bsd3; + }) {}; + "servant-named" = callPackage ({ mkDerivation, base, hspec, hspec-wai, http-types, servant , servant-server @@ -237794,8 +238578,8 @@ self: { }: mkDerivation { pname = "simple-ui"; - version = "0.1.2"; - sha256 = "106fcxl97gnkpv2bc50bg5zv8j7f1cdyxbl1l99p3rsq6wr6mr0m"; + version = "0.2.0"; + sha256 = "0j0xq5s9l7dckbv0bakw96f3xnqsa2b7pqsji7s1y46k2fcr0r5s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default-class exceptions lens mtl stm template-haskell @@ -242690,22 +243474,22 @@ self: { }) {}; "sound-collage" = callPackage - ({ mkDerivation, array, base, Cabal, carray, containers, fft - , filepath, numeric-prelude, optparse-applicative, pathtype - , sample-frame, soxlib, storablevector, storablevector-carray + ({ mkDerivation, array, base, carray, containers, fft, filepath + , numeric-prelude, optparse-applicative, pathtype, sample-frame + , shell-utility, soxlib, storablevector, storablevector-carray , synthesizer-core, temporary, transformers, utility-ht }: mkDerivation { pname = "sound-collage"; - version = "0.2.0.1"; - sha256 = "0ywsy3q8f6y6k0vg4g21v6cm3n7662ngbzvfx502makdkf47i75a"; + version = "0.2.0.2"; + sha256 = "11rirlg25iawv4shwhvc4bcnzk4axvgk5n7yj05nnbpyx4s6r0pp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base Cabal carray containers fft filepath numeric-prelude - optparse-applicative pathtype sample-frame soxlib storablevector - storablevector-carray synthesizer-core temporary transformers - utility-ht + array base carray containers fft filepath numeric-prelude + optparse-applicative pathtype sample-frame shell-utility soxlib + storablevector storablevector-carray synthesizer-core temporary + transformers utility-ht ]; description = "Approximate a song from other pieces of sound"; license = lib.licenses.bsd3; @@ -249560,6 +250344,18 @@ self: { license = lib.licenses.mit; }) {}; + "stripe-concepts_1_0_2_8" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "stripe-concepts"; + version = "1.0.2.8"; + sha256 = "03sqgmbbjqi18wjb96sc3lvc6p3bqk5sgsgbcf9z8k9rbdspribm"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Stripe API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers @@ -249663,8 +250459,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.8"; - sha256 = "1r91lf3yjivfcxdnqy1ayfzs2ckszyx8x6f6fn8rjiz0gfv1v6hn"; + version = "1.1"; + sha256 = "15l3b01wf55k3cnwspkqvphs822cmdbnxyfcka8bi0vaj8xl84x9"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -249696,8 +250492,8 @@ self: { }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.8"; - sha256 = "0cybjsvzknsldqhf7fjd4ar2qjyym43x2ymmgw01f9a1ixyaxgmn"; + version = "1.0.0.10"; + sha256 = "04b5z6hnm000fii4qiczm4xpr41v55fgcj07yh35iwh4gwgc7c4h"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptonite memory stripe-concepts text @@ -249734,8 +250530,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.8"; - sha256 = "1km0h94d1clgba0yy520yx54axdkf4xl5p5hnmn8ghg40r0pax73"; + version = "1.0.1.10"; + sha256 = "0pxaffbmnibivg8pdkvmyjkw8hz0grq3x84apd94mkji7vjg9xgh"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -251802,6 +252598,73 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest_0_2_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, Diff, dlist + , envparse, filepath, MonadRandom, mtl, optparse-applicative, path + , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle + , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm + , sydtest-discover, text, yaml, yamlparse-applicative + }: + mkDerivation { + pname = "sydtest"; + version = "0.2.0.0"; + sha256 = "1k0jpnvfizvgscwpgd827w7x4nczlv7krwj10y35byj79wb5xy2m"; + libraryHaskellDepends = [ + async base bytestring containers Diff dlist envparse filepath + MonadRandom mtl optparse-applicative path path-io pretty-show + QuickCheck quickcheck-io random-shuffle safe safe-coloured-text + safe-coloured-text-terminfo split text yaml yamlparse-applicative + ]; + testHaskellDepends = [ + base bytestring path path-io QuickCheck safe-coloured-text + safe-coloured-text-terminfo stm text + ]; + testToolDepends = [ sydtest-discover ]; + description = "A modern testing framework for Haskell with good defaults and advanced testing features"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-aeson" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, path + , path-io, sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "sydtest-aeson"; + version = "0.0.0.0"; + sha256 = "0x4n27v60m6h44xwpf60j11j1r9r1zzixlszq21skrf2r6lla2gn"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring path path-io sydtest text + ]; + testHaskellDepends = [ aeson base sydtest text ]; + testToolDepends = [ sydtest-discover ]; + description = "An aeson companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-amqp" = callPackage + ({ mkDerivation, aeson, amqp, async, base, bytestring, network + , path, path-io, port-utils, process, stm, sydtest + , sydtest-discover, sydtest-rabbitmq, sydtest-typed-process, text + , typed-process + }: + mkDerivation { + pname = "sydtest-amqp"; + version = "0.1.0.0"; + sha256 = "122n2nf0z2s925yjg6zlp3bvl70yprip57v6775vqglhbr959v8m"; + libraryHaskellDepends = [ + aeson amqp async base bytestring network path path-io port-utils + process stm sydtest sydtest-rabbitmq sydtest-typed-process text + typed-process + ]; + testHaskellDepends = [ amqp base sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An amqp companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-discover" = callPackage ({ mkDerivation, base, filepath, optparse-applicative, path , path-io @@ -251821,6 +252684,84 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-hedis" = callPackage + ({ mkDerivation, base, bytestring, hedis, network, path, path-io + , port-utils, sydtest, sydtest-discover, sydtest-typed-process + , text, typed-process + }: + mkDerivation { + pname = "sydtest-hedis"; + version = "0.0.0.0"; + sha256 = "0y31aqn4ra92arq054amhkcxxng0wsngv59ngwn05gc5jv6whi9j"; + libraryHaskellDepends = [ + base bytestring hedis network path path-io port-utils sydtest + sydtest-typed-process text typed-process + ]; + testHaskellDepends = [ base hedis sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An hedis companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-hspec" = callPackage + ({ mkDerivation, base, hspec, hspec-core, mtl, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "sydtest-hspec"; + version = "0.0.0.0"; + sha256 = "1fjj6v1f6rilzjcjgg0yqmhhmj067g45sw7q2xr8q9p7qiqnpkh1"; + libraryHaskellDepends = [ base hspec-core mtl sydtest ]; + testHaskellDepends = [ base hspec sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An Hspec companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-mongo" = callPackage + ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network + , path, path-io, port-utils, process, sydtest, sydtest-discover + , sydtest-process, text, yaml + }: + mkDerivation { + pname = "sydtest-mongo"; + version = "0.0.0.0"; + sha256 = "0jm2c05dxri0w83ii3pyphb2rrla72fih5g26w0indb51i0wlnq1"; + libraryHaskellDepends = [ + base binary bson bytestring mongoDB network path path-io port-utils + process sydtest sydtest-process text yaml + ]; + testHaskellDepends = [ base mongoDB sydtest text ]; + testToolDepends = [ sydtest-discover ]; + description = "An mongoDB companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-persistent-postgresql" = callPackage + ({ mkDerivation, base, monad-logger, mtl, persistent + , persistent-postgresql, persistent-template, sydtest + , sydtest-discover, tmp-postgres + }: + mkDerivation { + pname = "sydtest-persistent-postgresql"; + version = "0.1.0.0"; + sha256 = "1g669w4rcjd7pnf6hrcc5lb6li30m9fdkrchm00bmg1350kxmnmp"; + libraryHaskellDepends = [ + base monad-logger mtl persistent persistent-postgresql sydtest + tmp-postgres + ]; + testHaskellDepends = [ + base persistent persistent-postgresql persistent-template sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "An persistent-postgresql companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-persistent-sqlite" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent , persistent-sqlite, persistent-template, sydtest, sydtest-discover @@ -251842,6 +252783,63 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-persistent-sqlite_0_1_0_0" = callPackage + ({ mkDerivation, base, monad-logger, mtl, persistent + , persistent-sqlite, persistent-template, sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-persistent-sqlite"; + version = "0.1.0.0"; + sha256 = "1al80sym9r2h769szky5kpkllbs7gm4lc8gn9nlavj0in663x0ly"; + libraryHaskellDepends = [ + base monad-logger mtl persistent persistent-sqlite + persistent-template sydtest + ]; + testHaskellDepends = [ + base persistent persistent-sqlite persistent-template sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A persistent-sqlite companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-process" = callPackage + ({ mkDerivation, base, bytestring, process, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "sydtest-process"; + version = "0.0.0.0"; + sha256 = "1afjwxq7bq4q0g5qznffxfn20ikxxmr7yywiksfyfnyh4n0a1zsf"; + libraryHaskellDepends = [ base process sydtest ]; + testHaskellDepends = [ base bytestring process sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "A typed-process companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-rabbitmq" = callPackage + ({ mkDerivation, aeson, amqp, async, base, bytestring, network + , path, path-io, port-utils, process, stm, sydtest + , sydtest-discover, sydtest-typed-process, text, typed-process + }: + mkDerivation { + pname = "sydtest-rabbitmq"; + version = "0.1.0.0"; + sha256 = "0ra32y2w7hirjmaz67myq26waccznkl7gqmdnwdd93n6n1h1gb9p"; + libraryHaskellDepends = [ + aeson amqp async base bytestring network path path-io port-utils + process stm sydtest sydtest-typed-process text typed-process + ]; + testHaskellDepends = [ amqp base sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An rabbitmq companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-servant" = callPackage ({ mkDerivation, base, http-client, servant, servant-client , servant-server, stm, sydtest, sydtest-discover, sydtest-wai @@ -251863,6 +252861,43 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-servant_0_1_0_0" = callPackage + ({ mkDerivation, base, http-client, servant, servant-client + , servant-server, stm, sydtest, sydtest-discover, sydtest-wai + }: + mkDerivation { + pname = "sydtest-servant"; + version = "0.1.0.0"; + sha256 = "0mn7fys01qakapnrcrlpji1kwc3cgywblid4wpipmh2kdpy61ndk"; + libraryHaskellDepends = [ + base http-client servant servant-client servant-server sydtest + sydtest-wai + ]; + testHaskellDepends = [ + base servant servant-client servant-server stm sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A servant companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-typed-process" = callPackage + ({ mkDerivation, base, bytestring, sydtest, sydtest-discover + , typed-process + }: + mkDerivation { + pname = "sydtest-typed-process"; + version = "0.0.0.0"; + sha256 = "0j5x2liimaxnd1p7bhkd1ic9vccxdph431rq3dmzl3f440qb3rws"; + libraryHaskellDepends = [ base sydtest typed-process ]; + testHaskellDepends = [ base bytestring sydtest typed-process ]; + testToolDepends = [ sydtest-discover ]; + description = "A typed-process companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-wai" = callPackage ({ mkDerivation, base, http-client, http-types, stm, sydtest , sydtest-discover, wai, warp @@ -251881,6 +252916,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-wai_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, http-client + , http-types, mtl, network, pretty-show, stm, sydtest + , sydtest-discover, text, time, wai, warp + }: + mkDerivation { + pname = "sydtest-wai"; + version = "0.1.0.0"; + sha256 = "0fk1b7205h8ib35bp4pma37vk7cy7dwg0kkcv63k60sq1laj48rl"; + libraryHaskellDepends = [ + base bytestring case-insensitive http-client http-types mtl network + pretty-show sydtest text time wai warp + ]; + testHaskellDepends = [ + base http-client http-types stm sydtest wai + ]; + testToolDepends = [ sydtest-discover ]; + description = "A wai companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-yesod" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , conduit, containers, cookie, exceptions, http-client, http-types @@ -254260,22 +255317,22 @@ self: { "talash" = callPackage ({ mkDerivation, alfred-margaret, base, brick, bytestring - , colorful-monoids, containers, directory, ghc-compact, intro - , microlens, microlens-th, text, unix, unordered-containers, vector + , colorful-monoids, directory, ghc-compact, intro, microlens + , microlens-th, text, unix, unordered-containers, vector , vector-algorithms, vector-sized, vty }: mkDerivation { pname = "talash"; - version = "0.1.0.1"; - sha256 = "1j28i5aipldjknfx22dil0xi1gwlv89frl1fn606yl1g84q1kr5n"; + version = "0.1.1.1"; + sha256 = "0sa4ay2dc4srh5wbk72iznjwr5bjjhggafhf27zyyxjhnjvfgsq1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - alfred-margaret base brick bytestring colorful-monoids containers - directory ghc-compact intro microlens microlens-th text unix + alfred-margaret base brick bytestring colorful-monoids directory + ghc-compact intro microlens microlens-th text unix unordered-containers vector vector-algorithms vector-sized vty ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base intro ]; description = "Line oriented fast enough text search"; license = lib.licenses.gpl3Only; }) {}; @@ -259926,8 +260983,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.2.0.1"; - sha256 = "1n6raffsjn9iq427nyh7hnnx1jvgvilisfy6dz72hl4ry5198sdq"; + version = "1.2.1"; + sha256 = "0dd1f0lhq0sdl2i3cz7maf49vif89jlv6ny64pw4ywnwycblq3if"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265893,6 +266950,23 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "1.0.0.0"; + sha256 = "1w9xzgks9vj89mzrnjpgrx1iv67xbp6rn8s1ffc0qam268y8dbzv"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -267285,8 +268359,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "type-fun"; - version = "0.1.2"; - sha256 = "1qb9h6x1npq1pc8h7n6ism5a6jccysn76czqym1f69x0qh1jjlay"; + version = "0.1.3"; + sha256 = "0br31kghd0hm2qaz14pm6lxbl2z1ci3c0758qfpiq1dmm9mmc4ir"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Collection of widely reimplemented type families"; @@ -275158,8 +276232,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.3.0.1"; - sha256 = "0i834y50b4820109asrzp61bqprxs9rfgr9b8310zhsisrlbxgl3"; + version = "0.3.1"; + sha256 = "1q40cny80lf0yb38ahmpz42k0w6646mscajlny8zxb6rwylvscv9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -276022,8 +277096,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.10.1"; - sha256 = "0lk4l65qvq1b3dz9fkz981zgm2m9nx38ylccnsxcgxns2s2zx9b3"; + version = "3.10.2"; + sha256 = "0l3afdavqn226vg96cq5di2ra7snl0ygmil5g8zcs46vkamgzcmy"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -279556,8 +280630,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.4.1"; - sha256 = "0bi42gpw0cf5ymnwlffnfdq68jfvk0j4qcnqv8lvwz2vp1ngs23j"; + version = "0.14.4.2"; + sha256 = "1l77qh9iyrcvsf0kha9vcm1v6fayk5i71qprdzbvfp5sihbcnz3r"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; @@ -280455,6 +281529,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_13" = callPackage + ({ mkDerivation, async, base, containers, fold-debounce, hspec + , hspec-discover, mtl, semigroups, stm, text, time, transformers + , wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.13"; + sha256 = "0fs8k2kfzm6qq9xy35278xprgq7vf0v4qz7q0gz8qv480hffccc5"; + libraryHaskellDepends = [ + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 + ]; + testToolDepends = [ hspec-discover ]; + description = "X11-specific implementation for WildBind"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "willow" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hashable , hedgehog, hedgehog-classes, HUnit, mtl, text, transformers @@ -285674,6 +286770,26 @@ self: { license = lib.licenses.mit; }) {}; + "yamlparse-applicative_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , optparse-applicative, path, path-io, prettyprinter + , safe-coloured-text, scientific, text, unordered-containers + , validity, validity-text, vector, yaml + }: + mkDerivation { + pname = "yamlparse-applicative"; + version = "0.2.0.0"; + sha256 = "1c287mc7rl6xhwsb3gw51m6sx29dz88a9b6qa0b324hgcmf086sk"; + libraryHaskellDepends = [ + aeson base bytestring containers optparse-applicative path path-io + prettyprinter safe-coloured-text scientific text + unordered-containers validity validity-text vector yaml + ]; + description = "Declaritive configuration parsing with free docs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yampa-canvas" = callPackage ({ mkDerivation, base, blank-canvas, stm, time, Yampa }: mkDerivation { @@ -290131,6 +291247,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "zip_1_7_1" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base, unix + }: + mkDerivation { + pname = "zip"; + version = "1.7.1"; + sha256 = "0impiv9xsirbvnpnv1lh6lhnl8a4fqylpjif7niyjjbcvyxh4zqd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base unix + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + description = "Operations on zip archives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process From 0b4e5efe092a12a1a6b24ac9b9af0265b0be21b5 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 22:56:04 +0200 Subject: [PATCH 328/797] haskellPackages.discord-haskell: build example binaries again This reverts commit 683d06d4ae42e6170a2f461bf21b452c1ab1ebb3. upstream resolved the issue we were experiencing. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4ef8828cb02..cc39fb4fd10 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1953,8 +1953,4 @@ EOT # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 reactive-banana = doJailbreak super.reactive-banana; - # Example executable doesn't compile - # https://github.com/aquarial/discord-haskell/issues/69 - discord-haskell = setBuildTarget super.discord-haskell "lib:discord-haskell"; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 13c72a9a82a96751c185c653208cb13fa84f53bc Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 7 Jun 2021 18:54:53 +0200 Subject: [PATCH 329/797] haskellPackages.dhall-{nix,openapi}: pin to support dhall 1.38.* --- .../configuration-hackage2nix/main.yaml | 3 ++ .../haskell-modules/hackage-packages.nix | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6f380810306..02739f83c4e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -93,6 +93,9 @@ default-package-overrides: - futhark < 0.19.5 # 2021-06-05: remove once pandoc 2.14 is in stackage - pandoc-crossref < 0.3.11.0 + # 2021-06-07: stackage still has dhall < 1.39 + - dhall-nix < 1.1.21 + - dhall-openapi < 1.0.1 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d7aa37d59c8..b9cc0d00004 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74058,6 +74058,30 @@ self: { }) {}; "dhall-nix" = callPackage + ({ mkDerivation, base, containers, data-fix, dhall, hnix + , lens-family-core, neat-interpolation, optparse-generic, text + }: + mkDerivation { + pname = "dhall-nix"; + version = "1.1.20"; + sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; + revision = "2"; + editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-fix dhall hnix lens-family-core + neat-interpolation text + ]; + executableHaskellDepends = [ + base dhall hnix optparse-generic text + ]; + description = "Dhall to Nix compiler"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + + "dhall-nix_1_1_21" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: @@ -74076,6 +74100,7 @@ self: { ]; description = "Dhall to Nix compiler"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; @@ -74102,6 +74127,31 @@ self: { }) {}; "dhall-openapi" = callPackage + ({ mkDerivation, aeson, base, containers, dhall, directory + , filepath, megaparsec, optparse-applicative, parser-combinators + , prettyprinter, scientific, sort, text, vector + }: + mkDerivation { + pname = "dhall-openapi"; + version = "1.0.0"; + sha256 = "1dg1hj8yfm08bzzirzg6cq26vkxv6i86rrf96a73pb1hpz3jjq7j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers dhall prettyprinter scientific sort text + vector + ]; + executableHaskellDepends = [ + aeson base containers dhall directory filepath megaparsec + optparse-applicative parser-combinators prettyprinter sort text + vector + ]; + description = "Convert an OpenAPI specification to a Dhall package"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + + "dhall-openapi_1_0_1" = callPackage ({ mkDerivation, aeson, base, containers, dhall, directory , filepath, megaparsec, optparse-applicative, parser-combinators , prettyprinter, scientific, sort, text, vector @@ -74123,6 +74173,7 @@ self: { ]; description = "Convert an OpenAPI specification to a Dhall package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; From e76ccc6b2798e50ef959a8cf830035d76a92106b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 8 Jun 2021 11:50:05 +0200 Subject: [PATCH 330/797] php.extensions: Add missing meta info --- pkgs/development/php-packages/apcu/default.nix | 7 ++++++- pkgs/development/php-packages/apcu_bc/default.nix | 9 +++++++-- pkgs/development/php-packages/ast/default.nix | 7 ++++++- pkgs/development/php-packages/couchbase/default.nix | 9 +++++++-- pkgs/development/php-packages/igbinary/default.nix | 7 ++++++- pkgs/development/php-packages/imagick/default.nix | 7 ++++++- pkgs/development/php-packages/mailparse/default.nix | 7 ++++++- pkgs/development/php-packages/maxminddb/default.nix | 1 + pkgs/development/php-packages/memcached/default.nix | 7 ++++++- pkgs/development/php-packages/mongodb/default.nix | 7 ++++++- pkgs/development/php-packages/oci8/default.nix | 7 ++++++- pkgs/development/php-packages/pcov/default.nix | 7 ++++++- pkgs/development/php-packages/pdlib/default.nix | 1 + pkgs/development/php-packages/pdo_sqlsrv/default.nix | 7 ++++++- pkgs/development/php-packages/php_excel/default.nix | 9 +++++++-- pkgs/development/php-packages/phpmd/default.nix | 4 +--- pkgs/development/php-packages/pinba/default.nix | 1 + pkgs/development/php-packages/rdkafka/default.nix | 1 + pkgs/development/php-packages/redis/default.nix | 7 ++++++- pkgs/development/php-packages/smbclient/default.nix | 7 ++++++- pkgs/development/php-packages/sqlsrv/default.nix | 7 ++++++- pkgs/development/php-packages/xdebug/default.nix | 7 ++++++- pkgs/development/php-packages/yaml/default.nix | 7 ++++++- 23 files changed, 116 insertions(+), 24 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 5aa8b2b4f9b..0cfc7b4b44f 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -13,5 +13,10 @@ buildPecl { makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Userland cache for PHP"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/APCu"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix index 448c25bee64..e487a075dbd 100644 --- a/pkgs/development/php-packages/apcu_bc/default.nix +++ b/pkgs/development/php-packages/apcu_bc/default.nix @@ -14,6 +14,11 @@ buildPecl { mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so ''; - meta.maintainers = lib.teams.php.members; - meta.broken = lib.versionAtLeast php.version "8"; + meta = with lib; { + description = "APCu Backwards Compatibility Module"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/apcu_bc"; + maintainers = teams.php.members; + broken = versionAtLeast php.version "8"; + }; } diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index fb609b9f04f..03cd439867a 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -6,5 +6,10 @@ buildPecl { version = "1.0.10"; sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Exposes the abstract syntax tree generated by PHP"; + license = licenses.bsd3; + homepage = "https://pecl.php.net/package/ast"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 6d6bdf76e40..0b34ffe780a 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -44,6 +44,11 @@ buildPecl { '') ]; - meta.broken = lib.versionAtLeast php.version "8.0"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Couchbase Server PHP extension"; + license = licenses.asl20; + homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html"; + maintainers = teams.php.members; + broken = versionAtLeast php.version "8.0"; + }; } diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index 7a321cc90b4..9e710f3c3d1 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -10,5 +10,10 @@ buildPecl { makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Binary serialization for PHP"; + license = licenses.bsd3; + homepage = "https://github.com/igbinary/igbinary/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 744ba2302f7..1af4f1a23b4 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -23,5 +23,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre2 ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Imagick is a native php extension to create and modify images using the ImageMagick API"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/imagick"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index 820bbbdbad6..1981b3d6aea 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -11,5 +11,10 @@ buildPecl { echo "#define HAVE_MBSTRING 1" >> config.h ''; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Mailparse is an extension for parsing and working with email messages"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/mailparse"; + maintainers = lib.teams.php.members; + }; } diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 9a5a96e15c2..ae7ef3d0602 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -19,6 +19,7 @@ buildPecl { meta = with lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; + homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php"; maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; } diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 4880e08e062..0aea58572cb 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -26,5 +26,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ cyrus_sasl zlib ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP extension for interfacing with memcached via libmemcached library"; + license = licenses.php301; + homepage = "https://github.com/php-memcached-dev/php-memcached"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index d0e5e545f6b..f8cd990d267 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -17,5 +17,10 @@ buildPecl { pcre2 ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "MongoDB driver for PHP"; + license = licenses.asl20; + homepage = "https://docs.mongodb.com/drivers/php/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index eeaffb4b7fc..eb65b5a27cd 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -11,5 +11,10 @@ buildPecl { sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4 ''; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Extension for Oracle Database"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/oci8"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 0583f776e56..8511ccbebc5 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -8,5 +8,10 @@ buildPecl { buildInputs = [ pcre2 ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "A self contained php-code-coverage compatible driver for PHP."; + license = licenses.php301; + homepage = "https://github.com/krakjoe/pcov"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix index e217edd29ef..5a1e431d52d 100644 --- a/pkgs/development/php-packages/pdlib/default.nix +++ b/pkgs/development/php-packages/pdlib/default.nix @@ -19,6 +19,7 @@ buildPecl { meta = with lib; { description = "A PHP extension for Dlib"; license = with licenses; [ mit ]; + homepage = "https://github.com/goodspb/pdlib"; maintainers = lib.teams.php.members; }; } diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index d80944ada09..ab7e6e71fea 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -10,5 +10,10 @@ buildPecl { buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Microsoft Drivers for PHP for SQL Server"; + license = licenses.mit; + homepage = "https://github.com/Microsoft/msphpsql"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix index 4effddaed49..0930926a06e 100644 --- a/pkgs/development/php-packages/php_excel/default.nix +++ b/pkgs/development/php-packages/php_excel/default.nix @@ -20,6 +20,11 @@ buildPecl { "--with-libxl-libdir=${libxl}/lib" ]; - meta.broken = lib.versionAtLeast php.version "8.0"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP Extension interface to the Excel writing/reading library"; + license = licenses.php301; + homepage = "https://github.com/iliaal/php_excel"; + maintainers = lib.teams.php.members; + broken = lib.versionAtLeast php.version "8.0"; + }; } diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index fde674701eb..bf6979f88ea 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -2,8 +2,6 @@ let pname = "phpmd"; version = "2.8.2"; - - isPhp74 = lib.versionAtLeast php.version "7.4"; in mkDerivation { inherit pname version; @@ -28,6 +26,6 @@ mkDerivation { license = licenses.bsd3; homepage = "https://phpmd.org/"; maintainers = teams.php.members; - broken = !isPhp74; + broken = versionAtLeast php.version "7.4"; }; } diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 4c1b42183ba..0373e74d9fc 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -17,6 +17,7 @@ buildPecl { Pinba is a MySQL storage engine that acts as a realtime monitoring and statistics server for PHP using MySQL as a read-only interface. ''; + license = licenses.lgpl2Plus; homepage = "http://pinba.org/"; maintainers = teams.php.members; }; diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index c8dea9463d6..1b963a01ad5 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -15,6 +15,7 @@ buildPecl { meta = with lib; { description = "Kafka client based on librdkafka"; + license = licenses.mit; homepage = "https://github.com/arnaud-lb/php-rdkafka"; maintainers = teams.php.members; }; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index fedc7a7ffde..35e9a909b37 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -14,5 +14,10 @@ buildPecl { hash ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP extension for interfacing with Redis"; + license = licenses.php301; + homepage = "https://github.com/phpredis/phpredis/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix index 0b485e04805..65cfad9ea3a 100644 --- a/pkgs/development/php-packages/smbclient/default.nix +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -10,5 +10,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ samba ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP wrapper for libsmbclient"; + license = licenses.bsd2; + homepage = "https://github.com/eduardok/libsmbclient-php"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 4522129b2aa..37ff1cb187e 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -10,5 +10,10 @@ buildPecl { unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Microsoft Drivers for PHP for SQL Server"; + license = licenses.mit; + homepage = "https://github.com/Microsoft/msphpsql"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 56341be436a..eaadb4b1f54 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -11,5 +11,10 @@ buildPecl { zendExtension = true; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Provides functions for function traces and profiling"; + license = licenses.php301; + homepage = "https://xdebug.org/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 9bd30ff4e3c..ef58b315fae 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -10,5 +10,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "YAML-1.1 parser and emitter"; + license = licenses.mit; + homepage = "http://bd808.com/pecl-file_formats-yaml/"; + maintainers = teams.php.members; + }; } From 094dcbe0ff1ace98c198c94d96028d6c67a40f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 8 Jun 2021 13:47:44 +0200 Subject: [PATCH 331/797] 389-base: Add CVE-2021-3514 --- pkgs/servers/ldap/389/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index db9041574fc..4387542e5af 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -65,5 +65,8 @@ stdenv.mkDerivation rec { description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl3Plus; platforms = platforms.linux; + knownVulnerabilities = [ + "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514 + ]; }; } From a5d51a575cf6392b06bcab001c35149f09fc39c4 Mon Sep 17 00:00:00 2001 From: mupdt <25388474+mupdt@users.noreply.github.com> Date: Tue, 8 Jun 2021 12:54:34 +0100 Subject: [PATCH 332/797] terraform-providers.grafana: 1.5.0 -> 1.10.0 --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 252b6272703..0fe5b452ffc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -378,11 +378,13 @@ "version": "3.47.0" }, "grafana": { - "owner": "terraform-providers", + "owner": "grafana", + "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.5.0", - "sha256": "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi", - "version": "1.5.0" + "rev": "v1.10.0", + "sha256": "0q3j30q1zxpdm0fmda3ivnl754q2p61xn9l30l0a3n0r5b25w8pk", + "vendorSha256": null, + "version": "1.10.0" }, "gridscale": { "owner": "terraform-providers", From 2af97c1a045c09693525d34e33845225c9d24952 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 7 Jun 2021 22:08:55 +0200 Subject: [PATCH 333/797] intel-media-driver: 21.2.1 -> 21.2.2 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index a782e088820..37375f52c32 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.2.1"; + version = "21.2.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0a49087ca3li1cbsdcwp31zlakfw9dxcr2lnxzm5s3x63jvwlbag"; + sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48"; }; cmakeFlags = [ From f46a1e353af8bd3f021f400f7275888c22dbaa29 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 8 Jun 2021 11:36:09 +0200 Subject: [PATCH 334/797] tests.writers: give all test derivations unique names This makes it easier to debug test failures since the derivation name will give an indication which writer it belongs to. --- pkgs/build-support/writers/test.nix | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 689b45a126f..b0df153fee8 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -13,11 +13,11 @@ with writers; let bin = { - bash = writeBashBin "test_writers" '' + bash = writeBashBin "test_writers_bash_bin" '' if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeCBin "test_writers" { libraries = [ ]; } '' + c = writeCBin "test_writers_c" { libraries = [ ]; } '' #include int main() { printf("success\n"); @@ -25,17 +25,17 @@ let } ''; - dash = writeDashBin "test_writers" '' + dash = writeDashBin "test_writers_dash_bin" '' test '~' = '~' && echo 'success' ''; - rust = writeRustBin "test_writers" {} '' + rust = writeRustBin "test_writers_rust_bin" {} '' fn main(){ println!("success") } ''; - haskell = writeHaskellBin "test_writers" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = writeHaskellBin "test_writers_haskell_bin" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -47,7 +47,7 @@ let _ -> print "fail" ''; - js = writeJSBin "test_writers" { libraries = [ nodePackages.semver ]; } '' + js = writeJSBin "test_writers_js_bin" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -57,12 +57,12 @@ let } ''; - perl = writePerlBin "test_writers" { libraries = [ perlPackages.boolean ]; } '' + perl = writePerlBin "test_writers_perl_bin" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; ''; - python2 = writePython2Bin "test_writers" { libraries = [ python2Packages.enum ]; } '' + python2 = writePython2Bin "test_writers_python2_bin" { libraries = [ python2Packages.enum ]; } '' from enum import Enum @@ -73,7 +73,7 @@ let print Test.a ''; - python3 = writePython3Bin "test_writers" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = writePython3Bin "test_writers_python3_bin" { libraries = [ python3Packages.pyyaml ]; } '' import yaml y = yaml.load(""" @@ -84,11 +84,11 @@ let }; simple = { - bash = writeBash "test_bash" '' + bash = writeBash "test_writers_bash" '' if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeC "test_c" { libraries = [ glib.dev ]; } '' + c = writeC "test_writers_c" { libraries = [ glib.dev ]; } '' #include #include int main() { @@ -106,11 +106,11 @@ let } ''; - dash = writeDash "test_dash" '' + dash = writeDash "test_writers_dash" '' test '~' = '~' && echo 'success' ''; - haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = writeHaskell "test_writers_haskell" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -122,7 +122,7 @@ let _ -> print "fail" ''; - js = writeJS "test_js" { libraries = [ nodePackages.semver ]; } '' + js = writeJS "test_writers_js" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -132,12 +132,12 @@ let } ''; - perl = writePerl "test_perl" { libraries = [ perlPackages.boolean ]; } '' + perl = writePerl "test_writers_perl" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; ''; - python2 = writePython2 "test_python2" { libraries = [ python2Packages.enum ]; } '' + python2 = writePython2 "test_writers_python2" { libraries = [ python2Packages.enum ]; } '' from enum import Enum @@ -148,7 +148,7 @@ let print Test.a ''; - python3 = writePython3 "test_python3" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = writePython3 "test_writers_python3" { libraries = [ python3Packages.pyyaml ]; } '' import yaml y = yaml.load(""" @@ -157,21 +157,21 @@ let print(y[0]['test']) ''; - python2NoLibs = writePython2 "test_python2_no_libs" {} '' + python2NoLibs = writePython2 "test_writers_python2_no_libs" {} '' print("success") ''; - python3NoLibs = writePython3 "test_python3_no_libs" {} '' + python3NoLibs = writePython3 "test_writers_python3_no_libs" {} '' print("success") ''; }; path = { - bash = writeBash "test_bash" (writeText "test" '' + bash = writeBash "test_writers_bash_path" (writeText "test" '' if [[ "test" == "test" ]]; then echo "success"; fi ''); - haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' + haskell = writeHaskell "test_writers_haskell_path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' import Data.Default int :: Int @@ -184,8 +184,8 @@ let ''); }; - writeTest = expectedValue: test: - writeDash "test-writers" '' + writeTest = expectedValue: name: test: + writeDash "run-${name}" '' if test "$(${test})" != "${expectedValue}"; then echo 'test ${test} failed' exit 1 @@ -196,9 +196,9 @@ in runCommand "test-writers" { passthru = { inherit writeTest bin simple; }; meta.platforms = lib.platforms.all; } '' - ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues path)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues simple)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues path)} echo 'nix-writers successfully tested' >&2 touch $out From 3bc8e5cd23b84b2e149e7aaad57117da16a19e6f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 8 Jun 2021 12:38:25 +0200 Subject: [PATCH 335/797] tests.writers: use dashes instead of underscores in drv names This is more in line with standard derivation name policy in nixpkgs. --- pkgs/build-support/writers/test.nix | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index b0df153fee8..d0824b17bd1 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -13,11 +13,11 @@ with writers; let bin = { - bash = writeBashBin "test_writers_bash_bin" '' + bash = writeBashBin "test-writers-bash-bin" '' if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeCBin "test_writers_c" { libraries = [ ]; } '' + c = writeCBin "test-writers-c" { libraries = [ ]; } '' #include int main() { printf("success\n"); @@ -25,17 +25,17 @@ let } ''; - dash = writeDashBin "test_writers_dash_bin" '' + dash = writeDashBin "test-writers-dash-bin" '' test '~' = '~' && echo 'success' ''; - rust = writeRustBin "test_writers_rust_bin" {} '' + rust = writeRustBin "test-writers-rust-bin" {} '' fn main(){ println!("success") } ''; - haskell = writeHaskellBin "test_writers_haskell_bin" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = writeHaskellBin "test-writers-haskell-bin" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -47,7 +47,7 @@ let _ -> print "fail" ''; - js = writeJSBin "test_writers_js_bin" { libraries = [ nodePackages.semver ]; } '' + js = writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -57,12 +57,12 @@ let } ''; - perl = writePerlBin "test_writers_perl_bin" { libraries = [ perlPackages.boolean ]; } '' + perl = writePerlBin "test-writers-perl-bin" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; ''; - python2 = writePython2Bin "test_writers_python2_bin" { libraries = [ python2Packages.enum ]; } '' + python2 = writePython2Bin "test-writers-python2-bin" { libraries = [ python2Packages.enum ]; } '' from enum import Enum @@ -73,7 +73,7 @@ let print Test.a ''; - python3 = writePython3Bin "test_writers_python3_bin" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' import yaml y = yaml.load(""" @@ -84,11 +84,11 @@ let }; simple = { - bash = writeBash "test_writers_bash" '' + bash = writeBash "test-writers-bash" '' if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeC "test_writers_c" { libraries = [ glib.dev ]; } '' + c = writeC "test-writers-c" { libraries = [ glib.dev ]; } '' #include #include int main() { @@ -106,11 +106,11 @@ let } ''; - dash = writeDash "test_writers_dash" '' + dash = writeDash "test-writers-dash" '' test '~' = '~' && echo 'success' ''; - haskell = writeHaskell "test_writers_haskell" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -122,7 +122,7 @@ let _ -> print "fail" ''; - js = writeJS "test_writers_js" { libraries = [ nodePackages.semver ]; } '' + js = writeJS "test-writers-js" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -132,12 +132,12 @@ let } ''; - perl = writePerl "test_writers_perl" { libraries = [ perlPackages.boolean ]; } '' + perl = writePerl "test-writers-perl" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; ''; - python2 = writePython2 "test_writers_python2" { libraries = [ python2Packages.enum ]; } '' + python2 = writePython2 "test-writers-python2" { libraries = [ python2Packages.enum ]; } '' from enum import Enum @@ -148,7 +148,7 @@ let print Test.a ''; - python3 = writePython3 "test_writers_python3" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' import yaml y = yaml.load(""" @@ -157,21 +157,21 @@ let print(y[0]['test']) ''; - python2NoLibs = writePython2 "test_writers_python2_no_libs" {} '' + python2NoLibs = writePython2 "test-writers-python2-no-libs" {} '' print("success") ''; - python3NoLibs = writePython3 "test_writers_python3_no_libs" {} '' + python3NoLibs = writePython3 "test-writers-python3-no-libs" {} '' print("success") ''; }; path = { - bash = writeBash "test_writers_bash_path" (writeText "test" '' + bash = writeBash "test-writers-bash-path" (writeText "test" '' if [[ "test" == "test" ]]; then echo "success"; fi ''); - haskell = writeHaskell "test_writers_haskell_path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' + haskell = writeHaskell "test-writers-haskell-path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' import Data.Default int :: Int From e1d814abda8f88712d8f1c10640802a6cdc83a54 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 8 Jun 2021 14:07:01 +0200 Subject: [PATCH 336/797] sshfs: 3.7.1 -> 3.7.2 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index e575bd3e138..879199347bd 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -22,7 +22,7 @@ in if stdenv.isDarwin then } else mkSSHFS { - version = "3.7.1"; - sha256 = "088mgcsqv9f2vly4xn6lvvkmqkgr9jjmjs9qp8938hl7j6rrgd17"; + version = "3.7.2"; + sha256 = "0i0ycgwdxja8313hlkrlwrl85a4ykkyqddgg484jkr4rnr7ylk8w"; platforms = lib.platforms.linux; } From 4a56c948d2b0f3dc05e85bd0e9e2ac7c8f4f0092 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 8 Jun 2021 14:12:15 +0200 Subject: [PATCH 337/797] terraform-providers.aiven: init at 2.1.14 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 252b6272703..1f87cc6163a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -14,6 +14,15 @@ "sha256": "1wdrjpd3l0xadsa3lqhsc9c57g8x2qkwb76q824sk8za1a7lapii", "version": "1.5.0-patched" }, + "aiven": { + "owner": "aiven", + "provider-source-address": "registry.terraform.io/aiven/aiven", + "repo": "terraform-provider-aiven", + "rev": "v2.1.14", + "sha256": "14bfdhn3daygj1v3lm9b3791sx2cd5h0panchpp39h6vrccrpmmk", + "vendorSha256": "1j09bfbld03yxq0vv9ld0xmw5axbza2bwlz01i1gl1v9dprlnbkc", + "version": "2.1.14" + }, "akamai": { "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/akamai/akamai", From 272b93463ebd3ba7797bd7544e27543513941dea Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 8 Jun 2021 14:14:35 +0200 Subject: [PATCH 338/797] gocryptfs: 2.0 -> 2.0.1 (#126178) --- pkgs/tools/filesystems/gocryptfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 83d53c31888..c2e022ca4bd 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -16,13 +16,13 @@ in buildGoModule rec { pname = "gocryptfs"; - version = "2.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "1wpdzi1qfpab76v0ki74qkk82m3ykr4iqb8r6a8k11l4fn42fjk0"; + sha256 = "0wiagmym8mwi0vpvrs5ryn3zjwha8ilh7xkavvkd1gqd5laln0kp"; }; vendorSha256 = "10az8n7z4rhsk1af2x6v3pmxg4zp7c9cal35ily8bdzzcb9cpgs0"; From 118b28a127c79dbae8c513742fbb17f300407a4b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 1 Jun 2021 23:52:19 +0200 Subject: [PATCH 339/797] haskell.compiler.*: pull in unwrapped bintools for darwin GHC calls otool on darwin which is contained in the stdenv.cc.bintools.bintools derivation and thus needs adding to the runtime PATH of GHC. Since this is toolchain specific technically, we check for cctools instead of darwin (although I don't know if GHC or nixpkgs work on macOS without cctools). This fixes usage of GHC in an environment where otool is not available and more specifically in stdenvNoCC which is used by writers.writeHaskell. Resolves #123228. --- pkgs/development/compilers/ghc/8.10.4.nix | 11 ++++++++++- pkgs/development/compilers/ghc/8.8.4.nix | 11 ++++++++++- pkgs/development/compilers/ghc/9.0.1.nix | 11 ++++++++++- pkgs/development/compilers/ghc/head.nix | 11 ++++++++++- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index da957f93520..9c514efc282 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -93,6 +93,15 @@ let # see #84670 and #49071 for more background. useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; + in stdenv.mkDerivation (rec { version = "8.10.4"; @@ -235,7 +244,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index b0336ad3992..fcb7db617d0 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -102,6 +102,15 @@ let # see #84670 and #49071 for more background. useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; + in stdenv.mkDerivation (rec { version = "8.8.4"; @@ -242,7 +251,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index 58beef5d688..a110d587874 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -94,6 +94,15 @@ let # see #84670 and #49071 for more background. useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; + in stdenv.mkDerivation (rec { version = "9.0.1"; @@ -225,7 +234,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a0ca13270a2..e1c1cdf8dc5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -104,6 +104,15 @@ let # see #84670 and #49071 for more background. useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; + in stdenv.mkDerivation (rec { inherit version; @@ -242,7 +251,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; From 5da1daec6c8b9933a834f903a42f6680fee246db Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 8 Jun 2021 11:53:52 +0200 Subject: [PATCH 340/797] codeowners: Add all @NixOS/php team members to codeowners list --- .github/CODEOWNERS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 597978aa53b..2f5c5950cdb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -196,12 +196,12 @@ /nixos/tests/prometheus-exporters.nix @WilliButz # PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @NixOS/php -/nixos/tests/php @NixOS/php -/pkgs/build-support/build-pecl.nix @NixOS/php -/pkgs/development/interpreters/php @NixOS/php @jtojnar -/pkgs/development/php-packages @NixOS/php -/pkgs/top-level/php-packages.nix @NixOS/php @jtojnar +/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz +/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq From e097f7efc77726a17acca7be3e6e2346331883f3 Mon Sep 17 00:00:00 2001 From: tcmal Date: Tue, 8 Jun 2021 13:36:06 +0100 Subject: [PATCH 341/797] lldb: fix python lldb library _lldb.so is now properly symlinked to the shared library. applies to lldb 8 through 12. fixes #125183 --- pkgs/development/compilers/llvm/10/lldb/default.nix | 6 ++++++ .../compilers/llvm/10/lldb/gnu-install-dirs.patch | 13 +++++++++++++ pkgs/development/compilers/llvm/11/lldb/default.nix | 6 ++++++ .../compilers/llvm/11/lldb/gnu-install-dirs.patch | 13 +++++++++++++ pkgs/development/compilers/llvm/12/lldb/default.nix | 6 ++++++ .../compilers/llvm/12/lldb/gnu-install-dirs.patch | 13 +++++++++++++ pkgs/development/compilers/llvm/8/lldb/default.nix | 6 ++++++ .../compilers/llvm/8/lldb/gnu-install-dirs.patch | 13 +++++++++++++ pkgs/development/compilers/llvm/9/lldb/default.nix | 6 ++++++ .../compilers/llvm/9/lldb/gnu-install-dirs.patch | 13 +++++++++++++ 10 files changed, 95 insertions(+) diff --git a/pkgs/development/compilers/llvm/10/lldb/default.nix b/pkgs/development/compilers/llvm/10/lldb/default.nix index 04b9e06e77a..7ce7e1f8150 100644 --- a/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -68,6 +68,12 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch index 053a580e45e..d781779bbe0 100644 --- a/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch @@ -63,3 +63,16 @@ index aff75d7db334..98a527c5e761 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file diff --git a/pkgs/development/compilers/llvm/11/lldb/default.nix b/pkgs/development/compilers/llvm/11/lldb/default.nix index 785ac4671ef..ed118537a5d 100644 --- a/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/pkgs/development/compilers/llvm/11/lldb/default.nix @@ -68,6 +68,12 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch index a4769109523..ac071617dd4 100644 --- a/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch @@ -63,3 +63,16 @@ index efba2f74904f..e08413b1dbb1 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index 07517308b46..24cbcabddad 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -84,6 +84,12 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch index 98321f4479e..0435784a247 100644 --- a/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch @@ -63,3 +63,16 @@ index 734167e51bc5..f95761b5df58 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file diff --git a/pkgs/development/compilers/llvm/8/lldb/default.nix b/pkgs/development/compilers/llvm/8/lldb/default.nix index ee1f678996a..27ed52189b1 100644 --- a/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch index b2e79086bed..eb1ca727df4 100644 --- a/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch @@ -79,3 +79,16 @@ index b5316540fdf3..3c3c882d503f 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cdf22c4..d56fc6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON) + --cfgBldDir=${lldb_scripts_dir} + --prefix=${CMAKE_BINARY_DIR} + --cmakeBuildConfiguration=${CMAKE_CFG_INTDIR} +- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX} ++ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + ${use_python_wrapper_from_src_dir} + ${use_six_py_from_system} + VERBATIM diff --git a/pkgs/development/compilers/llvm/9/lldb/default.nix b/pkgs/development/compilers/llvm/9/lldb/default.nix index 9957a0218da..ee42e391b58 100644 --- a/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -58,6 +58,12 @@ stdenv.mkDerivation rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' # man page mkdir -p $out/share/man/man1 diff --git a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch index cb4e400b367..a482aac5779 100644 --- a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch @@ -63,3 +63,16 @@ index b5316540fdf3..3c3c882d503f 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cdf22c4..d56fc6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON) + --cfgBldDir=${lldb_scripts_dir} + --prefix=${CMAKE_BINARY_DIR} + --cmakeBuildConfiguration=${CMAKE_CFG_INTDIR} +- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX} ++ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + ${use_python_wrapper_from_src_dir} + ${use_six_py_from_system} + VERBATIM From 8f34dc40570e4bc8e395c36be751c64ca177b38d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 8 Jun 2021 15:24:59 +0200 Subject: [PATCH 342/797] terraform-providers.metal: add missing provider-source-address attribute (#126206) --- .../networking/cluster/terraform-providers/providers.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1f87cc6163a..bad5e68ce77 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -618,6 +618,7 @@ }, "metal": { "owner": "equinix", + "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", "rev": "v2.1.0", "sha256": "06i3rj6ig8hxbncdpa8b11v8pr3zhi90ppmf77jjin1114ikd172", From 3fd62910383a19fc910a38ea6ba9c3b35f9ed9c6 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 8 Jun 2021 14:48:57 +0100 Subject: [PATCH 343/797] agate: 3.0.3 -> 3.1.0 --- pkgs/servers/gemini/agate/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 5585926da58..faaef53f164 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,26 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0sh9OuX52kvhTt681uZesOUttrxH8ZMxn6mTILQDQuU="; + sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA="; }; - cargoSha256 = "sha256-JBmSa2sc/eor0bCcIMhGGLmcJN+wCloP0Ao9DBybQbc="; + cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlags = [ - # Username and Password use the same ports and causes collision - # https://github.com/mbrubeck/agate/issues/50 - "--skip username" - "--skip password" - ]; - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck From 428c0e107ff085c64e9f39ae678784421ed14b64 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 8 Jun 2021 08:54:33 -0500 Subject: [PATCH 344/797] poetry2nix: 1.17.0 -> 1.17.1 --- pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 8 ++++---- .../tools/poetry2nix/poetry2nix/mk-poetry-dep.nix | 2 +- .../development/tools/poetry2nix/poetry2nix/overrides.nix | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 712baf613e4..3971a7631d4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.17.0"; + version = "1.17.1"; inherit (poetryLib) isCompatible readTOML moduleName; @@ -209,12 +209,12 @@ lib.makeScope pkgs.newScope (self: { poetry-core = if __isBootstrap then null else poetryPkg.passthru.python.pkgs.poetry-core; poetry = if __isBootstrap then null else poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools-scm; - __toPluginAble = toPluginAble self; inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook; + } // lib.optionalAttrs (! super ? setuptools-scm) { + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 193e44935b4..b403e9941f3 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -89,7 +89,7 @@ pythonPackages.callPackage # Prevent infinite recursion skipSetupToolsSCM = [ - "setuptools-scm" + "setuptools_scm" "setuptools-scm" "toml" # Toml is an extra for setuptools-scm ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ea0045c1147..78751385577 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -598,7 +598,7 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ]; + nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ]; } ); @@ -636,6 +636,10 @@ self: super: cat > setup.cfg < Date: Tue, 8 Jun 2021 16:21:41 +0200 Subject: [PATCH 345/797] shattered-pixel-dungeon: 0.9.2b -> 0.9.3 --- pkgs/games/shattered-pixel-dungeon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index a11d698b801..ec18a26829f 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,15 +10,15 @@ let pname = "shattered-pixel-dungeon"; - version = "0.9.2b"; + version = "0.9.3"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 - rev = "eba806ef561921b86637cf26818e095556edec0d"; - sha256 = "05m4sfchccr437pxjvgzjk6nd9r3n4c4p3q8lxcc5pj6qrppk49j"; + rev = "785c869f2b61013a15fddbf5f0c65d67fe900e80"; + sha256 = "sha256-d7Fc1IPOW/0RwLYe9vwaD3gFw6div2/J0DOFdWYDXWY="; }; postPatch = '' From f637d1b63219581259559bf0356386fcf3fff1ed Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 8 Jun 2021 00:22:36 +0700 Subject: [PATCH 346/797] coqPackages.reglang: init at 1.1.2 --- .../coq-modules/reglang/default.nix | 25 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/coq-modules/reglang/default.nix diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix new file mode 100644 index 00000000000..bc18108264a --- /dev/null +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -0,0 +1,25 @@ +{ lib, mkCoqDerivation, coq, ssreflect, version ? null }: +with lib; + +mkCoqDerivation { + pname = "reglang"; + + releaseRev = v: "v${v}"; + + release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.13"; out = "1.1.2"; } + ] null; + + + propagatedBuildInputs = [ ssreflect ]; + + meta = { + description = "Regular Language Representations in Coq"; + maintainers = with maintainers; [ siraben ]; + license = licenses.cecill-b; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bd957bdb49d..1ac8c4c4005 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -69,6 +69,7 @@ let paramcoq = callPackage ../development/coq-modules/paramcoq {}; pocklington = callPackage ../development/coq-modules/pocklington {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; + reglang = callPackage ../development/coq-modules/reglang {}; relation-algebra = callPackage ../development/coq-modules/relation-algebra {}; simple-io = callPackage ../development/coq-modules/simple-io { }; stdpp = callPackage ../development/coq-modules/stdpp { }; From af51d708572f8ebb9fc0020ca62ae780955b0503 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Tue, 8 Jun 2021 11:13:59 -0400 Subject: [PATCH 347/797] nixos/networkmanager: Add connectionConfig. (#118308) Adds the `networking.networkmanager.connectionConfig` option which allows setting arbitrary settings inside the `[connection]` section. This also reworked the underlying representation significantly to be less string-pasting and more semantic. In a future step it probably makes sense to provide raw access to other sections to users rather than replying on `extraConfig`. However I decided to defer this primarily because ordering of sections can matter. (Although IIUC this is only true for different `[connection]` sections). I think in the future we could expose an object where users can define/edit all sections and map the current configuration onto those. For now however only `[connection]` is exposed and the rest are just used internally. --- .../services/networking/networkmanager.nix | 103 +++++++++++++----- 1 file changed, 76 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 135f29be58c..064018057cd 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -22,36 +22,51 @@ let enableIwd = cfg.wifi.backend == "iwd"; - configFile = pkgs.writeText "NetworkManager.conf" '' - [main] - plugins=keyfile - dhcp=${cfg.dhcp} - dns=${cfg.dns} - # If resolvconf is disabled that means that resolv.conf is managed by some other module. - rc-manager=${if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"} + mkValue = v: + if v == true then "yes" + else if v == false then "no" + else if lib.isInt v then toString v + else v; - [keyfile] - ${optionalString (cfg.unmanaged != []) - ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''} - - [logging] - level=${cfg.logLevel} - audit=${lib.boolToString config.security.audit.enable} - - [connection] - ipv6.ip6-privacy=2 - ethernet.cloned-mac-address=${cfg.ethernet.macAddress} - wifi.cloned-mac-address=${cfg.wifi.macAddress} - ${optionalString (cfg.wifi.powersave != null) - ''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''} - - [device] - wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"} - wifi.backend=${cfg.wifi.backend} - - ${cfg.extraConfig} + mkSection = name: attrs: '' + [${name}] + ${ + lib.concatStringsSep "\n" + (lib.mapAttrsToList + (k: v: "${k}=${mkValue v}") + (lib.filterAttrs + (k: v: v != null) + attrs)) + } ''; + configFile = pkgs.writeText "NetworkManager.conf" (lib.concatStringsSep "\n" [ + (mkSection "main" { + plugins = "keyfile"; + dhcp = cfg.dhcp; + dns = cfg.dns; + # If resolvconf is disabled that means that resolv.conf is managed by some other module. + rc-manager = + if config.networking.resolvconf.enable then "resolvconf" + else "unmanaged"; + }) + (mkSection "keyfile" { + unmanaged-devices = + if cfg.unmanaged == [] then null + else lib.concatStringsSep ";" cfg.unmanaged; + }) + (mkSection "logging" { + audit = config.security.audit.enable; + level = cfg.logLevel; + }) + (mkSection "connection" cfg.connectionConfig) + (mkSection "device" { + "wifi.scan-rand-mac-address" = cfg.wifi.scanRandMacAddress; + "wifi.backend" = cfg.wifi.backend; + }) + cfg.extraConfig + ]); + /* [network-manager] Identity=unix-group:networkmanager @@ -154,6 +169,28 @@ in { ''; }; + connectionConfig = mkOption { + type = with types; attrsOf (nullOr (oneOf [ + bool + int + str + ])); + default = {}; + description = '' + Configuration for the [connection] section of NetworkManager.conf. + Refer to + + https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html#id-1.2.3.11 + + or + + NetworkManager.conf + 5 + + for more information. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -482,6 +519,18 @@ in { (mkIf enableIwd { wireless.iwd.enable = true; }) + + { + networkmanager.connectionConfig = { + "ipv6.ip6-privacy" = 2; + "ethernet.cloned-mac-address" = cfg.ethernet.macAddress; + "wifi.cloned-mac-address" = cfg.wifi.macAddress; + "wifi.powersave" = + if cfg.wifi.powersave == null then null + else if cfg.wifi.powersave then 3 + else 2; + }; + } ]; boot.kernelModules = [ "ctr" ]; From d8e656dbcf400a6249886e5e620a151b9b3d42f5 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Tue, 8 Jun 2021 21:16:39 +0530 Subject: [PATCH 348/797] Picard: 2.6.2 -> 2.6.3 --- pkgs/applications/audio/picard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 28d0ae6f5f4..49aa0ba4714 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -18,13 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1dhkdzc3601rhg8pqljbv3dz7j0mx75brpfhlizhgwgv65qk3ifj"; + sha256 = "sha256-bSqGgRXqHGjT+OYCEafsT/btVe+n91+L0kB8fnrywss="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] From e6903f1e94803841e21e24c0a5cc52215e2d233d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Jun 2021 19:17:46 -0700 Subject: [PATCH 349/797] steam/fhsenv: add pipewire as hard requirement --- pkgs/games/steam/fhsenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 44bee8ff11a..fe3dde7167b 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -98,6 +98,7 @@ in buildFHSUserEnv rec { xorg.libXfixes libGL libva + pipewire.lib # Not formally in runtime but needed by some games at-spi2-atk From a2f1504ff815f88686894f4af39997c4bf6aaa22 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 8 Jun 2021 18:02:28 +0200 Subject: [PATCH 350/797] mvapich: fix default compilers Fix some typos which resulted in an infinite recursion when mpic++ was called. --- pkgs/development/libraries/mvapich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 71c6ce38f95..704a28dbb8c 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { done # Ensure the default compilers are the ones mvapich was built with - substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/gcc' - substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CC=${stdenv.cc}/bin/g++' - substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'CC=${gfortran}/bin/gfortran' + substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/cc' + substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CXX=${stdenv.cc}/bin/c++' + substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'FC=${gfortran}/bin/gfortran' ''; enableParallelBuilding = true; From d847851a3719ebc53c653250f808905d496aafc1 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 8 Jun 2021 18:30:49 +0200 Subject: [PATCH 351/797] blender: add libharu as dependency This allows to export Grease Pencil drawings as pdfs. For more information, see: https://wiki.blender.org/wiki/Reference/Release_Notes/2.93/Grease_Pencil https://developer.blender.org/rBa8a92cd15a52 --- pkgs/applications/misc/blender/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index cf5ede1c7fe..305ab891713 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -12,7 +12,7 @@ , pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL , potrace , openxr-loader -, embree, gmp +, embree, gmp, libharu }: with lib; @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { gmp pugixml potrace + libharu ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender From 013c6c32c97c6eea5b593eef33cbd4e5f20e2d0c Mon Sep 17 00:00:00 2001 From: Akino Watanabe Date: Tue, 8 Jun 2021 09:42:37 -0700 Subject: [PATCH 352/797] zchunk: 1.1.9 -> 1.1.11 --- pkgs/development/libraries/zchunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 2037d815a81..cf0063f7780 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.9"; + version = "1.1.11"; outputs = [ "out" "lib" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-MqnHtqOjLl6R5GZ4f2UX1iLoO9FUT2IfZlSN58wW8JA="; + hash = "sha256-r+qWJOUnTyPJjM9eW44Q2DMKxx4HloyfNrQ6xWDO9vQ="; }; nativeBuildInputs = [ From 57e51b50b7f7f84617514282560650e434461433 Mon Sep 17 00:00:00 2001 From: marius david Date: Tue, 8 Jun 2021 18:14:16 +0200 Subject: [PATCH 353/797] linuxPackages.rtl8821ce: unstable-2021-03-21 -> 2021-06-06 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index b94bd3128e4..b4def6f001c 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { - pname = "rtl8821ce-${kernel.version}"; - version = "unstable-2021-03-21"; + pname = "rtl8821ce"; + version = "${kernel.version}-unstable-2021-05-28"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "897e7c4c15dd5a0a569745dc223d969a26ff5bfc"; - sha256 = "0935dzz0njxh78wfd17yqah1dxn6b3kaszvzclwwrwwhwcrdp80j"; + rev = "f93db734666f75ebf65e44ceb943c19b598b1647"; + sha256 = "sha256-cqXV52U+6Jl9Jje1nEOYDvmH4rgA1QdrwNCfYeul3hU="; }; hardeningDisable = [ "pic" ]; From 8327060fd7791a7e764a46b0e108c05ae46ac364 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 8 Jun 2021 23:29:10 +0700 Subject: [PATCH 354/797] althttpd: init at unstable-2021-05-07 --- pkgs/servers/althttpd/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/althttpd/default.nix diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix new file mode 100644 index 00000000000..dfb073aa11f --- /dev/null +++ b/pkgs/servers/althttpd/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchfossil }: + +stdenv.mkDerivation rec { + pname = "althttpd"; + version = "unstable-2021-05-07"; + + src = fetchfossil { + url = "https://sqlite.org/althttpd/"; + rev = "2c5e3f9f7051a578"; + sha256 = "sha256-+RuogtQAc+zjCWTOiOunu1pXf3LxfdWYQX+24ysJ7uY="; + }; + + installPhase = '' + install -Dm755 -t $out/bin althttpd + ''; + + meta = with lib; { + description = "The Althttpd webserver"; + homepage = "https://sqlite.org/althttpd/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4988effa176..a95088c7cc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -176,6 +176,8 @@ in alda = callPackage ../development/interpreters/alda { }; + althttpd = callPackage ../servers/althttpd { }; + among-sus = callPackage ../games/among-sus { }; ankisyncd = callPackage ../servers/ankisyncd { }; From 8582f4cd830b0b2fc8e9a4eb28d69340fb1e8014 Mon Sep 17 00:00:00 2001 From: Timothy Klim Date: Tue, 1 Jun 2021 23:12:57 +0700 Subject: [PATCH 355/797] sbt: 1.5.1 -> 1.5.3 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 7b9c6bca7e2..89628b81fbc 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "0dsbqipr549awv584fyl227s1gknlpsf5krp990w7w3bbxl3avb7"; + sha256 = "10kIQNy+3V1SD4uEZs/BJ4E6bTCRV3wjBN8gw9jr9VQ="; }; postPatch = '' From 51bb9f3e9ab6161a3bf7746e20b955712cef618b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Jun 2021 18:07:21 +0200 Subject: [PATCH 356/797] minecraft-server: 1.16.5 -> 1.17 --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 7d70ee9e6d3..ee47a0ecdc2 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.5"; + version = "1.17"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar"; + url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar"; # sha1 because that comes from mojang via api - sha1 = "1b557e7b033b583cd9f66746b7a9ab1ec1673ced"; + sha1 = "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"; }; preferLocalBuild = true; From ee9c929fc7bbe1e2e3252146eed040dc18e73c4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 09:05:07 +0200 Subject: [PATCH 357/797] python3Packages.s3fs: 0.5.2 -> 2021.5.0 --- .../python-modules/s3fs/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 86701865861..63a9e722f2c 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,24 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, aiobotocore +, fsspec +}: buildPythonPackage rec { pname = "s3fs"; - version = "0.5.2"; + version = "2021.5.0"; src = fetchPypi { inherit pname version; - sha256 = "87e5210415db17b9de18c77bcfc4a301570cc9030ee112b77dc47ab82426bae1"; + sha256 = "sha256-cEJVMIFMaC3E9829ofKTCtgy2/G+40G1yQURxUzBJpA="; }; - buildInputs = [ docutils ]; - propagatedBuildInputs = [ aiobotocore fsspec ]; + buildInputs = [ + docutils + ]; + + propagatedBuildInputs = [ + aiobotocore + fsspec + ]; # Depends on `moto` which has a long dependency chain with exact # version requirements that can't be made to work with current # pythonPackages. doCheck = false; + pythonImportsCheck = [ "s3fs" ]; + meta = with lib; { - description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; + description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3"; homepage = "https://github.com/dask/s3fs/"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; From 5afbcec69f1cb2b8143947567512469e2ef58873 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 10:00:58 +0200 Subject: [PATCH 358/797] python3Packages.gcsfs: 2021.04.0 -> 2021.05.0 --- .../python-modules/gcsfs/default.nix | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 483e4a61084..c71794b106e 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -1,31 +1,54 @@ -{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth -, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod -, pytest-vcr, vcrpy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, google-auth +, google-auth-oauthlib +, requests +, decorator +, fsspec +, ujson +, aiohttp +, crcmod +, pytest-vcr +, vcrpy +}: buildPythonPackage rec { pname = "gcsfs"; - version = "2021.04.0"; + version = "2021.05.0"; + disabled = pythonOlder "3.6"; - # github sources needed for test data src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs="; + sha256 = "sha256-I17eWaijxn0+8CzfzvzXVc0t9gQ03vx29a/i+QCQ0/U="; }; propagatedBuildInputs = [ + aiohttp + crcmod + decorator + fsspec google-auth google-auth-oauthlib requests - decorator - fsspec - aiohttp ujson - crcmod ]; - checkInputs = [ pytestCheckHook pytest-vcr vcrpy ]; + checkInputs = [ + pytest-vcr + pytestCheckHook + vcrpy + ]; + + disabledTests = [ + # Tests wants to communicate with the Link-local address + "test_GoogleCredentials_None" + ]; + pythonImportsCheck = [ "gcsfs" ]; meta = with lib; { From 4704cf91c8707ca871234521fed930bd767eb7b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 12:43:09 +0200 Subject: [PATCH 359/797] python3Packages.imgaug: fix build --- .../python-modules/imgaug/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 343c7869a6c..ab3cdd6e6d0 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -4,7 +4,7 @@ , imagecorruptions , numpy , opencv3 -, pytest +, pytestCheckHook , scikitimage , scipy , shapely @@ -43,11 +43,30 @@ buildPythonPackage rec { six ]; - checkPhase = '' - pytest ./test - ''; + checkInputs = [ + opencv3 + pytestCheckHook + ]; - checkInputs = [ opencv3 pytest ]; + disabledTests = [ + # Tests are outdated + "test_quokka_segmentation_map" + "test_pool" + "test_avg_pool" + "test_max_pool" + "test_min_pool" + "est_median_pool" + "test_alpha_is_080" + "test_face_and_lines_at_half_visibility" + "test_polygon_fully_inside_image__no_rectangular_shape" + ]; + + disabledTestPaths = [ + # TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType' + "test/augmenters/test_pooling.py" + ]; + + pythonImportsCheck = [ "imgaug" ]; meta = with lib; { homepage = "https://github.com/aleju/imgaug"; From 31634eb7d82903f5e3406f95262e1b307da525e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 13:02:12 +0200 Subject: [PATCH 360/797] python3Packages.zeep: 3.4.0 -> 4.0.0 --- .../python-modules/zeep/default.nix | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 50dda4c8edb..7c72d250034 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -1,85 +1,85 @@ -{ fetchPypi -, lib -, fetchpatch -, buildPythonPackage -, isPy3k +{ lib +, aiohttp +, aioresponses , appdirs , attrs +, buildPythonPackage , cached-property , defusedxml +, fetchFromGitHub +, freezegun +, httpx , isodate , lxml -, requests -, requests_toolbelt -, six -, pytz -, tornado -, aiohttp -# test dependencies -, freezegun , mock , pretend -, pytest -, pytestcov +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +, pythonOlder +, pytz +, requests +, requests_toolbelt +, requests-file , requests-mock -, aioresponses +, xmlsec }: buildPythonPackage rec { pname = "zeep"; - version = "3.4.0"; + version = "4.0.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "0e98669cfeb60756231ae185498f9ae21b30b2681786b8de58ed34c3b93e41dd"; + src = fetchFromGitHub { + owner = "mvantellingen"; + repo = "python-zeep"; + rev = version; + sha256 = "1rwmwk47fxs8dxwv5dr6gbnbiyilznifb47fhbxgzj231w0y82cm"; }; - patches = [ - ( fetchpatch { - url = "https://github.com/mvantellingen/python-zeep/pull/1006/commits/ba7edd6bf2b31023b31e8f17c161e1d6d5af3d29.patch"; - sha256 = "1j0jd5hmh457im9sbawaqf6pnfy36fhr9wqdim8wk5da9ixr0ajs"; - }) - ]; - propagatedBuildInputs = [ appdirs attrs cached-property defusedxml + httpx isodate lxml + pytz requests requests_toolbelt - six - pytz - - # optional requirements - tornado - ] ++ lib.optional isPy3k aiohttp; + requests-file + xmlsec + ]; checkInputs = [ + aiohttp + aioresponses freezegun mock pretend - pytestcov - pytest + pytest-asyncio + pytest-httpx + pytestCheckHook requests-mock - ] ++ lib.optional isPy3k aioresponses; + xmlsec + ]; - checkPhase = '' - runHook preCheck - # fix compatibility with pytest 4 - substituteInPlace tests/conftest.py \ - --replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")' - # ignored tests requires xmlsec python module - HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py - runHook postCheck + preCheck = '' + export HOME=$(mktemp -d); ''; + disabledTests = [ + # lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64 + "test_mime_content_serialize_text_xml" + ]; + + pythonImportsCheck = [ "zeep" ]; + meta = with lib; { + description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = licenses.mit; - description = "A modern/fast Python SOAP client based on lxml / requests"; maintainers = with maintainers; [ rvl ]; }; } From fe84261826dff85b64796363e513a895f39f1412 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jun 2021 13:05:08 +0200 Subject: [PATCH 361/797] python3Packages.xmlsec: 1.3.9 -> 1.3.11 --- pkgs/development/python-modules/xmlsec/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 82f4a968ba6..b8c60f1b642 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.9"; + version = "1.3.11"; src = fetchPypi { inherit pname version; - sha256 = "1c4k42zv3plm6v65p7z6l5rxyf50h40d02nhc16vq7cjrfvdf4rx"; + sha256 = "sha256-zS6q/38xeEoH3ZnOgfp2cxPfO6GDT6pBQ+4sBwAMrHo="; }; # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 @@ -38,6 +38,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook hypothesis ]; disabledTestPaths = [ "tests/test_doc_examples.py" ]; + pythonImportsCheck = [ "xmlsec" ]; + meta = with lib; { description = "Python bindings for the XML Security Library"; homepage = "https://github.com/mehcode/python-xmlsec"; From 0b963e0fed8c006a29983dee867fcb3cdacd8ca0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 20:19:33 +0200 Subject: [PATCH 362/797] python3Packages.fsspec: 2021.04.0 -> 2021.05.0 --- .../python-modules/fsspec/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index fbcf09de2eb..e1a5611dfd3 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -1,33 +1,44 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder , pytestCheckHook , numpy -, stdenv , aiohttp , pytest-vcr , requests +, paramiko +, smbprotocol }: buildPythonPackage rec { pname = "fsspec"; - version = "2021.04.0"; - disabled = pythonOlder "3.5"; + version = "2021.05.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-9072kb1VEQ0xg9hB8yEzJMD2Ttd3UGjBmTuhE+Uya1k="; + sha256 = "sha256-MQjUBLmx3Lb3nZNU/AgBKUQ/qNOd+XH+2YI51wV8AO0="; }; - checkInputs = [ pytestCheckHook numpy pytest-vcr ]; + propagatedBuildInputs = [ + aiohttp + paramiko + requests + smbprotocol + ]; + + checkInputs = [ + numpy + pytest-vcr + pytestCheckHook + ]; __darwinAllowLocalNetworking = true; - propagatedBuildInputs = [ aiohttp requests ]; - disabledTests = [ # Test assumes user name is part of $HOME # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' @@ -43,8 +54,10 @@ buildPythonPackage rec { "test_touch" ]; + pythonImportsCheck = [ "fsspec" ]; + meta = with lib; { - description = "A specification that python filesystems should adhere to"; + description = "A specification that Python filesystems should adhere to"; homepage = "https://github.com/intake/filesystem_spec"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; From 9ade9c3a724d5fde361391c309b1926482fe73f3 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 3 Jun 2021 08:29:19 +0200 Subject: [PATCH 363/797] linux: 5.10.40 -> 5.10.41 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index ae8f5095307..7b4636f332d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.40"; + version = "5.10.41"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "091g9g29m4vh66bxihiylyprb3cxr8cy4m494klb2lkirlx8103l"; + sha256 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From a4bc9184f4b16ac53b36a8105a32b2fb40c51227 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 3 Jun 2021 08:29:24 +0200 Subject: [PATCH 364/797] linux: 5.12.7 -> 5.12.8 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 80a25ad2396..3c61889bc68 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.7"; + version = "5.12.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ircrclggrbmm80vz7irhg73qvhjddsmf7zclw5cqnnmm3qfj8jk"; + sha256 = "134g8d5zvbzdqxy7z6a527dqcmiq4ixf7s05rnnsc4qcajpbcimd"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From c3c4121168711d04fcca7465d140f9ec93261ff7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 3 Jun 2021 08:29:30 +0200 Subject: [PATCH 365/797] linux: 5.4.122 -> 5.4.123 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a245ee7c44e..85d24132b7e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.122"; + version = "5.4.123"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "00g6s3ymriwddshy5sd458b1wfvw2ynxv6dr63ziykwfq50jlr9p"; + sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 28c43185ca0538a4a57ddc994ed901aa75957136 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:10:11 +0200 Subject: [PATCH 366/797] linux: 4.14.234 -> 4.14.235 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 58804158761..7c986259dff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.234"; + version = "4.14.235"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1mwqb9sq6qd9angl3xysdsrfpgppf46g3kiwg1svqgpgrx7cqn1b"; + sha256 = "03k793hj294zf7jncs1h8zh5dh6xagkfvnydd9jadxvq2z8vvl8f"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 4c8c3546c53cf3a4b03b70ff17e9c2d59abc61e7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:10:24 +0200 Subject: [PATCH 367/797] linux: 4.19.192 -> 4.19.193 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 23d651e21da..3a31ad473cf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.192"; + version = "4.19.193"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1680dz4wjg721a8lqwh6ijd90zcr2f3wzcvhwgn3shbwgjkwsk87"; + sha256 = "17ci49ak5iw01kfkn3fcgncg9hm4j188417bxi3bnsq9il5ymhl4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 9caacfc58f26bca47b7019ff9621a9c8dca70e5f Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:10:29 +0200 Subject: [PATCH 368/797] linux: 4.4.270 -> 4.4.271 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8320c2fb9ce..9bc01eeff49 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.270"; + version = "4.4.271"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lz48gv1v3wvw9xvd3y9q4py7ii1g9fj4dwyvvjdzbipyw7s21pq"; + sha256 = "0n5h2lv1p542a45pas3pi0vkhgrk096vwrps79a7v3a6c1q2dxx6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 0f80703b960e3f6b241e53f5d4712ee869730727 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:10:33 +0200 Subject: [PATCH 369/797] linux: 4.9.270 -> 4.9.271 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 7dda6f5356d..4be4b6fb222 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.270"; + version = "4.9.271"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ck5abzpla291gcxrxjindj5szgcvmb2fwfilvdnzc6pnqk00ay3"; + sha256 = "1480miixphkf0b8w00m753ar7yp1rnl3zyr9wp4inngi2f90553r"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From af416a6290fdeb932c3549b90704a32ebae5c1a5 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:10:39 +0200 Subject: [PATCH 370/797] linux: 5.10.41 -> 5.10.42 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 7b4636f332d..ec7b16f9f3f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.41"; + version = "5.10.42"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n"; + sha256 = "1r86v6q7ml7zv001f25w3h667nqqy39439s94vnqsyyn7g3jg84b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From d026ea755aefbd941577fa8c3206bcc16a2c3ec7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:10:45 +0200 Subject: [PATCH 371/797] linux: 5.12.8 -> 5.12.9 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 3c61889bc68..85a69f0c5ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.8"; + version = "5.12.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "134g8d5zvbzdqxy7z6a527dqcmiq4ixf7s05rnnsc4qcajpbcimd"; + sha256 = "0vg71h8r90fl01a8khyf1776y76rgqisxafky89cswa2fpsvxyn7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 34e5e750b5f459aee555180d6c67a2380a647f7e Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:10:50 +0200 Subject: [PATCH 372/797] linux: 5.4.123 -> 5.4.124 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 85d24132b7e..4cf7c2bfafd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.123"; + version = "5.4.124"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf"; + sha256 = "10kxa1ng9w9xd2d5xh48fbhp1kri650p90nihrcpnb845gd9vwpp"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From f546dc2d15500258a3cacbb43498f91c744b3d40 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:11:04 +0200 Subject: [PATCH 373/797] linux-rt_5_10: 5.10.35-rt39 -> 5.10.41-rt42 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 90c0c4e2930..5567022edcc 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.35-rt39"; # updated by ./update-rt.sh + version = "5.10.41-rt42"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc"; + sha256 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "03gq9y111k4js4cc87yc9y7hyg1wxwbc1bjyjdvb4nrx2wqka79y"; + sha256 = "1z8jgsq5fkg486xxawg4c4wk1l9xra7x1cfqaf4grhw0csbbx883"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From 029f5773d7eb933e6a9709e7c16e38d628b0e162 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:11:27 +0200 Subject: [PATCH 374/797] linux-rt_5_4: 5.4.115-rt57 -> 5.4.123-rt59 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 34efc8e21ee..8592ad4c3b3 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.115-rt57"; # updated by ./update-rt.sh + version = "5.4.123-rt59"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1llxk04vlpi7a4ca2f5vlcxfn68n8yhmsar3hsl259i7hms28isv"; + sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1xh7xi27q58njhfayi2lnk4id7hnlklkgh2zx012gxv4ari76g0k"; + sha256 = "1m1mnmk7h35p7dv6mg3pla6pw3b645hbbccjmp1jc3fyn6qiy6fq"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From b1358430881ac9c3067ec56cf6cd9fb3b233d9dc Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:11:46 +0200 Subject: [PATCH 375/797] linux_latest-libre: 18096 -> 18115 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 6d1c7339720..2001b350ecc 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18096"; - sha256 = "08m7afj0h9bcgg8rx8ksp85hmaqjl4k4p4q4zy6x51788xn4mycg"; + rev = "18115"; + sha256 = "00wsxlhz7lc4qk7jcgshb05hvv3mm4m8r3zalc9wvp4r1r6xbbjp"; } , ... }: From 4324b2ae60ac6c407992f4d4e1bc52796a1ccf49 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:11:58 +0200 Subject: [PATCH 376/797] linux/hardened/patches/4.14: 4.14.234-hardened1 -> 4.14.235-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6cf635da18b..3763dba1559 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.234-hardened1.patch", - "sha256": "1vdr3j62whc2xdy1l4imkp6axpwh7r3cjp0sgsld7l5331x19qh7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.234-hardened1/linux-hardened-4.14.234-hardened1.patch" + "name": "linux-hardened-4.14.235-hardened1.patch", + "sha256": "0m49pg27pnp6kwkbawg0fw3lzm5nchqjhqkfgprckwgb9v5bgbcc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.235-hardened1/linux-hardened-4.14.235-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 4ccdbb8ef2a6c8b45a2705cc9215e4ea2c626413 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:12:00 +0200 Subject: [PATCH 377/797] linux/hardened/patches/4.19: 4.19.192-hardened1 -> 4.19.193-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3763dba1559..5f3e94213b7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.192-hardened1.patch", - "sha256": "0gy4h73ygiqr6c9zbmfz4as18ldcnnzgc4qd2nss08m2x1cb1n76", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.192-hardened1/linux-hardened-4.19.192-hardened1.patch" + "name": "linux-hardened-4.19.193-hardened1.patch", + "sha256": "0r2rxl08x2l1yimaqksrc79s36rnp77xm5in9cvp7ff24y9r9g0j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.193-hardened1/linux-hardened-4.19.193-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 9d523a68c053406ac8f407fa20f7ea504b3614b1 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:12:01 +0200 Subject: [PATCH 378/797] linux/hardened/patches/5.10: 5.10.40-hardened1 -> 5.10.42-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5f3e94213b7..cd1c85c69bc 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.40-hardened1.patch", - "sha256": "15nprqyw9whqghpnr39wpn54snxz49wdr4dq41dbmmqmrrlfyxnr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.40-hardened1/linux-hardened-5.10.40-hardened1.patch" + "name": "linux-hardened-5.10.42-hardened1.patch", + "sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch" }, "5.11": { "extra": "-hardened1", From 293242a0ef7bc48464af9b5235fb9c5062cdcbbc Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:12:03 +0200 Subject: [PATCH 379/797] linux/hardened/patches/5.12: 5.12.7-hardened1 -> 5.12.9-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cd1c85c69bc..271ca09d380 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.7-hardened1.patch", - "sha256": "1r8bf8hrxpzyxqcy3zf1m86bfi0lr4aijbrq12sqb7n2g1wc1j87", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.7-hardened1/linux-hardened-5.12.7-hardened1.patch" + "name": "linux-hardened-5.12.9-hardened1.patch", + "sha256": "08ijifhl8sl858ik32ny47h7pq0r160sv55a07igkbhrh60arfqa", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.9-hardened1/linux-hardened-5.12.9-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 4b9a7a17fd2c86421dd2f0464ca52f2cb2a9c0cb Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 7 Jun 2021 20:12:05 +0200 Subject: [PATCH 380/797] linux/hardened/patches/5.4: 5.4.122-hardened1 -> 5.4.124-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 271ca09d380..028bdbda3f2 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.122-hardened1.patch", - "sha256": "1wa3h18gwgn4blkidf8mlw3r0nb2asya5rbwylghq3qnaa2hc0k7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.122-hardened1/linux-hardened-5.4.122-hardened1.patch" + "name": "linux-hardened-5.4.124-hardened1.patch", + "sha256": "1bn7fa09kzgv6v9d3gl66l8wg6z23chjhk6g219cqb7mfd4m5ykl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.124-hardened1/linux-hardened-5.4.124-hardened1.patch" } } From e968368c0d76ea8917f901b28e65491020ca0e13 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Tue, 8 Jun 2021 16:22:28 +0200 Subject: [PATCH 381/797] linux: remove 5.11 --- .../linux/kernel/hardened/patches.json | 6 ------ pkgs/os-specific/linux/kernel/linux-5.11.nix | 20 ------------------- pkgs/os-specific/linux/kernel/linux-lqx.nix | 8 ++++---- pkgs/os-specific/linux/kernel/linux-zen.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 10 +--------- 5 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.11.nix diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 028bdbda3f2..bb668a6e904 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch" }, - "5.11": { - "extra": "-hardened1", - "name": "linux-hardened-5.11.22-hardened1.patch", - "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" - }, "5.12": { "extra": "-hardened1", "name": "linux-hardened-5.12.9-hardened1.patch", diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix deleted file mode 100644 index e6a8aef650b..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.11.22"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi"; - }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 4bc5cee4444..609dc494c69 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.21"; + version = "5.12.9"; suffix = "lqx1"; in @@ -14,13 +14,13 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1klvik8nrqsqi5ijnga1li4gacsknmap75g2zp8f3hd3hz18d5n1"; + sha256 = "sha256-qmX66nz+gVOt1RGsUT9fA3wPUT7I9Z4jhxpybP0I8Cw="; }; extraMeta = { - branch = "5.10/master"; + branch = "5.12/master"; maintainers = with lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; -} // (args.argsOverride or {})) +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index b28400819d5..47e72a61c18 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.11.16"; + version = "5.12.9"; suffix = "zen1"; in @@ -14,13 +14,13 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0jyicnpqccn194jrm1mc4zq0cil7ls9l57ws3nv783vlk7b0k3gv"; + sha256 = "sha256-Sbe7pY/htLRRx5Qs78BpEzNCSIEsnZMj1+bkAftZdbQ="; }; extraMeta = { - branch = "5.10/master"; + branch = "5.12/master"; maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; -} // (args.argsOverride or {})) +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40335b63e39..9f9448d50c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20557,13 +20557,6 @@ in ]; }; - linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20875,7 +20868,6 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); # When adding to the list above: @@ -20909,7 +20901,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_11; + linux_latest_for_hardened = pkgs.linux_5_12; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { From 5915f689b452816381e9f4e8d9cbf32ece20f467 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 8 Jun 2021 20:32:02 +0200 Subject: [PATCH 382/797] chromiumDev: 93.0.4530.5 -> 93.0.4535.3 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9762bcbbe9d..be7a84576b3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "93.0.4530.5", - "sha256": "0xxnn9fbwgmfk0zz5an35na1zprhas487pbg2qpgg76g50zxnsx5", - "sha256bin64": "14fzmfhaiish91byg7knr9nf2cigklfvy145vc7qhg17b6gzba25", + "version": "93.0.4535.3", + "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18", + "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r", "deps": { "gn": { "version": "2021-05-07", From 960d10ab7b281118ea7eee051adc3b21bba5ff31 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 9 Jun 2021 01:33:16 +0700 Subject: [PATCH 383/797] terraform_1_0_0: init at 1.0.0 (#126219) --- .../applications/networking/cluster/terraform/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f2c11bc92cb..66185b2cc3d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -171,6 +171,14 @@ in rec { passthru = { inherit plugins; }; }); + terraform_1_0_0 = pluggable (generic { + version = "1.0.0"; + sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o="; + vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; + patches = [ ./provider-path-0_15.patch ]; + passthru = { inherit plugins; }; + }); + # Tests that the plugins are being used. Terraform looks at the specific # file pattern and if the plugin is not found it will try to download it # from the Internet. With sandboxing enable this test will fail if that is diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f9448d50c7..453c4758ae4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31171,6 +31171,7 @@ in terraform_0_13 terraform_0_14 terraform_0_15 + terraform_1_0_0 terraform_plugins_test ; From 052e0227f7e26ed7ca525a0d2f9bf9c1fc2cbef1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 20:33:35 +0200 Subject: [PATCH 384/797] python3Packages.datasette: 0.54.1 -> 0.57.1 --- .../python-modules/datasette/default.nix | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 1d919de6ee8..58920b40646 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -5,6 +5,7 @@ , asgi-csrf , click , click-default-group +, itsdangerous , janus , jinja2 , hupper @@ -17,56 +18,62 @@ , httpx # Check Inputs , pytestCheckHook -, pytestrunner +, pytest-runner , pytest-asyncio +, pytest-timeout , aiohttp , beautifulsoup4 , asgiref , setuptools +, trustme +, pythonOlder }: buildPythonPackage rec { pname = "datasette"; - version = "0.54.1"; + version = "0.57.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; - repo = "datasette"; + repo = pname; rev = version; - sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ="; + sha256 = "sha256-BHsf3GOganPhsDiZlRxvAsRZH/Sq+Jr+CZcc2ubce+8="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ aiofiles asgi-csrf + asgiref click click-default-group + httpx + hupper + itsdangerous janus jinja2 - hupper mergedeep pint pluggy python-baseconv pyyaml - uvicorn setuptools - httpx - asgiref + uvicorn ]; checkInputs = [ - pytestCheckHook - pytest-asyncio aiohttp beautifulsoup4 + pytest-asyncio + pytest-timeout + pytestCheckHook + trustme ]; postConfigure = '' substituteInPlace setup.py \ - --replace "click~=7.1.1" "click" \ --replace "click-default-group~=1.2.2" "click-default-group" \ --replace "hupper~=1.9" "hupper" \ --replace "pint~=0.9" "pint" \ @@ -75,12 +82,13 @@ buildPythonPackage rec { --replace "PyYAML~=5.3" "PyYAML" ''; - # takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews - # with pytest-xdist, it still takes around 10mins with 32 cores + # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews + # with pytest-xdist, it still takes around 10 mins with 32 cores # just run the csv tests, as this should give some indictation of correctness pytestFlagsArray = [ "tests/test_csv.py" ]; + disabledTests = [ "facet" "_invalid_database" # checks error message when connecting to invalid database @@ -97,10 +105,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "An instant JSON API for your SQLite databases"; - homepage = "https://github.com/simonw/datasette"; + description = "Multi-tool for exploring and publishing data"; + homepage = "https://datasette.io/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; - } From 6a18a9a2c517c7e9a8a1b3490502ad54583bbf62 Mon Sep 17 00:00:00 2001 From: piegames Date: Tue, 8 Jun 2021 20:42:36 +0200 Subject: [PATCH 385/797] matrix-appservice-irc: 0.26.0 -> 0.26.1 --- .../matrix-appservice-irc/node-packages.nix | 563 +++++++++++------- .../matrix-appservice-irc/package.json | 2 +- 2 files changed, 359 insertions(+), 206 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix index cb552b34f96..290eae2c02f 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix @@ -22,13 +22,13 @@ let sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/generator-7.14.2" = { + "@babel/generator-7.14.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.2"; + version = "7.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz"; - sha512 = "OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz"; + sha512 = "bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA=="; }; }; "@babel/helper-function-name-7.14.2" = { @@ -76,13 +76,13 @@ let sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg=="; }; }; - "@babel/parser-7.14.2" = { + "@babel/parser-7.14.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.2"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz"; - sha512 = "IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz"; + sha512 = "ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA=="; }; }; "@babel/runtime-7.14.0" = { @@ -112,13 +112,13 @@ let sha512 = "TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA=="; }; }; - "@babel/types-7.14.2" = { + "@babel/types-7.14.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.2"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz"; - sha512 = "SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz"; + sha512 = "lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw=="; }; }; "@dabh/diagnostics-2.0.2" = { @@ -130,40 +130,40 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@eslint/eslintrc-0.4.1" = { + "@eslint/eslintrc-0.4.2" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.7" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz"; + sha512 = "BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA=="; }; }; "@sentry/core-5.30.0" = { @@ -247,13 +247,13 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@types/bluebird-3.5.34" = { + "@types/bluebird-3.5.35" = { name = "_at_types_slash_bluebird"; packageName = "@types/bluebird"; - version = "3.5.34"; + version = "3.5.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.34.tgz"; - sha512 = "QMc57Pf067Rr78l6f4FftvuIXPYxu0VYFRKrZk1Clv+LWy7gN2fTBiAiv68askFHEHZcTLPFd01kNlpKOiSPgQ=="; + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.35.tgz"; + sha512 = "2WeeXK7BuQo7yPI4WGOBum90SzF/f8rqlvpaXx4rjeTmNssGRDHWf7fgDUH90xMB3sUOu716fUK5d+OVx0+ncQ=="; }; }; "@types/body-parser-1.19.0" = { @@ -274,22 +274,22 @@ let sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@types/express-4.17.11" = { + "@types/express-4.17.12" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.11"; + version = "4.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; - sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.12.tgz"; + sha512 = "pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q=="; }; }; - "@types/express-serve-static-core-4.17.19" = { + "@types/express-serve-static-core-4.17.21" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.19"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; - sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz"; + sha512 = "gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA=="; }; }; "@types/extend-3.0.1" = { @@ -337,13 +337,13 @@ let sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-15.0.3" = { + "@types/node-15.12.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.0.3"; + version = "15.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.0.3.tgz"; - sha512 = "/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz"; + sha512 = "zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="; }; }; "@types/nopt-3.0.29" = { @@ -355,13 +355,13 @@ let sha1 = "f19df3db4c97ee1459a2740028320a71d70964ce"; }; }; - "@types/pg-7.14.11" = { + "@types/pg-8.6.0" = { name = "_at_types_slash_pg"; packageName = "@types/pg"; - version = "7.14.11"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.11.tgz"; - sha512 = "EnZkZ1OMw9DvNfQkn2MTJrwKmhJYDEs5ujWrPfvseWNoI95N8B4HzU/Ltrq5ZfYxDX/Zg8mTzwr6UAyTjjFvXA=="; + url = "https://registry.npmjs.org/@types/pg/-/pg-8.6.0.tgz"; + sha512 = "3JXFrsl8COoqVB1+2Pqelx6soaiFVXzkT3fkuSNe7GB40ysfT0FHphZFPiqIXpMyTHSFRdLTyZzrFBrJRPAArA=="; }; }; "@types/qs-6.9.6" = { @@ -382,13 +382,13 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/sanitize-html-1.27.2" = { + "@types/sanitize-html-2.3.1" = { name = "_at_types_slash_sanitize-html"; packageName = "@types/sanitize-html"; - version = "1.27.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-1.27.2.tgz"; - sha512 = "DrH26m7CV6PB4YVckjbSIx+xloB7HBolr9Ctm0gZBffSu5dDV4yJKFQGPquJlReVW+xmg59gx+b/8/qYHxZEuw=="; + url = "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.3.1.tgz"; + sha512 = "+UT/XRluJuCunRftwO6OzG6WOBgJ+J3sROIoSJWX+7PB2FtTJTEJLrHCcNwzCQc0r60bej3WAbaigK+VZtZCGw=="; }; }; "@types/serve-static-1.13.9" = { @@ -400,67 +400,67 @@ let sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; - "@typescript-eslint/eslint-plugin-4.23.0" = { + "@typescript-eslint/eslint-plugin-4.26.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz"; - sha512 = "tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz"; + sha512 = "aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw=="; }; }; - "@typescript-eslint/experimental-utils-4.23.0" = { + "@typescript-eslint/experimental-utils-4.26.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz"; - sha512 = "WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz"; + sha512 = "sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ=="; }; }; - "@typescript-eslint/parser-4.23.0" = { + "@typescript-eslint/parser-4.26.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.23.0.tgz"; - sha512 = "wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz"; + sha512 = "q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ=="; }; }; - "@typescript-eslint/scope-manager-4.23.0" = { + "@typescript-eslint/scope-manager-4.26.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz"; - sha512 = "ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz"; + sha512 = "TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ=="; }; }; - "@typescript-eslint/types-4.23.0" = { + "@typescript-eslint/types-4.26.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.23.0.tgz"; - sha512 = "oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz"; + sha512 = "STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg=="; }; }; - "@typescript-eslint/typescript-estree-4.23.0" = { + "@typescript-eslint/typescript-estree-4.26.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz"; - sha512 = "5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz"; + sha512 = "l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg=="; }; }; - "@typescript-eslint/visitor-keys-4.23.0" = { + "@typescript-eslint/visitor-keys-4.26.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz"; - sha512 = "5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz"; + sha512 = "IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw=="; }; }; "abbrev-1.1.1" = { @@ -517,13 +517,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.3.0" = { + "ajv-8.6.0" = { name = "ajv"; packageName = "ajv"; - version = "8.3.0"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.3.0.tgz"; - sha512 = "RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz"; + sha512 = "cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ=="; }; }; "another-json-0.2.0" = { @@ -949,6 +949,15 @@ let sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; }; }; + "chardet-1.3.0" = { + name = "chardet"; + packageName = "chardet"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-1.3.0.tgz"; + sha512 = "cyTQGGptIjIT+CMGT5J/0l9c6Fb+565GCFjjeUTKxUO7w3oR+FcNCMEKTn5xtVKaLFmladN7QF68IiQsv5Fbdw=="; + }; + }; "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; @@ -1048,6 +1057,15 @@ let sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg=="; }; }; + "colorette-1.2.2" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; + sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; + }; + }; "colors-1.4.0" = { name = "colors"; packageName = "colors"; @@ -1273,6 +1291,15 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + }; + }; "default-require-extensions-2.0.0" = { name = "default-require-extensions"; packageName = "default-require-extensions"; @@ -1345,13 +1372,13 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; - "dom-serializer-1.3.1" = { + "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.1.tgz"; - sha512 = "Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; }; "domelementtype-2.2.0" = { @@ -1381,13 +1408,13 @@ let sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; }; }; - "domutils-2.6.0" = { + "domutils-2.7.0" = { name = "domutils"; packageName = "domutils"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz"; - sha512 = "y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"; + sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; }; }; "dot-prop-5.3.0" = { @@ -1543,13 +1570,22 @@ let sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; }; - "eslint-7.26.0" = { + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + }; + "eslint-7.28.0" = { name = "eslint"; packageName = "eslint"; - version = "7.26.0"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.26.0.tgz"; - sha512 = "4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz"; + sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; }; "eslint-scope-5.1.1" = { @@ -1570,6 +1606,15 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -1885,13 +1930,13 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; "fresh-0.5.2" = { @@ -2047,22 +2092,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-12.4.0" = { + "globals-13.9.0" = { name = "globals"; packageName = "globals"; - version = "12.4.0"; + version = "13.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; - }; - }; - "globals-13.8.0" = { - name = "globals"; - packageName = "globals"; - version = "13.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; - sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + url = "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz"; + sha512 = "74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA=="; }; }; "globby-11.0.3" = { @@ -2218,6 +2254,15 @@ let sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; }; }; + "htmlparser2-6.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; + }; + }; "http-cache-semantics-4.1.0" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -2272,6 +2317,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "iconv-lite-0.6.3" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + }; "ignore-4.0.6" = { name = "ignore"; packageName = "ignore"; @@ -2543,6 +2597,15 @@ let sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; @@ -2831,6 +2894,15 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; + "klona-2.0.4" = { + name = "klona"; + packageName = "klona"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -2921,6 +2993,15 @@ let sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; }; }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; "lodash.truncate-4.4.2" = { name = "lodash.truncate"; packageName = "lodash.truncate"; @@ -3038,13 +3119,13 @@ let sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; }; }; - "matrix-appservice-bridge-2.6.0" = { + "matrix-appservice-bridge-2.6.1" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.0.tgz"; - sha512 = "o1KHQHG1GdfUhTFBXVLztwbTowuCFO9/h8n2zdkRK/bZsdcXSFQVfUwDtRULcyinD4N7r0Lrwlg1LyR0pg2WSw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.1.tgz"; + sha512 = "XNOziYVQoTQ9cym3Z2acXy8CKRXPVcEbni0XXCUfvu4O9+cBjUPywtRmhDBENsl/bgGbFKqbJNr68E/j9j+Tbw=="; }; }; "matrix-bot-sdk-0.4.0" = { @@ -3074,6 +3155,15 @@ let sha512 = "JFIMJPNGGqi0myzIlN94SQReUbCrWi1TW5PZih1OGXzUj2wXYz3puktV/f64HZYn6D1ZKcwxZdLuNCG8cRuCyw=="; }; }; + "matrix-org-irc-1.0.0-alpha4" = { + name = "matrix-org-irc"; + packageName = "matrix-org-irc"; + version = "1.0.0-alpha4"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.0.0-alpha4.tgz"; + sha512 = "2wKzQSpITrG9vChfw9d0goDcQZgKdaL7hgPzQwaybO9NF96HLarXFhznaFtngJiaaBAN52jkEetsQKV/lEfPqA=="; + }; + }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -3137,22 +3227,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.47.0" = { + "mime-db-1.48.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.47.0"; + version = "1.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz"; - sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz"; + sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="; }; }; - "mime-types-2.1.30" = { + "mime-types-2.1.31" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.30"; + version = "2.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz"; - sha512 = "crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz"; + sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg=="; }; }; "mimic-response-1.0.1" = { @@ -3263,6 +3353,15 @@ let sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; + "nanoid-3.1.23" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.23"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz"; + sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; + }; + }; "natural-compare-1.4.0" = { name = "natural-compare"; packageName = "natural-compare"; @@ -3362,13 +3461,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-url-4.5.0" = { + "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; "nyc-14.1.1" = { @@ -3389,13 +3488,13 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-hash-2.1.1" = { + "object-hash-2.2.0" = { name = "object-hash"; packageName = "object-hash"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz"; - sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"; + sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; }; }; "object-inspect-1.10.3" = { @@ -3623,13 +3722,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-0.1.7" = { @@ -3731,13 +3830,13 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "picomatch-2.2.3" = { + "picomatch-2.3.0" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz"; - sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; }; }; "pify-3.0.0" = { @@ -3776,6 +3875,15 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; + "postcss-8.3.0" = { + name = "postcss"; + packageName = "postcss"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz"; + sha512 = "+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -3857,13 +3965,13 @@ let sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng=="; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; "proxyquire-1.8.0" = { @@ -4271,6 +4379,15 @@ let sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A=="; }; }; + "sanitize-html-2.4.0" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.4.0.tgz"; + sha512 = "Y1OgkUiTPMqwZNRLPERSEi39iOebn2XJLbeiGOBhaJD/yLqtLGu6GE5w7evx177LeGgSE+4p4e107LMiydOf6A=="; + }; + }; "semver-5.7.1" = { name = "semver"; packageName = "semver"; @@ -4424,6 +4541,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + }; + }; "spawn-wrap-1.4.3" = { name = "spawn-wrap"; packageName = "spawn-wrap"; @@ -4460,13 +4586,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.7" = { + "spdx-license-ids-3.0.9" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.7"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; - sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; + sha512 = "Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="; }; }; "split2-3.2.2" = { @@ -4640,13 +4766,13 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "table-6.7.0" = { + "table-6.7.1" = { name = "table"; packageName = "table"; - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.7.0.tgz"; - sha512 = "SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw=="; + url = "https://registry.npmjs.org/table/-/table-6.7.1.tgz"; + sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; }; }; "tdigest-0.1.1" = { @@ -4838,13 +4964,13 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typescript-4.2.4" = { + "typescript-4.3.2" = { name = "typescript"; packageName = "typescript"; - version = "4.2.4"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"; - sha512 = "V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz"; + sha512 = "zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw=="; }; }; "undefsafe-2.0.3" = { @@ -5183,18 +5309,18 @@ let }; in { - "matrix-appservice-irc-git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.0" = nodeEnv.buildNodePackage { + "matrix-appservice-irc-git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.1" = nodeEnv.buildNodePackage { name = "matrix-appservice-irc"; packageName = "matrix-appservice-irc"; - version = "0.26.0"; + version = "0.26.1"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-irc.git"; - rev = "6117f33202e616f6c9dffae0543c8044213100fb"; - sha256 = "98c049b895b1b4102fe43f5b5f5a0b2d650d56064e64b03f56defb55df3fbb96"; + rev = "4edab6f7b02e0f08e7c3b24f72441be25b30b5b8"; + sha256 = "3715ba3e80d79cea98ceb108e1df87b4d864d4f9149f147df0f3b78c691f00d6"; }; dependencies = [ sources."@babel/code-frame-7.12.11" - (sources."@babel/generator-7.14.2" // { + (sources."@babel/generator-7.14.3" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -5214,7 +5340,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.2" + sources."@babel/parser-7.14.4" sources."@babel/runtime-7.14.0" (sources."@babel/template-7.12.13" // { dependencies = [ @@ -5227,18 +5353,17 @@ in sources."globals-11.12.0" ]; }) - sources."@babel/types-7.14.2" + sources."@babel/types-7.14.4" sources."@dabh/diagnostics-2.0.2" - (sources."@eslint/eslintrc-0.4.1" // { + (sources."@eslint/eslintrc-0.4.2" // { dependencies = [ - sources."globals-12.4.0" sources."ignore-4.0.6" sources."strip-json-comments-3.1.1" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@sentry/core-5.30.0" sources."@sentry/hub-5.30.0" sources."@sentry/minimal-5.30.0" @@ -5248,42 +5373,47 @@ in sources."@sentry/utils-5.30.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/bluebird-3.5.34" + sources."@types/bluebird-3.5.35" sources."@types/body-parser-1.19.0" sources."@types/connect-3.4.34" - sources."@types/express-4.17.11" - sources."@types/express-serve-static-core-4.17.19" + sources."@types/express-4.17.12" + sources."@types/express-serve-static-core-4.17.21" sources."@types/extend-3.0.1" sources."@types/he-1.1.1" sources."@types/json-schema-7.0.7" sources."@types/mime-1.3.2" sources."@types/nedb-1.8.11" - sources."@types/node-15.0.3" + sources."@types/node-15.12.2" sources."@types/nopt-3.0.29" - sources."@types/pg-7.14.11" + sources."@types/pg-8.6.0" sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" - sources."@types/sanitize-html-1.27.2" + (sources."@types/sanitize-html-2.3.1" // { + dependencies = [ + sources."domhandler-4.2.0" + sources."htmlparser2-6.1.0" + ]; + }) sources."@types/serve-static-1.13.9" - (sources."@typescript-eslint/eslint-plugin-4.23.0" // { + (sources."@typescript-eslint/eslint-plugin-4.26.1" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/experimental-utils-4.23.0" - sources."@typescript-eslint/parser-4.23.0" - sources."@typescript-eslint/scope-manager-4.23.0" - sources."@typescript-eslint/types-4.23.0" - (sources."@typescript-eslint/typescript-estree-4.23.0" // { + sources."@typescript-eslint/experimental-utils-4.26.1" + sources."@typescript-eslint/parser-4.26.1" + sources."@typescript-eslint/scope-manager-4.26.1" + sources."@typescript-eslint/types-4.26.1" + (sources."@typescript-eslint/typescript-estree-4.26.1" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-4.23.0" + sources."@typescript-eslint/visitor-keys-4.26.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."acorn-7.4.1" @@ -5355,6 +5485,7 @@ in sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chalk-4.1.1" + sources."chardet-1.3.0" sources."chokidar-3.5.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -5373,6 +5504,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.5.5" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -5399,6 +5531,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" + sources."deepmerge-4.2.2" sources."default-require-extensions-2.0.0" sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" @@ -5406,14 +5539,14 @@ in sources."destroy-1.0.4" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" - (sources."dom-serializer-1.3.1" // { + (sources."dom-serializer-1.3.2" // { dependencies = [ sources."domhandler-4.2.0" ]; }) sources."domelementtype-2.2.0" sources."domhandler-3.3.0" - (sources."domutils-2.6.0" // { + (sources."domutils-2.7.0" // { dependencies = [ sources."domhandler-4.2.0" ]; @@ -5437,9 +5570,15 @@ in sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" - (sources."eslint-7.26.0" // { + (sources."eslint-7.28.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."ignore-4.0.6" sources."lru-cache-6.0.0" sources."semver-7.3.5" @@ -5449,11 +5588,7 @@ in ]; }) sources."eslint-scope-5.1.1" - (sources."eslint-utils-2.1.0" // { - dependencies = [ - sources."eslint-visitor-keys-1.3.0" - ]; - }) + sources."eslint-utils-3.0.0" sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { dependencies = [ @@ -5521,7 +5656,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -5537,7 +5672,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-2.1.0" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -5595,6 +5730,7 @@ in sources."is-obj-2.0.0" sources."is-object-1.0.2" sources."is-path-inside-3.0.3" + sources."is-plain-object-5.0.0" sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-stream-2.0.0" @@ -5641,6 +5777,7 @@ in sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" sources."keyv-3.1.0" + sources."klona-2.0.4" sources."kuler-2.0.0" sources."latest-version-5.1.0" sources."levn-0.4.1" @@ -5651,6 +5788,7 @@ in sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" sources."lodash.flattendeep-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."logform-2.2.0" sources."loglevel-1.7.1" @@ -5664,7 +5802,7 @@ in ]; }) sources."matrix-appservice-0.8.0" - (sources."matrix-appservice-bridge-2.6.0" // { + (sources."matrix-appservice-bridge-2.6.1" // { dependencies = [ sources."argparse-2.0.1" sources."extend-3.0.2" @@ -5675,6 +5813,7 @@ in (sources."matrix-bot-sdk-0.4.0" // { dependencies = [ sources."chalk-3.0.0" + sources."sanitize-html-1.27.5" ]; }) (sources."matrix-js-sdk-9.11.0" // { @@ -5683,6 +5822,11 @@ in ]; }) sources."matrix-lastactive-0.1.5" + (sources."matrix-org-irc-1.0.0-alpha4" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge-source-map-1.1.0" @@ -5690,8 +5834,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" @@ -5708,6 +5852,7 @@ in }) sources."ms-2.1.2" sources."nan-2.14.2" + sources."nanoid-3.1.23" sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" @@ -5723,7 +5868,7 @@ in sources."nopt-3.0.6" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" (sources."nyc-14.1.1" // { dependencies = [ sources."make-dir-2.1.0" @@ -5732,7 +5877,7 @@ in ]; }) sources."oauth-sign-0.9.0" - sources."object-hash-2.1.1" + sources."object-hash-2.2.0" sources."object-inspect-1.10.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -5762,7 +5907,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" @@ -5773,7 +5918,7 @@ in sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-3.0.0" sources."pkg-dir-3.0.0" (sources."postcss-7.0.35" // { @@ -5800,7 +5945,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."prom-client-13.1.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" (sources."proxyquire-1.8.0" // { dependencies = [ sources."resolve-1.1.7" @@ -5852,7 +5997,14 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sanitize-html-1.27.5" + (sources."sanitize-html-2.4.0" // { + dependencies = [ + sources."domhandler-4.2.0" + sources."escape-string-regexp-4.0.0" + sources."htmlparser2-6.1.0" + sources."postcss-8.3.0" + ]; + }) sources."semver-5.7.1" (sources."semver-diff-3.1.1" // { dependencies = [ @@ -5884,6 +6036,7 @@ in ]; }) sources."source-map-0.6.1" + sources."source-map-js-0.6.2" (sources."spawn-wrap-1.4.3" // { dependencies = [ sources."rimraf-2.7.1" @@ -5893,7 +6046,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."spdx-license-ids-3.0.9" sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -5918,9 +6071,9 @@ in sources."strip-bom-3.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - (sources."table-6.7.0" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.3.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."json-schema-traverse-1.0.0" sources."strip-ansi-6.0.0" @@ -5950,7 +6103,7 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.2.4" + sources."typescript-4.3.2" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json index 0e6da99fdfe..ae1326275a2 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json @@ -1,3 +1,3 @@ [ - {"matrix-appservice-irc": "git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.0" } + {"matrix-appservice-irc": "git+https://github.com/matrix-org/matrix-appservice-irc.git#0.26.1" } ] From 7963eb827ea60e6e4c591b1f11cdbab3c371ae0f Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 8 Jun 2021 22:21:01 +0300 Subject: [PATCH 386/797] teams: 1.4.00.7556 -> 1.4.00.13653 --- .../networking/instant-messengers/teams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index cd7efb7ad89..db8d4472b07 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.4.00.7556"; + version = "1.4.00.13653"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "0yak3jxh0gdn57wjss0s7sdjssf1b70j0klrcpv66bizqvw1xl7b"; + sha256 = "1kx4j837fd344zy90nl0j3r8cdvihy6i6gf56wd5n56zngx1fhjv"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; From c21b54701b857dd6d2e594d95b404226830786e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 20:47:48 +0200 Subject: [PATCH 387/797] python3Packages.hupper: 1.10.2 -> 1.10.3 --- .../python-modules/hupper/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 27e308ee447..97260697460 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -3,25 +3,35 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest-cov , watchdog }: buildPythonPackage rec { pname = "hupper"; - version = "1.10.2"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "3818f53dabc24da66f65cf4878c1c7a9b5df0c46b813e014abdd7c569eb9a02a"; + sha256 = "sha256-zW9Rtyx1h7ybzopl7NAloelfGwMoRRm/6RKE0BAxbNk="; }; # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - checkInputs = [ pytestCheckHook pytest-cov ] ++ lib.optional (!stdenv.isDarwin) watchdog; + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (!stdenv.isDarwin) [ + watchdog + ]; + + disabledTestPaths = [ + # Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx + "tests/test_it.py" + ]; + + pythonImportsCheck = [ "hupper" ]; meta = with lib; { - description = "in-process file monitor / reloader for reloading your code automatically during development"; + description = "In-process file monitor/reloader for reloading your code automatically during development"; homepage = "https://github.com/Pylons/hupper"; license = licenses.mit; maintainers = with maintainers; [ ]; From 7843fd5f9bc85e6749998bb27d23f5292b700502 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 13:23:00 +0200 Subject: [PATCH 388/797] python3Packages.hdate: 0.10.2 -> 0.10.3 --- pkgs/development/python-modules/hdate/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index a034eddd565..5c8a2c1e9fc 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -2,7 +2,6 @@ , astral , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.2"; + version = "0.10.3"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -19,7 +18,7 @@ buildPythonPackage rec { owner = "py-libhdate"; repo = "py-libhdate"; rev = "v${version}"; - sha256 = "07b0c7q8w6flj4q72v58d3wymsxfp5qz8z97qhhc2977mjx5fsxd"; + sha256 = "sha256-6rOsG6qgq4woBhj25SNWvKshvFLBL/6MJiBZb+NPvdk="; }; nativeBuildInputs = [ @@ -35,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Version was not updated for the release - (fetchpatch { - name = "update-version.patch"; - url = "https://github.com/py-libhdate/py-libhdate/commit/b8186a891b29fed99def5ce0985ee0ae1e0dd77e.patch"; - sha256 = "1pmhgh57x9390ff5gyisng0l6b79sd6dxmf172hpk1gr03c3hv98"; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" ''; From 7bf7d9f8a741674f612987e879bd9bb2fb32a95f Mon Sep 17 00:00:00 2001 From: Jenny Date: Tue, 8 Jun 2021 22:06:28 +0200 Subject: [PATCH 389/797] nixos/pam_mount: add support for FUSE-filesystems (#126069) --- nixos/modules/security/pam_mount.nix | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index 9a0143c155c..e25ace38f57 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -29,6 +29,28 @@ in xlink:href="http://pam-mount.sourceforge.net/pam_mount.conf.5.html" />. ''; }; + + additionalSearchPaths = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.bindfs ]"; + description = '' + Additional programs to include in the search path of pam_mount. + Useful for example if you want to use some FUSE filesystems like bindfs. + ''; + }; + + fuseMountOptions = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample '' + [ "nodev" "nosuid" "force-user=%(USER)" "gid=%(USERGID)" "perms=0700" "chmod-deny" "chown-deny" "chgrp-deny" ] + ''; + description = '' + Global mount options that apply to every FUSE volume. + You can define volume-specific options in the volume definitions. + ''; + }; }; }; @@ -60,11 +82,12 @@ in - ${pkgs.util-linux}/bin + ${makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)} + ${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])} ${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT) ${pkgs.pam_mount}/bin/umount.crypt %(MNTPT) ${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION) From 77a3e577517daf38bd7534ff194c7f7fc572cd71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 22:11:32 +0200 Subject: [PATCH 390/797] python3Packages.plugwise: 0.9.4 -> 0.10.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index d62c2e8bb72..299e2af2f95 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = version; - sha256 = "sha256-5r+Xe3EKLjuR7mPGEPOKzhE7G6OzNEClf847Px9VdWU="; + sha256 = "sha256-M0Zwao8I8PRxxF9xvtzFeCFK9+eMlXYcWJarfHSGAlw="; }; propagatedBuildInputs = [ From 63dbdd0ec9f498ab278adc5383a83f95fd4d97f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 22:15:20 +0200 Subject: [PATCH 391/797] python3Packages.tuyaha: 0.0.10 -> 0.0.11 --- pkgs/development/python-modules/tuyaha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix index a53124783d1..749ac4e1982 100644 --- a/pkgs/development/python-modules/tuyaha/default.nix +++ b/pkgs/development/python-modules/tuyaha/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tuyaha"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "PaulAnnekov"; repo = pname; rev = version; - sha256 = "0n08mqrz76zv1cyqky6ibs6im1fqcywkiyvfmfabml0vzvr43awf"; + sha256 = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM="; }; propagatedBuildInputs = [ requests ]; From 036eef1d1e5d902486ca6a3f7c48f0a31e3c053c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 8 Jun 2021 14:17:38 +0200 Subject: [PATCH 392/797] haskell.compiler.*: use gold based on targetPlatform.linker useLdGold previously just checked for useLLVM which (currently) implies `linker == "lld"`. However more accurate is to check the `linker` of the `targetPlatform` as it actually tells us which bintools package we can expect. `linker == "bfd"` implies that we are using the `binutils` package, so gold is available, so we can use it unless musl is the libc. `linker == "gold"` implies that gold is the default linker already and we should absolutely use it. --- pkgs/development/compilers/ghc/8.10.4.nix | 5 +++-- pkgs/development/compilers/ghc/8.8.4.nix | 5 +++-- pkgs/development/compilers/ghc/9.0.1.nix | 5 +++-- pkgs/development/compilers/ghc/head.nix | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index da957f93520..6787e8e591b 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -89,9 +89,10 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); in stdenv.mkDerivation (rec { diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index b0336ad3992..14e48de475a 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -98,9 +98,10 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); in stdenv.mkDerivation (rec { diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index 58beef5d688..ab9356656ee 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -90,9 +90,10 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); in stdenv.mkDerivation (rec { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a0ca13270a2..3d571597268 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -100,9 +100,10 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); in stdenv.mkDerivation (rec { From 4211a977d4cd4a74652b8117ca6d45675824cc35 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 7 Jun 2021 20:11:08 -0300 Subject: [PATCH 393/797] opentabletdriver: 0.5.3.1 -> 0.5.3.2 --- pkgs/tools/X11/opentabletdriver/default.nix | 6 ++-- pkgs/tools/X11/opentabletdriver/deps.nix | 37 ++++++++++++--------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 5128e4d30ca..2d1ce4a4e33 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.5.3.1"; + version = "0.5.3.2"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "OT8/c+6wNpZyq/q7uMxIqmyJKNAq0B4ynEAqFF0GWyo="; + sha256 = "qRc/9Edp3x7/XVEWgBbPush76MSQz4biYSk+E9Gt68w="; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "0nm0v1xhphl6g6rz3li4rbdp7408g6sf9l4nh3mbbif5042xa0qh"; + sha256 = "14k06iyc642x42yadyfmmf8ky84y8rc6kgd63b4ipskkcxyl1gvl"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index 041795596b1..45ded855587 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -1,43 +1,48 @@ { fetchNuGet }: [ (fetchNuGet { name = "AtkSharp"; - version = "3.22.25.74"; - sha256 = "04zjpjrddw5clac0mjpk0q00rbmv45bh1bsqa4s3pc5pb7fm9cd9"; + version = "3.24.24.34"; + sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) (fetchNuGet { name = "CairoSharp"; - version = "3.22.25.74"; - sha256 = "0sx7vmwcrfbkg3g887v051iklcdmdhh43ndp96nk4bccjimmmwl6"; + version = "3.24.24.34"; + sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) (fetchNuGet { name = "Eto.Forms"; version = "2.5.10"; sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; }) + (fetchNuGet { + name = "Eto.Forms"; + version = "2.5.11"; + sha256 = "0h86jc19wy3ssj7pb34w1h02v92mg29gdipszwjs3y15piy66z3s"; + }) (fetchNuGet { name = "Eto.Platform.Gtk"; - version = "2.5.10"; - sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g"; + version = "2.5.11"; + sha256 = "1s9njz7l9zghrbzli7lbiav5ss3glqf17npj07f3jldd933nb95j"; }) (fetchNuGet { name = "GdkSharp"; - version = "3.22.25.74"; - sha256 = "07sdfvqk2jmyjj7fyd0mikhnzsk52zd3g2dhip8kz3006cczqm81"; + version = "3.24.24.34"; + sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; }) (fetchNuGet { name = "GioSharp"; - version = "3.22.25.74"; - sha256 = "01l4216bm5jxbxypkkq4d2527c6zd68kbywr3h1lr1darc9nf1d1"; + version = "3.24.24.34"; + sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; }) (fetchNuGet { name = "GLibSharp"; - version = "3.22.25.74"; - sha256 = "0k2p79z4wcswi528v0ykc37rsqfqi6xd6pl0j4csdj9zf19svgx2"; + version = "3.24.24.34"; + sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; }) (fetchNuGet { name = "GtkSharp"; - version = "3.22.25.74"; - sha256 = "0vazfvkjyzppcynqa1h70s1jmp4vq2j30v5x2scg8n2c5dxaj0k3"; + version = "3.24.24.34"; + sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; }) (fetchNuGet { name = "HidSharpCore"; @@ -126,8 +131,8 @@ }) (fetchNuGet { name = "PangoSharp"; - version = "3.22.25.74"; - sha256 = "172i1hjpz4rgqlilir8a57kgmciw9x0shz4zwbhhlr59mndvqbih"; + version = "3.24.24.34"; + sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; From 4215a4d2b3f3a9442de1e111957482deddcd97f2 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 8 Jun 2021 23:49:58 +0300 Subject: [PATCH 394/797] adguardhome: 0.105.2 -> 0.106.3 --- pkgs/servers/adguardhome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 87de7589ae9..f9f164dd764 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "adguardhome"; - version = "0.105.2"; + version = "0.106.3"; src = fetchurl { url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; - sha256 = "1gpaqyczidsy7h05g318zc83swvwninidddlmlq3hgs8s7ibk2cb"; + sha256 = "11p081dqilga61zfziw5w37k6v2r84qynhz2hr4gk8367jck54x8"; }; installPhase = '' From 70346bf6d076c35df89c22fef0f3aaac304f75b2 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 7 Jun 2021 22:04:18 +0200 Subject: [PATCH 395/797] unifi6: 6.1.71 -> 6.2.25 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index aeaa4409aa7..0cca27a6be9 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.1.71"; - sha256 = "1lvsq0xpfgwpbzs25khy7bnrhv8i1jgzi8ij75bsh65hfa3rplc2"; + version = "6.2.25"; + sha256 = "14pfy9cxjyaczdp9lk56by8s5485sjsz2414x7wshf1x76yfjh27"; }; } From e075fef89f1ef6d09e85201ace4a7a53385a78c1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 8 Jun 2021 18:20:38 -0300 Subject: [PATCH 396/797] reason: ppxlib migration (#126066) * reason: refactoring * reason: add superherointj as maintainer * reason: ppxlib migration Migrate from ocaml-migrate-parsetree to ppxlib fixing conflicts in downstream dependencies. * reason: add downloadPage to meta * reason: removed maintainer volth by his request * reason: add test hello --- pkgs/development/compilers/reason/default.nix | 34 +++++++++++++++---- .../compilers/reason/tests/hello/default.nix | 23 +++++++++++++ .../compilers/reason/tests/hello/dune | 4 +++ .../reason/tests/hello/helloreason.opam | 0 .../reason/tests/hello/helloreason.re | 6 ++++ 5 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/compilers/reason/tests/hello/default.nix create mode 100644 pkgs/development/compilers/reason/tests/hello/dune create mode 100644 pkgs/development/compilers/reason/tests/hello/helloreason.opam create mode 100644 pkgs/development/compilers/reason/tests/hello/helloreason.re diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index a65748d0642..dbc6f40a68c 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 -, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppx_tools_versioned, utop, cppo +{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 +, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: stdenv.mkDerivation rec { @@ -13,11 +13,28 @@ stdenv.mkDerivation rec { sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; }; - nativeBuildInputs = [ makeWrapper menhir ]; + nativeBuildInputs = [ + makeWrapper + menhir + ]; - propagatedBuildInputs = [ menhirLib merlin-extend ppx_tools_versioned ]; + buildInputs = [ + cppo + dune_2 + findlib + fix + menhir + menhirSdk + ocaml + ppxlib + utop + ]; - buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir menhirSdk ]; + propagatedBuildInputs = [ + menhirLib + merlin-extend + ppx_derivers + ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -29,11 +46,16 @@ stdenv.mkDerivation rec { --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" ''; + passthru.tests = { + hello = callPackage ./tests/hello { }; + }; + meta = with lib; { homepage = "https://reasonml.github.io/"; + downloadPage = "https://github.com/reasonml/reason"; description = "Facebook's friendly syntax to OCaml"; license = licenses.mit; inherit (ocaml.meta) platforms; - maintainers = [ maintainers.volth ]; + maintainers = with maintainers; [ superherointj ]; }; } diff --git a/pkgs/development/compilers/reason/tests/hello/default.nix b/pkgs/development/compilers/reason/tests/hello/default.nix new file mode 100644 index 00000000000..9b551a0a1ee --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, reason }: + +buildDunePackage rec { + pname = "helloreason"; + version = "0.0.1"; + + src = ./.; + + useDune2 = true; + + buildInputs = [ + reason + ]; + + doCheck = true; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/${pname} | grep -q "Hello From Reason" > /dev/null + ''; + + meta.timeout = 60; +} diff --git a/pkgs/development/compilers/reason/tests/hello/dune b/pkgs/development/compilers/reason/tests/hello/dune new file mode 100644 index 00000000000..578a56dc6de --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/dune @@ -0,0 +1,4 @@ +(executable + (name helloreason) + (public_name helloreason) + (libraries reason)) diff --git a/pkgs/development/compilers/reason/tests/hello/helloreason.opam b/pkgs/development/compilers/reason/tests/hello/helloreason.opam new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkgs/development/compilers/reason/tests/hello/helloreason.re b/pkgs/development/compilers/reason/tests/hello/helloreason.re new file mode 100644 index 00000000000..795bd314dcf --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/helloreason.re @@ -0,0 +1,6 @@ +let sayHello = () => { + let fromWhom = "From Reason"; + print_endline("Hello " ++ fromWhom); +}; + +sayHello(); From ca27566a8a88c0ec244cc9a4db1eb592f7818d91 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 8 Jun 2021 23:22:26 +0200 Subject: [PATCH 397/797] wasm-bindgen-cli: 0.2.73 -> 0.2.74 --- .../tools/wasm-bindgen-cli/Cargo.lock | 917 ++++++++++-------- .../tools/wasm-bindgen-cli/default.nix | 18 +- 2 files changed, 525 insertions(+), 410 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index 165aa6ac856..094c703b65f 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -15,9 +15,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arrayref" @@ -45,21 +45,21 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "ascii" -version = "0.8.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" +checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109" [[package]] name = "askama" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12" +checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" dependencies = [ "askama_derive", "askama_escape", @@ -68,13 +68,12 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881" +checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" dependencies = [ "askama_shared", "proc-macro2", - "quote", "syn", ] @@ -86,15 +85,15 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" [[package]] name = "askama_shared" -version = "0.10.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5" +checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" dependencies = [ "askama_escape", "humansize", - "nom", - "num-traits 0.2.12", - "percent-encoding 2.1.0", + "nom 6.1.2", + "num-traits 0.2.14", + "percent-encoding", "proc-macro2", "quote", "serde", @@ -104,10 +103,11 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da" +checksum = "a88b6bd5df287567ffdf4ddf4d33060048e1068308e5f62d81c6f9824a045a48" dependencies = [ + "bstr", "doc-comment", "predicates", "predicates-core", @@ -134,9 +134,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base64" @@ -150,9 +150,18 @@ dependencies = [ [[package]] name = "base64" -version = "0.11.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" @@ -167,16 +176,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] -name = "blake2b_simd" -version = "0.5.10" +name = "bitvec" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[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 = "bstr" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", +] + [[package]] name = "buf_redux" version = "0.8.4" @@ -189,15 +221,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "canvas" @@ -210,9 +242,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.58" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" [[package]] name = "cfg-if" @@ -235,26 +267,28 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.13" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ + "libc", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", "time", + "winapi", ] [[package]] name = "chunked_transfer" -version = "0.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" [[package]] name = "clap" -version = "2.33.1" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -285,9 +319,9 @@ dependencies = [ [[package]] name = "color_quant" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console_error_panic_hook" @@ -314,58 +348,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "crossbeam-deque" -version = "0.7.3" +name = "crossbeam-channel" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", - "maybe-uninit", ] [[package]] name = "crossbeam-epoch" -version = "0.8.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crossbeam-utils", "lazy_static", - "maybe-uninit", "memoffset", "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils", - "maybe-uninit", -] - [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "lazy_static", ] [[package]] name = "curl" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78" +checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" dependencies = [ "curl-sys", "libc", @@ -378,9 +408,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.33+curl-7.71.1" +version = "0.4.44+curl-7.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9818ea018327f79c811612f29b9834d2abddbe7db81460a2d5c7e12946b337" +checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1" dependencies = [ "cc", "libc", @@ -439,14 +469,14 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docopt" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" +checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", "serde", - "strsim 0.9.3", + "strsim 0.10.0", ] [[package]] @@ -459,9 +489,9 @@ dependencies = [ [[package]] name = "either" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "enum_primitive" @@ -480,7 +510,7 @@ checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", - "log 0.4.11", + "log 0.4.14", "regex", "termcolor", ] @@ -499,13 +529,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b" +checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.8", "winapi", ] @@ -515,7 +545,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -533,6 +563,16 @@ 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 = "fuchsia-cprng" version = "0.1.1" @@ -540,10 +580,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] -name = "futures" -version = "0.3.5" +name = "funty" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "futures" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -556,9 +602,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -575,9 +621,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-core-preview" @@ -587,9 +633,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -598,27 +644,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-lite" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "futures-core", - "memchr", "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg 1.0.1", "proc-macro-hack", "proc-macro2", "quote", @@ -627,25 +673,23 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" -dependencies = [ - "once_cell", -] +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ + "autocfg 1.0.1", "futures-channel", "futures-core", "futures-io", @@ -653,7 +697,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project-lite", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -662,13 +706,24 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -696,9 +751,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -712,30 +767,30 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "humansize" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" +checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "humantime" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "id-arena" @@ -748,9 +803,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.1.5" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -789,23 +844,22 @@ checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jpeg-decoder" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" dependencies = [ - "byteorder", "rayon", ] [[package]] name = "js-sys" -version = "0.3.50" +version = "0.3.51" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -833,16 +887,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] -name = "libc" -version = "0.2.74" +name = "lexical-core" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags 1.2.1", + "cfg-if 1.0.0", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" [[package]] name = "libz-sys" -version = "1.0.25" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" dependencies = [ "cc", "libc", @@ -856,16 +923,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.11", + "log 0.4.14", ] [[package]] name = "log" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -880,25 +947,19 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memoffset" -version = "0.5.5" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -924,19 +985,19 @@ dependencies = [ [[package]] name = "multipart" -version = "0.15.4" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" +checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01" dependencies = [ "buf_redux", "httparse", - "log 0.4.11", + "log 0.4.14", "mime", "mime_guess", "quick-error", - "rand 0.4.6", + "rand 0.6.5", "safemem", - "tempdir", + "tempfile", "twoway", ] @@ -954,7 +1015,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "memchr", - "version_check 0.9.2", + "version_check 0.9.3", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check 0.9.3", ] [[package]] @@ -965,23 +1039,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.0", - "num-traits 0.2.12", + "autocfg 1.0.1", + "num-traits 0.2.14", ] [[package]] name = "num-iter" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -991,7 +1065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" dependencies = [ "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -1000,16 +1074,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -1024,46 +1098,46 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "openssl" -version = "0.10.30" +version = "0.10.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" dependencies = [ "bitflags 1.2.1", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "foreign-types", - "lazy_static", "libc", + "once_cell", "openssl-sys", ] [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.10.2+1.1.1g" +version = "111.15.0+1.1.1k" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" +checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.58" +version = "0.9.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "cc", "libc", "openssl-src", @@ -1071,12 +1145,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -1131,26 +1199,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "pin-project" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "pin-project-lite" version = "0.2.6" @@ -1165,9 +1213,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "png" @@ -1183,15 +1231,15 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "predicates" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a" +checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" dependencies = [ "difference", "float-cmp", @@ -1202,15 +1250,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" dependencies = [ "predicates-core", "treeline", @@ -1218,47 +1266,45 @@ dependencies = [ [[package]] name = "proc-macro-error" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", "syn", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "proc-macro-error-attr" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "syn", - "syn-mid", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] @@ -1271,38 +1317,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.4.6" +name = "radium" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi", -] +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "rand" @@ -1329,13 +1355,25 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", ] +[[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.1.1" @@ -1356,6 +1394,16 @@ dependencies = [ "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" @@ -1377,7 +1425,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "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.3", ] [[package]] @@ -1398,6 +1455,15 @@ 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_isaac" version = "0.1.1" @@ -1453,11 +1519,11 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "crossbeam-deque", "either", "rayon-core", @@ -1465,12 +1531,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", @@ -1517,33 +1583,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] -name = "redox_users" -version = "0.3.4" +name = "redox_syscall" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ - "getrandom", - "redox_syscall", + "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.3.9" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] -name = "regex-syntax" -version = "0.6.18" +name = "regex-automata" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -1564,16 +1644,17 @@ dependencies = [ [[package]] name = "rouille" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" +checksum = "0cfaebc11a52b7415f07e69f18f8240a0ea5eedf0dcb888c5fb7b432e7b4729b" dependencies = [ - "base64 0.9.3", + "base64 0.10.1", "chrono", "filetime", "multipart", "num_cpus", - "rand 0.5.6", + "percent-encoding", + "rand 0.7.3", "serde", "serde_derive", "serde_json", @@ -1587,11 +1668,11 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64 0.11.0", + "base64 0.13.0", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -1606,9 +1687,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" [[package]] name = "ryu" @@ -1662,18 +1743,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -1682,9 +1763,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -1705,19 +1786,17 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "socket2" -version = "0.3.12" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" dependencies = [ - "cfg-if 0.1.10", "libc", - "redox_syscall", "winapi", ] @@ -1727,6 +1806,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.8.0" @@ -1735,15 +1820,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.15" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" dependencies = [ "clap", "lazy_static", @@ -1752,9 +1837,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", @@ -1765,9 +1850,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.67" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -1775,36 +1860,21 @@ dependencies = [ ] [[package]] -name = "syn-mid" -version = "0.5.0" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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", -] +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall", + "rand 0.8.3", + "redox_syscall 0.2.8", "remove_dir_all", "winapi", ] @@ -1822,9 +1892,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -1838,15 +1908,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - [[package]] name = "threadpool" version = "1.8.1" @@ -1868,22 +1929,31 @@ dependencies = [ [[package]] name = "tiny_http" -version = "0.6.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" +checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39" dependencies = [ "ascii", "chrono", "chunked_transfer", - "log 0.4.11", + "log 0.4.14", "url", ] [[package]] name = "tinyvec" -version = "0.3.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +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 = "todomvc" @@ -1898,9 +1968,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] @@ -1913,9 +1983,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trybuild" -version = "1.0.31" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4d94e6adf00b96b1ab94fcfcd8c3cf916733b39adf90c8f72693629887b9b8" +checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46" dependencies = [ "glob", "lazy_static", @@ -1954,27 +2024,27 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" [[package]] name = "unicode-width" @@ -1984,26 +2054,27 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "url" -version = "1.7.2" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ + "form_urlencoded", "idna", "matches", - "percent-encoding 1.0.1", + "percent-encoding", ] [[package]] name = "vcpkg" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" [[package]] name = "vec_map" @@ -2019,9 +2090,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "wait-timeout" @@ -2034,24 +2105,24 @@ dependencies = [ [[package]] name = "walrus" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d470d0583e65f4cab21a1ff3c1ba3dd23ae49e68f516f0afceaeb001b32af39" +checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" dependencies = [ "anyhow", "id-arena", "leb128", - "log 0.4.11", + "log 0.4.14", "rayon", "walrus-macro", - "wasmparser 0.59.0", + "wasmparser 0.77.0", ] [[package]] name = "walrus-macro" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16" +checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" dependencies = [ "heck", "proc-macro2", @@ -2065,9 +2136,15 @@ 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.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + [[package]] name = "wasm-bindgen" -version = "0.2.73" +version = "0.2.74" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2083,11 +2160,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.73" +version = "0.2.74" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.11", + "log 0.4.14", "proc-macro2", "quote", "syn", @@ -2104,7 +2181,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "assert_cmd", @@ -2112,7 +2189,7 @@ dependencies = [ "diff", "docopt", "env_logger", - "log 0.4.11", + "log 0.4.14", "openssl", "predicates", "rayon", @@ -2132,11 +2209,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "base64 0.9.3", - "log 0.4.11", + "log 0.4.14", "rustc-demangle", "serde_json", "tempfile", @@ -2154,19 +2231,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.23" +version = "0.4.24" dependencies = [ "cfg-if 1.0.0", "futures-channel-preview", @@ -2180,7 +2257,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.73" +version = "0.2.74" dependencies = [ "quote", "trybuild", @@ -2191,7 +2268,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.73" +version = "0.2.74" dependencies = [ "proc-macro2", "quote", @@ -2202,13 +2279,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] @@ -2223,11 +2300,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.73" +version = "0.2.74" [[package]] name = "wasm-bindgen-test" -version = "0.3.23" +version = "0.3.24" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2253,7 +2330,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.23" +version = "0.3.24" dependencies = [ "proc-macro2", "quote", @@ -2261,7 +2338,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "walrus", @@ -2270,7 +2347,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "walrus", @@ -2278,10 +2355,10 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", - "log 0.4.11", + "log 0.4.14", "tempfile", "walrus", "wasm-bindgen-wasm-conventions", @@ -2290,13 +2367,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "env_logger", "heck", "lazy_static", - "log 0.4.11", + "log 0.4.14", "proc-macro2", "quote", "sourcefile", @@ -2324,6 +2401,15 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "wasm-in-web-worker" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm2js" version = "0.1.0" @@ -2339,18 +2425,24 @@ checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" [[package]] name = "wasmparser" -version = "0.60.2" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d5790a08f11f3d6b5767f6c49152df74b215e3dc5a38147713c4f6a05aac7f" +checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" + +[[package]] +name = "wasmparser" +version = "0.78.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" [[package]] name = "wasmprinter" -version = "0.2.7" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc836dba85dd00df43d71b22063bcb367d324aa1be0d046077cc7fca4c43876" +checksum = "2ccec894c70710c2e4669320a532cb2b9cfb97adb0429745642f8ce76916ed85" dependencies = [ "anyhow", - "wasmparser 0.60.2", + "wasmparser 0.78.2", ] [[package]] @@ -2363,17 +2455,26 @@ dependencies = [ ] [[package]] -name = "wat" -version = "1.0.22" +name = "wast" +version = "35.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" dependencies = [ - "wast", + "leb128", +] + +[[package]] +name = "wat" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ec280a739b69173e0ffd12c1658507996836ba4e992ed9bc1e5385a0bd72a02" +dependencies = [ + "wast 35.0.2", ] [[package]] name = "web-sys" -version = "0.3.50" +version = "0.3.51" dependencies = [ "js-sys", "wasm-bindgen", @@ -2447,7 +2548,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" dependencies = [ - "nom", + "nom 5.1.2", ] [[package]] @@ -2517,7 +2618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f" dependencies = [ "anyhow", - "wast", + "wast 21.0.0", "wit-writer", ] @@ -2535,9 +2636,9 @@ dependencies = [ [[package]] name = "wit-walrus" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b532d7bc47d02a08463adc934301efbf67e7b1e1284f8a68edc85d1ca84fa125" +checksum = "ad559e3e4c6404b2a6a675d44129d62a3836e3b951b90112fa1c5feb852757cd" dependencies = [ "anyhow", "id-arena", @@ -2572,3 +2673,9 @@ dependencies = [ "wasm-bindgen", "web-sys", ] + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index a52f7b6550c..ef8affdf244 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,10 +1,17 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security +{ rustPlatform +, fetchFromGitHub +, lib +, openssl +, pkg-config +, stdenv +, curl +, Security , runCommand }: rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.73"; + version = "0.2.74"; src = let @@ -12,9 +19,10 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw="; + hash = "sha256-GsraYfWzUZjFpPpufTyXF0i2llBzjh04iTKio6m4NRA="; }; - in runCommand "source" { } '' + in + runCommand "source" { } '' cp -R ${tarball} $out chmod -R +w $out cp ${./Cargo.lock} $out/Cargo.lock @@ -23,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-GUdoOms4FrNmPkELFX1PXcU/ww7CSN8JGHoCvnm73PQ="; + cargoHash = "sha256-djeI7kSGRHMpXnsbVlM2CDek02u5tFAsyAdHwbKC0y8="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { From b66975c129a6beb0208e77df2ea896d5ece0eb93 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 4 May 2021 17:37:08 +0200 Subject: [PATCH 398/797] secp256k1: (unstable-)2020-08-16 -> unstable-2021-06-06 - use sane defaults - drop JNI option which is not available anymore https://github.com/bitcoin-core/secp256k1/pull/682 --- pkgs/tools/security/secp256k1/default.nix | 42 +++++++++-------------- pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index a8acf3586c9..6953151cbe2 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -1,45 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, jdk - -# Enable ECDSA pubkey recovery module -, enableRecovery ? true - -# Enable ECDH shared secret computation (disabled by default because it is -# experimental) -, enableECDH ? false - -# Enable libsecp256k1_jni (disabled by default because it requires a jdk, -# which is a large dependency) -, enableJNI ? false - +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook }: -let inherit (lib) optionals; in - stdenv.mkDerivation { pname = "secp256k1"; # I can't find any version numbers, so we're just using the date of the # last commit. - version = "2020-08-16"; + version = "unstable-2021-06-06"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "670cdd3f8be25f81472b2d16dcd228b0d24a5c45"; - sha256 = "0ak2hrr0wznl5d9s905qwn5yds7k22i28d2jp957l4a8yf8cqv3s"; + rev = "7973576f6e3ab27d036a09397152b124d747f4ae"; + sha256 = "0vjk55dv0mkph4k6bqgkykmxn05ngzvhc4rzjnvn33xzi8dzlvah"; }; - buildInputs = optionals enableJNI [ jdk ]; - nativeBuildInputs = [ autoreconfHook ]; - configureFlags = - [ "--enable-benchmark=no" "--enable-tests=yes" "--enable-exhaustive-tests=no" ] ++ - optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++ - optionals enableRecovery [ "--enable-module-recovery" ] ++ - optionals enableJNI [ "--enable-jni" ]; + configureFlags = [ + "--enable-benchmark=no" + "--enable-exhaustive-tests=no" + "--enable-experimental" + "--enable-module-ecdh" + "--enable-module-recovery" + "--enable-module-schnorrsig" + "--enable-tests=yes" + ]; doCheck = true; + checkPhase = "./tests"; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32e7367bef4..169b3498be4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22703,10 +22703,7 @@ in jnetmap = callPackage ../applications/networking/jnetmap {}; - libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { - secp256k1 = secp256k1.override { enableECDH = true; }; - }; - + libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { }; libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix { }; libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { }; libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix { }; From 42e25d855fa959b7832fbdbc0a384294460d9258 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Jun 2021 20:29:28 +0200 Subject: [PATCH 399/797] firefox: use nss without p11-kit Quickfix to allow firefox to recognize certificates as trusted by Mozilla. Related: #126065 --- pkgs/applications/networking/browsers/firefox/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e35fd6ca701..a44fb2032f4 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -116,7 +116,9 @@ let then overrideCC stdenv llvmPackages.clangUseLLVM else stdenv; - nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; + # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY + # https://github.com/NixOS/nixpkgs/issues/126065 + nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss.override { useP11kit = false; }; # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking From 9febe63ae6daa36e4ad1c5cbd67517593a508b2d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 9 Jun 2021 00:39:56 +0200 Subject: [PATCH 400/797] grafana: 7.5.7 -> 8.0.0 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.0 Also had to skip one of the plugin tests as it tried to access grafana.com (test-failure is documented as comment in `preBuild`). --- pkgs/servers/monitoring/grafana/default.nix | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 89e49671d86..24bb3633cae 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.5.7"; + version = "8.0.0"; excludedPackages = [ "release_publisher" ]; @@ -10,32 +10,32 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GTQK02zxOBTE+93vT0zLMhAeZ7F3Cq/0lbvbzwB2QZA="; + sha256 = "sha256-HtubiSx4Orf9knZcuYy4eF2qwclX/JVd2Ba9L33tM74="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-IQ7aAuUrNa+bSh5ld6IttujM8AgKUSlu8H7pwzDi164="; + sha256 = "sha256-bwBpkPy4kwfnkRsLOktUgQx+Sm8WJA2d65efMBCnGp4="; }; - vendorSha256 = "sha256-AsPRaRLomp090XAKLXLXKm40ESPO4im9qi6VLpLYRQU="; + vendorSha256 = "sha256-Hon5WrhXUvZUtMRxx3XcBDQe3rkRkfqbnXjY3xCzuuM="; - # grafana-aws-sdk is specified with two versions which causes a problem later: - # go: inconsistent vendoring in /build/source: - # github.com/grafana/grafana-aws-sdk@v0.3.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt - # Remove the older one here to fix this. - postPatch = '' - substituteInPlace go.mod \ - --replace 'github.com/grafana/grafana-aws-sdk v0.3.0' "" - - substituteInPlace pkg/cmd/grafana-server/main.go \ - --replace 'var version = "5.0.0"' 'var version = "${version}"' - ''; - - # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go - # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/dashboard-schemas preBuild = '' - rm -r dashboard-schemas scripts/go + # The testcase makes an API call against grafana.com: + # + # --- Expected + # +++ Actual + # @@ -1,4 +1,4 @@ + # (map[string]interface {}) (len=2) { + # - (string) (len=5) "error": (string) (len=16) "plugin not found", + # - (string) (len=7) "message": (string) (len=16) "Plugin not found" + # + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused", + # + (string) (len=7) "message": (string) (len=24) "Failed to install plugin" + # } + sed -ie '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go + + # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go + rm -r scripts/go ''; postInstall = '' From 2d4ed9bae6f9c80d75cf5ef18ccdac85cf889ff3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Jun 2021 00:32:53 +0200 Subject: [PATCH 401/797] nixos/tests/custom-ca: disable firefox test integration Firefox has been decoupled from the system certificate store since the nss p11-kit integration in combination with our cacert package does not expose CKA_NSS_MOZILLA_CA_POLICY, which among other things is required for addon updates. --- nixos/tests/custom-ca.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index 7ce1101911d..26f29a3e68f 100644 --- a/nixos/tests/custom-ca.nix +++ b/nixos/tests/custom-ca.nix @@ -107,8 +107,15 @@ in ''; }; - environment.systemPackages = with pkgs; - [ xdotool firefox chromium falkon midori ]; + environment.systemPackages = with pkgs; [ + xdotool + # Firefox was disabled here, because we needed to disable p11-kit support in nss, + # which is why it will not use the system certificate store for the time being. + # firefox + chromium + falkon + midori + ]; }; testScript = '' @@ -145,7 +152,14 @@ in with subtest("Unknown CA is untrusted in curl"): machine.fail("curl -fv https://bad.example.com") - browsers = ["firefox", "chromium", "falkon", "midori"] + browsers = [ + # Firefox was disabled here, because we needed to disable p11-kit support in nss, + # which is why it will not use the system certificate store for the time being. + # "firefox", + "chromium", + "falkon", + "midori" + ] errors = ["Security Risk", "not private", "Certificate Error", "Security"] machine.wait_for_x() From 06c19c70ccfb873fd08ae729ecad4910ca4719be Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Tue, 8 Jun 2021 17:03:10 -0300 Subject: [PATCH 402/797] fsharp41: remove --- .../from_md/release-notes/rl-2111.section.xml | 6 + .../manual/release-notes/rl-2111.section.md | 2 + .../compilers/fsharp41/default.nix | 126 ------------------ ...eNameWithoutExtension-type-inference.patch | 13 -- .../fsharp-IsPathRooted-type-inference.patch | 21 --- .../fsharp41/fsharp-path-overloads.patch | 22 --- .../fsharp41/fsharp-string-switchName.patch | 13 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 9 files changed, 9 insertions(+), 197 deletions(-) delete mode 100644 pkgs/development/compilers/fsharp41/default.nix delete mode 100644 pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch delete mode 100644 pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch delete mode 100644 pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch delete mode 100644 pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 099fd803ee2..d9a418ffb16 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -71,6 +71,12 @@ fetchConfigured = false;. + + + fsharp41 has been removed in preference to use the latest + dotnet-sdk + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index cd942d2f730..809c17e3f6c 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -31,4 +31,6 @@ In addition to numerous new and upgraded packages, this release has the followin * Those making use of `buildBazelPackage` will need to regenerate the fetch hashes (preferred), or set `fetchConfigured = false;`. +* fsharp41 has been removed in preference to use the latest dotnet-sdk + ## Other Notable Changes diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix deleted file mode 100644 index e9f9088df3a..00000000000 --- a/pkgs/development/compilers/fsharp41/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it - -{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: - -stdenv.mkDerivation rec { - pname = "fsharp"; - version = "4.1.34"; - - src = fetchurl { - url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - autoconf - automake - which - mono - msbuild - dotnetbuildhelpers - dotnetPackages.FsCheck262 - dotnetPackages.FSharpCompilerTools - dotnetPackages.FSharpCore302 - dotnetPackages.FSharpCore3125 - dotnetPackages.FSharpCore4001 - dotnetPackages.FSharpCore4117 - dotnetPackages.FSharpData225 - dotnetPackages.FsLexYacc706 - dotnetPackages.MicrosoftDiaSymReader - dotnetPackages.MicrosoftDiaSymReaderPortablePdb - dotnetPackages.NUnit350 - dotnetPackages.SystemCollectionsImmutable131 - dotnetPackages.SystemReflectionMetadata - dotnetPackages.SystemValueTuple - ]; - - # https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches - # https://github.com/mono/mono/issues/7805 - patches = [ - ./fsharp-IsPathRooted-type-inference.patch - ./fsharp-string-switchName.patch - ./fsharp-path-overloads.patch - ./fsharp-GetFileNameWithoutExtension-type-inference.patch - ]; - - configurePhase = '' - substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" - ./autogen.sh --prefix $out - ''; - - preBuild = '' - substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" - - rm -rf packages - mkdir packages - - ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2 - ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27 - ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2 - ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5 - ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 - ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17 - ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5 - ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6 - ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0 - ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0 - ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0 - ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1 - ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2 - ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1 - ''; - - # Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key - # ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path - # "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied. - preInstall = '' - find Release/ -name FSharp.Core.dll -exec chmod u+w {} \; - ''; - - # Set up some symlinks for backwards compatibility. - postInstall = '' - ln -s $out/bin/fsharpc $out/bin/fsc - ln -s $out/bin/fsharpi $out/bin/fsi - for dll in "$out/lib/mono/fsharp"/FSharp*.dll - do - create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" - done - ''; - - doInstallCheck = true; - installCheckPhase = '' - echo 'printf "int = %i" (6 * 7);;' > script.fsx - $out/bin/fsi --exec script.fsx | grep "int = 42" - $out/bin/fsharpi --exec script.fsx | grep "int = 42" - $out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42" - - cat > answer.fs <] -let main argv = - printfn "int = %i" (6 * 7) - 0 -EOF - - $out/bin/fsc answer.fs - ${mono}/bin/mono answer.exe | grep "int = 42" - ''; - - # To fix this error when running: - # The file "/nix/store/path/whatever.exe" is an not a valid CIL image - dontStrip = true; - - meta = { - description = "A functional CLI language"; - homepage = "https://fsharp.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thoughtpolice raskin ]; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch deleted file mode 100644 index 14e9444b1de..00000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx -index 0bee9b79e..e6ceda11e 100644 ---- a/src/scripts/fssrgen.fsx -+++ b/src/scripts/fssrgen.fsx -@@ -329,7 +329,7 @@ let StringBoilerPlate filename = - // END BOILERPLATE - " - --let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) = -+let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) = - try - let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename) - if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then diff --git a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch deleted file mode 100644 index 06dd3e82adc..00000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit c37fce5b3019c7a150203fc3a484885591b194de -Author: Alexis Christoforides -Date: Sun Dec 2 00:10:24 2018 -0500 - - Help Path.IsPathRooted method overload selection. - - .NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload. - -diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx -index cc797e305..699c7bb93 100644 ---- a/src/scripts/scriptlib.fsx -+++ b/src/scripts/scriptlib.fsx -@@ -92,7 +92,7 @@ module Scripting = - - module Process = - -- let processExePath baseDir exe = -+ let processExePath baseDir (exe:string) = - if Path.IsPathRooted(exe) then exe - else - match Path.GetDirectoryName(exe) with diff --git a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch deleted file mode 100644 index f791317d080..00000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx -index cc797e305..ae8a6d3cc 100644 ---- a/src/scripts/scriptlib.fsx -+++ b/src/scripts/scriptlib.fsx -@@ -59,12 +59,12 @@ module Scripting = - - let (++) a b = Path.Combine(a,b) - -- let getBasename a = Path.GetFileNameWithoutExtension a -- let getFullPath a = Path.GetFullPath a -- let getFilename a = Path.GetFileName a -- let getDirectoryName a = Path.GetDirectoryName a -+ let getBasename (path: string) = Path.GetFileNameWithoutExtension path -+ let getFullPath (path: string) = Path.GetFullPath path -+ let getFilename (path: string) = Path.GetFileName path -+ let getDirectoryName (path: string) = Path.GetDirectoryName path - -- let copyFile source dir = -+ let copyFile (source: string) dir = - let dest = - if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore - let result = Path.Combine(dir, Path.GetFileName source) diff --git a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch deleted file mode 100644 index 4b36eaabcaf..00000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx -index cc797e305..5a7be7d2b 100644 ---- a/src/scripts/scriptlib.fsx -+++ b/src/scripts/scriptlib.fsx -@@ -36,7 +36,7 @@ module Scripting = - #if INTERACTIVE - let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray - -- let getCmdLineArgOptional switchName = -+ let getCmdLineArgOptional (switchName: string) = - argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead - - let getCmdLineArg switchName defaultValue = diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9415b6e24ae..08d8ed9494f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -237,6 +237,7 @@ mapAliases ({ ''; font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12 foomatic_filters = foomatic-filters; # 2016-08 + fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 453c4758ae4..070b89ce953 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11103,8 +11103,6 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { }; - fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_07; }; From 07c2912ca6acab4175e7d5b20f006b28fabbecaf Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 9 Jun 2021 09:26:07 +0800 Subject: [PATCH 403/797] stevenblack-blocklist: 3.7.6 -> 3.7.8 --- pkgs/tools/networking/stevenblack-blocklist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index f3f37581884..29faa448a3d 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.6"; + version = "3.7.8"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-zjUdHzsjv16PHXfxTuVC6aNKfh+73dH1AABvq1MArXI="; + sha256 = "sha256-z+AkjWmqP4ASnpIAG/OyZC4W5xU5YOeFTsmdkLvPixQ="; meta = with lib; { description = "Unified hosts file with base extensions"; From 0fa2b43956e89a71fa1613b38f0ce6140610102b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 22:02:06 +0200 Subject: [PATCH 404/797] python3Packages.azure-servicebus: 7.2.0 -> 7.3.0 --- .../development/python-modules/azure-servicebus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index d89def355f9..93f70108c35 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.2.0"; + version = "7.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "919e81d6d9e6e098dbb7abf51d90282a73c0071846b104e70488417cd5d07863"; + sha256 = "sha256-NigQxqZjekZjlu6wSrziVwbEBclxfwSK4svd0eHPKr8="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ]; meta = with lib; { - description = "This is the Microsoft Azure Service Bus Client Library"; + description = "Microsoft Azure Service Bus Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; From c86cd65e9ba49a6e8c4595da9ee27d6ff8ed561b Mon Sep 17 00:00:00 2001 From: natto1784 Date: Wed, 9 Jun 2021 06:25:25 +0530 Subject: [PATCH 405/797] vimPlugins.presence-nvim: init at 2021-06-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9b28224a310..f1a06264688 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3995,6 +3995,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; + presence-nvim = buildVimPluginFrom2Nix { + pname = "presence-nvim"; + version = "2021-06-08"; + src = fetchFromGitHub { + owner = "andweeb"; + repo = "presence.nvim"; + rev = "f4c1e227be0a0c863c2de201155401950eda572e"; + sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883"; + }; + meta.homepage = "https://github.com/andweeb/presence.nvim/"; + }; + PreserveNoEOL = buildVimPluginFrom2Nix { pname = "PreserveNoEOL"; version = "2013-06-14"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c17da77231c..1a2457d36d3 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -20,6 +20,7 @@ AndrewRadev/sideways.vim@main AndrewRadev/splitjoin.vim@main andsild/peskcolor.vim andviro/flake8-vim +andweeb/presence.nvim andymass/vim-matchup andys8/vim-elm-syntax antoinemadec/coc-fzf From 4be2fcb69ee1c53fe397e929af3520ec17f9278b Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 8 Jun 2021 18:40:22 -0700 Subject: [PATCH 406/797] =?UTF-8?q?teleport:=206.1.3=20=E2=86=92=206.2.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/servers/teleport/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 348681799a6..b8804974158 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -4,21 +4,21 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "cf396f868aebb8ba654ea2398c25f033181e7114"; - sha256 = "sha256-12jkpWl/kL0ttRHtxyDnKjYAZNrheEGQF8HEGSXvvAk="; + rev = "8c2812c169fa6bd5f31c13160bd93ef8b317bbc9"; + sha256 = "sha256-O+H8N1yqQiH645mgXeSc330GRmxF+gxiJJ5iYn65Z6Q="; }; in buildGoModule rec { pname = "teleport"; - version = "6.1.3"; + version = "6.2.3"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-kb7qRPZKXDY0Qy3/72epAGaN2FCOO/XAN8lOoUYkoM0="; + sha256 = "sha256-3syl1a2ui8/aTgCvihuhg575Df31loOXuENBNJG3nR0="; }; vendorSha256 = null; From 11925bdc3244ae4f1c0d18e5a0b9ddc55d9ab562 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 02:28:20 +0000 Subject: [PATCH 407/797] bemenu: 0.6.1 -> 0.6.2 --- pkgs/applications/misc/bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index eaad132de92..371bb3a3ef9 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-UdsfIXlKfXmsrFwrerX1wfne4mdtd69WXnXu3EmxCBY="; + sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8="; }; nativeBuildInputs = [ pkg-config pcre ]; From 4d8569b1730a34532719184c82caaca1e18b7c3b Mon Sep 17 00:00:00 2001 From: Natan Lao Date: Tue, 8 Jun 2021 16:46:45 -0700 Subject: [PATCH 408/797] nixos/nvidia: fix hardware.nvidia.package example --- nixos/modules/hardware/video/nvidia.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 97accc7b99a..2be9da8f42a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -92,7 +92,7 @@ in example = "PCI:4:0:0"; description = '' Bus ID of the AMD APU. You can find it using lspci; for example if lspci - shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0". + shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0". ''; }; @@ -159,7 +159,7 @@ in description = '' The NVIDIA X11 derivation to use. ''; - example = "config.boot.kernelPackages.nvidiaPackages.legacy340"; + example = "config.boot.kernelPackages.nvidiaPackages.legacy_340"; }; }; From 7c22d10a9fdacb91a78af8b2d5db68a6e0cb0e29 Mon Sep 17 00:00:00 2001 From: Dennis Bogers Date: Tue, 8 Jun 2021 00:11:43 +0200 Subject: [PATCH 409/797] vscode-extensions.octref.vetur: init at 0.34.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index d9ac9f19f37..1ca566bf7f2 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -841,6 +841,18 @@ let }; }; + octref.vetur = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vetur"; + publisher = "octref"; + version = "0.34.1"; + sha256 = "09w3bik1mxs7qac67wgrc58vl98ham3syrn2anycpwd7135wlpby"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + redhat.java = buildVscodeMarketplaceExtension { mktplcRef = { name = "java"; From ae2f75ef8949f5174325e655adefa1b86e80befb Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 18:49:58 +0200 Subject: [PATCH 410/797] rebar3WithPlugins: add ability to ignore dependencies --- .../beam-modules/rebar3-release.nix | 12 +----- .../tools/build-managers/rebar3/default.nix | 4 +- .../rebar3/rebar_ignore_deps.erl | 43 +++++++++++++++++++ 3 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 80082945e4c..98d10cb87c4 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -51,20 +51,12 @@ let inherit src; + REBAR_IGNORE_DEPS = beamDeps != [ ]; + configurePhase = '' runHook preConfigure ${lib.optionalString (checkouts != null) "cp --no-preserve=all -R ${checkouts}/_checkouts ."} - ${# Prevent rebar3 from trying to manage deps - lib.optionalString (beamDeps != [ ]) '' - erl -noshell -eval ' - {ok, Terms0} = file:consult("rebar.config"), - Terms = lists:keydelete(deps, 1, Terms0), - ok = file:write_file("rebar.config", [io_lib:format("~tp.~n", [T]) || T <- Terms]), - init:stop(0) - ' - rm -f rebar.lock - ''} runHook postConfigure ''; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index d551b98b5b8..ba4641552fe 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -118,9 +118,11 @@ let {ok, _} = zip:extract(Archive, [{cwd, "'$out/lib'"}]), init:stop(0) ' + cp ${./rebar_ignore_deps.erl} rebar_ignore_deps.erl + erlc -o $out/lib/rebar/ebin rebar_ignore_deps.erl mkdir -p $out/bin makeWrapper ${erlang}/bin/erl $out/bin/rebar3 \ - --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames}" \ + --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames} rebar_ignore_deps" \ --suffix-each ERL_LIBS ":" "$out/lib ${toString pluginLibDirs}" \ --add-flags "+sbtu +A1 -noshell -boot start_clean -s rebar3 main -extra" ''; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl b/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl new file mode 100644 index 00000000000..3e0ae67c453 --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl @@ -0,0 +1,43 @@ +%% This module, when loaded as a plugin, overrides the default `install_deps` +%% provider and erases the dependencies from the rebar3 state, when +%% REBAR_IGNORE_DEPS is true. + +-module(rebar_ignore_deps). + +-export([init/1, do/1, format_error/1]). + +init(State0) -> + case os:getenv("REBAR_IGNORE_DEPS", "") of + "" -> + {ok, State0}; + _ -> + do_init(State0) + end. + +do_init(State0) -> + State1 = rebar_state:allow_provider_overrides(State0, true), + Provider = providers:create( + [ + {name, install_deps}, %% override the default install_deps provider + {module, ?MODULE}, + {bare, false}, + {deps, [app_discovery]}, + {example, undefined}, + {opts, []}, + {short_desc, ""}, + {desc, ""} + ]), + State2 = rebar_state:add_provider(State1, Provider), + {ok, rebar_state:allow_provider_overrides(State2, false)}. + +do(State0) -> + io:format("Ignoring deps...~n"), + Profiles = rebar_state:current_profiles(State0), + State = lists:foldl(fun(P, Acc0) -> + Acc = rebar_state:set(Acc0, {deps, P}, []), + rebar_state:set(Acc, {parsed_deps, P}, []) + end, State0, Profiles), + {ok, State}. + +format_error(Reason) -> + io_lib:format("~p", [Reason]). From c34a62ebefc402d6bf0aa299fd50993557fa8383 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 19:22:37 +0200 Subject: [PATCH 411/797] rebar3-proper: init at 0.12.1 --- pkgs/development/beam-modules/default.nix | 2 +- .../beam-modules/rebar3-proper/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/beam-modules/rebar3-proper/default.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 0c184e0ba73..6c33298ff92 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -21,8 +21,8 @@ let inherit (callPackage ../tools/build-managers/rebar3 { }) rebar3 rebar3WithPlugins; rebar = callPackage ../tools/build-managers/rebar { }; - # rebar3 port compiler plugin is required by buildRebar3 pc = callPackage ./pc { }; + rebar3-proper = callPackage ./rebar3-proper { }; rebar3-nix = callPackage ./rebar3-nix { }; fetchHex = callPackage ./fetch-hex.nix { }; diff --git a/pkgs/development/beam-modules/rebar3-proper/default.nix b/pkgs/development/beam-modules/rebar3-proper/default.nix new file mode 100644 index 00000000000..2955beeeb5b --- /dev/null +++ b/pkgs/development/beam-modules/rebar3-proper/default.nix @@ -0,0 +1,13 @@ +{ lib, buildHex }: + +buildHex { + name = "rebar3_proper"; + version = "0.12.1"; + sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6"; + + meta = { + description = "rebar3 proper plugin"; + license = lib.licenses.bsd3; + homepage = "https://github.com/ferd/rebar3_proper"; + }; +} From e5d8f1adc94224da8c32a9dd6da0373b9d718b6b Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 19:25:05 +0200 Subject: [PATCH 412/797] erlang-ls: add checkPhase --- .../beam-modules/erlang-ls/default.nix | 16 +- .../beam-modules/erlang-ls/rebar-deps.nix | 322 ++++++++++-------- 2 files changed, 198 insertions(+), 140 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index e6f3e7fb9e9..b2a69a69278 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, lib }: +{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: let version = "0.16.0"; owner = "erlang-ls"; @@ -6,6 +6,11 @@ let deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; builder = buildRebar3; + overrides = (self: super: { + proper = super.proper.overrideAttrs (_: { + configurePhase = "true"; + }); + }); }; in rebar3Relx { name = "erlang-ls"; @@ -17,7 +22,16 @@ in rebar3Relx { }; releaseType = "escript"; beamDeps = builtins.attrValues deps; + buildPlugins = [ rebar3-proper ]; buildPhase = "HOME=. make"; + # based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml + # these tests are excessively long and we should probably skip them + checkPhase = '' + HOME=. epmd -daemon + HOME=. rebar3 ct + HOME=. rebar3 proper --constraint_tries 100 + ''; + doCheck = true; installPhase = '' mkdir -p $out/bin cp _build/default/bin/erlang_ls $out/bin/ diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 12cbb182ceb..5d55ce0c523 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -1,175 +1,219 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { - getopt = builder { - name = "getopt"; - version = "1.0.1"; - src = fetchHex { - pkg = "getopt"; +in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + getopt = builder { + name = "getopt"; version = "1.0.1"; - sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + src = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - zipper = builder { - name = "zipper"; - version = "1.0.1"; - src = fetchHex { - pkg = "zipper"; + zipper = builder { + name = "zipper"; version = "1.0.1"; - sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + src = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - quickrand = builder { - name = "quickrand"; - version = "2.0.1"; - src = fetchHex { - pkg = "quickrand"; + quickrand = builder { + name = "quickrand"; version = "2.0.1"; - sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + src = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - providers = builder { - name = "providers"; - version = "1.8.1"; - src = fetchHex { - pkg = "providers"; + providers = builder { + name = "providers"; version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + src = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + beamDeps = [ getopt ]; }; - beamDeps = [ getopt ]; - }; - katana_code = builder { - name = "katana_code"; - version = "0.2.1"; - src = fetchHex { - pkg = "katana_code"; + katana_code = builder { + name = "katana_code"; version = "0.2.1"; - sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + src = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - bucs = builder { - name = "bucs"; - version = "1.0.16"; - src = fetchHex { - pkg = "bucs"; + bucs = builder { + name = "bucs"; version = "1.0.16"; - sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + src = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - yamerl = builder { - name = "yamerl"; - version = "0.8.1"; - src = fetchHex { - pkg = "yamerl"; + yamerl = builder { + name = "yamerl"; version = "0.8.1"; - sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + src = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - uuid = builder { - name = "uuid"; - version = "2.0.1"; - src = fetchHex { - pkg = "uuid_erl"; + uuid = builder { + name = "uuid"; version = "2.0.1"; - sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + src = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + beamDeps = [ quickrand ]; }; - beamDeps = [ quickrand ]; - }; - tdiff = builder { - name = "tdiff"; - version = "0.1.2"; - src = fetchHex { - pkg = "tdiff"; + tdiff = builder { + name = "tdiff"; version = "0.1.2"; - sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + src = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - redbug = builder { - name = "redbug"; - version = "2.0.6"; - src = fetchHex { - pkg = "redbug"; + redbug = builder { + name = "redbug"; version = "2.0.6"; - sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + src = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - rebar3_format = builder { - name = "rebar3_format"; - version = "0.8.2"; - src = fetchHex { - pkg = "rebar3_format"; + rebar3_format = builder { + name = "rebar3_format"; version = "0.8.2"; - sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + src = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + beamDeps = [ katana_code ]; }; - beamDeps = [ katana_code ]; - }; - ranch = builder { - name = "ranch"; - version = "2.0.0"; - src = fetchHex { - pkg = "ranch"; + ranch = builder { + name = "ranch"; version = "2.0.0"; - sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; + src = fetchHex { + pkg = "ranch"; + version = "2.0.0"; + sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - jsx = builder { - name = "jsx"; - version = "3.0.0"; - src = fetchHex { - pkg = "jsx"; + jsx = builder { + name = "jsx"; version = "3.0.0"; - sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + src = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - erlfmt = builder { - name = "erlfmt"; - version = "git"; - src = fetchFromGitHub { - owner = "whatsapp"; - repo = "erlfmt"; - rev = "2e93fc4a646111357642b0179a2a63151868d890"; - sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + erlfmt = builder { + name = "erlfmt"; + version = "git"; + src = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + beamDeps = [ ]; }; - beamDeps = [ ]; - }; - ephemeral = builder { - name = "ephemeral"; - version = "2.0.4"; - src = fetchHex { - pkg = "ephemeral"; + ephemeral = builder { + name = "ephemeral"; version = "2.0.4"; - sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + src = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + beamDeps = [ bucs ]; }; - beamDeps = [ bucs ]; - }; - elvis_core = builder { - name = "elvis_core"; - version = "1.1.1"; - src = fetchHex { - pkg = "elvis_core"; + elvis_core = builder { + name = "elvis_core"; version = "1.1.1"; - sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + src = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + beamDeps = [ katana_code zipper ]; }; - beamDeps = [ katana_code zipper ]; - }; - docsh = builder { - name = "docsh"; - version = "0.7.2"; - src = fetchHex { - pkg = "docsh"; + docsh = builder { + name = "docsh"; version = "0.7.2"; - sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + src = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; + beamDeps = [ providers ]; + }; + proper_contrib = builder { + name = "proper_contrib"; + version = "0.2.0"; + src = fetchHex { + pkg = "proper_contrib"; + version = "0.2.0"; + sha256 = "sha256-jFRRL1zr9JKaG1eqMDfcKk2xe93uOrXUenB14icVCBU="; + }; + beamDeps = [ proper ]; + }; + proper = builder { + name = "proper"; + version = "1.3.0"; + src = fetchHex { + pkg = "proper"; + version = "1.3.0"; + sha256 = "sha256-SqGS/M3dA/2+UP72IL6dTS+SY1tU9V+4OuwYWZRAPLw="; + }; + beamDeps = [ ]; + }; + meck = builder { + name = "meck"; + version = "0.9.0"; + src = fetchHex { + pkg = "meck"; + version = "0.9.0"; + sha256 = "sha256-+BPpDdC4myUWoCAaNV6EsavHi1dRqgy/ZpqdhagQrGM="; + }; + beamDeps = [ ]; + }; + coveralls = builder { + name = "coveralls"; + version = "2.2.0"; + src = fetchHex { + pkg = "coveralls"; + version = "2.2.0"; + sha256 = "sha256-zVTbCqjGS1OSgBicVhns7hOkaiiw8ct3RUTdzBZiBKM="; + }; + beamDeps = [ jsx ]; }; - beamDeps = [ providers ]; }; -} +in self From 00ee61b3cc858ebf7652b7317a3d91a59d3e85f1 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 6 Jun 2021 16:43:34 +0200 Subject: [PATCH 413/797] rebar3: add checkPhase --- .../tools/build-managers/rebar3/default.nix | 9 + .../build-managers/rebar3/rebar-deps.nix | 168 ++++++++++++------ 2 files changed, 125 insertions(+), 52 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index ba4641552fe..9be3d232fb8 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -39,6 +39,12 @@ let HOME=. escript bootstrap ''; + checkPhase = '' + HOME=. escript ./rebar3 ct + ''; + + doCheck = true; + installPhase = '' mkdir -p $out/bin cp rebar3 $out/bin/rebar3 @@ -101,6 +107,9 @@ let # instruct rebar3 to always load a certain plugin. It is necessary since # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this. patches = [ ./skip-plugins.patch ./global-plugins.patch ]; + + # our patches cause the tests to fail + doCheck = false; })); in stdenv.mkDerivation { pname = "rebar3-with-plugins"; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 6894b8666e6..34c4821aaec 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -1,54 +1,118 @@ # Generated by rebar3_nix -{ fetchHex, fetchFromGitHub }: -{ - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.6"; - sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; +let fetchOnly = { src, ... }: src; +in { builder ? fetchOnly, fetchHex, 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.4.0"; + src = fetchHex { + pkg = "relx"; + version = "4.4.0"; + sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; + }; + beamDeps = [ bbmustache ]; + }; + providers = builder { + name = "providers"; + version = "1.8.1"; + src = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + beamDeps = [ 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.6.1"; + src = fetchHex { + pkg = "certifi"; + version = "2.6.1"; + sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; + }; + beamDeps = [ ]; + }; + bbmustache = builder { + name = "bbmustache"; + version = "1.10.0"; + src = fetchHex { + pkg = "bbmustache"; + version = "1.10.0"; + sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; + }; + beamDeps = [ ]; + }; + meck = builder { + name = "meck"; + version = "0.8.13"; + src = fetchHex { + pkg = "meck"; + version = "0.8.13"; + sha256 = "sha256-008BPBVttRrVfMVWiRuXIOahwd9f4uFa+ZnITWzr6xo="; + }; + beamDeps = [ ]; + }; }; - relx = fetchHex { - pkg = "relx"; - version = "4.4.0"; - sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; - }; - providers = fetchHex { - pkg = "providers"; - version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; - }; - eunit_formatters = fetchHex { - pkg = "eunit_formatters"; - version = "0.5.0"; - sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; - }; - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "1.5.0"; - sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns="; - }; - cth_readable = fetchHex { - pkg = "cth_readable"; - version = "1.5.1"; - sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; - }; - cf = fetchHex { - pkg = "cf"; - version = "0.3.1"; - sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; - }; - certifi = fetchHex { - pkg = "certifi"; - version = "2.6.1"; - sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; - }; - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.10.0"; - sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; - }; -} +in self From dca55d9a451fba34c87e8adea7a3782d667149fa Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 9 Jun 2021 12:16:24 +0900 Subject: [PATCH 414/797] mix-release: add rebar dependency --- pkgs/development/beam-modules/mix-release.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index e096bdee0cf..80e8721302e 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: +{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: { pname , version @@ -32,6 +32,8 @@ stdenv.mkDerivation (overridable // { HEX_OFFLINE = 1; DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation # the api with `mix local.rebar rebar path` makes a copy of the binary + # some older dependencies still use rebar + MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; postUnpack = '' From c374fd03ffd37d400c6bad69a4cd386749df803b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 04:00:20 +0000 Subject: [PATCH 415/797] deno: 1.10.3 -> 1.11.0 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 08c69dde399..dee8ad0c9b8 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-25FfxGtPZ+KQCmXur6pwrb1l/xjCWgw69CMLPihnhAU="; + sha256 = "sha256-rsQ9MdMgYPqnLzMfW4rwDpx5QKVDm6TMCCHqJzvTpjw="; }; - cargoSha256 = "sha256-CopfdjafWAhpbrdYSHJjKHKCLw94TSaiSAH4CVFOHi8="; + cargoSha256 = "sha256-nKbc73bEKb0XzuBZApu21E1OzkgU9sqbCaaWhUMiWdQ="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 8ae163f2c90..6ae0de15c77 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.22.2"; + version = "0.22.3"; shas = { - x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q="; - aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s="; - x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs="; - aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI="; + x86_64-linux = "sha256-RS1fUuTm6zhln67ank6Sit9nhGyKij1UsJ77ezffCh8="; + aarch64-linux = "sha256-E7SSFYODO8diPmEvpJyzAcltrh7YUXhWlqsRytFRmtA="; + x86_64-darwin = "sha256-29XTC7RoUDNJq46WkLCQT1vCuv4dzBrp8no6vVCsQ2g="; + aarch64-darwin = "sha256-UZHhKUjWQGklH26z2Kc2J7VwlV83LWl5n3YZt5ryKrY="; }; } From e52e7335dd0bb1ebd1d6c3da7c9f545e21e34695 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 9 Jun 2021 02:23:44 -0300 Subject: [PATCH 416/797] nixos/dotnetPackages: remove packages F# packages have been removed for being unmaintaned. --- .../from_md/release-notes/rl-2111.section.xml | 149 ++++++ .../manual/release-notes/rl-2111.section.md | 31 ++ pkgs/top-level/dotnet-packages.nix | 480 ------------------ 3 files changed, 180 insertions(+), 480 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index d9a418ffb16..070e7b14293 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -77,6 +77,155 @@ dotnet-sdk + + + The following F#-related packages have been removed for being + unmaintaned. Please use fetchNuGet for + specific packages. + + + + + ExtCore + + + + + Fake + + + + + Fantomas + + + + + FsCheck + + + + + FsCheck262 + + + + + FsCheckNunit + + + + + FSharpAutoComplete + + + + + FSharpCompilerCodeDom + + + + + FSharpCompilerService + + + + + FSharpCompilerTools + + + + + FSharpCore302 + + + + + FSharpCore3125 + + + + + FSharpCore4001 + + + + + FSharpCore4117 + + + + + FSharpData + + + + + FSharpData225 + + + + + FSharpDataSQLProvider + + + + + FSharpFormatting + + + + + FsLexYacc + + + + + FsLexYacc706 + + + + + FsLexYaccRuntime + + + + + FsPickler + + + + + FsUnit + + + + + Projekt + + + + + Suave + + + + + UnionArgParser + + + + + ExcelDnaRegistration + + + + + MathNetNumerics + + + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 809c17e3f6c..c1fde5a032b 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -33,4 +33,35 @@ In addition to numerous new and upgraded packages, this release has the followin * fsharp41 has been removed in preference to use the latest dotnet-sdk +* The following F#-related packages have been removed for being unmaintaned. + Please use `fetchNuGet` for specific packages. + - ExtCore + - Fake + - Fantomas + - FsCheck + - FsCheck262 + - FsCheckNunit + - FSharpAutoComplete + - FSharpCompilerCodeDom + - FSharpCompilerService + - FSharpCompilerTools + - FSharpCore302 + - FSharpCore3125 + - FSharpCore4001 + - FSharpCore4117 + - FSharpData + - FSharpData225 + - FSharpDataSQLProvider + - FSharpFormatting + - FsLexYacc + - FsLexYacc706 + - FsLexYaccRuntime + - FsPickler + - FsUnit + - Projekt + - Suave + - UnionArgParser + - ExcelDnaRegistration + - MathNetNumerics + ## Other Notable Changes diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 55eb5676403..f3310d90b12 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -8,14 +8,12 @@ , glib , pkg-config , mono -, fsharp , overrides ? {} }: let self = dotnetPackages // overrides; dotnetPackages = with self; { # BINARY PACKAGES - Autofac = fetchNuGet { baseName = "Autofac"; version = "3.5.2"; @@ -23,176 +21,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ]; }; - Fake = fetchNuGet { - baseName = "FAKE"; - version = "3.33.0"; - sha256 = "04gllx9d1w8zn9gq9p5k76b79ix07rilk3apdi72dmz6h3yylcdm"; - outputFiles = [ "tools/*" ]; - dllFiles = [ "Fake*.dll" ]; - }; - - Fantomas = fetchNuGet { - baseName = "Fantomas"; - version = "4.4.0"; - sha256 = "cYz0ewJdK9nRlMKmigk3IENfOXvJRhXJfLXshaqgZ6o="; - outputFiles = [ "lib/*" ]; - dllFiles = [ "Fantomas*.dll" ]; - - meta = with lib; { - description = "FSharp source code formatter"; - homepage = "https://github.com/fsprojects/fantomas"; - license = licenses.asl20; - maintainers = [ maintainers.ratsclub ]; - }; - }; - - FSharpCompilerCodeDom = fetchNuGet { - baseName = "FSharp.Compiler.CodeDom"; - version = "0.9.2"; - sha256 = "0cy9gbvmfx2g74m7bgp6x9mr4avb6s560yjii7cyyxb7jlwabfcj"; - outputFiles = [ "lib/net40/*" ]; - }; - - FSharpCore302 = fetchNuGet { - baseName = "FSharp.Core"; - version = "3.0.2"; - sha256 = "1s4pqwbmhrsg5sw8i6dixdri3x0yjyilmkhsf4apfkp80si7d73q"; - outputFiles = [ "*" ]; - }; - - FSharpCore3125 = fetchNuGet { - baseName = "FSharp.Core"; - version = "3.1.2.5"; - sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih"; - outputFiles = [ "*" ]; - }; - - FSharpCore4001 = fetchNuGet { - baseName = "FSharp.Core"; - version = "4.0.0.1"; - sha256 = "0v53iq12ji2d1bkdyg9dn8sz5l93sprrh835amh39dghh8v8vm8k"; - outputFiles = [ "*" ]; - }; - - FSharpCore4117 = fetchNuGet { - baseName = "FSharp.Core"; - version = "4.1.17"; - sha256 = "1yk23ir66fgqm5r6qyf66zf64l0s223l3yd7p9yvbyimyg0hgzb1"; - outputFiles = [ "*" ]; - }; - - FSharpData = fetchNuGet { - baseName = "FSharp.Data"; - version = "4.1.1"; - sha256 = "0ytjiQi8vQQU51JYexnC13Bi7NqVmLRzM75SOZ+hhQU="; - outputFiles = [ "lib/*" ]; - - meta = with lib; { - description = "F# Data: Library for Data Access"; - homepage = "https://fsprojects.github.io/FSharp.Data/"; - license = licenses.asl20; - maintainers = [ maintainers.ratsclub ]; - }; - }; - - FSharpData225 = fetchNuGet { - baseName = "FSharp.Data"; - version = "2.2.5"; - sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724"; - outputFiles = [ "*" ]; - }; - - FSharpDataSQLProvider = fetchNuGet { - baseName = "SQLProvider"; - version = "0.0.9-alpha"; - sha256 = "1wmgr5ca9hh6a7f0s8yc87n6arn7bq6nwc8n4crbbdil4r0bw46w"; - outputFiles = [ "lib/net40/*" ]; - }; - - FsCheck = fetchNuGet { - baseName = "FsCheck"; - version = "1.0.4"; - sha256 = "1q2wk4d4d1q94qzcccgmxb2lh0b8qkmpyz0p7lfphkw2gx6cy5ad"; - outputFiles = [ "lib/net45/*" ]; - }; - - FsCheck262 = fetchNuGet { - baseName = "FsCheck"; - version = "2.6.2"; - sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl"; - outputFiles = [ "*" ]; - }; - - FsCheckNunit = fetchNuGet { - baseName = "FsCheck.Nunit"; - version = "1.0.4"; - sha256 = "1s62jrsa5hxqy1ginl8r29rjdc8vbkwmz7mb0hglhwccdqfyr5xy"; - outputFiles = [ "lib/net45/*" ]; - }; - - FSharpCompilerTools = fetchNuGet { - baseName = "FSharp.Compiler.Tools"; - version = "4.1.27"; - sha256 = "1m3hl8ja9gp5ajxmjf7bnq24bbkd6kx7yhxf4zb8si27h1n9l6dl"; - outputFiles = [ "*" ]; - }; - - FsLexYacc = fetchNuGet { - baseName = "FsLexYacc"; - version = "6.1.0"; - sha256 = "1v5myn62zqs431i046gscqw2v0c969fc7pdplx7z9cnpy0p2s4rv"; - outputFiles = [ "build/*" ]; - }; - - FsLexYacc706 = fetchNuGet { - baseName = "FsLexYacc"; - version = "7.0.6"; - sha256 = "0xwiq8q5q6ga6zj24w83ch5csbv405xcg6jg2hmnjic0npz0drk2"; - outputFiles = [ "*" ]; - }; - - FsLexYaccRuntime = fetchNuGet { - baseName = "FsLexYacc.Runtime"; - version = "6.1.0"; - sha256 = "18vrx4lxsn4hkfishg4abv0d4q21dsph0bm4mdq5z8afaypp5cr7"; - outputFiles = [ "lib/net40/*" ]; - }; - - FsPickler = fetchNuGet { - baseName = "FsPickler"; - version = "1.2.9"; - sha256 = "12fgcj7pvffsj1s1kaz15j22i1n98dy5mf4z84555xdf7mw7dpm4"; - outputFiles = [ "lib/net45/*" ]; - }; - - FsUnit = fetchNuGet { - baseName = "FsUnit"; - version = "1.3.0.1"; - sha256 = "1k7w8pc81aplsfn7n46617khmzingd2v7hcgdhh7vgsssibwms64"; - outputFiles = [ "Lib/Net40/*" ]; - }; - - FSharpFormatting = fetchNuGet { - baseName = "FSharp.Formatting"; - version = "11.2.0"; - sha256 = "4IMrd+jpRZw+vBXx4X89/B/Fdpiuy2hwtmQNGWQp0wM="; - outputFiles = [ "lib/*" ]; - postUnpack = '' - chmod -R a+r $sourceRoot - ''; - - meta = with lib; { - description = "F# tools for generating documentation (Markdown processor and F# code formatter)"; - homepage = "https://fsprojects.github.io/FSharp.Formatting/"; - longDescription = '' - The FSharp.Formatting package includes libraries and tools for processing F# script files, - markdown and components for documentation generation. - ''; - license = licenses.asl20; - maintainers = [ maintainers.ratsclub ]; - }; - }; - NUnit3 = fetchNuGet { baseName = "NUnit"; version = "3.0.1"; @@ -349,15 +177,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i"; outputFiles = [ "*" ]; }; - - Suave = fetchNuGet { - baseName = "Suave"; - version = "0.29.0"; - propagatedBuildInputs = [ FsPickler ]; - sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln"; - outputFiles = [ "lib/net40/*" ]; - }; - # SOURCE PACKAGES Boogie = buildDotnetPackage rec { @@ -518,164 +337,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - ExcelDnaRegistration = buildDotnetPackage rec { - baseName = "Excel-DNA.Registration"; - version = "git-" + (builtins.substring 0 10 rev); - rev = "69abb1b3528f40dbcf425e13690aaeab5f707bb6"; - - src = fetchFromGitHub { - inherit rev; - owner = "Excel-DNA"; - repo = "Registration"; - sha256 = "094932h6r2f4x9r5mnw8rm4jzz8vkfv90d95qi3h0i89ws2dnn07"; - }; - - buildInputs = [ - fsharp - dotnetPackages.ExcelDna - ]; - - xBuildFiles = [ "Source/ExcelDna.Registration/ExcelDna.Registration.csproj" "Source/ExcelDna.Registration.FSharp/ExcelDna.Registration.FSharp.fsproj" ]; - outputFiles = [ "Source/ExcelDna.Registration/bin/Release/*" "Source/ExcelDna.Registration.FSharp/bin/Release/*FSharp*" ]; - - meta = { - description = "This library implements helper functions to assist and modify the Excel-DNA function registration"; - homepage = "https://github.com/Excel-DNA/Registration"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - ExtCore = buildDotnetPackage { - baseName = "ExtCore"; - version = "0.8.46"; - - src = fetchFromGitHub { - owner = "jack-pappas"; - repo = "ExtCore"; - rev = "0269b6d3c479f45abd7aa983aaeca08d07473943"; - sha256 = "1kxkiszpvqisffhd6wciha8j3dhkq06w9c540bmq8zixa4xaj83p"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NUnit - dotnetPackages.FsCheck - ]; - - postConfigure = '' - # Fix case - sed -i -e s,nuget.targets,NuGet.targets, ExtCore.Tests/ExtCore.Tests.fsproj - ''; - - xBuildFlags = [ "/p:Configuration=Release (net45)" ]; - outputFiles = [ "ExtCore/bin/net45/Release/*" ]; - - meta = { - description = "ExtCore is an extended core library for F#"; - homepage = "https://github.com/jack-pappas/ExtCore"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - broken = true; - }; - }; - - FSharpAutoComplete = buildDotnetPackage rec { - baseName = "FSharp.AutoComplete"; - version = "0.18.2"; - - src = fetchFromGitHub { - owner = "fsharp"; - repo = "FSharp.AutoComplete"; - rev = version; - sha256 = "1ikl72003xzqq2dc8i6h404hnq3q5g1p1q4rmzz9bdm7282q2jgs"; - }; - - buildInputs = [ - fsharp - glib - dotnetPackages.FSharpCompilerService - dotnetPackages.NewtonsoftJson - dotnetPackages.NDeskOptions - ]; - - outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ]; - - meta = { - description = "An interface to the FSharp.Compiler.Service project"; - longDescription = '' - This project provides a command-line interface to the - FSharp.Compiler.Service project. It is intended to be used as a backend - service for rich editing or 'intellisense' features for editors. - ''; - homepage = "https://github.com/fsharp/FSharp.AutoComplete"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - FSharpCompilerService = buildDotnetPackage { - baseName = "FSharp.Compiler.Service"; - version = "0.0.90"; - - src = fetchFromGitHub { - owner = "fsharp"; - repo = "FSharp.Compiler.Service"; - rev = "a87939ab3f3c571cad79bc3b5f298aa3e180e6b3"; - sha256 = "0axr38q8m0h11hhbxg5myd1wwfgysadriln8c7bqsv5sf9djihvd"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NUnit - ]; - - outputFiles = [ "bin/v4.5/*" ]; - - meta = { - description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings"; - homepage = "https://fsharp.github.io/FSharp.Compiler.Service/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - # FSharpxExtras = buildDotnetPackage rec { - # baseName = "FSharpx.Extras"; - # version = "1.8.41"; - # - # src = fetchurl { - # name = "${baseName}-${version}.tar.gz"; - # url = "https://github.com/fsprojects/FSharpx.Extras/archive/${version}.tar.gz"; - # sha256 = "102z5bvk3ffi1crgyp51488vamv41fsf61n8x8pdiznq155zydhl"; - # }; - # - # buildInputs = [ - # fsharp - # dotnetPackages.NUnit - # dotnetPackages.FsCheck - # dotnetPackages.FsCheckNunit - # dotnetPackages.FsUnit - # ]; - # - # patches = [ ./disable_excel.patch ]; - # - # xBuildFiles = [ "FSharpx.WithTypeProviders.sln" ]; - # outputFiles = [ "build/*" ]; - # - # meta = { - # description = "FSharpx.Extras is a collection of libraries and tools for use with F#"; - # homepage = "https://fsprojects.github.io/FSharpx.Extras/"; - # license = lib.licenses.asl20; - # maintainers = with lib.maintainers; [ obadz ]; - # platforms = with lib.platforms; linux; - # }; - # }; - GitVersionTree = buildDotnetPackage { baseName = "GitVersionTree"; version = "2013-10-01"; @@ -724,30 +385,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - MathNetNumerics = buildDotnetPackage rec { - baseName = "MathNet.Numerics"; - version = "3.7.0"; - - src = fetchurl { - name = "${baseName}-${version}.tar.gz"; - url = "https://github.com/mathnet/mathnet-numerics/archive/v${version}.tar.gz"; - sha256 = "1yq6aqmc2gwh96z544qn83kby01lv1lsxm158hq0bimv2i9yywc7"; - }; - - buildInputs = [ fsharp ]; - - xBuildFiles = [ "MathNet.Numerics.sln" ]; - outputFiles = [ "out/lib/Net40/*" "src/FSharp/MathNet.Numerics.fsx" "src/FSharp/MathNet.Numerics.IfSharp.fsx" ]; - - meta = { - description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; - homepage = "https://numerics.mathdotnet.com/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - MonoAddins = buildDotnetPackage rec { baseName = "Mono.Addins"; version = "1.2"; @@ -780,62 +417,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - # MonoDevelopFSharpBinding = buildDotnetPackage rec { - # baseName = "MonoDevelop.FSharpBinding"; - # version = "git-a09c8185eb"; - - # broken = true; - - # src = fetchFromGitHub { - # owner = "fsharp"; - # repo = "fsharpbinding"; - # rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011"; - # sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91"; - # }; - - # buildInputs = [ - # fsharp - # monodevelop - # pkgs.gtk-sharp - # pkgs.gnome-sharp - # dotnetPackages.ExtCore - # dotnetPackages.FSharpCompilerService - # dotnetPackages.FSharpCompilerCodeDom - # dotnetPackages.FSharpAutoComplete - # dotnetPackages.Fantomas - # ]; - - # patches = [ - # ../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch - # ../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch - # ]; - - # preConfigure = '' - # substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop - # substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop - # (cd monodevelop; fsharpi ./configure.fsx) - # ''; - - # # This will not work as monodevelop probably looks in absolute nix store path rather than path - # # relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding - # # ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way - - # # postInstall = '' - # # mkdir -p "$out/lib/monodevelop/AddIns" - # # ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns" - # # ''; - - # xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ]; - # outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ]; - - # meta = { - # description = "F# addin for MonoDevelop 5.9"; - # homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9"; - # license = lib.licenses.asl20; - # maintainers = with lib.maintainers; [ obadz ]; - # platforms = with lib.platforms; linux; - # }; - # }; NDeskOptions = stdenv.mkDerivation rec { pname = "NDesk.Options"; @@ -900,67 +481,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "*" ]; }; - Projekt = buildDotnetPackage rec { - baseName = "projekt"; - version = "git-" + (builtins.substring 0 10 rev); - rev = "715a21e5cd3c86310387562618b04e979d0ec9c4"; - - src = fetchFromGitHub { - inherit rev; - owner = "kjnilsson"; - repo = "projekt"; - sha256 = "1ph3af07wmia6qkiq1qlywaj2xh6zn5drdx19dwb1g3237h5fnz0"; - }; - - buildInputs = [ - fsharp - dotnetPackages.UnionArgParser - dotnetPackages.FsUnit - ]; - - preConfigure = '' - sed -i -e "s/FSharp.Core, Version=\$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a/FSharp.Core/" src/Projekt/Projekt.fsproj - ''; - - outputFiles = [ "src/Projekt/bin/Release/*" ]; - - meta = { - description = "A command-line tool for manipulating F# project files"; - homepage = "https://github.com/kjnilsson/projekt"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - UnionArgParser = buildDotnetPackage { - baseName = "UnionArgParser"; - version = "0.8.7"; - - src = fetchFromGitHub { - owner = "nessos"; - repo = "UnionArgParser"; - rev = "acaeb946e53cbb0bd9768977c656b3242146070a"; - sha256 = "1yrs7ycf2hg7h8z6vm9lr7i3gr9s30k74fr2maigdydnnls93als"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NUnit - dotnetPackages.FsUnit - ]; - - outputFiles = [ "bin/net40/*" ]; - - meta = { - description = "A declarative CLI argument/XML configuration parser for F# applications"; - homepage = "https://nessos.github.io/UnionArgParser/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - YamlDotNet = fetchNuGet { baseName = "YamlDotNet"; version = "11.1.1"; From b3f37af994686fded62c3e0da03c1e807a328f91 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 8 Jun 2021 21:01:25 -0700 Subject: [PATCH 417/797] mesa-demos: Configure --with-system-data-files Fixes #126301. Signed-off-by: Anders Kaseorg --- pkgs/tools/graphics/mesa-demos/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 14b7a038a13..550b06d0f0e 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ]; nativeBuildInputs = [ pkg-config ]; + configureFlags = [ "--with-system-data-files" ]; enableParallelBuilding = true; meta = with lib; { From 81cca90a8f058577849541f92d7ac62150271d9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 04:23:38 +0000 Subject: [PATCH 418/797] dockle: 0.3.13 -> 0.3.14 --- pkgs/development/tools/dockle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index f0d8a5ac6e0..55869b02295 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U0nIGuQ4QjBaCck0Kg1RTS2IQwfivN3VI5vxh8lxAYE="; + sha256 = "sha256-Xe5qgM0yPBVtH9S4OSiNnkKxcH0W89aABJF6PVRBEhQ="; }; - vendorSha256 = "sha256-uHHm4AgnjTdPgpu3OpXXIRzrGhkpOoRY8qynfl7DO6w="; + vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; From a87b39eb2a1d4c417939492b82a656bf76531019 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 04:40:44 +0000 Subject: [PATCH 419/797] earthly: 0.5.15 -> 0.5.16 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 82f59817b22..1e71c63272f 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.15"; + version = "0.5.16"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-3hiiCcCgbWxSfG8XCcoKdNJsQoP2L2G4g4zFQkFtzQI="; + sha256 = "sha256-p2O9GkXrRCxgOnVVmtBFUpbg0w9b3LB0PNOlK1gxYAY="; }; - vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; + vendorSha256 = "sha256-avxNVTPcJ5HjeN7Q9rVmmSud1i3Yb8cSFTAUtNPYbBg="; buildFlagsArray = '' -ldflags= From db966f24946928e348f2332cf96aa18febd61f1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 04:35:05 +0000 Subject: [PATCH 420/797] dua: 2.12.2 -> 2.13.0 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 4090a0f5051..32c5d3b4745 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.12.2"; + version = "2.13.0"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-0w9RKkoKWwPrVLkQieL69HIsSWbqS0vQesi7yijwXRw="; + sha256 = "sha256-gJOEMp2Ex9gBsvYOmIKH7WNLQejiJhY8wnw2JYxcUU4="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-JqOblCWJSKuTzE4XQzk5nCQL7NIwC5ZDhue1HA7JdzA="; + cargoSha256 = "sha256-cN5rURv1RmesLzwm3ZXyGJXxvFeIbpTb6kWzJSKgX5o="; doCheck = false; From f1ab5c38a9c8ff6438c3129a18e419abec80fcc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 05:57:56 +0000 Subject: [PATCH 421/797] fend: 0.1.16 -> 0.1.17 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index ceaee9746af..6c4160b06e3 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ITS2wE4vwp0W/nlTyX55cY5E95VIwR46JBzF0pD/xsE="; + sha256 = "sha256-Xq2UjeZiKy9BjNQ9xnC7tppEwrEtg8ZN5BVDz1bUOmw="; }; - cargoSha256 = "sha256-YqOc/B+ZP1i9xJLrOguQ6fwQr6SV0qvQ3fWwguY2S0I="; + cargoSha256 = "sha256-Bf3fYHhpoX05AmTdwwdRU2YRfGVb1EmaGDm75i+Vs2w="; doInstallCheck = true; From e5fdaf06f5985e238a629fad85414c0868d84d73 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 8 Jun 2021 21:47:40 +0200 Subject: [PATCH 422/797] vscode-extensions.hashicorp.terraform: 2.11.0 -> 2.12.0 --- pkgs/misc/vscode-extensions/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 44e2bdb1005..90ea121850d 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.11.0"; + version = "2.12.0"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "0wqdya353b415qxs8jczmis3q6d8fddv1pdd8jdd0w64s1ibv3sy"; + sha256 = "1r12yxpf0wlh7vdxpj04356zlgxmlwz9apdlxnv5ay056a2a8k3a"; }; patches = [ ./fix-terraform-ls.patch ]; From d85d5dd92bc7883b054c3905c5da0b0b0060b41a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 04:58:38 +0000 Subject: [PATCH 423/797] esbuild: 0.12.6 -> 0.12.7 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2aa67483337..894168145ae 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-ncRHsYxG4XVT7TUJv+VgXMsLmQ52+/dXUlgMy8QnzNc="; + sha256 = "sha256-LHM3dlVfwgA1HJPg/77Er/RWEDVmmQuuhrS5KzTAtV0="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From a362b1e9eed7888e2b0664d22a1ac57aaa12e068 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 07:03:20 +0000 Subject: [PATCH 424/797] glab: 1.17.0 -> 1.18.0 --- .../version-management/git-and-tools/glab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index c810598d7cf..12fd8357fc7 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UW6KYqqeDnswPSHrjprbClnIwpX5zA+ePq7kwlsWEfA="; + sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ="; }; - vendorSha256 = "sha256-5hVIwEG70r9EDyapQ/OBlHfA1Zw5y4KxEysX415t3xk="; + vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw="; runVend = true; # Tests are trying to access /homeless-shelter From fbc06db82fcac9c5866c9c02aef57deacf09f50a Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 9 Jun 2021 04:09:00 -0300 Subject: [PATCH 425/797] dotnetPackages.YamlDotNet: remove --- pkgs/top-level/dotnet-packages.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index f3310d90b12..4dc848c08c6 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -481,18 +481,4 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "*" ]; }; - YamlDotNet = fetchNuGet { - baseName = "YamlDotNet"; - version = "11.1.1"; - sha256 = "rwZ/QyDVrN3wGrEYKY3QY5Xqo2Tp3FkR6dh4QrC+QS0="; - outputFiles = [ "lib/*" ]; - - meta = with lib; { - description = "YamlDotNet is a .NET library for YAML"; - homepage = "https://github.com/aaubry/YamlDotNet"; - license = licenses.mit; - maintainers = [ maintainers.ratsclub ]; - }; - }; - }; in self From 9d350d84c140f181d3dc12a917b31ec6f8ae6f4b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Jun 2021 09:07:06 -0700 Subject: [PATCH 426/797] .github/CONTRIBUTING.md: Add backport release criteria --- .github/CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 76bf94785f2..cc1a6632ac4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -59,6 +59,14 @@ Follow these steps to backport a change into a release branch in compliance with 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. +## Criteria for Backporting changes + +Anything that does not cause user or downstream dependency regressions can be backported. This includes: +- New Packages / Modules +- Security / Patch updates +- Version updates which include new functionality (but no breaking changes) +- Software which is always meant to be at it's latest. (E.g. `spotify`, `steam`, or `discord`) + ## Generating 21.11 Release Notes Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. From 0a6008f4e5a842538327fb722a7610e6a8050e93 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Jun 2021 09:13:28 -0700 Subject: [PATCH 427/797] doc/manual: Add backport criteria --- .github/CONTRIBUTING.md | 3 ++- doc/contributing/submitting-changes.chapter.md | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cc1a6632ac4..159b9f84348 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -65,7 +65,8 @@ Anything that does not cause user or downstream dependency regressions can be ba - New Packages / Modules - Security / Patch updates - Version updates which include new functionality (but no breaking changes) -- Software which is always meant to be at it's latest. (E.g. `spotify`, `steam`, or `discord`) +- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) +- Security critical applications (E.g. `firefox`) ## Generating 21.11 Release Notes diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 97b32c15df1..29b8ec493e7 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -269,3 +269,14 @@ Other examples of reasons are: - Previously the build would fail due to, e.g., `getaddrinfo` not being defined - The previous download links were all broken - Crash when starting on some X11 systems + +#### Acceptable backport criteria + +The stable branch does have some changes which cannot be backported. Most notable are breaking changes. The desire is to have stable users be uninterrupted when updating packages. + +However, many changes are able to be backported, including: +- New Packages / Modules +- Security / Patch updates +- Version updates which include new functionality (but no breaking changes) +- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) +- Security critical applications (E.g. `firefox`) From e1a98c34349e931481231cc3e46d1656b6f0ed7d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 2 Jun 2021 07:46:37 +0200 Subject: [PATCH 428/797] =?UTF-8?q?ocamlPackages.lwt:=205.4.0=20=E2=86=92?= =?UTF-8?q?=205.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index ee0c3b5b00c..b0f73546eed 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -8,13 +8,13 @@ let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "5.4.0"; + version = "5.4.1"; useDune2 = true; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; + sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy"; }; nativeBuildInputs = [ pkg-config ]; From 318689f6d5d6c6e4f54e295c4a7e20f7a31811c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 09:19:36 +0200 Subject: [PATCH 429/797] python3Packages.bme680: 1.0.5 -> 1.1.1 --- .../python-modules/bme680/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix index cdae502e7e5..9797a7ab0d8 100644 --- a/pkgs/development/python-modules/bme680/default.nix +++ b/pkgs/development/python-modules/bme680/default.nix @@ -1,30 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub +, mock , smbus-cffi , pytestCheckHook }: buildPythonPackage rec { pname = "bme680"; - version = "1.0.5"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pimoroni"; repo = "bme680-python"; rev = "v${version}"; - sha256 = "sha256-oIXh1JnGTI/Cj4MQFpWq+sWR2X+ioCsK0Q+T7wPITCQ="; + sha256 = "sha256-gmdRxMJ0DoCyNcb/bYp746PBi4HktHAAYOcSQJ0Uheg="; }; - propagatedBuildInputs = [ smbus-cffi ]; + propagatedBuildInputs = [ + smbus-cffi + ]; preBuild = '' cd library ''; - checkInputs = [ pytestCheckHook ]; - # next release will have tests, but not the current one - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace library/setup.cfg \ + --replace "smbus" "smbus-cffi" + ''; pythonImportsCheck = [ "bme680" ]; From 1588db35a24255ccc2f09e5a37af8e716f5d3a98 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 9 Jun 2021 14:22:04 +0700 Subject: [PATCH 430/797] python3Packages.audioread: remove input pytestrunner --- pkgs/development/python-modules/audioread/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index a4f6d905765..d2964accc14 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner }: buildPythonPackage rec { @@ -13,8 +12,6 @@ buildPythonPackage rec { sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089"; }; - nativeBuildInputs = [ pytestrunner ]; - # No tests, need to disable or py3k breaks doCheck = false; From 7c915252f992ff871e3dfd31aaf08ace81dc684e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 10:19:42 +0200 Subject: [PATCH 431/797] python3Packages.ambee: init at 0.2.1 --- .../python-modules/ambee/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/ambee/default.nix diff --git a/pkgs/development/python-modules/ambee/default.nix b/pkgs/development/python-modules/ambee/default.nix new file mode 100644 index 00000000000..b6fe6851aea --- /dev/null +++ b/pkgs/development/python-modules/ambee/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, poetry-core +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ambee"; + version = "0.2.1"; + disabled = pythonOlder "3.8"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-ambee"; + rev = "v${version}"; + sha256 = "11liw2206lyrnx09giqapjpi25lr2qnbmigi6rgynr2a1i9vxy1s"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ "ambee" ]; + + meta = with lib; { + description = "Python client for Ambee API"; + homepage = "https://github.com/frenck/python-ambee"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6d4128719f..d58f8152c4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -385,6 +385,8 @@ in { amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + ambee = callPackage ../development/python-modules/ambee { }; + ambiclimate = callPackage ../development/python-modules/ambiclimate { }; amcrest = callPackage ../development/python-modules/amcrest { }; From 8c3fbc315db20cbb5f36cfea2e389a15c0b49059 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 9 Jun 2021 09:29:59 +0100 Subject: [PATCH 432/797] tektoncd-cli: 0.18.0 -> 0.19.0 --- .../networking/cluster/tektoncd-cli/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 979216b3ccd..03f02c55ad2 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-vZxpfVMUl1EZwCuLlwmSKWrz86aTjWYlAIwO4b9ACqk="; + sha256 = "sha256-fWcHjpfbpj2lrJ0FawhQJuSxAEX1WwOY7m+CAgag4qk="; }; vendorSha256 = null; @@ -43,7 +43,8 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/tkn --help - $out/bin/tkn version | grep "Client version: ${version}" + # New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389 + # $out/bin/tkn version | grep "Client version: ${version}" runHook postInstallCheck ''; From 7e6776d373e613566f61eccc0be86b1a8f43af8c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 9 Jun 2021 10:42:09 +0200 Subject: [PATCH 433/797] vorta: 0.7.5 -> 0.7.6 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.6 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index fc56d6c5400..4cb21e5267d 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw="; + sha256 = "sha256-bzhabRVgl1eLTS4KtFkn4xw2KDTZJyFU6zCJdHW5IGE="; }; postPatch = '' From 640c1a795129dc8b071e9d97ffa479ef703596c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 11:00:13 +0200 Subject: [PATCH 434/797] python3Packages.pynobo: init at 1.2.0 --- .../python-modules/pynobo/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pynobo/default.nix diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix new file mode 100644 index 00000000000..52cada82781 --- /dev/null +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pynobo"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "echoromeo"; + repo = pname; + rev = "v${version}"; + sha256 = "0f98qm9vp7f0hqaxhihv7y5swciyp60222la44f4936g0rvs005x"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pynobo" ]; + + meta = with lib; { + description = "Python 3 TCP/IP interface for Nobo Hub/Nobo Energy Control devices"; + homepage = "https://github.com/echoromeo/pynobo"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6d4128719f..0823550aff8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5160,6 +5160,8 @@ in { pynndescent = callPackage ../development/python-modules/pynndescent { }; + pynobo = callPackage ../development/python-modules/pynobo { }; + pynuki = callPackage ../development/python-modules/pynuki { }; pynws = callPackage ../development/python-modules/pynws { }; From 15291a19cbd253198daeaae5c24b9c2b76ca8993 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 11:12:49 +0200 Subject: [PATCH 435/797] python3Packages.adafruit-platformdetect: 3.13.3 -> 3.13.4 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 21579406c52..64df2e02759 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.13.3"; + version = "3.13.4"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-tA3UafaFvUH6Ko0OAXhh8Jz+ht+seTuhPjBsHHaI6rE="; + sha256 = "sha256-e8hliPYLvHR3JjZ4AFgJWjPW1vK10BYuVqUYtF54J5c="; }; nativeBuildInputs = [ setuptools-scm ]; From 950b321244d541e3c4d05bb163912d53c6c063df Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 8 Jun 2021 21:12:07 +0200 Subject: [PATCH 436/797] chromiumDev: Revert a patch to fix the build with LLVM 12 The build was failing with: clang++: error: unknown argument: '-fsanitize-ignorelist=../../tools/cfi/ignores.txt' --- .../networking/browsers/chromium/common.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7e95da747d1..57cac091912 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -54,9 +54,9 @@ let # source tree. extraAttrs = buildFun base; - githubPatch = commit: sha256: fetchpatch { + githubPatch = { commit, sha256, revert ? false }: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; - inherit sha256; + inherit sha256 revert; }; mkGnFlags = @@ -166,6 +166,14 @@ let # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch + ] ++ lib.optionals (chromiumVersionAtLeast "93") [ + # We need to revert this patch to build M93 with LLVM 12. + (githubPatch { + # Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/." + commit = "9d080c0934b848ee4a05013c78641e612fcc1e03"; + sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; + revert = true; + }) ]; postPatch = '' From 1b7e0d91ec1070c8fa013b386a8fa30e849715f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Wed, 9 Jun 2021 11:29:28 +0200 Subject: [PATCH 437/797] kdenlive: Add turion as maintainer --- pkgs/applications/kde/kdenlive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index 3beaa4427d7..8ec2d2a81b0 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -102,5 +102,6 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ turion ]; }; } From 6aa70348df2073f117ac7de42fb7f957ad3443ab Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Wed, 9 Jun 2021 19:59:20 +1000 Subject: [PATCH 438/797] arc-theme: restore metacity theme Fixes theme usage on MATE. --- pkgs/data/themes/arc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 630d928e602..ea2362c0529 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm" + "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" "-Dvariants=light,darker,dark,lighter" "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" "-Dgnome_shell_version=${gnome.gnome-shell.version}" From 6a11eafbc9eede9d6f981a8d1b52fae7ccc2591b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Jun 2021 11:59:41 +0200 Subject: [PATCH 439/797] signal-desktop: 5.4.0 -> 5.4.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a512e3a004d..67a52113df3 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.4.0"; # Please backport all updates to the stable channel. + version = "5.4.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "046xy033ars70ay5ryj39i5053py00xj92ajdg212pamq415z1zb"; + sha256 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6"; }; nativeBuildInputs = [ From 0d8332d2b9abf26c3066a50e425633439216d66b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 9 Jun 2021 14:44:33 +0700 Subject: [PATCH 440/797] koka: 2.1.1 -> 2.1.4 --- pkgs/development/compilers/koka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 6523dcca2f6..30e273271ae 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.1.1"; + version = "2.1.4"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-cq+dljfTKJh5NgwQfxQQP9jRcg2PQxxBVEgQ59ll36o="; + sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { From 013d3cb42d98c5ce14173545448f538dbb74f8c6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Jun 2021 12:21:02 +0000 Subject: [PATCH 441/797] xsnow: 1.42 -> 3.3.0 Since this package was last updated, xsnow has been relicensed, and then forked. It's also had its build system replaced. --- pkgs/games/xsnow/default.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index de07821c36a..ba0fcf784f4 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3-x11, libXt, libXpm }: stdenv.mkDerivation rec { - - version = "1.42"; pname = "xsnow"; + version = "3.3.0"; src = fetchurl { - url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz"; - sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; + url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; + sha256 = "1xnpqbamhglv7xsxzlrlpvsz6bbzlrvdpn5x2n9baww9kcrkbwjg"; }; - nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ - libXt libXpm libXext - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3-x11 libxml2 libXt libXpm ]; - makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; + makeFlags = [ "gamesdir=$(out)/bin" ]; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "An X-windows application that will let it snow on the root, in between and on windows"; - homepage = "http://janswaal.home.xs4all.nl/Xsnow/"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.robberer ]; + homepage = "https://ratrabbit.nl/ratrabbit/xsnow/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ robberer ]; + platforms = platforms.unix; }; } From 121fdde8278083250beadff1e2edbbaf7fd3299e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 8 Jun 2021 15:45:50 +0200 Subject: [PATCH 442/797] haskellPackages.wide-word: unbreak tests added breaking constraints which seem safe to lift. Co-authored-by: sterni --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc39fb4fd10..5e9b792f06e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1953,4 +1953,8 @@ EOT # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 reactive-banana = doJailbreak super.reactive-banana; + # Too strict version bounds on QuickCheck and semirings + # https://github.com/erikd/wide-word/issues/57 + wide-word = doJailbreak super.wide-word; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index bc9881ee1fc..fad45fc45f1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5119,7 +5119,6 @@ broken-packages: - whiskers - whois - why3 - - wide-word - WikimediaParser - windns - winerror diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b9cc0d00004..471fc47333f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -281423,8 +281423,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wide-word-instances" = callPackage From 77f3a9a3aa82a40766db3866fc813e97629e955e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Jun 2021 11:14:00 +0000 Subject: [PATCH 443/797] gcc: broaden platforms Okay, GCC might not technically support _every_ platform in platforms.unix, but I think it would be easier to subtract those as they're discovered, if that even matters, rather than trying to exhaustively list every Unix it does support. (I ran into this because I wanted to build GCC for NetBSD, which it definitely supports.) --- pkgs/development/compilers/gcc/10/default.nix | 6 +----- pkgs/development/compilers/gcc/11/default.nix | 6 +----- pkgs/development/compilers/gcc/4.8/default.nix | 6 +----- pkgs/development/compilers/gcc/4.9/default.nix | 6 +----- pkgs/development/compilers/gcc/6/default.nix | 6 +----- pkgs/development/compilers/gcc/7/default.nix | 6 +----- pkgs/development/compilers/gcc/8/default.nix | 6 +----- pkgs/development/compilers/gcc/9/default.nix | 6 +----- 8 files changed, 8 insertions(+), 40 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index f8f4ad71e35..143681c2a5b 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -282,11 +282,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index fe29440c25d..7efc9d589f9 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -287,11 +287,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 86dd9247f5a..98332290a07 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -309,11 +309,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ peti veprbl ]; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index b7c9e5bcc0a..a15cb770fdf 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -321,11 +321,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ peti veprbl ]; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b70d8a57b9d..4567e8b43e9 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -343,11 +343,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ peti ]; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5eb4389be3a..44e8b38fdf8 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -296,11 +296,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index ca1b31467af..b264d37418e 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -278,11 +278,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 93e75389bd9..857263e51e0 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -297,11 +297,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } From f1692c9431d0494efb92a741f657260972be38c5 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 9 Jun 2021 12:32:07 +0200 Subject: [PATCH 444/797] haskellPackages.parallel-io: remove now unnecessary override --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5e9b792f06e..3a3282d2ab7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1925,10 +1925,6 @@ EOT # https://github.com/haskell-hvr/missingh/issues/56 MissingH = doJailbreak super.MissingH; - # Too strict bound on containers - # https://github.com/batterseapower/parallel-io/issues/14#issuecomment-853441933 - parallel-io = doJailbreak super.parallel-io; - # Disable flaky tests # https://github.com/DavidEichmann/alpaca-netcode/issues/2 alpaca-netcode = overrideCabal super.alpaca-netcode { From bda8c3cb4a7b51ec4658b3737d2019c313e10d31 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 9 Jun 2021 13:33:00 +0300 Subject: [PATCH 445/797] =?UTF-8?q?reproxy:=200.7.0=20=E2=86=92=200.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/reproxy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 6c1be8f34c4..0d25b426783 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -2,19 +2,21 @@ buildGoModule rec { pname = "reproxy"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "umputun"; repo = pname; rev = "v${version}"; - hash = "sha256-TwqfnOKWpFC3fnHNu3/F6KLHuzE7uF6WEgZOArntpWI="; + hash = "sha256-zwQZr6BbvJ2Ol5pCLkZ49j0j5KWTK0N8BybvTr8PPeg="; }; postPatch = '' # Requires network access substituteInPlace app/main_test.go \ --replace "Test_Main" "Skip_Main" + substituteInPlace app/proxy/proxy_test.go \ + --replace "TestHttp_matchHandler" "SkipHttp_matchHandler" '' + lib.optionalString stdenv.isDarwin '' # Fails on Darwin. # https://github.com/umputun/reproxy/issues/77 From 8ba5828c24dca90fd409be95568bf8c28fab2ae0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 9 Jun 2021 12:41:02 +0200 Subject: [PATCH 446/797] haskellPackages: update list of transitively broken packages --- .../transitive-broken.yaml | 32 ++----------------- .../haskell-modules/hackage-packages.nix | 29 ----------------- 2 files changed, 3 insertions(+), 58 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e813a2a8347..408c750553f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -20,7 +20,6 @@ dont-distribute-packages: - activehs - actor - AC-Vector-Fancy - - addy - adhoc-network - adict - ADPfusionForest @@ -117,10 +116,8 @@ dont-distribute-packages: - atp - AttoJson - attoparsec-enumerator - - attoparsec-ip - attoparsec-iteratee - attoparsec-text-enumerator - - attoparsec-uri - atuin - audiovisual - aura @@ -168,8 +165,6 @@ dont-distribute-packages: - Barracuda - base16-lens - base32-bytestring - - base62 - - base64-bytes - baserock-schema - BASIC - batchd @@ -309,10 +304,8 @@ dont-distribute-packages: - buster-network - butterflies - bv-sized-lens - - bytebuild - bytehash - bytelog - - bytesmith - bytestring-read - c0check - cabal2arch @@ -622,7 +615,6 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-docs - - dhcp-lease-parser - dia-functions - diagrams-haddock - diagrams-html5 @@ -1565,7 +1557,6 @@ dont-distribute-packages: - invertible-hlist - ion - IORefCAS - - ip - ipatch - ipc - ipld-cid @@ -1575,7 +1566,6 @@ dont-distribute-packages: - irc-fun-client - irc-fun-color - irc-fun-messages - - iri - ironforge - isevaluated - ismtp @@ -1629,11 +1619,8 @@ dont-distribute-packages: - JsonGrammar - jsonifier - json-incremental-decoder - - json-query - jsons-to-schema - - json-syntax - json-togo - - json-tokens - jspath - JunkDB-driver-gdbm - JunkDB-driver-hashtables @@ -1886,7 +1873,6 @@ dont-distribute-packages: - markdown2svg - markdown-pap - markov-processes - - markup - marmalade-upload - marquise - marvin @@ -1986,7 +1972,6 @@ dont-distribute-packages: - mpretty - mprover - mps - - mptcp-pm - msgpack-aeson - msgpack-idl - msgpack-rpc @@ -2127,6 +2112,7 @@ dont-distribute-packages: - openpgp-crypto-api - OpenSCAD - openssh-github-keys + - opentelemetry-extra_0_7_0 - opentracing-jaeger - opentracing-zipkin-v1 - open-union @@ -2146,7 +2132,6 @@ dont-distribute-packages: - pairing - panda - pandoc-japanese-filters - - pan-os-syslog - papa - papa-base - papa-base-implement @@ -2526,7 +2511,6 @@ dont-distribute-packages: - runtime-arbitrary - S3 - safe-coloured-text-layout-gen - - safe-numeric - safer-file-handles - safer-file-handles-bytestring - safer-file-handles-text @@ -2565,7 +2549,6 @@ dont-distribute-packages: - scholdoc - scholdoc-citeproc - scholdoc-texmath - - scientific-notation - SciFlow - SciFlow-drmaa - scion @@ -2635,7 +2618,6 @@ dont-distribute-packages: - SGdemo - sgf - sgrep - - sha1 - shake-minify-css - shaker - shapefile @@ -2688,11 +2670,9 @@ dont-distribute-packages: - skylark-client - slidemews - slip32 - - small-bytearray-builder - smallstring - smartword - smcdel - - smith - smith-cli - smith-client - Smooth @@ -2842,6 +2822,8 @@ dont-distribute-packages: - swearjure - sweet-egison - switch + - sydtest_0_2_0_0 + - sydtest-persistent-postgresql - sylvia - symantic-atom - symantic-lib @@ -3035,7 +3017,6 @@ dont-distribute-packages: - universe-th - unix-fcntl - unix-simple - - unpacked-maybe-numeric - unpacked-these - unpacked-validation - unparse-attoparsec @@ -3048,9 +3029,7 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - url-bytes - UrlDisp - - urlpath - URLT - usb - usb-enumerator @@ -3063,7 +3042,6 @@ dont-distribute-packages: - uu-cco-examples - uu-cco-hut-parsing - uu-cco-uu-parsinglib - - uuid-bytes - uuid-crypto - uvector-algorithms - v4l2 @@ -3110,7 +3088,6 @@ dont-distribute-packages: - wai-middleware-cache - wai-middleware-cache-redis - wai-middleware-consul - - wai-middleware-content-type - wai-middleware-rollbar - wai-middleware-route - wai-session-tokyocabinet @@ -3144,7 +3121,6 @@ dont-distribute-packages: - wheb-redis - wheb-strapped - whitespace - - wide-word-instances - wikipedia4epub - windowslive - winio @@ -3163,7 +3139,6 @@ dont-distribute-packages: - wrecker-ui - wright - writer-cps-full - - ws - wss-client - wtk-gtk - wumpus-basic @@ -3235,7 +3210,6 @@ dont-distribute-packages: - yesod-colonnade - yesod-continuations - yesod-examples - - yesod-ip - yesod-mangopay - yesod-paypal-rest - yesod-platform diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 471fc47333f..cf40d4c78ba 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24030,7 +24030,6 @@ self: { ]; description = "A full-featured library for parsing, validating, and rendering email addresses"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "adhoc-network" = callPackage @@ -35184,7 +35183,6 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -35325,7 +35323,6 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-varword" = callPackage @@ -38346,7 +38343,6 @@ self: { ]; description = "Base62 encoding and decoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base64" = callPackage @@ -38397,7 +38393,6 @@ self: { ]; description = "Base64 encoding of byte sequences"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base64-bytestring" = callPackage @@ -47307,7 +47302,6 @@ self: { ]; description = "Serialize to a small byte arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytedump" = callPackage @@ -47453,7 +47447,6 @@ self: { ]; description = "Nonresumable byte parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring_0_11_1_0" = callPackage @@ -74319,7 +74312,6 @@ self: { ]; description = "Parse a DHCP lease file"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dhrun" = callPackage @@ -149603,7 +149595,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ip-quoter" = callPackage @@ -150220,7 +150211,6 @@ self: { ]; description = "RFC-based resource identifier library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "iridium" = callPackage @@ -153185,7 +153175,6 @@ self: { ]; description = "Kitchen sink for querying JSON"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-rpc" = callPackage @@ -153396,7 +153385,6 @@ self: { ]; description = "High-performance JSON parser and encoder"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-to-haskell" = callPackage @@ -153473,7 +153461,6 @@ self: { ]; description = "Tokenize JSON"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-tools" = callPackage @@ -170593,7 +170580,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -179861,7 +179847,6 @@ self: { testHaskellDepends = [ base HUnit ip text ]; description = "A Multipath TCP path manager"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "mpvguihs" = callPackage @@ -194476,7 +194461,6 @@ self: { benchmarkHaskellDepends = [ base byteslice gauge primitive ]; description = "Parse syslog traffic from PAN-OS"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "panda" = callPackage @@ -227026,7 +227010,6 @@ self: { testHaskellDepends = [ base containers doctest ]; description = "Safe arithmetic operations"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -229235,7 +229218,6 @@ self: { ]; description = "Scientific notation intended for tokenization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "scion" = callPackage @@ -235789,7 +235771,6 @@ self: { ]; description = "SHA-1 Hash"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "shade" = callPackage @@ -240416,7 +240397,6 @@ self: { doHaddock = false; description = "Serialize to bytes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "smallarray" = callPackage @@ -240866,7 +240846,6 @@ self: { libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "smith-cli" = callPackage @@ -272316,7 +272295,6 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "maybes of numeric values with fewer indirections"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unpacked-maybe-text" = callPackage @@ -273045,7 +273023,6 @@ self: { ]; description = "Memory efficient url type and parser"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "url-decoders" = callPackage @@ -273168,7 +273145,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "urn" = callPackage @@ -273945,7 +273921,6 @@ self: { ]; description = "UUID parsing using byteverse packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "uuid-crypto" = callPackage @@ -278249,7 +278224,6 @@ self: { ]; description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-crowd" = callPackage @@ -281434,7 +281408,6 @@ self: { libraryHaskellDepends = [ base binary serialise wide-word ]; description = "Instances for wide-word"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -283254,7 +283227,6 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ws-chans" = callPackage @@ -288613,7 +288585,6 @@ self: { ]; description = "Code for using the ip package with yesod"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-job-queue" = callPackage From 5bbe01147841f2916658851ede28018952d93a18 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Fri, 4 Jun 2021 09:37:37 -0400 Subject: [PATCH 447/797] flatbuffers: 1.12.0 -> 2.0.0 --- .../libraries/flatbuffers/1.12.nix | 26 +++++++++ .../development/libraries/flatbuffers/2.0.nix | 6 ++ .../libraries/flatbuffers/default.nix | 55 ------------------- .../libraries/flatbuffers/generic.nix | 46 ++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 81 insertions(+), 56 deletions(-) create mode 100644 pkgs/development/libraries/flatbuffers/1.12.nix create mode 100644 pkgs/development/libraries/flatbuffers/2.0.nix delete mode 100644 pkgs/development/libraries/flatbuffers/default.nix create mode 100644 pkgs/development/libraries/flatbuffers/generic.nix diff --git a/pkgs/development/libraries/flatbuffers/1.12.nix b/pkgs/development/libraries/flatbuffers/1.12.nix new file mode 100644 index 00000000000..df2980ba204 --- /dev/null +++ b/pkgs/development/libraries/flatbuffers/1.12.nix @@ -0,0 +1,26 @@ +{ callPackage, fetchpatch, lib, stdenv }: + +callPackage ./generic.nix { + version = "1.12.0"; + sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; + + patches = [ + (fetchpatch { + # Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020. + # Should be included in the next release after 1.12.0 + url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch"; + sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s"; + excludes = [ "src/idl_gen_cpp.cpp" ]; + }) + (fetchpatch { + # Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020. + # Should be included in the next release after 1.12.0 + url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch"; + sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4"; + }) + ]; + + preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' + rm BUILD + ''; +} diff --git a/pkgs/development/libraries/flatbuffers/2.0.nix b/pkgs/development/libraries/flatbuffers/2.0.nix new file mode 100644 index 00000000000..2b907e77c49 --- /dev/null +++ b/pkgs/development/libraries/flatbuffers/2.0.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "2.0.0"; + sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; +} diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix deleted file mode 100644 index 374203556a6..00000000000 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "flatbuffers"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "flatbuffers"; - rev = "v${version}"; - sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; - }; - patches = [ - (fetchpatch { - # Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020. - # Should be included in the next release after 1.12.0 - url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch"; - sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s"; - excludes = [ "src/idl_gen_cpp.cpp" ]; - }) - (fetchpatch { - # Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020. - # Should be included in the next release after 1.12.0 - url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch"; - sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4"; - }) - ]; - - preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' - rm BUILD - ''; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - - # tests fail to compile - doCheck = false; - # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - checkTarget = "test"; - - meta = with lib; { - description = "Memory Efficient Serialization Library"; - longDescription = '' - FlatBuffers is an efficient cross platform serialization library for - games and other memory constrained apps. It allows you to directly - access serialized data without unpacking/parsing it first, while still - having great forwards/backwards compatibility. - ''; - maintainers = [ maintainers.teh ]; - license = licenses.asl20; - platforms = platforms.unix; - homepage = "https://google.github.io/flatbuffers/"; - }; -} diff --git a/pkgs/development/libraries/flatbuffers/generic.nix b/pkgs/development/libraries/flatbuffers/generic.nix new file mode 100644 index 00000000000..1cdfb4b9c87 --- /dev/null +++ b/pkgs/development/libraries/flatbuffers/generic.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, version +, sha256 +, patches ? [ ] +, preConfigure ? null +}: + +stdenv.mkDerivation rec { + pname = "flatbuffers"; + inherit version; + + src = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + rev = "v${version}"; + inherit sha256; + }; + + inherit patches preConfigure; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkTarget = "test"; + + meta = with lib; { + description = "Memory Efficient Serialization Library"; + longDescription = '' + FlatBuffers is an efficient cross platform serialization library for + games and other memory constrained apps. It allows you to directly + access serialized data without unpacking/parsing it first, while still + having great forwards/backwards compatibility. + ''; + maintainers = [ maintainers.teh ]; + license = licenses.asl20; + platforms = platforms.unix; + homepage = "https://google.github.io/flatbuffers/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f19cd1a679..657ae9468a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17614,7 +17614,9 @@ in protozero = callPackage ../development/libraries/protozero { }; - flatbuffers = callPackage ../development/libraries/flatbuffers { }; + flatbuffers = flatbuffers_2_0; + flatbuffers_2_0 = callPackage ../development/libraries/flatbuffers/2.0.nix { }; + flatbuffers_1_12 = callPackage ../development/libraries/flatbuffers/1.12.nix { }; nanopb = callPackage ../development/libraries/nanopb { }; From 55b647e9a9077b4be9ee4a563a69123b6e3f3f2b Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Jun 2021 18:43:40 +0800 Subject: [PATCH 448/797] signald: use jre_headless (#125900) --- .../instant-messengers/signald/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 593e63d32f5..a26fbed2a04 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, jre, coreutils, gradle_6, git, perl +{ lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl , makeWrapper }: let @@ -52,20 +52,28 @@ in stdenv.mkDerivation rec { inherit pname src version postPatch patches; buildPhase = '' + runHook preBuild + export GRADLE_USER_HOME=$(mktemp -d) # Use the local packages from -deps sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle gradle --offline --no-daemon distTar + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ wrapProgram $out/bin/signald \ --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ - --set JAVA_HOME "${jre}" + --set JAVA_HOME "${jre_headless}" + + runHook postInstall ''; nativeBuildInputs = [ git gradle_6 makeWrapper ]; From 1c2347a5d90e68926fe03df86db56721062fa9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Kennedy?= Date: Wed, 9 Jun 2021 03:49:55 -0700 Subject: [PATCH 449/797] veikk-linux-driver: init at 2.0 (#125856) Add linux kernel driver that enables VEIKK brand digitizer functionality --- .../linux/veikk-linux-driver/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/os-specific/linux/veikk-linux-driver/default.nix diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix new file mode 100644 index 00000000000..117103cdf28 --- /dev/null +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "veikk-linux-driver"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "jlam55555"; + repo = pname; + rev = "v${version}"; + sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn"; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildInputs = [ kernel ]; + + buildPhase = '' + make BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + ''; + + installPhase = '' + mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk + install -Dm755 veikk.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk + ''; + + meta = with lib; { + description = "Linux driver for VEIKK-brand digitizers"; + homepage = "https://github.com/jlam55555/veikk-linux-driver/"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ nicbk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f19cd1a679..5816d3293f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20805,6 +20805,8 @@ in v86d = callPackage ../os-specific/linux/v86d { }; + veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; + vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; From 10eab5b6b3d1d38ffd3594fa6e4be13924dafd15 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 9 Jun 2021 11:39:53 +0200 Subject: [PATCH 450/797] nixos/tests/kernel-generic: fix evaluation The test doesn't evaluate since #125469 because Linux 5.11 got removed as it's EOL. As this fixes the evaluation of the test and it only removes a declaration that was apparently forgotten, I figured that a push to unbreak the test is fine. --- nixos/tests/kernel-generic.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index a300609cf2b..cb23bb2fc2d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,7 +31,6 @@ with pkgs; { linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; - linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11; linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_testing = makeKernelTest "testing" linuxPackages_testing; From 7e84163a5d5bdf45477b6ed9820818403f9ac964 Mon Sep 17 00:00:00 2001 From: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Date: Wed, 9 Jun 2021 13:09:54 +0200 Subject: [PATCH 451/797] zenith: add nvidia GPU support (#126097) --- pkgs/tools/system/zenith/default.nix | 19 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 7 +++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 8fc9637bfb9..1e36614c427 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, IOKit }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, IOKit +, nvidiaSupport ? false +, makeWrapper +}: rustPlatform.buildRustPackage rec { pname = "zenith"; @@ -11,12 +18,20 @@ rustPlatform.buildRustPackage rec { sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax"; }; + cargoBuildFlags = lib.optionals nvidiaSupport [ "--features" "nvidia" ]; cargoSha256 = "0c2mk2bcz4qjyqmf11yqhnhy4pqxr77b3c1gvr5jfmjshx4ff7v2"; + nativeBuildInputs = lib.optional nvidiaSupport makeWrapper; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + postInstall = lib.optionalString nvidiaSupport '' + wrapProgram $out/bin/zenith \ + --suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib" + ''; + meta = with lib; { - description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"; + description = "Sort of like top or htop but with zoom-able charts, network, and disk usage" + + lib.optionalString nvidiaSupport ", and NVIDIA GPU usage"; homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; maintainers = with maintainers; [ bbigras ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbc0e79a3c0..8a563ee0352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10115,6 +10115,13 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + # Nvidia support does not require any propietary libraries, so CI can build it. + # Note that when enabling this unconditionally, non-nvidia users will always have an empty "GPU" section. + zenith-nvidia = callPackage ../tools/system/zenith { + inherit (darwin.apple_sdk.frameworks) IOKit; + nvidiaSupport = true; + }; + zerotierone = callPackage ../tools/networking/zerotierone { }; zerofree = callPackage ../tools/filesystems/zerofree { }; From 7c2e0cc2f790fcc064f9c2b70340987851058b7f Mon Sep 17 00:00:00 2001 From: Clemens Lutz Date: Wed, 9 Jun 2021 13:31:20 +0200 Subject: [PATCH 452/797] zoom-us: 5.6.20278.0524 -> 5.6.22045.0607 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 364e6e294ec..4d44c1b4cc4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -29,11 +29,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.6.20278.0524"; + version = "5.6.22045.0607"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1nkpmrpb0bz4zkg8nszxmcfy3ymigd2bmxhnxbjrcnv64ykdrgp7"; + sha256 = "0zdk02zq9apxnfbxwnlda9z8nqkqa1h1javbh9wwj8yy3y3a1lb5"; }; }; From ef12ba0d046998b947e0fe5ddfb9a760a98f6db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sun, 6 Jun 2021 20:23:23 +0300 Subject: [PATCH 453/797] glmark2: 2017-09-01 -> 2021.02 --- pkgs/tools/graphics/glmark2/default.nix | 50 ++++++++++++++++++++----- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 806b03061c7..64294481257 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,23 +1,55 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, udev, mesa, wafHook }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, makeWrapper +, libjpeg +, libpng +, xorg +, libX11 +, libGL +, libdrm +, udev +, python3 +, wayland +, wayland-protocols +, mesa +, wafHook +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "glmark2"; - version = "2017-09-01"; + version = "2021.02"; src = fetchFromGitHub { owner = "glmark2"; repo = "glmark2"; - rev = "7265e8e6c77c4f60302507eca0e18560b1117a86"; - sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn"; + rev = version; + sha256 = "1a75gg1dn03d3jq7n74wsw7kc14ildbb8azzbj4k28xik1m6khr9"; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa + libjpeg + libpng + xorg.libxcb + libX11 + libdrm + python3 + udev + wayland + wayland-protocols + mesa ]; - wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; + wafConfigureFlags = [ "--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; + + postInstall = '' + for binary in $out/bin/glmark2*; do + wrapProgram $binary \ + --set LD_LIBRARY_PATH ${libGL}/lib + done + ''; meta = with lib; { description = "OpenGL (ES) 2.0 benchmark"; From 870705b611d31009e26e2ebe5e16ef8d3f5d3eb4 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 9 Jun 2021 13:53:10 +0200 Subject: [PATCH 454/797] attract-mode: ffmpeg_3 -> ffmpeg Replace insecure FFMPEG v3 with current version. See https://github.com/NixOS/nixpkgs/issues/120705 --- pkgs/misc/emulators/attract-mode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 92c42a1d394..7a3f61fd8dc 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,4 +1,4 @@ -{ expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg +{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg , libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg_3 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib + expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; meta = with lib; { From 1b9e3c923c223edc6fb1433773b9139f89b22fd4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 9 Jun 2021 08:45:10 -0300 Subject: [PATCH 455/797] shellhub-agent: 0.7.0 -> 0.7.1 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 7a8f35b76b0..7ecb8936a69 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "07gfi0l9l19cy7304v18knbfhs7zqhfglw0jjhcmxa79dg6wzdia"; + sha256 = "0fgkjv7p2p0k58ifs77qfy0ni2yhrmk8rqyysjxq0im6j3f3az11"; }; modRoot = "./agent"; - vendorSha256 = "0rcb384yxk1dsip15qh32rkd07i2zzr1k53wcfpnrgi6jpixvsvi"; + vendorSha256 = "1avl5xvav9y2vni5w3ksvrcz67x2kkadqw9p1cfq5rkjny1c2jrg"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; From ffced8d681f976e8a009850c2482da224853c58d Mon Sep 17 00:00:00 2001 From: Yipeng Sun Date: Sat, 5 Jun 2021 16:31:39 +0200 Subject: [PATCH 456/797] root: 6.22.08 -> 6.24.00 We switched to the bundled llvm-clang combo because to use the llvm provided in nixpkgs, clang also needs to be patched and built externally, which is too much trouble. --- .../science/misc/root/default.nix | 26 ++++++++++++++----- .../science/misc/root/sw_vers.patch | 16 +++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 20b239dc677..b3d0e96a564 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 -, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre +{ stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl +, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json , pkg-config, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "6.22.08"; + version = "6.24.00"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0vrgi83hrw4n9zgx873fn4ba3vk54slrwk1cl4cc4plgxzv1y1kg"; + sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx"; }; - nativeBuildInputs = [ makeWrapper cmake pkg-config llvm_5.dev ]; - buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] + nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; + buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' + # Don't require textutil on macOS + : > cmake/modules/RootCPack.cmake + + # Hardcode path to fix use with cmake + sed -i cmake/scripts/ROOTConfig.cmake.in \ + -e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' + patchShebangs build/unix/ '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" @@ -35,11 +42,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" + "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-Dbuiltin_nlohmannjson=OFF" + "-Dbuiltin_openui5=OFF" "-Dalien=OFF" "-Dbonjour=OFF" - "-Dbuiltin_llvm=OFF" "-Dcastor=OFF" "-Dchirp=OFF" "-Dclad=OFF" @@ -53,6 +62,7 @@ stdenv.mkDerivation rec { "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF" + "-Dhttp=ON" "-Dkrb5=OFF" "-Dldap=OFF" "-Dmonalisa=OFF" @@ -64,9 +74,11 @@ stdenv.mkDerivation rec { "-Dpythia6=OFF" "-Dpythia8=OFF" "-Drfio=OFF" + "-Droot7=OFF" "-Dsqlite=OFF" "-Dssl=OFF" "-Dvdt=OFF" + "-Dwebgui=OFF" "-Dxml=ON" "-Dxrootd=OFF" ] diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index b2ee1b6a4ce..836bbb5b17a 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -1,8 +1,8 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake -@@ -8,17 +8,10 @@ set(ROOT_ARCHITECTURE macosx) - set(ROOT_PLATFORM macosx) +@@ -28,17 +28,10 @@ if(CMAKE_VERSION VERSION_LESS 3.14.4) + endif() if (CMAKE_SYSTEM_NAME MATCHES Darwin) - EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" @@ -19,16 +19,15 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #TODO: check haveconfig and rpath -> set rpath true #TODO: check Thread, define link command #TODO: more stuff check configure script -@@ -37,23 +30,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -57,22 +50,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") - else() -- MESSAGE(STATUS "Found a 32bit system") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") -- endif() + endif() - endif() - - if(MACOSX_VERSION VERSION_GREATER 10.6) @@ -40,11 +39,10 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake - if(MACOSX_VERSION VERSION_GREATER 10.8) - set(MACOSX_GLU_DEPRECATED ON) - endif() -+ endif() if (CMAKE_COMPILER_IS_GNUCXX) - message(STATUS "Found GNU compiler collection") -@@ -115,7 +92,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common") +@@ -130,7 +108,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) endif() #---Set Linker flags---------------------------------------------------------------------- From e9d48ab799074997673f3a4154ebb34f401f337e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 05:32:34 +0000 Subject: [PATCH 457/797] git-vendor: 1.2.0 -> 1.2.1 --- .../version-management/git-and-tools/git-vendor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index 8e3b9f13674..c7884c2b52e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.0"; - sha256 = "1z9fmrfxqi56pj7f1506q2z41crz702jk88gv57baf6fz63m93v2"; + version = "1.2.1"; + sha256 = "sha256-sm5SmckaXVjF3odqzYrbC46E1nPzQ9cuNJnNSAa7RWY="; in stdenv.mkDerivation { pname = "git-vendor"; From 963b1f068a4840f12bc465e10178e8c754f65fb7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 9 Jun 2021 08:46:26 -0300 Subject: [PATCH 458/797] gitRepo: 2.15.3 -> 2.15.4 Signed-off-by: Otavio Salvador --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 75a9fe37764..c84375cfece 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.15.3"; + version = "2.15.4"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-SuHp6C5ueUErvRiWDQNEmCybFIa7Iu7C/FtnHys9XqU="; + sha256 = "1ayw2pz9falcsi528q63z3w7npzkk7y8z258danqh41j6q9871js"; }; # Fix 'NameError: name 'ssl' is not defined' From b9311f2328237ea0a7a99ec78ad21c34ad007905 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 06:23:23 +0000 Subject: [PATCH 459/797] flatpak-builder: 1.0.12 -> 1.0.14 --- pkgs/development/tools/flatpak-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 75aa8a00f00..cc1a46c834b 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -46,13 +46,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.12"; + version = "1.0.14"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R4DBuOCDj/tk6WOb14AUF5ZP2BjHxtXpr8pNVRHe0sg="; + sha256 = "sha256-abZa9PY4BBJ1GMVFGE+d/JqTWM3tqr7yseUGI64rjYs="; }; nativeBuildInputs = [ From bee7e498d16401df20073b5e8fd7851e13f79cd7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 14:40:33 +0200 Subject: [PATCH 460/797] python3Packages.archinfo: 9.0.7833 -> 9.0.7912 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index ba678975fea..601dd954bc4 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.7833"; + version = "9.0.7912"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wieg38cHxliHU7esoSOl5ViiS/uR5yVJh9l3SEsb3mo="; + sha256 = "sha256-nHXF6Il6rHHrnGYEmv4FPQr6MsurzH1exkJS9UXThBs="; }; checkInputs = [ From 17f88a6a9cdce08ff9128d355b6dc7ca9775d91a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 14:40:36 +0200 Subject: [PATCH 461/797] python3Packages.ailment: 9.0.7833 -> 9.0.7912 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index de1a749bc32..e555d69169b 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GUy1wETKV9Y9RYwJZqV22a0GrWkVRJRuFv/ADzPCzPg="; + sha256 = "sha256-q1mi8ZNvjb3XM3le4ysy58bb978102OFKypTp9mSzxo="; }; propagatedBuildInputs = [ pyvex ]; From bc92c9f0e0ba406c1932df6fab515af0b36cf297 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 14:40:38 +0200 Subject: [PATCH 462/797] python3Packages.pyvex: 9.0.7833 -> 9.0.7912 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index fa757a39dda..cb0547dfe4c 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.7833"; + version = "9.0.7912"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vasPukhDpvTNEvSy3A2H4ZkFMpLSoHB6+uuimYH1VT4="; + sha256 = "sha256-KqTfu49Muicr5oJcXcoYpz3S7+0hk7dxbU7GMCDlJQA="; }; postPatch = lib.optionalString stdenv.isDarwin '' From c0b2dcb0f466ac4ca728f66a53eb617e90e91159 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 14:40:41 +0200 Subject: [PATCH 463/797] python3Packages.claripy: 9.0.7833 -> 9.0.7912 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 4866d302815..ad3c97b920d 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C+YjpnMpz96v9QUkcdlhGl83V4UHnWAKZV2eR+vZX3c="; + sha256 = "sha256-p9i3ajN/CpLdwcg8HLhtION0ghgs1fcnqjzUrxu1wDw="; }; # Use upstream z3 implementation From 05173bc33e27e378148e255f44293e06a5b201b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 14:40:44 +0200 Subject: [PATCH 464/797] python3Packages.cle: 9.0.7833 -> 9.0.7912 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index cb9daa66b0d..45e619b25c6 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.7833"; + version = "9.0.7912"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P8bz50OgJifGWbWRyGXEB3FRfJHG1m9RgMatKA/XQLc="; + sha256 = "sha256-AHJk40uRhrlQbfzRmMJXremKxnxjpmxLLAAYxNV9vkc="; }; propagatedBuildInputs = [ From 8f50d52b7bf25e296cdadd8554ac2bb897fcc8df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 14:40:47 +0200 Subject: [PATCH 465/797] python3Packages.angr: 9.0.7833 -> 9.0.7912 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index fd3bb30d20a..0ea298e06e1 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1D1FhRhFHpQSQnMAPmp78TRIx9T5LL5MIdaYV/hPCv0="; + sha256 = "sha256-261fk0JM37Hq+xsMF95VqLyidWE4ZUeygp8BP/DBXG4="; }; propagatedBuildInputs = [ From 4df030a587b943177c1732bdd5c9a412e410f801 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 14:40:50 +0200 Subject: [PATCH 466/797] python3Packages.angrop: 9.0.7833 -> 9.0.7912 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 997cd6c401a..cbe2ed9db2a 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JhD4/P5/IhmLBvmG3XoIEYVkowK+dDoLuwOdMhGi5q8="; + sha256 = "sha256-nbVvgbTk9LFA376alu4Cxqcu9b9CT9yutnfE5fVT8gY="; }; propagatedBuildInputs = [ From 4de8cbfb16707dfed1d695a7fc1da09cb6e2bf38 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Jun 2021 18:30:46 +0000 Subject: [PATCH 467/797] bmake.passthru.setupHook: set some defaults These are all read from the environment by the default bmake stdlib (e.g. , ). Some of the default values (like building cat pages instead of man pages, or stripping binaries when installing) don't really make sense for Nixpkgs, so we override them here for every build using bmake. Eventually I'd like to unify the bmake setupHook and the NetBSD make setupHook, but not today. --- .../tools/build-managers/bmake/setup-hook.sh | 10 ++++++++++ pkgs/servers/http/bozohttpd/default.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/development/tools/build-managers/bmake/setup-hook.sh index ae8f78ec90f..c5ca27dd910 100644 --- a/pkgs/development/tools/build-managers/bmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/bmake/setup-hook.sh @@ -1,3 +1,13 @@ +addMakeFlags() { + export prefix="$out" + export MANDIR="${!outputMan}/share/man" + export MANTARGET=man + export BINOWN= + export STRIP_FLAG= +} + +preConfigureHooks+=(addMakeFlags) + bmakeBuildPhase() { runHook preBuild diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index c01be041e86..1574a953b17 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt" ++ optional (luaSupport) "-llua" ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ]; - makeFlags = [ "LDADD=$(_LDADD)" "prefix=$(out)" "MANDIR=$(out)/share/man" "BINOWN=" ]; + makeFlags = [ "LDADD=$(_LDADD)" ]; doCheck = true; checkInputs = [ inetutils wget ]; From 6850357e888dc2a89b9d081f0d7824bd8f2eae45 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Wed, 9 Jun 2021 21:08:52 +0800 Subject: [PATCH 468/797] timewarrior: 1.4.2 -> 1.4.3 --- pkgs/applications/misc/timewarrior/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 41dc179efe0..adff6741d31 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor }: stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "0qvhpva0hmhybn0c2aajndw5vnxar1jw4pjjajd2k2cr6vax29dw"; + sha256 = "00ydikzmxym5jhv6w1ii12a6zw5ighddbzxsw03xg8yabzzfnvzw"; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake asciidoctor ]; + + dontUseCmakeBuildDir = true; meta = with lib; { description = "A command-line time tracker"; From 38e40a73fe3787728c4e2ded6bc2483fb81838df Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Wed, 9 Jun 2021 10:03:12 +0100 Subject: [PATCH 469/797] aws-iam-authenticator: 0.5.2 -> 0.5.3 I had to work around inconsistent vendoring; see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 --- pkgs/tools/security/aws-iam-authenticator/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index f0eda76821d..d9f4f4a0173 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "1xfc3a0dik4930va30sbl6687v6i5irv96fwis9lrqh5rjqnblqp"; + sha256 = "0ga3vf5gn7533iqnxn7kchb6xg5wvk92livlqzkhi5qvqhl1sbw0"; }; - vendorSha256 = null; + # Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 + deleteVendor = true; + vendorSha256 = "+Z8sENIMWXP29Piwb/W6i7UdNXVq6ZnO7AZbSaUYCME="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; From 1ea409a4f01b4adf115fd798afe369a760240256 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 8 Jun 2021 20:35:39 +1000 Subject: [PATCH 470/797] .github/workflows/rebase.yml: remove It only works sometimes and we're unable to fix it. --- .github/workflows/rebase.yml | 134 ----------------------------------- 1 file changed, 134 deletions(-) delete mode 100644 .github/workflows/rebase.yml diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml deleted file mode 100644 index 47e8f4e4e42..00000000000 --- a/.github/workflows/rebase.yml +++ /dev/null @@ -1,134 +0,0 @@ -on: - issue_comment: - types: - - created - -# This action allows people with write access to the repo to rebase a PRs base branch -# by commenting `/rebase ${branch}` on the PR while avoiding CODEOWNER notifications. - -jobs: - rebase: - runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') - steps: - - uses: peter-evans/create-or-update-comment@v1 - with: - comment-id: ${{ github.event.comment.id }} - reactions: eyes - - uses: scherermichael-oss/action-has-permission@1.0.6 - id: check-write-access - with: - required-permission: write - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: check permissions - run: | - echo "Commenter doesn't have write access to the repo" - exit 1 - if: "! steps.check-write-access.outputs.has-permission" - - name: setup - run: | - curl "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}" 2>/dev/null >pr.json - cat <>"$GITHUB_ENV" - CAN_MODIFY=$(jq -r '.maintainer_can_modify' pr.json) - COMMITS=$(jq -r '.commits' pr.json) - CURRENT_BASE=$(jq -r '.base.ref' pr.json) - PR_BRANCH=$(jq -r '.head.ref' pr.json) - COMMENT_BRANCH=$(echo ${{ github.event.comment.body }} | awk "/^\/rebase / {print \$2}") - PULL_REQUEST=${{ github.event.issue.number }} - EOF - rm pr.json - - name: check branch - env: - PERMANENT_BRANCHES: "haskell-updates|master|nixos|nixpkgs|python-unstable|release|staging" - VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|release-21.05|staging|staging-20.09|staging-21.05|staging-next|staging-next-21.05" - run: | - message() { - cat < Date: Wed, 9 Jun 2021 16:47:21 +0300 Subject: [PATCH 471/797] discord: symlink Discord to discord to be consistent (#126254) with distros such as arch --- .../applications/networking/instant-messengers/discord/base.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 110d3ffb00e..a155737499e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -54,6 +54,8 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ + # Without || true the install would fail on case-insensitive filesystems + ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ From f0b2272124962d245bd1a56c73d77c51f2ce913f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 8 Jun 2021 23:38:43 +0700 Subject: [PATCH 472/797] fossil: 2.14 -> 2.15.1 --- pkgs/applications/version-management/fossil/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index af2ed175ac8..70729a6648c 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.14"; + version = "2.15.1"; src = fetchurl { urls = @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k="; + sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E="; }; nativeBuildInputs = [ installShellFiles tcl ]; @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl readline sqlite which ed ] ++ lib.optional stdenv.isDarwin libiconv; + enableParallelBuilding = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; configureFlags = [ "--disable-internal-sqlite" ] @@ -61,8 +63,9 @@ stdenv.mkDerivation rec { many such systems in use today. Fossil strives to distinguish itself from the others by being extremely simple to setup and operate. ''; - homepage = "http://www.fossil-scm.org/"; + homepage = "https://www.fossil-scm.org/"; license = licenses.bsd2; maintainers = with maintainers; [ maggesi viric ]; + platforms = platforms.all; }; } From 476165ba5e996b5b5306b284f7685f7629d90ac9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 9 Jun 2021 15:52:17 +0200 Subject: [PATCH 473/797] terraform-providers.kafka-connect: init at 0.2.3 (#126368) --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c9c61254c52..5c713b6b92a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -517,6 +517,15 @@ "vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd", "version": "0.2.12" }, + "kafka-connect": { + "owner": "Mongey", + "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", + "repo": "terraform-provider-kafka-connect", + "rev": "v0.2.3", + "sha256": "0fn03l58lkrlinvnxld2ba7z1gx95vxklbhh2z7930pih0vhr0sr", + "vendorSha256": "17fwqhxh22szdys97dxh069z6s8xr3y9i3pi5ckdcr462j1dr95w", + "version": "0.2.3" + }, "keycloak": { "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", From b62bab62adafd2b096ca405e5e9c2fdef0bd6e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 9 Jun 2021 15:56:15 +0200 Subject: [PATCH 474/797] topgrade: 6.9.1 -> 7.0.1 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 42624df8a06..7677a756737 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.9.1"; + version = "7.0.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FaN1/S/VzHnaQp+UOmvNGaWDEFijVEI7GWkAmnln3jE="; + sha256 = "sha256-86lBEtwybHrcm7G0ZIbfOHSZPBzNERHGqrTR4YbpDnE="; }; - cargoSha256 = "sha256-Vq2gorQJbLfxKWKbYYOVaHPN0uITbGs1CgkwBtPwSrk="; + cargoSha256 = "sha256-yZIh01A1yC1ZeDDyXeh1C3abPfbW2JuJ7TIsVO1weZk="; buildInputs = lib.optional stdenv.isDarwin Foundation; From 6bae461af8daef5c1cd48ea5dd41de65c6ebf870 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Jun 2021 12:02:03 +0200 Subject: [PATCH 475/797] fuse3: 3.10.3 -> 3.10.4 --- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index b7ee8772f46..b060b908284 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.3"; - sha256Hash = "054g3jqy8lhlj8kkwd16wxaxzynmh8h5iv20cryd0psg0hgmhd7v"; + version = "3.10.4"; + sha256Hash = "1ml4bs4wx5dbz5xpnd5g8b9avmn7g7jvf16fbdlk0da8il0qd2rx"; }; } From cb431689195dd109ee8aa9e4cdf8d7227179c46a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 5 Jun 2021 12:59:56 -0300 Subject: [PATCH 476/797] ocamlPackages.ocplib-endian: 1.0 -> 1.1 --- .../ocaml-modules/ocplib-endian/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 553ad9562cc..2cb066a7c03 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,24 +1,22 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, cppo }: +{ lib, buildDunePackage, fetchzip, cppo }: -let version = "1.0"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocplib-endian-${version}"; +buildDunePackage rec { + version = "1.1"; + pname = "ocplib-endian"; src = fetchzip { url = "https://github.com/OCamlPro/ocplib-endian/archive/${version}.tar.gz"; - sha256 = "0s1ld3kavz892b8awyxyg1mr98h2g61gy9ci5v6yb49bsii6wicw"; + sha256 = "sha256-zKsSkhlZBXSqPtw+/WN3pwo9plM9rDZfMbGVfosqb10="; }; - buildInputs = [ ocaml findlib ocamlbuild cppo ]; + useDune2 = true; - createFindlibDestdir = true; + buildInputs = [ cppo ]; - meta = { + meta = with lib; { description = "Optimised functions to read and write int16/32/64"; homepage = "https://github.com/OCamlPro/ocplib-endian"; - license = lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = with lib.maintainers; [ vbgl ]; + license = licenses.lgpl21; + maintainers = with maintainers; [ vbgl ]; }; } From cc7740ae770c52ac1f385aa25cfc143fe79c6b6e Mon Sep 17 00:00:00 2001 From: tcmal Date: Wed, 9 Jun 2021 16:09:29 +0100 Subject: [PATCH 477/797] lldb: python into lib & wrap binary --- .../compilers/llvm/10/lldb/default.nix | 7 +++++-- .../compilers/llvm/10/lldb/gnu-install-dirs.patch | 15 ++++++++++++++- .../compilers/llvm/11/lldb/default.nix | 7 +++++-- .../compilers/llvm/11/lldb/gnu-install-dirs.patch | 15 ++++++++++++++- .../compilers/llvm/12/lldb/default.nix | 7 +++++-- .../compilers/llvm/12/lldb/gnu-install-dirs.patch | 15 ++++++++++++++- .../development/compilers/llvm/8/lldb/default.nix | 7 +++++-- .../compilers/llvm/8/lldb/gnu-install-dirs.patch | 13 +++++++++++++ .../development/compilers/llvm/9/lldb/default.nix | 7 +++++-- .../compilers/llvm/9/lldb/gnu-install-dirs.patch | 13 +++++++++++++ 10 files changed, 93 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/lldb/default.nix b/pkgs/development/compilers/llvm/10/lldb/default.nix index 7ce7e1f8150..a762151a586 100644 --- a/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -13,6 +13,7 @@ , version , darwin , lit +, makeWrapper , enableManpages ? false }: @@ -30,7 +31,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -69,12 +70,14 @@ stdenv.mkDerivation (rec { doCheck = false; installCheckPhase = '' - if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then return 1; fi ''; postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch index d781779bbe0..0a7539db5e6 100644 --- a/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch @@ -75,4 +75,17 @@ index 752113b..010f187 100644 +set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) if(WIN32 OR CYGWIN) # DLL platform -- put DLLs into bin. - set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf74802..1c98cae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python) + else() +- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH}) ++ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}) + endif() + if (NOT CMAKE_CFG_INTDIR STREQUAL ".") + string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH}) diff --git a/pkgs/development/compilers/llvm/11/lldb/default.nix b/pkgs/development/compilers/llvm/11/lldb/default.nix index ed118537a5d..46d6c6628e1 100644 --- a/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/pkgs/development/compilers/llvm/11/lldb/default.nix @@ -13,6 +13,7 @@ , version , darwin , lit +, makeWrapper , enableManpages ? false }: @@ -30,7 +31,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -69,12 +70,14 @@ stdenv.mkDerivation (rec { doCheck = false; installCheckPhase = '' - if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then return 1; fi ''; postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch index ac071617dd4..fd49be395a3 100644 --- a/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch @@ -75,4 +75,17 @@ index 752113b..010f187 100644 +set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) if(WIN32 OR CYGWIN) # DLL platform -- put DLLs into bin. - set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf74802..1c98cae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python) + else() +- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH}) ++ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}) + endif() + if (NOT CMAKE_CFG_INTDIR STREQUAL ".") + string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH}) diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index 24cbcabddad..0712396cccf 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -19,6 +19,7 @@ , Carbon , Cocoa , lit +, makeWrapper , enableManpages ? false }: @@ -41,7 +42,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -85,12 +86,14 @@ stdenv.mkDerivation (rec { doCheck = false; installCheckPhase = '' - if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then return 1; fi ''; postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch index 0435784a247..afc945ce261 100644 --- a/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch @@ -75,4 +75,17 @@ index 752113b..010f187 100644 +set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) if(WIN32 OR CYGWIN) # DLL platform -- put DLLs into bin. - set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5633e2..86e4738 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") + else() +- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") ++ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") + endif() + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") diff --git a/pkgs/development/compilers/llvm/8/lldb/default.nix b/pkgs/development/compilers/llvm/8/lldb/default.nix index 27ed52189b1..b6025f722eb 100644 --- a/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -12,6 +12,7 @@ , python3 , version , darwin +, makeWrapper }: stdenv.mkDerivation rec { @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig + cmake python3 which swig makeWrapper ]; buildInputs = [ @@ -62,12 +63,14 @@ stdenv.mkDerivation rec { doCheck = false; installCheckPhase = '' - if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then return 1; fi ''; postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch index eb1ca727df4..ffc946816b0 100644 --- a/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch @@ -92,3 +92,16 @@ index cdf22c4..d56fc6a 100644 ${use_python_wrapper_from_src_dir} ${use_six_py_from_system} VERBATIM +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index a9059dd..d76a47d 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -124,7 +124,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + link_directories("${LLVM_LIBRARY_DIR}") + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) + + set(LLDB_BUILT_STANDALONE 1) diff --git a/pkgs/development/compilers/llvm/9/lldb/default.nix b/pkgs/development/compilers/llvm/9/lldb/default.nix index ee42e391b58..63edc60828e 100644 --- a/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -12,6 +12,7 @@ , python3 , version , darwin +, makeWrapper , lit }: @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ]; buildInputs = [ @@ -59,12 +60,14 @@ stdenv.mkDerivation rec { doCheck = false; installCheckPhase = '' - if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then return 1; fi ''; postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # man page mkdir -p $out/share/man/man1 install ../docs/lldb.1 -t $out/share/man/man1/ diff --git a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch index a482aac5779..7876220e4d3 100644 --- a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch @@ -76,3 +76,16 @@ index cdf22c4..d56fc6a 100644 ${use_python_wrapper_from_src_dir} ${use_six_py_from_system} VERBATIM +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index b726797..1f057ac 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -95,7 +95,7 @@ include_directories( + "${CLANG_INCLUDE_DIRS}") + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) + + set(LLDB_BUILT_STANDALONE 1) From 972898113cdb7bafc8173bde5c0b515b1d83b429 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 9 Jun 2021 17:44:15 +0300 Subject: [PATCH 478/797] orchis: rename to orchis-theme orchis-theme: 2021-04-20 -> 2021-06-09 --- pkgs/data/themes/{orchis => orchis-theme}/default.nix | 10 +++------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) rename pkgs/data/themes/{orchis => orchis-theme}/default.nix (83%) diff --git a/pkgs/data/themes/orchis/default.nix b/pkgs/data/themes/orchis-theme/default.nix similarity index 83% rename from pkgs/data/themes/orchis/default.nix rename to pkgs/data/themes/orchis-theme/default.nix index a53e2f79f6a..b63e9c06d29 100644 --- a/pkgs/data/themes/orchis/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -9,14 +9,14 @@ }: stdenvNoCC.mkDerivation rec { - pname = "orchis"; - version = "2021-04-20"; + pname = "orchis-theme"; + version = "2021-06-09"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-cCUmainVTqFztZGpL2z2Zj6zcE2SQBWrec6yNFUMo5M="; + sha256 = "sha256-YlrocFDk3da2eqxbJ5lPUUxHHvJZx19LOa0MSljWY8Q="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -25,10 +25,6 @@ stdenvNoCC.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - preInstall = '' mkdir -p $out/share/themes ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 08d8ed9494f..cac2927d5d5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -515,6 +515,7 @@ mapAliases ({ openjpeg_2 = openjpeg; # added 2021-01-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 + orchis = orchis-theme; # added 2021-06-09 onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 osquery = throw "osquery has been removed."; # added 2019-11-24 osxfuse = macfuse-stubs; # added 2021-03-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..061f50deca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22184,7 +22184,7 @@ in orbitron = callPackage ../data/fonts/orbitron { }; - orchis = callPackage ../data/themes/orchis { }; + orchis-theme = callPackage ../data/themes/orchis-theme { }; orion = callPackage ../data/themes/orion {}; From 0b95a112a53eeef19d2e9ebc39c2aa31922ade9b Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Jun 2021 11:26:18 +0200 Subject: [PATCH 479/797] libharu: use fetchFromGitHub and switch to pname --- pkgs/development/libraries/libharu/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 53c14027ff3..7b8a5ac02c8 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchzip, cmake, zlib, libpng }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, libpng }: -stdenv.mkDerivation { - name = "libharu-2.3.0"; +stdenv.mkDerivation rec { + pname = "libharu"; + version = "2.3.0"; - src = fetchzip { - url = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"; + src = fetchFromGitHub { + owner = "libharu"; + repo = pname; + rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; From b1b0903340816b646a6c5d3a9315dd3b77824a2b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 9 Jun 2021 17:47:34 +0200 Subject: [PATCH 480/797] grafana-agent: 0.13.1 -> 0.15.0 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 1f08dc3344a..41b8b56fc44 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.13.1"; + version = "0.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-ySdBHlUSGIyhMwInoFT90mm+HfAkO/60wBPACQgxDAM="; + sha256 = "sha256-mRDd9G/VMbDwp/GYPoUE0v9j+BmUd08wOMJjgcg2qdo="; }; - vendorSha256 = null; + vendorSha256 = "sha256-sQFWdBOjfYb1e7ZzHGgtgnuEQCU4xnkJTyzC/9DRcYs="; # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 From 8f16b1629155ad0022bb7830739081532d1bae50 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 9 Jun 2021 17:50:45 +0200 Subject: [PATCH 481/797] gitlab: Make sure the FOSS version isn't identified as EE --- nixos/modules/services/misc/gitlab.nix | 2 +- pkgs/applications/version-management/gitlab/default.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 253d87537cf..b4fc4bf4b2c 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -145,7 +145,7 @@ let }; }; - gitlabEnv = { + gitlabEnv = cfg.packages.gitlab.gitlabEnv // { HOME = "${cfg.statePath}/home"; PUMA_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 0e6aaa5912c..225b9f6c0cb 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation { ${lib.optionalString (!gitlabEnterprise) '' # Remove all proprietary components rm -rf ee + sed -i 's/-ee//' ./VERSION ''} # For reasons I don't understand "bundle exec" ignores the @@ -181,6 +182,7 @@ stdenv.mkDerivation { GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; + gitlabEnv.FOSS_ONLY = lib.boolToString (!gitlabEnterprise); tests = { nixos-test-passes = nixosTests.gitlab; }; From c702cc43213dce2573adb924ab9c67522616aea6 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Wed, 2 Jun 2021 03:16:43 +0300 Subject: [PATCH 482/797] pipewire: 0.3.27 -> 0.3.30 --- .../desktops/pipewire/pipewire.conf.json | 13 +++++- .../pipewire/0080-pipewire-config-dir.patch | 24 +++++----- .../0090-pipewire-config-template-paths.patch | 28 ++++++++++++ .../libraries/pipewire/default.nix | 44 ++++++++++++++----- 4 files changed, 86 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch diff --git a/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/pipewire.conf.json index a9330f54f4f..a923ab4db23 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.conf.json +++ b/nixos/modules/services/desktops/pipewire/pipewire.conf.json @@ -74,7 +74,18 @@ "args": { "factory.name": "support.node.driver", "node.name": "Dummy-Driver", - "priority.driver": 8000 + "node.group": "pipewire.dummy", + "priority.driver": 20000 + } + }, + { + "factory": "spa-node-factory", + "args": { + "factory.name": "support.node.driver", + "node.name": "Freewheel-Driver", + "priority.driver": 19000, + "node.group": "pipewire.freewheel", + "node.freewheel": true } } ], diff --git a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch index b92e2818ea0..b8d8fcb0f90 100644 --- a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch @@ -1,30 +1,30 @@ diff --git a/meson.build b/meson.build -index a27569bd..fcf18344 100644 +index b6b4553b..f21c29d8 100644 --- a/meson.build +++ b/meson.build -@@ -36,7 +36,10 @@ pipewire_libexecdir = prefix / get_option('libexecdir') - pipewire_localedir = prefix / get_option('localedir') +@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir') pipewire_sysconfdir = prefix / get_option('sysconfdir') --pipewire_configdir = pipewire_sysconfdir / 'pipewire' -+pipewire_configdir = get_option('pipewire_config_dir') -+if pipewire_configdir == '' -+ pipewire_configdir = pipewire_sysconfdir / 'pipewire' + pipewire_configdir = pipewire_sysconfdir / 'pipewire' +-pipewire_confdatadir = pipewire_datadir / 'pipewire' ++pipewire_confdatadir = get_option('pipewire_confdata_dir') ++if pipewire_confdatadir == '' ++ pipewire_confdatadir = pipewire_datadir / 'pipewire' +endif modules_install_dir = pipewire_libdir / pipewire_name if host_machine.system() == 'linux' diff --git a/meson_options.txt b/meson_options.txt -index 85beb86a..372e8faa 100644 +index 9bc33fcd..e4bd2dc1 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -67,6 +67,9 @@ option('jack-devel', +@@ -61,6 +61,9 @@ option('jack-devel', option('libjack-path', description: 'Where to install the libjack.so library', type: 'string') -+option('pipewire_config_dir', -+ type : 'string', -+ description : 'Directory for pipewire configuration (defaults to /etc/pipewire)') ++option('pipewire_confdata_dir', ++ type: 'string', ++ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)') option('spa-plugins', description: 'Enable spa plugins integration', type: 'feature', diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch new file mode 100644 index 00000000000..966cb957977 --- /dev/null +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -0,0 +1,28 @@ +diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in +index bbafa134..227d3e06 100644 +--- a/src/daemon/pipewire.conf.in ++++ b/src/daemon/pipewire.conf.in +@@ -116,7 +116,7 @@ context.modules = [ + # access.allowed to list an array of paths of allowed + # apps. + #access.allowed = [ +- # @media_session_path@ ++ # + #] + + # An array of rejected paths. +@@ -220,12 +220,12 @@ context.exec = [ + # but it is better to start it as a systemd service. + # Run the session manager with -h for options. + # +- @comment@{ path = "@media_session_path@" args = "" } ++ @comment@{ path = "" args = "" } + # + # You can optionally start the pulseaudio-server here as well + # but it is better to start it as a systemd service. + # It can be interesting to start another daemon here that listens + # on another address with the -a option (eg. -a tcp:4713). + # +- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ @comment@{ path = "" args = "-c pipewire-pulse.conf" } + ] diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index b3e740f39c4..b8fb216e358 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitLab , removeReferencesTo +, python3 , meson , ninja , systemd @@ -19,6 +20,7 @@ , SDL2 , vulkan-headers , vulkan-loader +, webrtc-audio-processing , ncurses , makeFontsConf , callPackage @@ -31,6 +33,8 @@ , nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true +, pulseTunnelSupport ? true, libpulseaudio ? null +, zeroconfSupport ? true, avahi ? null }: let @@ -42,7 +46,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.27"; + version = "0.3.30"; outputs = [ "out" @@ -60,7 +64,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-GfcMODQWtcahBvXnZ98/PKIm4pkqLaz09oOy7zQR4IA="; + sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE="; }; patches = [ @@ -72,8 +76,10 @@ let ./0055-pipewire-media-session-path.patch # Move installed tests into their own output. ./0070-installed-tests-path.patch - # Add flag to specify configuration directory (different from the installation directory). + # Add option for changing the config install directory ./0080-pipewire-config-dir.patch + # Remove output paths from the comments in the config templates to break dependency cycles + ./0090-pipewire-config-template-paths.patch ]; nativeBuildInputs = [ @@ -82,6 +88,7 @@ let meson ninja pkg-config + python3 ]; buildInputs = [ @@ -94,12 +101,15 @@ let udev vulkan-headers vulkan-loader + webrtc-audio-processing valgrind SDL2 systemd ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; + ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ] + ++ lib.optional pulseTunnelSupport libpulseaudio + ++ lib.optional zeroconfSupport avahi; mesonFlags = [ "-Ddocs=enabled" @@ -112,6 +122,8 @@ let "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibcamera=disabled" + "-Dlibpulse=${mesonEnable pulseTunnelSupport}" + "-Davahi=${mesonEnable zeroconfSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}" "-Dffmpeg=${mesonEnable ffmpegSupport}" "-Dbluez5=${mesonEnable bluezSupport}" @@ -119,24 +131,35 @@ let "-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}" "-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}" "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" - "-Dpipewire_config_dir=/etc/pipewire" + "-Dsysconfdir=/etc" + "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" ]; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; + postUnpack = '' + patchShebangs source/doc/strip-static.sh + patchShebangs source/spa/tests/gen-cpp-test.py + ''; + postInstall = '' - pushd . - cd $out + pushd $lib/share mkdir -p $out/nix-support/etc/pipewire - for f in etc/pipewire/*.conf; do bin/spa-json-dump "$f" > "$out/nix-support/$f.json"; done + for f in pipewire/*.conf; do + echo "Generating JSON from $f" + $out/bin/spa-json-dump "$f" > "$out/nix-support/etc/$f.json" + done mkdir -p $mediaSession/nix-support/etc/pipewire/media-session.d - for f in etc/pipewire/media-session.d/*.conf; do bin/spa-json-dump "$f" > "$mediaSession/nix-support/$f.json"; done + for f in pipewire/media-session.d/*.conf; do + echo "Generating JSON from $f" + $out/bin/spa-json-dump "$f" > "$mediaSession/nix-support/etc/$f.json" + done popd - moveToOutput "etc/pipewire/media-session.d/*.conf" "$mediaSession" + moveToOutput "share/pipewire/media-session.d/*.conf" "$mediaSession" moveToOutput "share/systemd/user/pipewire-media-session.*" "$mediaSession" moveToOutput "lib/systemd/user/pipewire-media-session.*" "$mediaSession" moveToOutput "bin/pipewire-media-session" "$mediaSession" @@ -155,6 +178,7 @@ let test-paths = callPackage ./test-paths.nix { paths-out = [ "share/alsa/alsa.conf.d/50-pipewire.conf" + "nix-support/etc/pipewire/client-rt.conf.json" "nix-support/etc/pipewire/client.conf.json" "nix-support/etc/pipewire/jack.conf.json" "nix-support/etc/pipewire/pipewire.conf.json" From cb51b41ccf84814c5ae45d7a5f219d25ea7bb4d1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 9 Jun 2021 18:49:41 +0200 Subject: [PATCH 483/797] llvmPackages_git: fix variable shadowing The first substitution was not passed to the 2nd re.sub call as seems to be the intention of the original change. --- pkgs/development/compilers/llvm/update-git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py index 119a050e470..ec1a30c6b0f 100755 --- a/pkgs/development/compilers/llvm/update-git.py +++ b/pkgs/development/compilers/llvm/update-git.py @@ -64,7 +64,7 @@ default_nix = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/defa with fileinput.FileInput(default_nix, inplace=True) as f: for line in f: result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) - result = re.sub(r'^ version = ".+";', f' version = "{version}";', line) + result = re.sub(r'^ version = ".+";', f' version = "{version}";', result) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result) print(result, end='') From 08ae5f5caf189708e48a8d2ddbdb77737549faf3 Mon Sep 17 00:00:00 2001 From: Casey Marshall Date: Sun, 6 Jun 2021 13:31:20 -0500 Subject: [PATCH 484/797] Kubebuilder: init at 3.0.1 Kubebuilder is an SDK for building Kubernetes APIs using CRDs. --- .../cluster/kubebuilder/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubebuilder/default.nix diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix new file mode 100644 index 00000000000..d123790edd2 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, makeWrapper +, git +, go +}: + +buildGoModule rec { + pname = "kubebuilder"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kubebuilder"; + rev = "v${version}"; + sha256 = "1726j2b5jyvllvnk60g6px3g2jyyphd9pc4vgid45mis9b60sh8a"; + }; + vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n"; + + subPackages = ["cmd" "pkg/..."]; + + preBuild = '' + export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \ + -X main.goos=$GOOS \ + -X main.goarch=$GOARCH \ + -X main.gitCommit=v${version} \ + -X main.buildDate=v${version}") + ''; + + doCheck = true; + + postInstall = '' + mv $out/bin/cmd $out/bin/kubebuilder + wrapProgram $out/bin/kubebuilder \ + --prefix PATH : ${lib.makeBinPath [ go ]} + ''; + + allowGoReference = true; + nativeBuildInputs = [ makeWrapper git ]; + + meta = with lib; { + homepage = "https://github.com/kubernetes-sigs/kubebuilder"; + description = "SDK for building Kubernetes APIs using CRDs"; + license = licenses.asl20; + maintainers = with maintainers; [ cmars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c537b0545a3..3de6116ac49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24780,6 +24780,8 @@ in kubectl = callPackage ../applications/networking/cluster/kubectl { }; + kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; + kuttl = callPackage ../applications/networking/cluster/kuttl { buildGoModule = buildGo115Module; }; From d5ead7ab4c268d203795b9a51ce6dfef1e9b1460 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 10 Jun 2021 01:12:08 +0800 Subject: [PATCH 485/797] vieb: 5.0.0 -> 5.1.0 --- .../networking/browsers/vieb/default.nix | 4 +- .../networking/browsers/vieb/package.json | 18 +- .../networking/browsers/vieb/yarn.lock | 1294 ++++++++--------- .../networking/browsers/vieb/yarn.nix | 848 +++++------ 4 files changed, 991 insertions(+), 1173 deletions(-) diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 248bf86c0c2..5a2b45725df 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "jelmerro"; repo = pname; rev = version; - sha256 = "sha256-0fbH2tmrgbu/XQg1piK9f56cow+R/Qe6bYMdbeV/mus="; + sha256 = "sha256-0C2gD40nPgEZopGMPsd5ajwcwFRjcu4Xc2DTpEwSK4c="; }; packageJSON = ./package.json; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index 789c507786a..94effdaa2e5 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.0.0", + "version": "5.1.0", "description": "Vim Inspired Electron Browser", "bin": "app.js", "main": "app/index.js", @@ -30,18 +30,18 @@ "license": "GPL-3.0-or-later", "devDependencies": { "archiver": "5.3.0", - "electron": "13.0.1", - "electron-builder": "22.10.5", - "eslint": "7.27.0", - "eslint-plugin-compat": "^3.9.0", + "electron": "13.1.1", + "electron-builder": "22.11.5", + "eslint": "7.28.0", + "eslint-plugin-compat": "3.9.0", "eslint-plugin-sort-keys-fix": "1.1.1", - "jest-environment-jsdom": "^27.0.1", - "jest": "27.0.1" + "jest-environment-jsdom": "27.0.3", + "jest": "27.0.4" }, "dependencies": { "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.20.6", - "@cliqz/adblocker-electron-preload": "1.20.6", + "@cliqz/adblocker-electron": "1.22.1", + "@cliqz/adblocker-electron-preload": "1.22.1", "is-svg": "4.3.1", "rimraf": "3.0.2" }, diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 2c484e5bcf6..ff4a7248f61 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -2,16 +2,11 @@ # yarn lockfile v1 -"7zip-bin@5.1.1": +"7zip-bin@5.1.1", "7zip-bin@~5.1.1": version "5.1.1" resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== -"7zip-bin@~5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" - integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== - "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" @@ -26,10 +21,10 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.15": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" - integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== +"@babel/compat-data@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58" + integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ== "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": version "7.14.3" @@ -62,13 +57,13 @@ source-map "^0.5.0" "@babel/helper-compilation-targets@^7.13.16": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" - integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516" + integrity sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA== dependencies: - "@babel/compat-data" "^7.13.15" + "@babel/compat-data" "^7.14.4" "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" + browserslist "^4.16.6" semver "^6.3.0" "@babel/helper-function-name@^7.14.2": @@ -128,14 +123,14 @@ integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== "@babel/helper-replace-supers@^7.13.12": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz#ca17b318b859d107f0e9b722d58cf12d94436600" - integrity sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz#b2ab16875deecfff3ddfcd539bc315f72998d836" + integrity sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ== dependencies: "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.2" + "@babel/types" "^7.14.4" "@babel/helper-simple-access@^7.13.12": version "7.13.12" @@ -180,9 +175,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3", "@babel/parser@^7.7.2": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298" - integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18" + integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -298,10 +293,10 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3" - integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.14.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz#bfd6980108168593b38b3eb48a24aa026b919bc0" + integrity sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw== dependencies: "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" @@ -311,45 +306,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.6.tgz#1bfbdb1e5757fc610f3d5d9921bba9d166d687a7" - integrity sha512-KRo8EjIbiuAHBQHJcgs0oefJlp/lw93KQL1Rv9CeMFdKqVZV8IReGqe/V+ipoaOQFVgLZ8gWPOzEkLAQ4P2ZBQ== +"@cliqz/adblocker-content@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz#71bc0d0d473ae96d5086badb2f4d624769fa56c4" + integrity sha512-CSOCdK/SJOZVWGVJuurfL0KtPq1AhSp3ng6BAo3SLXAd+WP7obERw2qFWQ0uzrApY/N1a1hvzfw31uonqRakXg== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.20.6" + "@cliqz/adblocker-extended-selectors" "^1.22.1" -"@cliqz/adblocker-electron-preload@1.20.6", "@cliqz/adblocker-electron-preload@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.6.tgz#c2804edb8c4dd5ce226a2a5ef95b9e6cd3745767" - integrity sha512-2dF6aaTZftwUXswHRSIlSIop4SQGmtpzp3FHVQvB3lCCE2ssONT38nCY0b4PREooZ35tzZTZNyYcOboaear3UQ== +"@cliqz/adblocker-electron-preload@1.22.1", "@cliqz/adblocker-electron-preload@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" + integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== dependencies: - "@cliqz/adblocker-content" "^1.20.6" + "@cliqz/adblocker-content" "^1.22.1" -"@cliqz/adblocker-electron@1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.6.tgz#870ff1ba7765f545fee70327d3c7e08adadc7764" - integrity sha512-//fdnVxuab6nfx/Eq9u6r8EbgHl/wOGGIUu/ueaYEstR+m3Re22zJDtbj8AwmN75aDynQ7jhUz81GLqH4o4pzg== +"@cliqz/adblocker-electron@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" + integrity sha512-RZUog6ogMZnOx9Rz1LWIHE5MOWdDStfzkbfLpelka6PerRSKKltUvV4qwqM455eUMqHqPd27ZMM183+MQ85WpQ== dependencies: - "@cliqz/adblocker" "^1.20.6" - "@cliqz/adblocker-electron-preload" "^1.20.6" + "@cliqz/adblocker" "^1.22.1" + "@cliqz/adblocker-electron-preload" "^1.22.1" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.6.tgz#964d3b96e419778c6e4c8ecf5c2b94599dfbdcd7" - integrity sha512-EuGLyv00GeRFr2PKZLaWgnRpKSFLdezqXTJFaljtvb0iieR7yNdjfEdoEJmctRmslTrlcMmpOlNhAOpJavY4bw== +"@cliqz/adblocker-extended-selectors@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz#234ee70a1736e3690b25a7a073818f5a851bf9a8" + integrity sha512-uXB1TybAq6MgqsG09fcY8Qw0P9EOWp4G7KQ4QNXQd4HIP4o3zcJgBd5MKeclJAD/QOyPdhnb+a9JdwVFyqMamQ== -"@cliqz/adblocker@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.6.tgz#3428d3c066dbaafa98644fadfd28dd206f8691e2" - integrity sha512-BhYna9gkQnqQfFJy4FOW3cER2oO0IwZzvYQaQEMP5Y/ETUzMq5WBHq5X4dOU+hiJdbkgogIS5L73uPUHDK01Hw== +"@cliqz/adblocker@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz#dae3dd6c59f16244012d1e736150f618b2d578e6" + integrity sha512-kir/tVTe0VabtJfcRipDX+/UBnZn0aN0lX4GQT7wZIHMOACpW37eix7wGkzVS+icbwu1bEqZ+O8Q98UlORPm4w== dependencies: - "@cliqz/adblocker-content" "^1.20.6" - "@cliqz/adblocker-extended-selectors" "^1.20.6" + "@cliqz/adblocker-content" "^1.22.1" + "@cliqz/adblocker-extended-selectors" "^1.22.1" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.136" + "@types/chrome" "^0.0.144" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -377,10 +372,10 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@electron/universal@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5" - integrity sha512-ajZoumi4XwqwmZe8YVhu4XGkZBCPyWZsVCQONPTIe9TUlleSN+dic3YpXlaWcilx/HOzTdldTKtabNTeI0gDoA== +"@electron/universal@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" + integrity sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag== dependencies: "@malept/cross-spawn-promise" "^1.1.0" asar "^3.0.3" @@ -388,15 +383,15 @@ dir-compare "^2.4.0" fs-extra "^9.0.1" -"@eslint/eslintrc@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" - integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" @@ -419,94 +414,94 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.1.tgz#c6acfec201f9b6823596eb6c4fcd77c89a8b27e9" - integrity sha512-50E6nN2F5cAXn1lDljn0gE9F0WFXHYz/u0EeR7sOt4nbRPNli34ckbl6CUDaDABJbHt62DYnyQAIB3KgdzwKDw== +"@jest/console@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz#b8eeff8f21ac51d224c851e1729d2630c18631e6" + integrity sha512-/zYigssuHLImGeMAACkjI4VLAiiJznHgAl3xnFT19iWyct2LhrH3KXOjHRmxBGTkiPLZKKAJAgaPpiU9EZ9K+w== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.0.1" - jest-util "^27.0.1" + jest-message-util "^27.0.2" + jest-util "^27.0.2" slash "^3.0.0" -"@jest/core@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.1.tgz#88d0ff55f465fe1fc3a940718e8cf0fea242be4b" - integrity sha512-PiCbKSMf6t8PEfY3MAd0Ldn3aJAt5T+UcaFkAfMZ1VZgas35+fXk5uHIjAQHQLNIHZWX19TLv0wWNT03yvrw6w== +"@jest/core@^27.0.4": + version "27.0.4" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz#679bf9ac07900da2ddbb9667bb1afa8029038f53" + integrity sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA== dependencies: - "@jest/console" "^27.0.1" - "@jest/reporters" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/reporters" "^27.0.4" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^27.0.1" - jest-config "^27.0.1" - jest-haste-map "^27.0.1" - jest-message-util "^27.0.1" + jest-changed-files "^27.0.2" + jest-config "^27.0.4" + jest-haste-map "^27.0.2" + jest-message-util "^27.0.2" jest-regex-util "^27.0.1" - jest-resolve "^27.0.1" - jest-resolve-dependencies "^27.0.1" - jest-runner "^27.0.1" - jest-runtime "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" - jest-watcher "^27.0.1" + jest-resolve "^27.0.4" + jest-resolve-dependencies "^27.0.4" + jest-runner "^27.0.4" + jest-runtime "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" + jest-watcher "^27.0.2" micromatch "^4.0.4" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.1.tgz#27ed89bf8179c0a030690f063d922d6da7a519ac" - integrity sha512-nG+r3uSs2pOTsdhgt6lUm4ZGJLRcTc6HZIkrFsVpPcdSqEpJehEny9r9y2Bmhkn8fKXWdGCYJKF3i4nKO0HSmA== +"@jest/environment@^27.0.3": + version "27.0.3" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz#68769b1dfdd213e3456169d64fbe9bd63a5fda92" + integrity sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA== dependencies: - "@jest/fake-timers" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/fake-timers" "^27.0.3" + "@jest/types" "^27.0.2" "@types/node" "*" - jest-mock "^27.0.1" + jest-mock "^27.0.3" -"@jest/fake-timers@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.1.tgz#6987a596b0bcf8c07653086076c17058b4c77b5c" - integrity sha512-3CyLJQnHzKI4TCJSCo+I9TzIHjSK4RrNEk93jFM6Q9+9WlSJ3mpMq/p2YuKMe0SiHKbmZOd5G/Ll5ofF9Xkw9g== +"@jest/fake-timers@^27.0.3": + version "27.0.3" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz#9899ba6304cc636734c74478df502e18136461dd" + integrity sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@sinonjs/fake-timers" "^7.0.2" "@types/node" "*" - jest-message-util "^27.0.1" - jest-mock "^27.0.1" - jest-util "^27.0.1" + jest-message-util "^27.0.2" + jest-mock "^27.0.3" + jest-util "^27.0.2" -"@jest/globals@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.1.tgz#14c776942f7047a04f2aea09b148065e2aa9d7e9" - integrity sha512-80ZCzgopysKdpp5EOglgjApKxiNDR96PG4PwngB4fTwZ4qqqSKo0EwGwQIhl16szQ1M2xCVYmr9J6KelvnABNQ== +"@jest/globals@^27.0.3": + version "27.0.3" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz#1cf8933b7791bba0b99305cbf39fd4d2e3fe4060" + integrity sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ== dependencies: - "@jest/environment" "^27.0.1" - "@jest/types" "^27.0.1" - expect "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/types" "^27.0.2" + expect "^27.0.2" -"@jest/reporters@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.1.tgz#5b491f64e37c9b97b13e564f18f36b6697d28045" - integrity sha512-lZbJWuS1h/ytKERfu1D6tEQ4PuQ7+15S4+HrSzHR0i7AGVT1WRo49h4fZqxASOp7AQCupUVtPJNZDkaG9ZXy0g== +"@jest/reporters@^27.0.4": + version "27.0.4" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz#95609b1be97afb80d55d8aa3d7c3179c15810e65" + integrity sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -517,10 +512,10 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.0.1" - jest-resolve "^27.0.1" - jest-util "^27.0.1" - jest-worker "^27.0.1" + jest-haste-map "^27.0.2" + jest-resolve "^27.0.4" + jest-util "^27.0.2" + jest-worker "^27.0.2" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" @@ -536,52 +531,51 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.1.tgz#8fb97214268ea21cf8cfb83edc0f17e558b3466d" - integrity sha512-5aa+ibX2dsGSDLKaQMZb453MqjJU/CRVumebXfaJmuzuGE4qf87yQ2QZ6PEpEtBwVUEgrJCzi3jLCRaUbksSuw== +"@jest/test-result@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz#0451049e32ceb609b636004ccc27c8fa22263f10" + integrity sha512-gcdWwL3yP5VaIadzwQtbZyZMgpmes8ryBAJp70tuxghiA8qL4imJyZex+i+USQH2H4jeLVVszhwntgdQ97fccA== dependencies: - "@jest/console" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/types" "^27.0.2" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.1.tgz#2a3b85130978fc545d8ee6c34d65ff4231dbad86" - integrity sha512-yK2c2iruJ35WgH4KH8whS72uH+FASJUrzwxzNKTzLAEWmNpWKNEPOsSEKsHynvz78bLHafrTg4adN7RrYNbEOA== +"@jest/test-sequencer@^27.0.4": + version "27.0.4" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz#976493b277594d81e589896f0ed21f198308928a" + integrity sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ== dependencies: - "@jest/test-result" "^27.0.1" + "@jest/test-result" "^27.0.2" graceful-fs "^4.2.4" - jest-haste-map "^27.0.1" - jest-runner "^27.0.1" - jest-runtime "^27.0.1" + jest-haste-map "^27.0.2" + jest-runtime "^27.0.4" -"@jest/transform@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.1.tgz#a9ece291f82273d5e58132550996c16edd5a902a" - integrity sha512-LC95VpT6wMnQ96dRJDlUiAnW/90zyh4+jS30szI/5AsfS0qwSlr/O4TPcGoD2WVaVMfo6KvR+brvOtGyMHaNhA== +"@jest/transform@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz#b073b7c589e3f4b842102468875def2bb722d6b5" + integrity sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.1" + jest-haste-map "^27.0.2" jest-regex-util "^27.0.1" - jest-util "^27.0.1" + jest-util "^27.0.2" micromatch "^4.0.4" pirates "^4.0.1" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.1.tgz#631738c942e70045ebbf42a3f9b433036d3845e4" - integrity sha512-8A25RRV4twZutsx2D+7WphnDsp7If9Yu6ko0Gxwrwv8BiWESFzka34+Aa2kC8w9xewt7SDuCUSZ6IiAFVj3PRg== +"@jest/types@^27.0.2": + version "27.0.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz#e153d6c46bda0f2589f0702b071f9898c7bbd37e" + integrity sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -596,6 +590,16 @@ dependencies: cross-spawn "^7.0.1" +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + "@mdn/browser-compat-data@^2.0.7": version "2.0.7" resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz#72ec37b9c1e00ce0b4e0309d753be18e2da12ee3" @@ -651,9 +655,9 @@ type-detect "4.0.8" "@sinonjs/fake-timers@^7.0.2": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.0.tgz#8f13af27d842cbf51ad4502e05562fe9391d084e" - integrity sha512-hAEzXi6Wbvlb67NnGMGSNOeAflLVnMa4yliPU/ty1qjgW/vAletH15/v/esJwASSIA0YlIyjnloenFbEZc9q9A== + version "7.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5" + integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg== dependencies: "@sinonjs/commons" "^1.7.0" @@ -702,10 +706,10 @@ dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.136": - version "0.0.136" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz#7c011b9f997b0156f25a140188a0c5689d3f368f" - integrity sha512-XDEiRhLkMd+SB7Iw3ZUIj/fov3wLd4HyTdLltVszkgl1dBfc3Rb7oPMVZ2Mz2TLqnF7Ow+StbR8E7r9lqpb4DA== +"@types/chrome@^0.0.144": + version "0.0.144" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz#7dd9188e355aa17e3ad397f50b5cd3ad12caf788" + integrity sha512-BgoiO7/KP9hRNrCR2Wq+aKWT5Dh9bTofuWaRtcqPcj8YKhZojQgb6sSdIqvds2C+eO63BwaR9KHVMYYgZdGGBg== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -732,7 +736,7 @@ resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958" integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA== -"@types/fs-extra@^9.0.7": +"@types/fs-extra@^9.0.11": version "9.0.11" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87" integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA== @@ -755,9 +759,9 @@ "@types/node" "*" "@types/har-format@*": - version "1.2.5" - resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz#4f6648814d0fdcb6a510e3364a9db439a753c4b1" - integrity sha512-IG8AE1m2pWtPqQ7wXhFhy6Q59bwwnLwO36v5Rit2FrbXCIp8Sk8E2PfUCreyrdo17STwFSKDAkitVuVYbpEHvQ== + version "1.2.6" + resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.6.tgz#471c83acdf6a2ea429620daee4c6dc1784a0e85f" + integrity sha512-TeZjp4COiAWPOeGx1tuFJETr/SBMx80lxqeqnCC36ZVn463f7ElCdA3X9RzDuo3BHjhN4apw41A5uoIw5FzgWA== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" @@ -772,9 +776,9 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== dependencies: "@types/istanbul-lib-report" "*" @@ -784,14 +788,14 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.6.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.1.tgz#32d43390d5c62c5b6ec486a9bc9c59544de39a08" - integrity sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA== + version "15.12.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d" + integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww== "@types/node@^14.6.2": - version "14.17.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.1.tgz#5e07e0cb2ff793aa7a1b41deae76221e6166049f" - integrity sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw== + version "14.17.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d" + integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw== "@types/plist@^3.0.1": version "3.0.2" @@ -821,14 +825,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^15.0.13": - version "15.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" - integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== - dependencies: - "@types/yargs-parser" "*" - -"@types/yargs@^16.0.0": +"@types/yargs@^16.0.0", "@types/yargs@^16.0.1": version "16.0.3" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01" integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== @@ -864,9 +861,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.2.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" - integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== + version "8.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz#1193f9b96c4e8232f00b11a9edff81b2c8b98b88" + integrity sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw== agent-base@6: version "6.0.2" @@ -891,9 +888,9 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4: uri-js "^4.2.2" ajv@^8.0.1: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b" - integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ== + version "8.6.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" + integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -961,39 +958,39 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.12: - version "3.5.12" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" - integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== +app-builder-bin@3.5.13: + version "3.5.13" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" + integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== -app-builder-lib@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" - integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== +app-builder-lib@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz#d49f49dc2d9fd225249e4ae7e30add2996e7062f" + integrity sha512-lLEDvJuLdc4IVyADJK6t4qEIjRhOUj4p19B1RS/8pN/oAb8X5Qe1t3Einbsi4oFBJBweH2LIygnSAwumjQh9iA== dependencies: - "7zip-bin" "~5.0.3" + "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.0.4" + "@electron/universal" "1.0.5" + "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" + builder-util "22.11.5" + builder-util-runtime "8.7.6" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.10.5" - fs-extra "^9.1.0" - hosted-git-info "^3.0.8" - is-ci "^2.0.0" - istextorbinary "^5.12.0" - js-yaml "^4.0.0" - lazy-val "^1.0.4" + electron-publish "22.11.5" + fs-extra "^10.0.0" + hosted-git-info "^4.0.2" + is-ci "^3.0.0" + isbinaryfile "^4.0.8" + js-yaml "^4.1.0" + lazy-val "^1.0.5" minimatch "^3.0.4" - normalize-package-data "^3.0.0" - read-config-file "6.0.0" + read-config-file "6.2.0" sanitize-filename "^1.6.3" - semver "^7.3.4" - temp-file "^3.3.7" + semver "^7.3.5" + temp-file "^3.4.0" archiver-utils@^2.1.0: version "2.1.0" @@ -1088,13 +1085,13 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -babel-jest@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.1.tgz#9f1c4571ac17a39e599d1325dcaf53a274261df4" - integrity sha512-aWFD7OGQjk3Y8MdZKf1XePlQvHnjMVJQjIq9WKrlAjz9by703kJ45Jxhp26JwnovoW71YYz5etuqRl8wMcIv0w== +babel-jest@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz#7dc18adb01322acce62c2af76ea2c7cd186ade37" + integrity sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q== dependencies: - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" babel-preset-jest "^27.0.1" @@ -1159,11 +1156,6 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -binaryextensions@^4.15.0: - version "4.15.0" - resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz#c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e" - integrity sha512-MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw== - bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -1186,9 +1178,9 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.4.tgz#aa1df8749af41d7211b66b4eee584722ff428c27" - integrity sha512-5pyOr+w2LNN72F2mAq6J0ckHUfJYSgRKma7e/wlcMMhgOLV9OI0ERhERYXxUqo+dPyVxcbXKy9n+wg13+LpNnA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz#a245080649ebb80e7c0ea218a480e4e913136336" + integrity sha512-K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g== boxen@^5.0.0: version "5.0.1" @@ -1224,7 +1216,7 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.12.2, browserslist@^4.14.5: +browserslist@^4.12.2, browserslist@^4.16.6: version "4.16.6" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== @@ -1265,33 +1257,33 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.3: - version "8.7.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" - integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ== +builder-util-runtime@8.7.6: + version "8.7.6" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz#4b43c96db2bd494ced7694bcd7674934655e8324" + integrity sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug== dependencies: debug "^4.3.2" sax "^1.2.4" -builder-util@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" - integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== +builder-util@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz#08836d00e6bef39bdffd8a66fb07d2d5021b9c3c" + integrity sha512-ur9ksncYOnJg/VuJz3PdsBQHeg9tjdOC2HVj8mQ0WNcn/H3MO4tnwKBOWWikPDiWEjeBSvFUmYBnGFkRiUNkww== dependencies: - "7zip-bin" "~5.0.3" + "7zip-bin" "~5.1.1" "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.7" - app-builder-bin "3.5.12" + "@types/fs-extra" "^9.0.11" + app-builder-bin "3.5.13" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.3" - chalk "^4.1.0" + builder-util-runtime "8.7.6" + chalk "^4.1.1" debug "^4.3.2" - fs-extra "^9.1.0" - is-ci "^2.0.0" - js-yaml "^4.0.0" + fs-extra "^10.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" - temp-file "^3.3.7" + temp-file "^3.4.0" cacheable-request@^6.0.0: version "6.1.0" @@ -1322,9 +1314,9 @@ camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001230" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71" - integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ== + version "1.0.30001236" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958" + integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1335,7 +1327,7 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== @@ -1359,9 +1351,9 @@ ci-info@^2.0.0: integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== ci-info@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a" - integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" + integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== cjs-module-lexer@^1.0.0: version "1.2.1" @@ -1461,12 +1453,12 @@ commander@^5.0.0: integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== compress-commons@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz#25ec7a4528852ccd1d441a7d4353cd0ece11371b" - integrity sha512-ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA== + version "4.1.1" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" + integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== dependencies: buffer-crc32 "^0.2.13" - crc32-stream "^4.0.1" + crc32-stream "^4.0.2" normalize-path "^3.0.0" readable-stream "^3.6.0" @@ -1486,9 +1478,9 @@ concat-stream@^1.6.2: typedarray "^0.0.6" config-chain@^1.1.11: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== dependencies: ini "^1.3.4" proto-list "~1.2.1" @@ -1513,9 +1505,9 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: safe-buffer "~5.1.1" core-js@^3.6.5: - version "3.13.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.13.0.tgz#58ca436bf01d6903aee3d364089868d0d89fe58d" - integrity sha512-iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog== + version "3.14.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c" + integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1530,7 +1522,7 @@ crc-32@^1.2.0: exit-on-epipe "~1.0.1" printj "~1.1.0" -crc32-stream@^4.0.1: +crc32-stream@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== @@ -1680,21 +1672,21 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" - integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== +dmg-builder@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz#0df9843def73a217097956982fa21bb4d6a5836e" + integrity sha512-91Shh9+OK9RwBlBURxvhSnQNibEh/JYNAnMOfFguyNbasSfF50Jme4b3dgsQrHTTTfkFijcvzykPPFAZofQs6g== dependencies: - app-builder-lib "22.10.5" - builder-util "22.10.5" - fs-extra "^9.1.0" + app-builder-lib "22.11.5" + builder-util "22.11.5" + builder-util-runtime "8.7.6" + fs-extra "^10.0.0" iconv-lite "^0.6.2" - js-yaml "^4.0.0" - sanitize-filename "^1.6.3" + js-yaml "^4.1.0" optionalDependencies: - dmg-license "^1.0.8" + dmg-license "^1.0.9" -dmg-license@^1.0.8: +dmg-license@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== @@ -1735,24 +1727,16 @@ dotenv-expand@^5.1.0: resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== -dotenv@^8.2.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" - integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= -editions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz#ba6c6cf9f4bb571d9e53ea34e771a602e5a66549" - integrity sha512-h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA== - dependencies: - errlop "^4.0.0" - version-range "^1.0.0" - ejs@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" @@ -1760,49 +1744,46 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" - integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== +electron-builder@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz#914d8183e1bab7cda43ef1d67fc3d17314c7e242" + integrity sha512-QIhzrmSLNteItRvmAjwNpsya08oZeOJIrxFww/Alkjcwnrn5Xgog2qf3Xfa3ocuNUQIwb+mMzZrzqnPu0Mamyg== dependencies: - "@types/yargs" "^15.0.13" - app-builder-lib "22.10.5" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - dmg-builder "22.10.5" - fs-extra "^9.1.0" - is-ci "^2.0.0" - lazy-val "^1.0.4" - read-config-file "6.0.0" - sanitize-filename "^1.6.3" + "@types/yargs" "^16.0.1" + app-builder-lib "22.11.5" + builder-util "22.11.5" + builder-util-runtime "8.7.6" + chalk "^4.1.1" + dmg-builder "22.11.5" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" update-notifier "^5.1.0" - yargs "^16.2.0" + yargs "^17.0.1" -electron-publish@22.10.5: - version "22.10.5" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" - integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== +electron-publish@22.11.5: + version "22.11.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz#2fcd3280c4267e70e4aa15003c9b7dc34923320e" + integrity sha512-peN4tEP80Kb6reuwKKvSu9p/XUWpx/7x747u5NSg7Kg2axBjzdMtX5ZqBThfPtJWJhSWZ7PEYWmNyUCfdQl2Ag== dependencies: - "@types/fs-extra" "^9.0.7" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - fs-extra "^9.1.0" - lazy-val "^1.0.4" - mime "^2.5.0" + "@types/fs-extra" "^9.0.11" + builder-util "22.11.5" + builder-util-runtime "8.7.6" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" electron-to-chromium@^1.3.723: - version "1.3.739" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz#f07756aa92cabd5a6eec6f491525a64fe62f98b9" - integrity sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A== + version "1.3.750" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz#7e5ef6f478316b0bd656af5942fe502610e97eaf" + integrity sha512-Eqy9eHNepZxJXT+Pc5++zvEi5nQ6AGikwFYDCYwXUFBr+ynJ6pDG7MzZmwGYCIuXShLJM0n4bq+aoKDmvSGJ8A== -electron@13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.0.1.tgz#7dd3666f0f966ab83a1f9868d84add2e6205d43a" - integrity sha512-ds1cf0m46nStil0jbM2r9W/p+Kprdq22+2MikIUqEu69eGl1c86IinQVrpmJ9bR4RshDSF4j3uD32a0bsHDMnQ== +electron@13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz#de1ea908bcac2197d7a5a373fb68c0c66043e10e" + integrity sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -1847,11 +1828,6 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -errlop@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz#8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b" - integrity sha512-vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ== - es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1894,7 +1870,7 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-plugin-compat@^3.9.0: +eslint-plugin-compat@3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz#a7a224e09b102b58e7f7dff52c936428ff3e0186" integrity sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg== @@ -1940,13 +1916,13 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.27.0: - version "7.27.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz#665a1506d8f95655c9274d84bd78f7166b07e9c7" - integrity sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA== +eslint@7.28.0: + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" + integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.1" + "@eslint/eslintrc" "^0.4.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -1963,7 +1939,7 @@ eslint@7.27.0: fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" + glob-parent "^5.1.2" globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" @@ -2029,9 +2005,9 @@ esutils@^2.0.2: integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== execa@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" - integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -2053,16 +2029,16 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -expect@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.1.tgz#1290c74fef8d62f15f4c5dd1d7233001909abbfb" - integrity sha512-hjKwLeAvKUiq0Plha1dmzOH1FGEwJC9njbT993cq4PK9r58/+3NM+WDqFVGcPuRH7XTjmbIeHQBzp2faDrPhjQ== +expect@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz#e66ca3a4c9592f1c019fa1d46459a9d2084f3422" + integrity sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" ansi-styles "^5.0.0" jest-get-type "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" jest-regex-util "^27.0.1" extend@3.0.2: @@ -2193,7 +2169,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -2257,7 +2233,7 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -glob-parent@^5.0.0: +glob-parent@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -2311,17 +2287,10 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0: - version "13.8.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" - integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== dependencies: type-fest "^0.20.2" @@ -2381,14 +2350,7 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hosted-git-info@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" - integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^4.0.1: +hosted-git-info@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== @@ -2623,6 +2585,11 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isbinaryfile@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -2669,15 +2636,6 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -istextorbinary@^5.12.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz#2f84777838668fdf524c305a2363d6057aaeec84" - integrity sha512-wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w== - dependencies: - binaryextensions "^4.15.0" - editions "^6.1.0" - textextensions "^5.11.0" - jake@^10.6.1: version "10.8.2" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -2688,93 +2646,94 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.1.tgz#b8356b3708cac9d05ebf6f9e0b32227b514945c8" - integrity sha512-Y/4AnqYNcUX/vVgfkmvSA3t7rcg+t8m3CsSGlU+ra8kjlVW5ZqXcBZY/NUew2Mo8M+dn0ApKl+FmGGT1JV5dVA== +jest-changed-files@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz#997253042b4a032950fc5f56abf3c5d1f8560801" + integrity sha512-eMeb1Pn7w7x3wue5/vF73LPCJ7DKQuC9wQUR5ebP9hDPpk5hzcT/3Hmz3Q5BOFpR3tgbmaWhJcMTVgC8Z1NuMw== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.1.tgz#3a7ec9e9fd60ef4c827197dffe2288aa19f86678" - integrity sha512-Tz3ytmrsgxWlTwSyPYb8StF9J2IMjLlbBMKAjhL2UU9/0ZpYb2JiEGjXaAhnGauQRbbpyFbSH3yj5HIbdurmwQ== +jest-circus@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz#3b261514ee3b3da33def736a6352c98ff56bb6e6" + integrity sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw== dependencies: - "@jest/environment" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.0.1" + expect "^27.0.2" is-generator-fn "^2.0.0" - jest-each "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" - jest-runner "^27.0.1" - jest-runtime "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - pretty-format "^27.0.1" + jest-each "^27.0.2" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" + jest-runtime "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + pretty-format "^27.0.2" + slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.1.tgz#9accc8a505438571ee423438eac526a7ee4654b5" - integrity sha512-plDsQQwpkKK1SZ5L5xqMa7v/sTwB5LTIeSJqb+cV+4EMlThdUQfg8jwMfHX8jHuUc9TPGLcdoZeBuZcGGn3Rlg== +jest-cli@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz#491b12c754c0d7c6873b13a66f26b3a80a852910" + integrity sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ== dependencies: - "@jest/core" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/core" "^27.0.4" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" + jest-config "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" prompts "^2.0.1" yargs "^16.0.3" -jest-config@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.1.tgz#db4f202efcbb92011f62d8f25b52c3d1bd5672d4" - integrity sha512-V8O6+CZjGF0OMq4kxVR29ztV/LQqlAAcJLw7a94RndfRXkha4U84n50yZCXiPWtAHHTmb3g1y52US6rGPxA+3w== +jest-config@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz#c4f41378acf40ca77860fb4e213b12109d87b8cf" + integrity sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.1" - "@jest/types" "^27.0.1" - babel-jest "^27.0.1" + "@jest/test-sequencer" "^27.0.4" + "@jest/types" "^27.0.2" + babel-jest "^27.0.2" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" is-ci "^3.0.0" - jest-circus "^27.0.1" - jest-environment-jsdom "^27.0.1" - jest-environment-node "^27.0.1" + jest-circus "^27.0.4" + jest-environment-jsdom "^27.0.3" + jest-environment-node "^27.0.3" jest-get-type "^27.0.1" - jest-jasmine2 "^27.0.1" + jest-jasmine2 "^27.0.4" jest-regex-util "^27.0.1" - jest-resolve "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" + jest-resolve "^27.0.4" + jest-runner "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" micromatch "^4.0.4" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-diff@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.1.tgz#021beb29fe9f07e83c809a4f7a1ce807b229c4ab" - integrity sha512-DQ3OgfJgoGWVTYo4qnYW/Jg5mpYFS2QW9BLxA8bs12ZRN1K8QPZtWeYvUPohQFs3CHX3JLTndGg3jyxdL5THFQ== +jest-diff@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz#f315b87cee5dc134cf42c2708ab27375cc3f5a7e" + integrity sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw== dependencies: chalk "^4.0.0" diff-sequences "^27.0.1" jest-get-type "^27.0.1" - pretty-format "^27.0.1" + pretty-format "^27.0.2" jest-docblock@^27.0.1: version "27.0.1" @@ -2783,53 +2742,53 @@ jest-docblock@^27.0.1: dependencies: detect-newline "^3.0.0" -jest-each@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.1.tgz#37fa20b7d809b29d4349d8eb7d01f17c2feeab10" - integrity sha512-uJTK/aZ05HsdKkfXucAT5+/1DIURnTRv34OSxn1HWHrD+xu9eDX5Xgds09QSvg/mU01VS5upuHTDKG3W+r0rQA== +jest-each@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz#865ddb4367476ced752167926b656fa0dcecd8c7" + integrity sha512-OLMBZBZ6JkoXgUenDtseFRWA43wVl2BwmZYIWQws7eS7pqsIvePqj/jJmEnfq91ALk3LNphgwNK/PRFBYi7ITQ== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" chalk "^4.0.0" jest-get-type "^27.0.1" - jest-util "^27.0.1" - pretty-format "^27.0.1" + jest-util "^27.0.2" + pretty-format "^27.0.2" -jest-environment-jsdom@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.1.tgz#12b0ed587fb53e0a581a5101bb209aef09da2310" - integrity sha512-lesU8T9zkjgLaLpUFmFDgchu6/2OCoXm52nN6UumR063Hb+1TJdI7ihgM86+G01Ay86Lyr+K/FAR6yIIOviH3Q== +jest-environment-jsdom@27.0.3, jest-environment-jsdom@^27.0.3: + version "27.0.3" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz#ed73e913ddc03864eb9f934b5cbabf1b63504e2e" + integrity sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA== dependencies: - "@jest/environment" "^27.0.1" - "@jest/fake-timers" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/fake-timers" "^27.0.3" + "@jest/types" "^27.0.2" "@types/node" "*" - jest-mock "^27.0.1" - jest-util "^27.0.1" + jest-mock "^27.0.3" + jest-util "^27.0.2" jsdom "^16.6.0" -jest-environment-node@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.1.tgz#7d7df7ae191477a823ffb4fcc0772b4c23ec5c87" - integrity sha512-/p94lo0hx+hbKUw1opnRFUPPsjncRBEUU+2Dh7BuxX8Nr4rRiTivLYgXzo79FhaeMYV0uiV5WAbHBq6xC11JJg== +jest-environment-node@^27.0.3: + version "27.0.3" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz#b4acb3679d2552a4215732cab8b0ca7ec4398ee0" + integrity sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg== dependencies: - "@jest/environment" "^27.0.1" - "@jest/fake-timers" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/environment" "^27.0.3" + "@jest/fake-timers" "^27.0.3" + "@jest/types" "^27.0.2" "@types/node" "*" - jest-mock "^27.0.1" - jest-util "^27.0.1" + jest-mock "^27.0.3" + jest-util "^27.0.2" jest-get-type@^27.0.1: version "27.0.1" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz#34951e2b08c8801eb28559d7eb732b04bbcf7815" integrity sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg== -jest-haste-map@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.1.tgz#653c4ba59309a86499ad7bf663176e7f97478191" - integrity sha512-ioCuobr4z90H1Pz8+apz2vfz63387apzAoawm/9IIOndarDfRkjLURdLOe//AI5jUQmjVRg+WiL92339kqlCmA== +jest-haste-map@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz#3f1819400c671237e48b4d4b76a80a0dbed7577f" + integrity sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" @@ -2837,76 +2796,76 @@ jest-haste-map@^27.0.1: graceful-fs "^4.2.4" jest-regex-util "^27.0.1" jest-serializer "^27.0.1" - jest-util "^27.0.1" - jest-worker "^27.0.1" + jest-util "^27.0.2" + jest-worker "^27.0.2" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.1.tgz#d975bfe072f3ac3596c0be5fc0a1215fd2e91e77" - integrity sha512-o8Ist0o970QDDm/R2o9UDbvNxq8A0++FTFQ0z9OnieJwS1nDH6H7WBDYAGPTdmnla7kbW41oLFPvhmjJE4mekg== +jest-jasmine2@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz#c669519ccf4904a485338555e1e66cad36bb0670" + integrity sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.1" + "@jest/environment" "^27.0.3" "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.0.1" + expect "^27.0.2" is-generator-fn "^2.0.0" - jest-each "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" - jest-runtime "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - pretty-format "^27.0.1" + jest-each "^27.0.2" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" + jest-runtime "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + pretty-format "^27.0.2" throat "^6.0.1" -jest-leak-detector@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.1.tgz#eedeaee7c0ab553db4d8908f74967329624342b9" - integrity sha512-SQ/lRhfmnV3UuiaKIjwNXCaW2yh1rTMAL4n4Cl4I4gU0X2LoIc6Ogxe4UKM/J6Ld2uzc4gDGVYc5lSdpf6WjYw== +jest-leak-detector@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz#ce19aa9dbcf7a72a9d58907a970427506f624e69" + integrity sha512-TZA3DmCOfe8YZFIMD1GxFqXUkQnIoOGQyy4hFCA2mlHtnAaf+FeOMxi0fZmfB41ZL+QbFG6BVaZF5IeFIVy53Q== dependencies: jest-get-type "^27.0.1" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-matcher-utils@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.1.tgz#7a01330786e370f152b0b0159f827293b6322909" - integrity sha512-NauNU+olKhPzLlsRnTOYFGk/MK5QFYl9ZzkrtfsY4eCq4SB3Bcl03UL44VdnlN5S/uFn4H2jwvRY1y6nSDTX3g== +jest-matcher-utils@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz#f14c060605a95a466cdc759acc546c6f4cbfc4f0" + integrity sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA== dependencies: chalk "^4.0.0" - jest-diff "^27.0.1" + jest-diff "^27.0.2" jest-get-type "^27.0.1" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-message-util@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.1.tgz#382b7c55d8e0b1aba9eeb41d3cfdd34e451210ed" - integrity sha512-w8BfON2GwWORkos8BsxcwwQrLkV2s1ENxSRXK43+6yuquDE2hVxES/jrFqOArpP1ETVqqMmktU6iGkG8ncVzeA== +jest-message-util@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz#181c9b67dff504d8f4ad15cba10d8b80f272048c" + integrity sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.4" - pretty-format "^27.0.1" + pretty-format "^27.0.2" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.1.tgz#8394e297bc3dfed980961622cb51fd042b4acf5a" - integrity sha512-fXCSZQDT5hUcAUy8OBnB018x7JFOMQnz4XfpSKEbfpWzL6o5qaLRhgf2Qg2NPuVKmC/fgOf33Edj8wjF4I24CQ== +jest-mock@^27.0.3: + version "27.0.3" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz#5591844f9192b3335c0dca38e8e45ed297d4d23d" + integrity sha512-O5FZn5XDzEp+Xg28mUz4ovVcdwBBPfAhW9+zJLO0Efn2qNbYcDaJvSlRiQ6BCZUCVOJjALicuJQI9mRFjv1o9Q== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -2919,69 +2878,71 @@ jest-regex-util@^27.0.1: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz#69d4b1bf5b690faa3490113c47486ed85dd45b68" integrity sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ== -jest-resolve-dependencies@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.1.tgz#3dcaeb277e0253747706467e8f05e1e78a1d534d" - integrity sha512-ly1x5mEf21f3IVWbUNwIz/ePLtv4QdhYuQIVSVDqxx7yzAwhhdu0DJo7UNiEYKQY7Im48wfbNdOUpo7euFUXBQ== +jest-resolve-dependencies@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz#a07a242d70d668afd3fcf7f4270755eebb1fe579" + integrity sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" jest-regex-util "^27.0.1" - jest-snapshot "^27.0.1" + jest-snapshot "^27.0.4" -jest-resolve@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.1.tgz#4e1b76f61c7e2213d2fbd37342800864309de538" - integrity sha512-Q7QQ0OZ7z6D5Dul0MrsexlKalU8ZwexBfHLSu1qYPgphvUm6WO1b/xUnipU3e+uW1riDzMcJeJVYbdQ37hBHeg== +jest-resolve@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz#8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d" + integrity sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" chalk "^4.0.0" escalade "^3.1.1" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^27.0.1" + jest-util "^27.0.2" + jest-validate "^27.0.2" resolve "^1.20.0" slash "^3.0.0" -jest-runner@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.1.tgz#52137173fbf318b7b1f034b81200c2846758f681" - integrity sha512-DUNizlD2D7J80G3VOrwfbtb7KYxiftMng82HNcKwTW0W3AwwNuBeq+1exoCnLO7Mxh7NP+k/1XQBlzLpjr/CnA== +jest-runner@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz#2787170a9509b792ae129794f6944d27d5d12a4f" + integrity sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg== dependencies: - "@jest/console" "^27.0.1" - "@jest/environment" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/environment" "^27.0.3" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^27.0.1" jest-docblock "^27.0.1" - jest-haste-map "^27.0.1" - jest-leak-detector "^27.0.1" - jest-message-util "^27.0.1" - jest-resolve "^27.0.1" - jest-runtime "^27.0.1" - jest-util "^27.0.1" - jest-worker "^27.0.1" + jest-environment-jsdom "^27.0.3" + jest-environment-node "^27.0.3" + jest-haste-map "^27.0.2" + jest-leak-detector "^27.0.2" + jest-message-util "^27.0.2" + jest-resolve "^27.0.4" + jest-runtime "^27.0.4" + jest-util "^27.0.2" + jest-worker "^27.0.2" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.1.tgz#b71bb8ea189c50525aebb4aba6c524633ca27659" - integrity sha512-ImcrbQtpCUp8X9Rm4ky3j1GG9cqIKZJvXGZyB5cHEapGPTmg7wvvNooLmKragEe61/p/bhw1qO68Y0/9BSsBBg== +jest-runtime@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz#2e4a6aa77cac32ac612dfe12768387a8aa15c2f0" + integrity sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A== dependencies: - "@jest/console" "^27.0.1" - "@jest/environment" "^27.0.1" - "@jest/fake-timers" "^27.0.1" - "@jest/globals" "^27.0.1" + "@jest/console" "^27.0.2" + "@jest/environment" "^27.0.3" + "@jest/fake-timers" "^27.0.3" + "@jest/globals" "^27.0.3" "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.1" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/test-result" "^27.0.2" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/yargs" "^16.0.0" chalk "^4.0.0" cjs-module-lexer "^1.0.0" @@ -2989,14 +2950,14 @@ jest-runtime@^27.0.1: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.0.1" - jest-message-util "^27.0.1" - jest-mock "^27.0.1" + jest-haste-map "^27.0.2" + jest-message-util "^27.0.2" + jest-mock "^27.0.3" jest-regex-util "^27.0.1" - jest-resolve "^27.0.1" - jest-snapshot "^27.0.1" - jest-util "^27.0.1" - jest-validate "^27.0.1" + jest-resolve "^27.0.4" + jest-snapshot "^27.0.4" + jest-util "^27.0.2" + jest-validate "^27.0.2" slash "^3.0.0" strip-bom "^4.0.0" yargs "^16.0.3" @@ -3009,10 +2970,10 @@ jest-serializer@^27.0.1: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.1.tgz#01a82d901f260604908373795c9255b032d2a07a" - integrity sha512-HgKmSebDB3rswugREeh+nKrxJEVZE12K7lZ2MuwfFZT6YmiH0TlofsL2YmiLsCsG5KH5ZcLYYpF5bDrvtVx/Xg== +jest-snapshot@^27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz#2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b" + integrity sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -3020,79 +2981,79 @@ jest-snapshot@^27.0.1: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/transform" "^27.0.2" + "@jest/types" "^27.0.2" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.0.1" + expect "^27.0.2" graceful-fs "^4.2.4" - jest-diff "^27.0.1" + jest-diff "^27.0.2" jest-get-type "^27.0.1" - jest-haste-map "^27.0.1" - jest-matcher-utils "^27.0.1" - jest-message-util "^27.0.1" - jest-resolve "^27.0.1" - jest-util "^27.0.1" + jest-haste-map "^27.0.2" + jest-matcher-utils "^27.0.2" + jest-message-util "^27.0.2" + jest-resolve "^27.0.4" + jest-util "^27.0.2" natural-compare "^1.4.0" - pretty-format "^27.0.1" + pretty-format "^27.0.2" semver "^7.3.2" -jest-util@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.1.tgz#324ed9879d129c1e64f9169a739d6d50d7928769" - integrity sha512-lEw3waSmEOO4ZkwkUlFSvg4es1+8+LIkSGxp/kF60K0+vMR3Dv3O2HMZhcln9NHqSQzpVbsDT6OeMzUPW7DfRg== +jest-util@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz#fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7" + integrity sha512-1d9uH3a00OFGGWSibpNYr+jojZ6AckOMCXV2Z4K3YXDnzpkAaXQyIpY14FOJPiUmil7CD+A6Qs+lnnh6ctRbIA== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" is-ci "^3.0.0" picomatch "^2.2.3" -jest-validate@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.1.tgz#8e43428674b6097f8ee3abe42c4248a4826cd008" - integrity sha512-zvmPRcfTkqTZuHveIKAI2nbkUc3SDXjWVJULknPLGF5bdxOGSeGZg7f/Uw0MUVOkCOaspcHnsPCgZG0pqmg71g== +jest-validate@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz#7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5" + integrity sha512-UgBF6/oVu1ofd1XbaSotXKihi8nZhg0Prm8twQ9uCuAfo59vlxCXMPI/RKmrZEVgi3Nd9dS0I8A0wzWU48pOvg== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" camelcase "^6.2.0" chalk "^4.0.0" jest-get-type "^27.0.1" leven "^3.1.0" - pretty-format "^27.0.1" + pretty-format "^27.0.2" -jest-watcher@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.1.tgz#61b9403d7b498161f6aa6124602363525ac3efc2" - integrity sha512-Chp9c02BN0IgEbtGreyAhGqIsOrn9a0XnzbuXOxdW1+cW0Tjh12hMzHDIdLFHpYP/TqaMTmPHaJ5KWvpCCrNFw== +jest-watcher@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz#dab5f9443e2d7f52597186480731a8c6335c5deb" + integrity sha512-8nuf0PGuTxWj/Ytfw5fyvNn/R80iXY8QhIT0ofyImUvdnoaBdT6kob0GmhXR+wO+ALYVnh8bQxN4Tjfez0JgkA== dependencies: - "@jest/test-result" "^27.0.1" - "@jest/types" "^27.0.1" + "@jest/test-result" "^27.0.2" + "@jest/types" "^27.0.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.0.1" + jest-util "^27.0.2" string-length "^4.0.1" -jest-worker@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.1.tgz#b255fcbb40fb467295010c628474b1185cab4f9e" - integrity sha512-NhHqClI3owOjmS8dBhQMKHZ2rrT0sBTpqGitp9nMX5AAjVXd+15o4v96uBEMhoywaLKN+5opcKBlXwAoADZolA== +jest-worker@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz#4ebeb56cef48b3e7514552f80d0d80c0129f0b05" + integrity sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.1.tgz#d3822f0904f3bbe884bea393cede2be2aa290d0e" - integrity sha512-lFEoUdXjbGAIxk/gZhcv98xOaH1hjqG5R/PQHs5GBfIK5iL3tnXCjHQf4HQLVZZ2rcXML3oeVg9+XrRZbooBdQ== +jest@27.0.4: + version "27.0.4" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz#91d4d564b36bcf93b98dac1ab19f07089e670f53" + integrity sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA== dependencies: - "@jest/core" "^27.0.1" + "@jest/core" "^27.0.4" import-local "^3.0.2" - jest-cli "^27.0.1" + jest-cli "^27.0.4" js-tokens@^4.0.0: version "4.0.0" @@ -3107,7 +3068,7 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^4.0.0: +js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -3177,7 +3138,7 @@ json-stringify-safe@^5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^2.1.2: +json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -3219,7 +3180,7 @@ latest-version@^5.1.0: dependencies: package-json "^6.3.0" -lazy-val@^1.0.4: +lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== @@ -3304,7 +3265,7 @@ lodash.union@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= -lodash@^4.17.10, lodash@^4.7.0: +lodash@^4.17.10, lodash@^4.17.15, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -3360,19 +3321,19 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.47.0: - version "1.47.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" - integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== +mime-db@1.48.0: + version "1.48.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" + integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== mime-types@^2.1.12: - version "2.1.30" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" - integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== + version "2.1.31" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" + integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== dependencies: - mime-db "1.47.0" + mime-db "1.48.0" -mime@^2.5.0: +mime@^2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== @@ -3437,19 +3398,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-releases@^1.1.71: - version "1.1.72" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe" - integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw== - -normalize-package-data@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" - integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== - dependencies: - hosted-git-info "^4.0.1" - resolve "^1.20.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" + version "1.1.73" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" + integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== normalize-path@^3.0.0: version "3.0.0" @@ -3648,12 +3599,12 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -pretty-format@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.1.tgz#c4094621dfbd3e8ab751964d1cf01edc6f88474d" - integrity sha512-qE+0J6c/gd+R6XTcQgPJMc5hMJNsxzSF5p8iZSbMZ7GQzYGlSLNkh2P80Wa2dbF4gEVUsJEgcrBY+1L2/j265w== +pretty-format@^27.0.2: + version "27.0.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz#9283ff8c4f581b186b2d4da461617143dca478a4" + integrity sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig== dependencies: - "@jest/types" "^27.0.1" + "@jest/types" "^27.0.2" ansi-regex "^5.0.0" ansi-styles "^5.0.0" react-is "^17.0.1" @@ -3726,15 +3677,15 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -read-config-file@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299" - integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA== +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== dependencies: - dotenv "^8.2.0" + dotenv "^9.0.2" dotenv-expand "^5.1.0" - js-yaml "^3.13.1" - json5 "^2.1.2" + js-yaml "^4.1.0" + json5 "^2.2.0" lazy-val "^1.0.4" readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2: @@ -3907,7 +3858,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -3992,32 +3943,6 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" - integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== - sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -4193,7 +4118,7 @@ tar-stream@^2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -temp-file@^3.3.7: +temp-file@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== @@ -4223,27 +4148,36 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -textextensions@^5.11.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz#b908120b5c1bd4bb9eba41423d75b176011ab68a" - integrity sha512-IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w== - throat@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== -tldts-core@^5.7.37: - version "5.7.37" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.37.tgz#29f34676d2de7dfaae6b13ee8d5cd3c5a6ce6396" - integrity sha512-6sA9WzrPDCB596urfENoRpzA4RWVyo5u45dBSXtWfBtcxBYsCdkykc0Z9lFFd3B89PAd/f5Sb91nTGFZJqPFsQ== +tldts-core@^5.7.38: + version "5.7.38" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.38.tgz#779092c90941803fb682c3d7094a88f12aad4508" + integrity sha512-mcL16YTXjpVJ+ekoKC/ddvdjGNMg8HkdWQNp3WNz26WJMV7Z2Hjr1IPwYYr9W3LxGdXV7mmg21Zk2vSstiSsFg== tldts-experimental@^5.6.21: - version "5.7.37" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.37.tgz#ead49d7dea3b08341ef17c9a03e23717c006407e" - integrity sha512-LRms28QMSWZh+XH1hg9lEzc6JW/zjb1cHZHyJ5webutbLzJNpqgUSdAykwBkOlFlXR+4jCvHkxA7gC2mgPb8Cw== + version "5.7.38" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.38.tgz#a2b03ae0282ee7439b1ed1618a1d7d2e9e66be78" + integrity sha512-3L0yML53LSw3tlRPwHcGOf35l3dhZx/3DgPGWL3ILATnuu76OiAOvJ4Xw1Znl6sIxVKJ4B4BE0zroZMMzsHg/A== dependencies: - tldts-core "^5.7.37" + tldts-core "^5.7.38" + +tmp-promise@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz#6e933782abff8b00c3119d63589ca1fb9caaa62a" + integrity sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA== + dependencies: + tmp "^0.2.0" + +tmp@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" tmpl@1.0.x: version "1.0.4" @@ -4276,7 +4210,7 @@ tough-cookie@^4.0.0: punycode "^2.1.1" universalify "^0.1.2" -tr46@^2.0.2: +tr46@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== @@ -4329,11 +4263,6 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -4421,14 +4350,6 @@ v8-to-istanbul@^7.0.0: convert-source-map "^1.6.0" source-map "^0.7.3" -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - verror@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" @@ -4438,18 +4359,6 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -version-compare@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz#7b3e67e7e6cec5c72d9c9e586f8854e419ade17c" - integrity sha512-zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ== - -version-range@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz#1c233064202ee742afc9d56e21da3b2e15260acf" - integrity sha512-R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w== - dependencies: - version-compare "^1.0.0" - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -4494,12 +4403,12 @@ whatwg-mimetype@^2.3.0: integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" - integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg== + version "8.6.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c" + integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw== dependencies: lodash "^4.7.0" - tr46 "^2.0.2" + tr46 "^2.1.0" webidl-conversions "^6.1.0" which@^2.0.1: @@ -4595,7 +4504,7 @@ yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== -yargs@^16.0.3, yargs@^16.2.0: +yargs@^16.0.3: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -4608,6 +4517,19 @@ yargs@^16.0.3, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb" + integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 3e85c5d1bbf..11cf84050d0 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -9,14 +9,6 @@ sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; }; } - { - name = "7zip_bin___7zip_bin_5.0.3.tgz"; - path = fetchurl { - name = "7zip_bin___7zip_bin_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz"; - sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f"; - }; - } { name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { @@ -34,11 +26,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; - sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; + sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; }; } { @@ -58,11 +50,11 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; - sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; + sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; }; } { @@ -122,11 +114,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz"; - sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; + sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; }; } { @@ -178,11 +170,11 @@ }; } { - name = "_babel_parser___parser_7.14.3.tgz"; + name = "_babel_parser___parser_7.14.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz"; - sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298"; + name = "_babel_parser___parser_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz"; + sha1 = "a5c560d6db6cd8e6ed342368dea8039232cbab18"; }; } { @@ -306,11 +298,11 @@ }; } { - name = "_babel_types___types_7.14.2.tgz"; + name = "_babel_types___types_7.14.4.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz"; - sha1 = "4208ae003107ef8a057ea8333e56eb64d2f6a2c3"; + name = "_babel_types___types_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; + sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; }; } { @@ -322,43 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.20.6.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.6.tgz"; - sha1 = "1bfbdb1e5757fc610f3d5d9921bba9d166d687a7"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz"; + sha1 = "71bc0d0d473ae96d5086badb2f4d624769fa56c4"; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.6.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.6.tgz"; - sha1 = "c2804edb8c4dd5ce226a2a5ef95b9e6cd3745767"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz"; + sha1 = "8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af"; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.6.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.6.tgz"; - sha1 = "870ff1ba7765f545fee70327d3c7e08adadc7764"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz"; + sha1 = "13fe6de4be0c3beb2851634b27ea1223d10ca92b"; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.6.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.6.tgz"; - sha1 = "964d3b96e419778c6e4c8ecf5c2b94599dfbdcd7"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz"; + sha1 = "234ee70a1736e3690b25a7a073818f5a851bf9a8"; }; } { - name = "_cliqz_adblocker___adblocker_1.20.6.tgz"; + name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.20.6.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.6.tgz"; - sha1 = "3428d3c066dbaafa98644fadfd28dd206f8691e2"; + name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz"; + sha1 = "dae3dd6c59f16244012d1e736150f618b2d578e6"; }; } { @@ -378,19 +370,19 @@ }; } { - name = "_electron_universal___universal_1.0.4.tgz"; + name = "_electron_universal___universal_1.0.5.tgz"; path = fetchurl { - name = "_electron_universal___universal_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz"; - sha1 = "231ac246c39d45b80e159bd21c3f9027dcaa10f5"; + name = "_electron_universal___universal_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; + sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; }; } { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"; }; } { @@ -410,51 +402,51 @@ }; } { - name = "_jest_console___console_27.0.1.tgz"; + name = "_jest_console___console_27.0.2.tgz"; path = fetchurl { - name = "_jest_console___console_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.1.tgz"; - sha1 = "c6acfec201f9b6823596eb6c4fcd77c89a8b27e9"; + name = "_jest_console___console_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz"; + sha1 = "b8eeff8f21ac51d224c851e1729d2630c18631e6"; }; } { - name = "_jest_core___core_27.0.1.tgz"; + name = "_jest_core___core_27.0.4.tgz"; path = fetchurl { - name = "_jest_core___core_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.1.tgz"; - sha1 = "88d0ff55f465fe1fc3a940718e8cf0fea242be4b"; + name = "_jest_core___core_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz"; + sha1 = "679bf9ac07900da2ddbb9667bb1afa8029038f53"; }; } { - name = "_jest_environment___environment_27.0.1.tgz"; + name = "_jest_environment___environment_27.0.3.tgz"; path = fetchurl { - name = "_jest_environment___environment_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.1.tgz"; - sha1 = "27ed89bf8179c0a030690f063d922d6da7a519ac"; + name = "_jest_environment___environment_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz"; + sha1 = "68769b1dfdd213e3456169d64fbe9bd63a5fda92"; }; } { - name = "_jest_fake_timers___fake_timers_27.0.1.tgz"; + name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.1.tgz"; - sha1 = "6987a596b0bcf8c07653086076c17058b4c77b5c"; + name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz"; + sha1 = "9899ba6304cc636734c74478df502e18136461dd"; }; } { - name = "_jest_globals___globals_27.0.1.tgz"; + name = "_jest_globals___globals_27.0.3.tgz"; path = fetchurl { - name = "_jest_globals___globals_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.1.tgz"; - sha1 = "14c776942f7047a04f2aea09b148065e2aa9d7e9"; + name = "_jest_globals___globals_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz"; + sha1 = "1cf8933b7791bba0b99305cbf39fd4d2e3fe4060"; }; } { - name = "_jest_reporters___reporters_27.0.1.tgz"; + name = "_jest_reporters___reporters_27.0.4.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.1.tgz"; - sha1 = "5b491f64e37c9b97b13e564f18f36b6697d28045"; + name = "_jest_reporters___reporters_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz"; + sha1 = "95609b1be97afb80d55d8aa3d7c3179c15810e65"; }; } { @@ -466,35 +458,35 @@ }; } { - name = "_jest_test_result___test_result_27.0.1.tgz"; + name = "_jest_test_result___test_result_27.0.2.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.1.tgz"; - sha1 = "8fb97214268ea21cf8cfb83edc0f17e558b3466d"; + name = "_jest_test_result___test_result_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz"; + sha1 = "0451049e32ceb609b636004ccc27c8fa22263f10"; }; } { - name = "_jest_test_sequencer___test_sequencer_27.0.1.tgz"; + name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.1.tgz"; - sha1 = "2a3b85130978fc545d8ee6c34d65ff4231dbad86"; + name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz"; + sha1 = "976493b277594d81e589896f0ed21f198308928a"; }; } { - name = "_jest_transform___transform_27.0.1.tgz"; + name = "_jest_transform___transform_27.0.2.tgz"; path = fetchurl { - name = "_jest_transform___transform_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.1.tgz"; - sha1 = "a9ece291f82273d5e58132550996c16edd5a902a"; + name = "_jest_transform___transform_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; + sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; }; } { - name = "_jest_types___types_27.0.1.tgz"; + name = "_jest_types___types_27.0.2.tgz"; path = fetchurl { - name = "_jest_types___types_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.1.tgz"; - sha1 = "631738c942e70045ebbf42a3f9b433036d3845e4"; + name = "_jest_types___types_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; + sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; }; } { @@ -505,6 +497,14 @@ sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; }; } + { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + path = fetchurl { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; + sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; + }; + } { name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; path = fetchurl { @@ -578,11 +578,11 @@ }; } { - name = "_sinonjs_fake_timers___fake_timers_7.1.0.tgz"; + name = "_sinonjs_fake_timers___fake_timers_7.1.2.tgz"; path = fetchurl { - name = "_sinonjs_fake_timers___fake_timers_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.0.tgz"; - sha1 = "8f13af27d842cbf51ad4502e05562fe9391d084e"; + name = "_sinonjs_fake_timers___fake_timers_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz"; + sha1 = "2524eae70c4910edccf99b2f4e6efc5894aff7b5"; }; } { @@ -634,11 +634,11 @@ }; } { - name = "_types_chrome___chrome_0.0.136.tgz"; + name = "_types_chrome___chrome_0.0.144.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.136.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz"; - sha1 = "7c011b9f997b0156f25a140188a0c5689d3f368f"; + name = "_types_chrome___chrome_0.0.144.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz"; + sha1 = "7dd9188e355aa17e3ad397f50b5cd3ad12caf788"; }; } { @@ -698,11 +698,11 @@ }; } { - name = "_types_har_format___har_format_1.2.5.tgz"; + name = "_types_har_format___har_format_1.2.6.tgz"; path = fetchurl { - name = "_types_har_format___har_format_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz"; - sha1 = "4f6648814d0fdcb6a510e3364a9db439a753c4b1"; + name = "_types_har_format___har_format_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.6.tgz"; + sha1 = "471c83acdf6a2ea429620daee4c6dc1784a0e85f"; }; } { @@ -722,11 +722,11 @@ }; } { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; + sha1 = "9153fe98bba2bd565a63add9436d6f0d7f8468ff"; }; } { @@ -738,19 +738,19 @@ }; } { - name = "_types_node___node_15.6.1.tgz"; + name = "_types_node___node_15.12.2.tgz"; path = fetchurl { - name = "_types_node___node_15.6.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.6.1.tgz"; - sha1 = "32d43390d5c62c5b6ec486a9bc9c59544de39a08"; + name = "_types_node___node_15.12.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz"; + sha1 = "1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"; }; } { - name = "_types_node___node_14.17.1.tgz"; + name = "_types_node___node_14.17.3.tgz"; path = fetchurl { - name = "_types_node___node_14.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.1.tgz"; - sha1 = "5e07e0cb2ff793aa7a1b41deae76221e6166049f"; + name = "_types_node___node_14.17.3.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz"; + sha1 = "6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"; }; } { @@ -793,14 +793,6 @@ sha1 = "dd3e6699ba3237f0348cd085e4698780204842f9"; }; } - { - name = "_types_yargs___yargs_15.0.13.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_15.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz"; - sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"; - }; - } { name = "_types_yargs___yargs_16.0.3.tgz"; path = fetchurl { @@ -850,11 +842,11 @@ }; } { - name = "acorn___acorn_8.2.4.tgz"; + name = "acorn___acorn_8.3.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.2.4.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz"; - sha1 = "caba24b08185c3b56e3168e97d15ed17f4d31fd0"; + name = "acorn___acorn_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz"; + sha1 = "1193f9b96c4e8232f00b11a9edff81b2c8b98b88"; }; } { @@ -882,11 +874,11 @@ }; } { - name = "ajv___ajv_8.5.0.tgz"; + name = "ajv___ajv_8.6.0.tgz"; path = fetchurl { - name = "ajv___ajv_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; - sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + name = "ajv___ajv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz"; + sha1 = "60cc45d9c46a477d80d92c48076d972c342e5720"; }; } { @@ -970,19 +962,19 @@ }; } { - name = "app_builder_bin___app_builder_bin_3.5.12.tgz"; + name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.12.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz"; - sha1 = "bbe174972cc1f481f73d6d92ad47a8b4c7eb4530"; + name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz"; + sha1 = "6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"; }; } { - name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; + name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz"; - sha1 = "24a88581c891e5b187a0d569aa44e7c4a0dc8de2"; + name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz"; + sha1 = "d49f49dc2d9fd225249e4ae7e30add2996e7062f"; }; } { @@ -1090,11 +1082,11 @@ }; } { - name = "babel_jest___babel_jest_27.0.1.tgz"; + name = "babel_jest___babel_jest_27.0.2.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.1.tgz"; - sha1 = "9f1c4571ac17a39e599d1325dcaf53a274261df4"; + name = "babel_jest___babel_jest_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; + sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; }; } { @@ -1145,14 +1137,6 @@ sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; }; } - { - name = "binaryextensions___binaryextensions_4.15.0.tgz"; - path = fetchurl { - name = "binaryextensions___binaryextensions_4.15.0.tgz"; - url = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz"; - sha1 = "c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e"; - }; - } { name = "bl___bl_4.1.0.tgz"; path = fetchurl { @@ -1178,11 +1162,11 @@ }; } { - name = "boolean___boolean_3.0.4.tgz"; + name = "boolean___boolean_3.1.0.tgz"; path = fetchurl { - name = "boolean___boolean_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.4.tgz"; - sha1 = "aa1df8749af41d7211b66b4eee584722ff428c27"; + name = "boolean___boolean_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz"; + sha1 = "a245080649ebb80e7c0ea218a480e4e913136336"; }; } { @@ -1266,19 +1250,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz"; - sha1 = "0aaafa52d25295c939496f62231ca9ff06c30e40"; + name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz"; + sha1 = "4b43c96db2bd494ced7694bcd7674934655e8324"; }; } { - name = "builder_util___builder_util_22.10.5.tgz"; + name = "builder_util___builder_util_22.11.5.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz"; - sha1 = "8d0b04a3be6acc74938679aa90dcb3181b1ae86b"; + name = "builder_util___builder_util_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz"; + sha1 = "08836d00e6bef39bdffd8a66fb07d2d5021b9c3c"; }; } { @@ -1314,11 +1298,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz"; - sha1 = "8135c57459854b2240b57a4a6786044bdc5a9f71"; + name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz"; + sha1 = "0a80de4cdf62e1770bb46a30d884fc8d633e3958"; }; } { @@ -1362,11 +1346,11 @@ }; } { - name = "ci_info___ci_info_3.1.1.tgz"; + name = "ci_info___ci_info_3.2.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz"; - sha1 = "9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a"; + name = "ci_info___ci_info_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; + sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; }; } { @@ -1498,11 +1482,11 @@ }; } { - name = "compress_commons___compress_commons_4.1.0.tgz"; + name = "compress_commons___compress_commons_4.1.1.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz"; - sha1 = "25ec7a4528852ccd1d441a7d4353cd0ece11371b"; + name = "compress_commons___compress_commons_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz"; + sha1 = "df2a09a7ed17447642bad10a85cc9a19e5c42a7d"; }; } { @@ -1522,11 +1506,11 @@ }; } { - name = "config_chain___config_chain_1.1.12.tgz"; + name = "config_chain___config_chain_1.1.13.tgz"; path = fetchurl { - name = "config_chain___config_chain_1.1.12.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz"; - sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa"; + name = "config_chain___config_chain_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; + sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; }; } { @@ -1546,11 +1530,11 @@ }; } { - name = "core_js___core_js_3.13.0.tgz"; + name = "core_js___core_js_3.14.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.13.0.tgz"; - sha1 = "58ca436bf01d6903aee3d364089868d0d89fe58d"; + name = "core_js___core_js_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz"; + sha1 = "62322b98c71cc2018b027971a69419e2425c2a6c"; }; } { @@ -1762,11 +1746,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.10.5.tgz"; + name = "dmg_builder___dmg_builder_22.11.5.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz"; - sha1 = "65a33c106ead5a350c7de8997c546559bd6e0e7c"; + name = "dmg_builder___dmg_builder_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz"; + sha1 = "0df9843def73a217097956982fa21bb4d6a5836e"; }; } { @@ -1810,11 +1794,11 @@ }; } { - name = "dotenv___dotenv_8.6.0.tgz"; + name = "dotenv___dotenv_9.0.2.tgz"; path = fetchurl { - name = "dotenv___dotenv_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz"; - sha1 = "061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"; + name = "dotenv___dotenv_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; + sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; }; } { @@ -1825,14 +1809,6 @@ sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; } - { - name = "editions___editions_6.1.0.tgz"; - path = fetchurl { - name = "editions___editions_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz"; - sha1 = "ba6c6cf9f4bb571d9e53ea34e771a602e5a66549"; - }; - } { name = "ejs___ejs_3.1.6.tgz"; path = fetchurl { @@ -1842,35 +1818,35 @@ }; } { - name = "electron_builder___electron_builder_22.10.5.tgz"; + name = "electron_builder___electron_builder_22.11.5.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz"; - sha1 = "03b156b93e6012609027c3aaa69201a3ad21e454"; + name = "electron_builder___electron_builder_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz"; + sha1 = "914d8183e1bab7cda43ef1d67fc3d17314c7e242"; }; } { - name = "electron_publish___electron_publish_22.10.5.tgz"; + name = "electron_publish___electron_publish_22.11.5.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.10.5.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz"; - sha1 = "9cbe46266b6c79d8c6e99840755682e2262d3543"; + name = "electron_publish___electron_publish_22.11.5.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz"; + sha1 = "2fcd3280c4267e70e4aa15003c9b7dc34923320e"; }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.739.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.739.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz"; - sha1 = "f07756aa92cabd5a6eec6f491525a64fe62f98b9"; + name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz"; + sha1 = "7e5ef6f478316b0bd656af5942fe502610e97eaf"; }; } { - name = "electron___electron_13.0.1.tgz"; + name = "electron___electron_13.1.1.tgz"; path = fetchurl { - name = "electron___electron_13.0.1.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.0.1.tgz"; - sha1 = "7dd3666f0f966ab83a1f9868d84add2e6205d43a"; + name = "electron___electron_13.1.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz"; + sha1 = "de1ea908bcac2197d7a5a373fb68c0c66043e10e"; }; } { @@ -1929,14 +1905,6 @@ sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; }; } - { - name = "errlop___errlop_4.1.0.tgz"; - path = fetchurl { - name = "errlop___errlop_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz"; - sha1 = "8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b"; - }; - } { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { @@ -2042,11 +2010,11 @@ }; } { - name = "eslint___eslint_7.27.0.tgz"; + name = "eslint___eslint_7.28.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.27.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz"; - sha1 = "665a1506d8f95655c9274d84bd78f7166b07e9c7"; + name = "eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; + sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820"; }; } { @@ -2106,11 +2074,11 @@ }; } { - name = "execa___execa_5.0.0.tgz"; + name = "execa___execa_5.1.1.tgz"; path = fetchurl { - name = "execa___execa_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz"; - sha1 = "4029b0007998a841fbd1032e5f4de86a3c1e3376"; + name = "execa___execa_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; + sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; }; } { @@ -2130,11 +2098,11 @@ }; } { - name = "expect___expect_27.0.1.tgz"; + name = "expect___expect_27.0.2.tgz"; path = fetchurl { - name = "expect___expect_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.0.1.tgz"; - sha1 = "1290c74fef8d62f15f4c5dd1d7233001909abbfb"; + name = "expect___expect_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz"; + sha1 = "e66ca3a4c9592f1c019fa1d46459a9d2084f3422"; }; } { @@ -2426,19 +2394,11 @@ }; } { - name = "globals___globals_12.4.0.tgz"; + name = "globals___globals_13.9.0.tgz"; path = fetchurl { - name = "globals___globals_12.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; - sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; - }; - } - { - name = "globals___globals_13.8.0.tgz"; - path = fetchurl { - name = "globals___globals_13.8.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; - sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + name = "globals___globals_13.9.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; + sha1 = "4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"; }; } { @@ -2505,14 +2465,6 @@ sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; }; } - { - name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz"; - sha1 = "6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"; - }; - } { name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; path = fetchurl { @@ -2825,6 +2777,14 @@ sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; } + { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; + sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + }; + } { name = "isexe___isexe_2.0.0.tgz"; path = fetchurl { @@ -2873,14 +2833,6 @@ sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; }; } - { - name = "istextorbinary___istextorbinary_5.12.0.tgz"; - path = fetchurl { - name = "istextorbinary___istextorbinary_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz"; - sha1 = "2f84777838668fdf524c305a2363d6057aaeec84"; - }; - } { name = "jake___jake_10.8.2.tgz"; path = fetchurl { @@ -2890,43 +2842,43 @@ }; } { - name = "jest_changed_files___jest_changed_files_27.0.1.tgz"; + name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.1.tgz"; - sha1 = "b8356b3708cac9d05ebf6f9e0b32227b514945c8"; + name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz"; + sha1 = "997253042b4a032950fc5f56abf3c5d1f8560801"; }; } { - name = "jest_circus___jest_circus_27.0.1.tgz"; + name = "jest_circus___jest_circus_27.0.4.tgz"; path = fetchurl { - name = "jest_circus___jest_circus_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.1.tgz"; - sha1 = "3a7ec9e9fd60ef4c827197dffe2288aa19f86678"; + name = "jest_circus___jest_circus_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz"; + sha1 = "3b261514ee3b3da33def736a6352c98ff56bb6e6"; }; } { - name = "jest_cli___jest_cli_27.0.1.tgz"; + name = "jest_cli___jest_cli_27.0.4.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.1.tgz"; - sha1 = "9accc8a505438571ee423438eac526a7ee4654b5"; + name = "jest_cli___jest_cli_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz"; + sha1 = "491b12c754c0d7c6873b13a66f26b3a80a852910"; }; } { - name = "jest_config___jest_config_27.0.1.tgz"; + name = "jest_config___jest_config_27.0.4.tgz"; path = fetchurl { - name = "jest_config___jest_config_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.1.tgz"; - sha1 = "db4f202efcbb92011f62d8f25b52c3d1bd5672d4"; + name = "jest_config___jest_config_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz"; + sha1 = "c4f41378acf40ca77860fb4e213b12109d87b8cf"; }; } { - name = "jest_diff___jest_diff_27.0.1.tgz"; + name = "jest_diff___jest_diff_27.0.2.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.1.tgz"; - sha1 = "021beb29fe9f07e83c809a4f7a1ce807b229c4ab"; + name = "jest_diff___jest_diff_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz"; + sha1 = "f315b87cee5dc134cf42c2708ab27375cc3f5a7e"; }; } { @@ -2938,27 +2890,27 @@ }; } { - name = "jest_each___jest_each_27.0.1.tgz"; + name = "jest_each___jest_each_27.0.2.tgz"; path = fetchurl { - name = "jest_each___jest_each_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.1.tgz"; - sha1 = "37fa20b7d809b29d4349d8eb7d01f17c2feeab10"; + name = "jest_each___jest_each_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz"; + sha1 = "865ddb4367476ced752167926b656fa0dcecd8c7"; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.1.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.1.tgz"; - sha1 = "12b0ed587fb53e0a581a5101bb209aef09da2310"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz"; + sha1 = "ed73e913ddc03864eb9f934b5cbabf1b63504e2e"; }; } { - name = "jest_environment_node___jest_environment_node_27.0.1.tgz"; + name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.1.tgz"; - sha1 = "7d7df7ae191477a823ffb4fcc0772b4c23ec5c87"; + name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz"; + sha1 = "b4acb3679d2552a4215732cab8b0ca7ec4398ee0"; }; } { @@ -2970,51 +2922,51 @@ }; } { - name = "jest_haste_map___jest_haste_map_27.0.1.tgz"; + name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.1.tgz"; - sha1 = "653c4ba59309a86499ad7bf663176e7f97478191"; + name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; + sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; }; } { - name = "jest_jasmine2___jest_jasmine2_27.0.1.tgz"; + name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.1.tgz"; - sha1 = "d975bfe072f3ac3596c0be5fc0a1215fd2e91e77"; + name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz"; + sha1 = "c669519ccf4904a485338555e1e66cad36bb0670"; }; } { - name = "jest_leak_detector___jest_leak_detector_27.0.1.tgz"; + name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.1.tgz"; - sha1 = "eedeaee7c0ab553db4d8908f74967329624342b9"; + name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz"; + sha1 = "ce19aa9dbcf7a72a9d58907a970427506f624e69"; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.0.1.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.1.tgz"; - sha1 = "7a01330786e370f152b0b0159f827293b6322909"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz"; + sha1 = "f14c060605a95a466cdc759acc546c6f4cbfc4f0"; }; } { - name = "jest_message_util___jest_message_util_27.0.1.tgz"; + name = "jest_message_util___jest_message_util_27.0.2.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.1.tgz"; - sha1 = "382b7c55d8e0b1aba9eeb41d3cfdd34e451210ed"; + name = "jest_message_util___jest_message_util_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz"; + sha1 = "181c9b67dff504d8f4ad15cba10d8b80f272048c"; }; } { - name = "jest_mock___jest_mock_27.0.1.tgz"; + name = "jest_mock___jest_mock_27.0.3.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.1.tgz"; - sha1 = "8394e297bc3dfed980961622cb51fd042b4acf5a"; + name = "jest_mock___jest_mock_27.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz"; + sha1 = "5591844f9192b3335c0dca38e8e45ed297d4d23d"; }; } { @@ -3034,35 +2986,35 @@ }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.1.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.1.tgz"; - sha1 = "3dcaeb277e0253747706467e8f05e1e78a1d534d"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz"; + sha1 = "a07a242d70d668afd3fcf7f4270755eebb1fe579"; }; } { - name = "jest_resolve___jest_resolve_27.0.1.tgz"; + name = "jest_resolve___jest_resolve_27.0.4.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.1.tgz"; - sha1 = "4e1b76f61c7e2213d2fbd37342800864309de538"; + name = "jest_resolve___jest_resolve_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz"; + sha1 = "8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d"; }; } { - name = "jest_runner___jest_runner_27.0.1.tgz"; + name = "jest_runner___jest_runner_27.0.4.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.1.tgz"; - sha1 = "52137173fbf318b7b1f034b81200c2846758f681"; + name = "jest_runner___jest_runner_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz"; + sha1 = "2787170a9509b792ae129794f6944d27d5d12a4f"; }; } { - name = "jest_runtime___jest_runtime_27.0.1.tgz"; + name = "jest_runtime___jest_runtime_27.0.4.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.1.tgz"; - sha1 = "b71bb8ea189c50525aebb4aba6c524633ca27659"; + name = "jest_runtime___jest_runtime_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz"; + sha1 = "2e4a6aa77cac32ac612dfe12768387a8aa15c2f0"; }; } { @@ -3074,51 +3026,51 @@ }; } { - name = "jest_snapshot___jest_snapshot_27.0.1.tgz"; + name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; path = fetchurl { - name = "jest_snapshot___jest_snapshot_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.1.tgz"; - sha1 = "01a82d901f260604908373795c9255b032d2a07a"; + name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz"; + sha1 = "2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b"; }; } { - name = "jest_util___jest_util_27.0.1.tgz"; + name = "jest_util___jest_util_27.0.2.tgz"; path = fetchurl { - name = "jest_util___jest_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.1.tgz"; - sha1 = "324ed9879d129c1e64f9169a739d6d50d7928769"; + name = "jest_util___jest_util_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; + sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; }; } { - name = "jest_validate___jest_validate_27.0.1.tgz"; + name = "jest_validate___jest_validate_27.0.2.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.1.tgz"; - sha1 = "8e43428674b6097f8ee3abe42c4248a4826cd008"; + name = "jest_validate___jest_validate_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz"; + sha1 = "7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5"; }; } { - name = "jest_watcher___jest_watcher_27.0.1.tgz"; + name = "jest_watcher___jest_watcher_27.0.2.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.1.tgz"; - sha1 = "61b9403d7b498161f6aa6124602363525ac3efc2"; + name = "jest_watcher___jest_watcher_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz"; + sha1 = "dab5f9443e2d7f52597186480731a8c6335c5deb"; }; } { - name = "jest_worker___jest_worker_27.0.1.tgz"; + name = "jest_worker___jest_worker_27.0.2.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.1.tgz"; - sha1 = "b255fcbb40fb467295010c628474b1185cab4f9e"; + name = "jest_worker___jest_worker_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; + sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; }; } { - name = "jest___jest_27.0.1.tgz"; + name = "jest___jest_27.0.4.tgz"; path = fetchurl { - name = "jest___jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.0.1.tgz"; - sha1 = "d3822f0904f3bbe884bea393cede2be2aa290d0e"; + name = "jest___jest_27.0.4.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz"; + sha1 = "91d4d564b36bcf93b98dac1ab19f07089e670f53"; }; } { @@ -3442,19 +3394,19 @@ }; } { - name = "mime_db___mime_db_1.47.0.tgz"; + name = "mime_db___mime_db_1.48.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.47.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; - sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; + name = "mime_db___mime_db_1.48.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz"; + sha1 = "e35b31045dd7eada3aaad537ed88a33afbef2d1d"; }; } { - name = "mime_types___mime_types_2.1.30.tgz"; + name = "mime_types___mime_types_2.1.31.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.30.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; - sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; + name = "mime_types___mime_types_2.1.31.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz"; + sha1 = "a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"; }; } { @@ -3554,19 +3506,11 @@ }; } { - name = "node_releases___node_releases_1.1.72.tgz"; + name = "node_releases___node_releases_1.1.73.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.72.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz"; - sha1 = "14802ab6b1039a79a0c7d662b610a5bbd76eacbe"; - }; - } - { - name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; - sha1 = "cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"; + name = "node_releases___node_releases_1.1.73.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz"; + sha1 = "dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"; }; } { @@ -3818,11 +3762,11 @@ }; } { - name = "pretty_format___pretty_format_27.0.1.tgz"; + name = "pretty_format___pretty_format_27.0.2.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.1.tgz"; - sha1 = "c4094621dfbd3e8ab751964d1cf01edc6f88474d"; + name = "pretty_format___pretty_format_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz"; + sha1 = "9283ff8c4f581b186b2d4da461617143dca478a4"; }; } { @@ -3914,11 +3858,11 @@ }; } { - name = "read_config_file___read_config_file_6.0.0.tgz"; + name = "read_config_file___read_config_file_6.2.0.tgz"; path = fetchurl { - name = "read_config_file___read_config_file_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz"; - sha1 = "224b5dca6a5bdc1fb19e63f89f342680efdb9299"; + name = "read_config_file___read_config_file_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; + sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; }; } { @@ -4241,38 +4185,6 @@ sha1 = "5302f8169031735226544092e64981f751750383"; }; } - { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; - sha1 = "8a595135def9592bda69709474f1cbeea7c2467f"; - }; - } { name = "sprintf_js___sprintf_js_1.1.2.tgz"; path = fetchurl { @@ -4505,14 +4417,6 @@ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; } - { - name = "textextensions___textextensions_5.12.0.tgz"; - path = fetchurl { - name = "textextensions___textextensions_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz"; - sha1 = "b908120b5c1bd4bb9eba41423d75b176011ab68a"; - }; - } { name = "throat___throat_6.0.1.tgz"; path = fetchurl { @@ -4522,19 +4426,35 @@ }; } { - name = "tldts_core___tldts_core_5.7.37.tgz"; + name = "tldts_core___tldts_core_5.7.38.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.37.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.37.tgz"; - sha1 = "29f34676d2de7dfaae6b13ee8d5cd3c5a6ce6396"; + name = "tldts_core___tldts_core_5.7.38.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.38.tgz"; + sha1 = "779092c90941803fb682c3d7094a88f12aad4508"; }; } { - name = "tldts_experimental___tldts_experimental_5.7.37.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.38.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.37.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.37.tgz"; - sha1 = "ead49d7dea3b08341ef17c9a03e23717c006407e"; + name = "tldts_experimental___tldts_experimental_5.7.38.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.38.tgz"; + sha1 = "a2b03ae0282ee7439b1ed1618a1d7d2e9e66be78"; + }; + } + { + name = "tmp_promise___tmp_promise_3.0.2.tgz"; + path = fetchurl { + name = "tmp_promise___tmp_promise_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz"; + sha1 = "6e933782abff8b00c3119d63589ca1fb9caaa62a"; + }; + } + { + name = "tmp___tmp_0.2.1.tgz"; + path = fetchurl { + name = "tmp___tmp_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; + sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; }; } { @@ -4649,14 +4569,6 @@ sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; }; } - { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; - }; - } { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; path = fetchurl { @@ -4753,14 +4665,6 @@ sha1 = "30898d1a7fa0c84d225a2c1434fb958f290883c1"; }; } - { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; - }; - } { name = "verror___verror_1.10.0.tgz"; path = fetchurl { @@ -4769,22 +4673,6 @@ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } - { - name = "version_compare___version_compare_1.1.0.tgz"; - path = fetchurl { - name = "version_compare___version_compare_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz"; - sha1 = "7b3e67e7e6cec5c72d9c9e586f8854e419ade17c"; - }; - } - { - name = "version_range___version_range_1.1.0.tgz"; - path = fetchurl { - name = "version_range___version_range_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz"; - sha1 = "1c233064202ee742afc9d56e21da3b2e15260acf"; - }; - } { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { @@ -4842,11 +4730,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.5.0.tgz"; + name = "whatwg_url___whatwg_url_8.6.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz"; - sha1 = "7752b8464fc0903fec89aa9846fc9efe07351fd3"; + name = "whatwg_url___whatwg_url_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz"; + sha1 = "27c0205a4902084b872aecb97cf0f2a7a3011f4c"; }; } { @@ -4985,6 +4873,14 @@ sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; }; } + { + name = "yargs___yargs_17.0.1.tgz"; + path = fetchurl { + name = "yargs___yargs_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz"; + sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; + }; + } { name = "yauzl___yauzl_2.10.0.tgz"; path = fetchurl { From 305e524d46cc9004dc024dc4e093dd65a94b2326 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Jun 2021 16:33:14 +0200 Subject: [PATCH 486/797] minia: use `boost` instead of `boost159` --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..e9a008e6e96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29414,9 +29414,7 @@ in migrate = callPackage ../applications/science/biology/migrate { }; - minia = callPackage ../applications/science/biology/minia { - boost = boost159; - }; + minia = callPackage ../applications/science/biology/minia { }; mirtk = callPackage ../development/libraries/science/biology/mirtk { }; From f1bbe0c2cacba75b96311ea0ffea8cd1222ed1ed Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 9 Jun 2021 14:16:23 +0200 Subject: [PATCH 487/797] symfony-cli: init at 4.25.2 --- .../development/tools/symfony-cli/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/symfony-cli/default.nix diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix new file mode 100644 index 00000000000..eb12f9e1dcd --- /dev/null +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -0,0 +1,29 @@ +{ stdenvNoCC, fetchurl, lib }: + +stdenvNoCC.mkDerivation rec { + pname = "symfony-cli"; + version = "4.25.2"; + + src = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; + sha256 = "8bfa53c1479883e9b48d2e4e5d3f6f7a511df73d65fe5c7b07a4890ee2c75c7e"; + }; + + dontBuild = true; + + unpackPhase = '' + gunzip <$src >symfony + ''; + + installPhase = '' + install -D -t $out/bin symfony + ''; + + meta = with lib; { + description = "Symfony CLI"; + homepage = "https://symfony.com/download"; + license = licenses.unfree; + maintainers = with maintainers; [ drupol ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbc0e79a3c0..0bb89378eb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14016,6 +14016,8 @@ in swiftformat = callPackage ../development/tools/swiftformat { }; + symfony-cli = callPackage ../development/tools/symfony-cli { }; + swiftshader = callPackage ../development/libraries/swiftshader { }; systemfd = callPackage ../development/tools/systemfd { }; From 4e1dcacc306a1b2a3a2bfa38717b8fd0b3576a3f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 9 Jun 2021 16:20:59 +0200 Subject: [PATCH 488/797] maintainers: add drupol --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e044942eab..3dbc1902b71 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2677,6 +2677,16 @@ githubId = 10198051; name = "Drew Risinger"; }; + drupol = { + name = "Pol Dellaiera"; + email = "pol.dellaiera@protonmail.com"; + github = "drupol"; + githubId = 252042; + keys = [{ + longkeyid = "ed25519/0x0AAF2901E8040715"; + fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; + }]; + }; dschrempf = { name = "Dominik Schrempf"; email = "dominik.schrempf@gmail.com"; From cd92f32734cf1a73d66fdcc064561f0398c7fa15 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 9 Jun 2021 11:14:34 +0000 Subject: [PATCH 489/797] busybox: 1.32.1 -> 1.33.1; clarify license The patch for CVE-2021-28831 is included in this release. --- pkgs/os-specific/linux/busybox/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 63435e09168..4949cd7c14a 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab, fetchpatch +{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab , enableStatic ? stdenv.hostPlatform.isStatic , enableMinimal ? false # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: @@ -32,7 +32,7 @@ let CONFIG_FEATURE_WTMP n ''; - # The debian version lacks behind the upstream version and also contains + # The debian version lags behind the upstream version and also contains # a debian-specific suffix. We only fetch the debian repository to get the # default.script debianVersion = "1.30.1-6"; @@ -49,17 +49,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - # TODO: When bumping to next version, remove the patch - # for CVE-2021-28831 (assuming the patch was included in - # the next upstream release) - version = "1.32.1"; + version = "1.33.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"; + sha256 = "0a0dcvsh7nxnhxc5y73fky0z30i9p7r30qfidm2akn0n5fywdkhj"; }; hardeningDisable = [ "format" "pie" ] @@ -67,11 +64,6 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - (fetchpatch { - name = "CVE-2021-28831.patch"; - url = "https://git.busybox.net/busybox/patch/?id=f25d254dfd4243698c31a4f3153d4ac72aa9e9bd"; - sha256 = "0y79flfbk45krwn963nnbqc21a88bsz4k4asqwvcnfk2lkciadxm"; - }) # TODO: Removing when bumping the version ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; @@ -142,7 +134,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ TethysSvensson ]; platforms = platforms.linux; priority = 10; From 83f6711464e03a856fb554693fe2e0f3af2ab0d5 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 8 Jun 2021 00:52:17 +0200 Subject: [PATCH 490/797] neovim.tests: added more tests to check for creation of vi/vim aliases. These tests also now follow the coding conventions of having tests in passthru.test . --- .../editors/neovim}/neovim-override.vim | 0 pkgs/applications/editors/neovim/tests.nix | 135 ++++++++++++++++++ pkgs/applications/editors/neovim/wrapper.nix | 4 + pkgs/test/vim/default.nix | 107 +------------- 4 files changed, 142 insertions(+), 104 deletions(-) rename pkgs/{test/vim => applications/editors/neovim}/neovim-override.vim (100%) create mode 100644 pkgs/applications/editors/neovim/tests.nix diff --git a/pkgs/test/vim/neovim-override.vim b/pkgs/applications/editors/neovim/neovim-override.vim similarity index 100% rename from pkgs/test/vim/neovim-override.vim rename to pkgs/applications/editors/neovim/neovim-override.vim diff --git a/pkgs/applications/editors/neovim/tests.nix b/pkgs/applications/editors/neovim/tests.nix new file mode 100644 index 00000000000..f9d0d659b73 --- /dev/null +++ b/pkgs/applications/editors/neovim/tests.nix @@ -0,0 +1,135 @@ +{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable +, neovim-unwrapped +, fetchFromGitLab +, pkgs +}: +let + inherit (vimUtils) buildVimPluginFrom2Nix; + inherit (neovimUtils) makeNeovimConfig; + + packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; + + plugins = with vimPlugins; [ + { + plugin = vim-obsession; + config = '' + map $ Obsession + ''; + } + ]; + + nvimConfNix = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + nvimAutoDisableWrap = makeNeovimConfig { }; + + nvimConfDontWrap = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + wrapNeovim2 = suffix: config: + wrapNeovimUnstable neovim-unwrapped (config // { + extraName = suffix; + }); + + nmt = fetchFromGitLab { + owner = "rycee"; + repo = "nmt"; + rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; + sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; + }; + + runTest = neovim-drv: buildCommand: + pkgs.runCommandLocal "test-${neovim-drv.name}" ({ + nativeBuildInputs = [ ]; + meta.platforms = neovim-drv.meta.platforms; + }) ('' + source ${nmt}/bash-lib/assertions.sh + vimrc="${writeText "init.vim" neovim-drv.initRc}" + vimrcGeneric="$out/patched.vim" + mkdir $out + ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" + '' + buildCommand); + +in + pkgs.recurseIntoAttrs ( +rec { + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; + + ### neovim tests + ################## + nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; + + nvim_via_override = neovim.override { + extraName = "-via-override"; + configure = { + packages.foo.start = [ vimPlugins.ale ]; + customRC = '' + :help ale + ''; + }; + }; + + nvim_with_aliases = neovim.override { + extraName = "-with-aliases"; + vimAlias = true; + viAlias = true; + }; + + # nixpkgs should detect that no wrapping is necessary + nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; + + # this will generate a neovimRc content but we disable wrapping + nvimDontWrap = wrapNeovim2 "-forced-nowrap" (makeNeovimConfig { + wrapRc = false; + customRC = '' + " this shouldn't trigger the creation of an init.vim + ''; + }); + + force-nowrap = runTest nvimDontWrap '' + ! grep "-u" ${nvimDontWrap}/bin/nvim + ''; + + nvim_via_override-test = runTest nvim_via_override '' + assertFileContent \ + "$vimrcGeneric" \ + "${./neovim-override.vim}" + ''; + + + checkAliases = runTest nvim_with_aliases '' + folder=${nvim_with_aliases}/bin + assertFileExists "$folder/vi" + assertFileExists "$folder/vim" + ''; + + # having no RC generated should autodisable init.vim wrapping + nvim_autowrap = runTest nvim_via_override '' + ! grep "-u" ${nvimShouldntWrap}/bin/nvim + ''; + + + # system remote plugin manifest should be generated, deoplete should be usable + # without the user having to do `UpdateRemotePlugins`. To test, launch neovim + # and do `:call deoplete#enable()`. It will print an error if the remote + # plugin is not registered. + test_nvim_with_remote_plugin = neovim.override { + extraName = "-pathogen-remote"; + configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + }; + + # only neovim makes use of `requiredPlugins`, test this here + test_nvim_with_vim_nix_using_pathogen = neovim.override { + extraName = "-pathogen"; + configure.pathogen.pluginNames = [ "vim-nix" ]; + }; +}) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 07a1dad7c09..96b61a43cca 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -4,6 +4,7 @@ , nodejs , nodePackages , python3Packages +, callPackage }: with lib; @@ -120,6 +121,9 @@ let passthru = { unwrapped = neovim; initRc = neovimRcContent; + + tests = callPackage ./tests.nix { + }; }; meta = neovim.meta // { diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 3bdc3234134..cb3953a63f5 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,104 +1,16 @@ -{ vimUtils, vim_configurable, writeText, neovim, vimPlugins -, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable -, neovim-unwrapped -, fetchFromGitLab +{ vimUtils, vim_configurable, writeText, vimPlugins +, lib, fetchFromGitHub , pkgs }: let inherit (vimUtils) buildVimPluginFrom2Nix; - inherit (neovimUtils) makeNeovimConfig; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - plugins = with vimPlugins; [ - { - plugin = vim-obsession; - config = '' - map $ Obsession - ''; - } - ]; - - nvimConfNix = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - - nvimConfDontWrap = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - - wrapNeovim2 = suffix: config: - wrapNeovimUnstable neovim-unwrapped (config // { - extraName = suffix; - }); - - nmt = fetchFromGitLab { - owner = "rycee"; - repo = "nmt"; - rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; - sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; - }; - - runTest = neovim-drv: buildCommand: - pkgs.runCommandLocal "test-${neovim-drv.name}" ({ - nativeBuildInputs = [ ]; - meta.platforms = neovim-drv.meta.platforms; - }) ('' - source ${nmt}/bash-lib/assertions.sh - vimrc="${writeText "init.vim" neovim-drv.initRc}" - vimrcGeneric="$out/patched.vim" - mkdir $out - ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" - '' + buildCommand); - in - pkgs.recurseIntoAttrs ( -rec { + pkgs.recurseIntoAttrs (rec { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; - ### neovim tests - ################## - nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; - - nvim_via_override = neovim.override { - extraName = "-via-override"; - configure = { - packages.foo.start = [ vimPlugins.ale ]; - customRC = '' - :help ale - ''; - }; - }; - - - # nixpkgs should detect that no wrapping is necessary - nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimConfNix; - - - # this will generate a neovimRc content but we disable wrapping - nvimDontWrap = wrapNeovim2 "-dont-wrap" (makeNeovimConfig { - wrapRc = false; - customRC = '' - " this shouldn't trigger the creation of an init.vim - ''; - }); - - nvim_dontwrap-test = runTest nvimDontWrap '' - ! grep "-u" ${nvimDontWrap}/bin/nvim - ''; - - nvim_via_override-test = runTest nvim_via_override '' - assertFileContent \ - "$vimrcGeneric" \ - "${./neovim-override.vim}" - ''; - ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { @@ -126,11 +38,6 @@ rec { vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; }; - # only neovim makes use of `requiredPlugins`, test this here - test_nvim_with_vim_nix_using_pathogen = neovim.override { - configure.pathogen.pluginNames = [ "vim-nix" ]; - }; - # regression test for https://github.com/NixOS/nixpkgs/issues/53112 # The user may have specified their own plugins which may not be formatted # exactly as the generated ones. In particular, they may not have the `pname` @@ -153,12 +60,4 @@ rec { }); vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; }; - - # system remote plugin manifest should be generated, deoplete should be usable - # without the user having to do `UpdateRemotePlugins`. To test, launch neovim - # and do `:call deoplete#enable()`. It will print an error if the remote - # plugin is not registered. - test_nvim_with_remote_plugin = neovim.override { - configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; - }; }) From 37da9fdd2241e86bba02bcdc7ce3927d1f5a8a38 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Wed, 9 Jun 2021 11:17:53 -0500 Subject: [PATCH 491/797] ligjpeg-turbo: v7 and 8 abi compatibility - Add build-time flags as explained in the BUILDING.md to build the library with v7 and v8 abi compatibility --- .../libraries/libjpeg-turbo/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 1ac842e5593..964a007cc80 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,10 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, nasm +{ lib +, stdenv +, fetchFromGitHub +, cmake +, nasm , openjdk , enableJava ? false # whether to build the java wrapper +, enableJpeg7 ? false # whether to build libjpeg with v7 compatibility +, enableJpeg8 ? false # whether to build libjpeg with v8 compatibility , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: +assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both + stdenv.mkDerivation rec { pname = "libjpeg-turbo"; @@ -20,7 +28,7 @@ stdenv.mkDerivation rec { # This is needed by freeimage patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ] ++ lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") - ./mingw-boolean.patch; + ./mingw-boolean.patch; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; @@ -40,6 +48,10 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=${if enableShared then "1" else "0"}" ] ++ lib.optionals enableJava [ "-DWITH_JAVA=1" + ] ++ lib.optionals enableJpeg7 [ + "-DWITH_JPEG7=1" + ] ++ lib.optionals enableJpeg8 [ + "-DWITH_JPEG8=1" ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75 @@ -53,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses - maintainers = with maintainers; [ vcunat colemickens ]; + maintainers = with maintainers; [ vcunat colemickens kamadorueda ]; platforms = platforms.all; }; } From 6f1b0a7d73d5f7dae7013c02c7adb4e0294c9daa Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Wed, 9 Jun 2021 16:50:01 -0400 Subject: [PATCH 492/797] unison: M1m -> M2g --- pkgs/development/compilers/unison/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 433e07c68b0..d409ec8a276 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -6,18 +6,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1m"; + milestone_id = "M2g"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v"; + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; + sha256 = "1ib9pdzrfpzbi35fpwm9ym621nlydplvzgbhnyd86dbwbv3i9sga"; } else fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c"; + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; + sha256 = "004jx7q657mkcrvilk4lfkp8xcpl2bjflpn9m2p7jzlrlk97v9nj"; }; # The tarball is just the prebuilt binary, in the archive root. From 0d688b843dc6b4d189f26facba0200390a972e8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 21:55:33 +0200 Subject: [PATCH 493/797] python3Packages.systembridge: 1.1.1 -> 1.2.4 --- pkgs/development/python-modules/systembridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 94d41b7b673..6174e507d2a 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "1.1.1"; + version = "1.2.4"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "0vyfi7nyzkzsgg84n5wh4hzwvx6fybgqdzbabnsmvszb9sm1vlb2"; + sha256 = "sha256-dZOtvJXBXMKC+VOyQRMyaWAXg8lHjLcM2Zz9P0/ILT8="; }; propagatedBuildInputs = [ From efe210cec8e21fd7e29cd1801552b6458549eca0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 10:52:57 +0200 Subject: [PATCH 494/797] python3Packages.pytest-sanic: allow later websockets releases --- .../python-modules/pytest-sanic/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 81e189c22c5..3cea788643c 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -21,7 +21,9 @@ buildPythonPackage rec { sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw="; }; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ aiohttp @@ -36,6 +38,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/yunstanford/pytest-sanic/issues/55 + substituteInPlace setup.py \ + --replace "websockets>=8.1,<9.0" "websockets>=9.1,<10.0" + ''; + disabledTests = [ # https://github.com/yunstanford/pytest-sanic/issues/51 "test_fixture_sanic_client_get" From 515b0b158cfde071b6b9f89964cf3510043f9404 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 10:53:19 +0200 Subject: [PATCH 495/797] python3Packages.sanic-testing: 0.3.1 -> 0.4.0 --- .../python-modules/sanic-testing/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index e5194e36bd2..71af4a0a117 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, httpcore , httpx , pytest-asyncio , sanic @@ -11,22 +10,31 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "v${version}"; - hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs="; + sha256 = "0li984imqmqc001iw4m4b6cqik3d9nb4b3yvamvbwkb6hgd94sck"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'httpx>=0.16, <0.18' 'httpx' \ - --replace 'httpcore==0.12.*' 'httpcore' - ''; + propagatedBuildInputs = [ + httpx + sanic + websockets + ]; - propagatedBuildInputs = [ httpx sanic websockets httpcore ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/sanic-org/sanic-testing/issues/19 + substituteInPlace setup.py \ + --replace '"websockets==8.1",' '"websockets>=9.1",' + ''; # `sanic` is explicitly set to null when building `sanic` itself # to prevent infinite recursion. In that case we skip running @@ -34,7 +42,6 @@ buildPythonPackage rec { doCheck = sanic != null; dontUsePythonImportsCheck = sanic == null; - checkInputs = [ pytestCheckHook pytest-asyncio ]; pythonImportsCheck = [ "sanic_testing" ]; meta = with lib; { From 88a9705f7d383a32ec1dcecccb12d1d1e3e2534d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 11:32:10 +0200 Subject: [PATCH 496/797] python3Packages.amqtt: 0.10.0-alpha.3 -> 0.10.0-alpha.4 --- pkgs/development/python-modules/amqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 8ab0e7a7c0c..d0cc2bd5da5 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "amqtt"; - version = "0.10.0-alpha.3"; + version = "0.10.0-alpha.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Yakifo"; repo = pname; rev = "v${version}"; - sha256 = "0wz85ykjgi2174qcdgpakmc4m0p96v62az7pvc9hyallq1v1k4n6"; + sha256 = "1v5hlcciyicnhwk1xslh3kxyjqaw526fb05pvhjpp3zqrmbxya4d"; }; nativeBuildInputs = [ poetry-core ]; From 35b79dcf3689e192a452d1c3ff3e5c00e0cf9f31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 13:49:25 +0200 Subject: [PATCH 497/797] python3Packages.slack-sdk: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 9044ce19b5d..d04fd24f2e9 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.5.0"; + version = "3.6.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-5ZBaF/6p/eOWjAmo+IlF9zCb9xBr2bP6suPZblRogUg="; + sha256 = "sha256-OSRz8yH1yrWhN2a6ir4nxsPahwg8oHfVlJ020Swlb+Q="; }; propagatedBuildInputs = [ From 4558f8b5476c61b11cfce659ba69cb06c5602b06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 22:53:02 +0200 Subject: [PATCH 498/797] python3Packages.websockets: 8.1 -> 9.1 --- .../python-modules/websockets/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index eeb12bd5b75..51df6c70235 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -1,37 +1,45 @@ { lib -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub +, python , pythonOlder -, pytest , stdenv }: buildPythonPackage rec { pname = "websockets"; - version = "8.1"; + version = "9.1"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; rev = version; - sha256 = "05jbqcbjg50ydwl0fijhdlqcq7fl6v99kjva66kmmzzza7vwa872"; + sha256 = "sha256-7Y12IUG+ulD4+CTRlY+NE6qYZyI9gCPDydwpt+uyYZk="; }; - disabled = pythonOlder "3.3"; - # Tests fail on Darwin with `OSError: AF_UNIX path too long` doCheck = !stdenv.isDarwin; # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. + # time. This is nondeterministic. patchPhase = '' sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ - tests/test_protocol.py + tests/legacy/test_protocol.py ''; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ "websockets" ]; + meta = with lib; { - description = "WebSocket implementation in Python 3"; - homepage = "https://github.com/aaugustin/websockets"; + description = "WebSocket implementation in Python"; + homepage = "https://websockets.readthedocs.io/"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } From 79d4db358a99aa5a0977762f18600c6d8fc113a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 22:58:07 +0200 Subject: [PATCH 499/797] python3Packages.sanic: allow later websockets releases --- .../python-modules/sanic/default.nix | 71 ++++++++++++++----- 1 file changed, 55 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 5f610f6feab..cc7be4c93dc 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -1,24 +1,52 @@ -{ lib, buildPythonPackage, fetchPypi, doCheck ? true -, aiofiles, httptools, multidict, sanic-routing, ujson, uvloop, websockets -, pytestCheckHook, beautifulsoup4, gunicorn, uvicorn, sanic-testing -, pytest-benchmark, pytest-sanic, pytest-sugar, pytestcov +{ lib +, aiofiles +, beautifulsoup4 +, buildPythonPackage +, doCheck ? true +, fetchFromGitHub +, fetchpatch +, gunicorn +, httptools +, multidict +, pytest-asyncio +, pytest-benchmark +, pytest-sanic +, pytest-sugar +, pytestCheckHook +, sanic-routing +, sanic-testing +, ujson +, uvicorn +, uvloop +, websockets }: buildPythonPackage rec { pname = "sanic"; version = "21.3.4"; - src = fetchPypi { - inherit pname version; - sha256 = "1cbd12b9138b3ca69656286b0be91fff02b826e8cb72dd76a2ca8c5eb1288d8e"; + src = fetchFromGitHub { + owner = "sanic-org"; + repo = pname; + rev = "v${version}"; + sha256 = "0vldlic8gqcf56fqb31igycqf11syd9csk66v34w6dim54lcny2b"; }; + patches = [ + # Allow later websockets release, https://github.com/sanic-org/sanic/pull/2154 + (fetchpatch { + name = "later-websockets.patch"; + url = "https://github.com/sanic-org/sanic/commit/5fb820b5c1ce395e86a1ee11996790c65ec7bc65.patch"; + sha256 = "1glvq23pf1sxqjnrz0w8rr7nsnyz82k1479b3rm8szfkjg9q5d1w"; + }) + ]; + postPatch = '' # Loosen dependency requirements. substituteInPlace setup.py \ --replace '"pytest==5.2.1"' '"pytest"' \ --replace '"gunicorn==20.0.4"' '"gunicorn"' \ - --replace '"pytest-sanic",' "" + --replace '"pytest-sanic",' "" \ # Patch a request headers test to allow brotli encoding # (we build httpx with brotli support, upstream doesn't). substituteInPlace tests/test_headers.py \ @@ -26,25 +54,36 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - sanic-routing httptools uvloop ujson aiofiles websockets multidict + aiofiles + httptools + multidict + sanic-routing + ujson + uvloop + websockets ]; checkInputs = [ - sanic-testing gunicorn pytestcov beautifulsoup4 pytest-sanic pytest-sugar - pytest-benchmark pytestCheckHook uvicorn + beautifulsoup4 + gunicorn + pytest-asyncio + pytest-benchmark + pytest-sanic + pytest-sugar + pytestCheckHook + sanic-testing + uvicorn ]; inherit doCheck; disabledTests = [ - # No "examples" directory in pypi distribution - "test_gunicorn" - "test_zero_downtime" - # flaky + # Tests are flaky "test_keep_alive_client_timeout" "test_check_timeouts_request_timeout" "test_check_timeouts_response_timeout" "test_reloader_live" + "test_zero_downtime" ]; __darwinAllowLocalNetworking = true; @@ -52,7 +91,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sanic" ]; meta = with lib; { - description = "A microframework based on uvloop, httptools, and learnings of flask"; + description = "Web server and web framework"; homepage = "https://github.com/sanic-org/sanic/"; license = licenses.mit; maintainers = with maintainers; [ costrouc AluisioASG ]; From f7827c4a4f5bde40c5167aba98d7057b5d70fb09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 23:00:09 +0200 Subject: [PATCH 500/797] chia: allow later websockets releases --- pkgs/applications/blockchains/chia/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 22bb3d445ad..7b85a242eff 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "chia"; @@ -14,6 +18,12 @@ python3Packages.buildPythonApplication rec { patches = [ # tweak version requirements to what's available in Nixpkgs ./dependencies.patch + # Allow later websockets release, https://github.com/Chia-Network/chia-blockchain/pull/6304 + (fetchpatch { + name = "later-websockets.patch"; + url = "https://github.com/Chia-Network/chia-blockchain/commit/a188f161bf15a30e8e2efc5eec824e53e2a98a5b.patch"; + sha256 = "1s5qjhd4kmi28z6ni7pc5n09czxvh8qnbwmnqsmms7cpw700g78s"; + }) ]; nativeBuildInputs = [ @@ -47,8 +57,8 @@ python3Packages.buildPythonApplication rec { websockets ]; - checkInputs = [ - python3Packages.pytestCheckHook + checkInputs = with python3Packages; [ + pytestCheckHook ]; disabledTests = [ From 5102a1247103e7f23fdad9710f1887807b31e37f Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 9 Jun 2021 17:09:59 +0200 Subject: [PATCH 501/797] firefox: Make CUPS printers visible in the print dialog Firefox 81 introduced a new print dialog. Under NixOS, this dialog offers only "Save as PDF" as the destination. To print to a real printer, one has to click "Print using the system dialog" and print from there. This is not only one unnecessary extra click, but the system dialog also does not offer preview. With this commit, Firefox starts offering real printers in its printing dialog, removing the above mentioned deficiencies. CUPS is needed because Firefox uses dlopen() to load libcups.so.2 at runtime. See https://searchfox.org/mozilla-central/rev/b52cf6bbe214bd9d93ed9333d0403f7d556ad7c8/widget/nsCUPSShim.cpp#28 --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 13becfc4f62..f338a41be71 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -11,6 +11,7 @@ , libkrb5 , libva , mesa # firefox wants gbm for drm+dmabuf +, cups }: ## configurability of the wrapper itself @@ -62,7 +63,7 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups ] ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 From 1c297849784f969e1654d76ab12b4bce7b01f152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=9B=87=E5=B4=A9=E4=B9=83=E9=9F=B3?= Date: Wed, 9 Jun 2021 22:41:53 +0200 Subject: [PATCH 502/797] grafana: updated license to AGPLv3 See: https://github.com/grafana/grafana/commit/8db3eb90ae8c20e1a2bbbad300e0683def9bf8fb --- pkgs/servers/monitoring/grafana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 24bb3633cae..c2d18ae2396 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -48,7 +48,7 @@ buildGoModule rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; - license = licenses.asl20; + license = licenses.agpl3; homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = platforms.linux; From 8d022afa239de4e6e23b0a091d85740ed36461fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 23:38:31 +0200 Subject: [PATCH 503/797] python3Packages.scrapy: 2.4.1 -> 2.5.0 --- .../python-modules/scrapy/default.nix | 146 +++++++++++------- 1 file changed, 90 insertions(+), 56 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 08a3a596732..4ca07310658 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,64 +1,89 @@ { lib , stdenv -, buildPythonPackage -, isPy27 -, fetchPypi -, glibcLocales -, pytestCheckHook -, testfixtures -, pillow -, twisted -, cryptography -, w3lib -, lxml -, queuelib -, pyopenssl -, service-identity -, parsel -, pydispatcher -, cssselect -, zope_interface -, protego -, jmespath -, sybil -, pytest-twisted , botocore +, buildPythonPackage +, cryptography +, cssselect +, fetchFromGitHub +, fetchpatch +, glibcLocales +, installShellFiles , itemadapter , itemloaders +, jmespath +, lxml +, parsel +, pillow +, protego +, pydispatcher +, pyopenssl +, pytest-twisted +, pytestCheckHook +, pythonOlder +, queuelib +, service-identity +, sybil +, testfixtures +, twisted +, w3lib +, zope_interface }: buildPythonPackage rec { - version = "2.4.1"; - pname = "Scrapy"; + pname = "scrapy"; + version = "2.5.0"; + disabled = pythonOlder "3.6"; - disabled = isPy27; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "09lxnjz1cw37i9bgk8sci2xxknj20gi2lq8l7i0b3xw7q8bxzp7h"; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + cryptography + cssselect + itemadapter + itemloaders + lxml + parsel + protego + pydispatcher + pyopenssl + queuelib + service-identity + twisted + w3lib + zope_interface + ]; checkInputs = [ + botocore glibcLocales jmespath pytestCheckHook sybil testfixtures - pillow - pytest-twisted - botocore ]; - propagatedBuildInputs = [ - twisted - cryptography - cssselect - lxml - parsel - pydispatcher - pyopenssl - queuelib - service-identity - w3lib - zope_interface - protego - itemadapter - itemloaders + patches = [ + # Require setuptools, https://github.com/scrapy/scrapy/pull/5122 + (fetchpatch { + name = "add-setuptools.patch"; + url = "https://github.com/scrapy/scrapy/commit/4f500342c8ad4674b191e1fab0d1b2ac944d7d3e.patch"; + sha256 = "14030sfv1cf7dy4yww02b49mg39cfcg4bv7ys1iwycfqag3xcjda"; + }) + # Make Twisted[http2] installation optional, https://github.com/scrapy/scrapy/pull/5113 + (fetchpatch { + name = "remove-h2.patch"; + url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch"; + sha256 = "1gw28wg8qcb0al59rz214hm17smspi6j5kg62nr1r850pykyrsqk"; + }) ]; LC_ALL = "en_US.UTF-8"; @@ -68,39 +93,48 @@ buildPythonPackage rec { substituteInPlace pytest.ini --replace "--doctest-modules" "" ''; - pytestFlagsArray = [ - "--ignore=tests/test_proxy_connect.py" - "--ignore=tests/test_utils_display.py" - "--ignore=tests/test_command_check.py" + disabledTestPaths = [ + "tests/test_proxy_connect.py" + "tests/test_utils_display.py" + "tests/test_command_check.py" + # Don't test the documentation + "docs" ]; disabledTests = [ + # It's unclear if the failures are related to libxml2, https://github.com/NixOS/nixpkgs/pull/123890 + "test_nested_css" + "test_nested_xpath" + "test_flavor_detection" + # Requires network access "FTPFeedStorageTest" - "test_noconnect" - "test_retry_dns_error" + "FeedExportTest" "test_custom_asyncio_loop_enabled_true" "test_custom_loop_asyncio" + "test_custom_loop_asyncio_deferred_signal" "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" ]; - src = fetchPypi { - inherit pname version; - sha256 = "68c48f01a58636bdf0f6fcd5035a19ecf277b58af24bd70c36dc6e556df3e005"; - }; - postInstall = '' - install -m 644 -D extras/scrapy.1 $out/share/man/man1/scrapy.1 + installManPage extras/scrapy.1 install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy ''; + pythonImportsCheck = [ "scrapy" ]; + __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; + description = "High-level web crawling and web scraping framework"; + longDescription = '' + Scrapy is a fast high-level web crawling and web scraping framework, used to crawl + websites and extract structured data from their pages. It can be used for a wide + range of purposes, from data mining to monitoring and automated testing. + ''; homepage = "https://scrapy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ drewkett marsam ]; From b223fa619ed56bfa643f885767623ab1513838a8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Jun 2021 12:45:00 +0000 Subject: [PATCH 504/797] dbus: fix eval on BSD audit and libapparmor are libraries for Linux kernel features, so they should only be used on Linux, not excluded specifically for Darwin. --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index e9543fd95f9..1d1df0d24fc 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libICE libSM ] ++ lib.optional enableSystemd systemd - ++ lib.optionals (!stdenv.isDarwin) [ audit libapparmor ]; + ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; # ToDo: optional selinux? configureFlags = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ]; + ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ]; # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. From 5ff8c7392e7296d9052c085d9cd5dc13acc7b23b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Jun 2021 23:42:43 +0200 Subject: [PATCH 505/797] python3Packages.pysonos: 0.0.50 -> 0.0.51 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index cdd5291af99..63dbe762535 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.50"; + version = "0.0.51"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iyFdT+RH2dtMtD+jSLFuAVE1DIQn6k9ONLOXNFhpuHs="; + sha256 = "sha256-MjsbqrH4SWnnwGe9BVHaValoQEiaaZVhFdn6MDoEyZs="; }; propagatedBuildInputs = [ From 0aed08d6e38918d82c6a35358d3ad588d06ef46f Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Wed, 9 Jun 2021 11:17:34 -0400 Subject: [PATCH 506/797] pulumi-bin: 3.3.1 -> 3.4.0 --- pkgs/tools/admin/pulumi/data.nix | 42 +++++++++++++++---------------- pkgs/tools/admin/pulumi/update.sh | 10 ++++---- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 2955be2d793..f12e906a0ca 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,20 +1,20 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.3.1"; + version = "3.4.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-linux-x64.tar.gz"; - sha256 = "1mqvx5g1pfc5fi4xmdp8fva1pzfxqm062mzl972fc3yrzfl7792f"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.4.0-linux-x64.tar.gz"; + sha256 = "1xi4sr7wl948j0hjjjg7gxiy5y3zdlg4b2k8y0h2sf6s8h5hdrm3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-linux-amd64.tar.gz"; - sha256 = "0i2bwxx49nqca3kykxbjfbbmgyr3qdlw3q4wp384ai5r9psk4iac"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.7.0-linux-amd64.tar.gz"; + sha256 = "1zygz2imx7fxnczlcz4lbcxp521k94sjasqndjd9566y10xk64px"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-linux-amd64.tar.gz"; @@ -29,8 +29,8 @@ sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-linux-amd64.tar.gz"; - sha256 = "1r9cgwb0d332hrx33i40vphimhwcnqw5gkzbin7rmxlmasrkgwwy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.0-linux-amd64.tar.gz"; + sha256 = "1fyk7vy0lfbwhfr0m25nphrfiza14ysyciynhsk3cy613sjbcxgx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-linux-amd64.tar.gz"; - sha256 = "1pagydam6xypb1gbk710v3qid2bn77df9lzqfxk5l2pbbs65cvyp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.8.0-linux-amd64.tar.gz"; + sha256 = "0gnhan9wmrkszpcd8a43k5z12pwgzwaqgryz6qiz3r829aasbgf4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "0lqnb1xrb5ma8ssvn63lh92ihja6zx4nrx40pici1ggaln4sphn0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-linux-amd64.tar.gz"; - sha256 = "0l1pr8yfq901wr8ngan1hrwhb4lvcxa92sg38gqixzma0x6xhgwb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.1-linux-amd64.tar.gz"; + sha256 = "027jqzk2nxsqwff7yx306sz2b3r6nyj0za2kyw1aid5k2lg4wc6k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz"; @@ -99,16 +99,16 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-darwin-x64.tar.gz"; - sha256 = "0ri2wq45qm8fabdfsyr1vipnf6ybshxhqr3zrjs8qq1pyf92m5ks"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.4.0-darwin-x64.tar.gz"; + sha256 = "169il8bb4y3kbl6ms5856wfv2ws8pmyq1zgj6x4ra5y9wm6vb492"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-darwin-amd64.tar.gz"; - sha256 = "1rnb9q8w88jhp9mm3g31dnd4dis3j52pl97cd0yqg046f6jm048q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.7.0-darwin-amd64.tar.gz"; + sha256 = "0gb2ridcq7zxb849s77za1cyqnh3kai54gfk6402xq736ycf5w7c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-darwin-amd64.tar.gz"; @@ -123,8 +123,8 @@ sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-darwin-amd64.tar.gz"; - sha256 = "18qisw7m1kih27vl2099rzw44h8qyr2f3dnxby03z95f1nwyz1f1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "17lvl37aplxnanmci1drx4fh1mhijfqbflkpd50y4pb3h5lpy9s0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; @@ -135,8 +135,8 @@ sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-darwin-amd64.tar.gz"; - sha256 = "07fdrg3wd3wlsvh37gbxli0xcxd2c7g61ynrxzi0q8dg7687gjpq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.8.0-darwin-amd64.tar.gz"; + sha256 = "0b80bkjmsl6g7fw0c56bphddrfj0mqnn11w80wf2czs1aclcss37"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-darwin-amd64.tar.gz"; @@ -151,8 +151,8 @@ sha256 = "1lkrx2cayhhv432dvzvz8q4i1gfi659rkl59c0y0dkwbs8x425zb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0ic8cnrv8z1qwnlqk3dc3xrczx4ncxwdsdh1shk655hcsfdrcldq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.1-darwin-amd64.tar.gz"; + sha256 = "1f3vdij0ikf4nr5zdy32qpv9kbz8pdq8d39hnx8p41cs1lxiw3kd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index ed4fbd79ed8..dd6c2798459 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,24 +3,24 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.3.1" +VERSION="3.4.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=2.2.0" - "aws=4.6.0" + "aws=4.7.0" "cloudflare=3.1.0" "consul=3.2.0" "datadog=3.3.0" - "digitalocean=4.3.1" + "digitalocean=4.4.0" "docker=3.0.0" "equinix-metal=2.0.0" - "gcp=5.6.0" + "gcp=5.8.0" "github=4.1.0" "gitlab=4.1.0" "hcloud=1.0.0" - "kubernetes=3.3.0" + "kubernetes=3.3.1" "linode=3.1.0" "mailgun=3.1.0" "mysql=3.0.0" From dbc6affe798ff152d2799994b73b5a77ff0d7fc5 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Jun 2021 20:40:05 +0200 Subject: [PATCH 507/797] lucenepp: use fetchFromGitHub --- pkgs/development/libraries/lucene++/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 2761329ea23..79e28cc7bb4 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, boost, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest }: stdenv.mkDerivation rec { pname = "lucene++"; version = "3.0.7"; - src = fetchurl { - url = "https://github.com/luceneplusplus/LucenePlusPlus/" - + "archive/rel_${version}.tar.gz"; - sha256 = "032yb35b381ifm7wb8cy2m3yndklnxyi5cgprjh48jqy641z46bc"; + src = fetchFromGitHub { + owner = "luceneplusplus"; + repo = "LucenePlusPlus"; + rev = "rel_${version}"; + sha256 = "06b37fly6l27zc6kbm93f6khfsv61w792j8xihfagpcm9cfz2zi1"; }; postPatch = '' From 3f2e9c6dccb2b7caa9311a9b01a4621d9a27d113 Mon Sep 17 00:00:00 2001 From: ash lea Date: Fri, 4 Jun 2021 18:17:46 -0700 Subject: [PATCH 508/797] netbsd: add aliases for i486 and i586 --- pkgs/os-specific/bsd/netbsd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index d53a1afe5e6..479ab92c797 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -67,6 +67,8 @@ in lib.makeScopeWithSplicing HOST_SH = stdenv'.shell; MACHINE_ARCH = { + i486 = "i386"; + i586 = "i386"; i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; @@ -74,6 +76,8 @@ in lib.makeScopeWithSplicing MACHINE = { x86_64 = "amd64"; aarch64 = "evbarm64"; + i486 = "i386"; + i586 = "i386"; i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; From 5452b7f24c6c0bb02db7e41fead3e28a3086f7d6 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Wed, 9 Jun 2021 18:38:05 -0400 Subject: [PATCH 509/797] acme-sh: fix missing runtime dependencies (#121322) acme.sh is a shell script and uses coreutils, sed and grep. If they are not found in $PATH, it fails with obscure error message: >= /usr/bin/env -i ./result/bin/acme.sh --help /nix/store/rcbiaxiszy5pl49flfimqrn81fa491l1-acme.sh-2.8.2/libexec/acme.sh: line 6926: --help: command not found Co-authored-by: Dmitry Bogatov --- pkgs/tools/admin/acme.sh/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 0417e3079ce..83d4387bd35 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, + unixtools, dnsutils, coreutils, gnugrep, gnused }: stdenv.mkDerivation rec { pname = "acme.sh"; version = "2.9.0"; @@ -13,11 +14,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out $out/bin $out/libexec cp -R $src/* $_ makeWrapper $out/libexec/acme.sh $out/bin/acme.sh \ --prefix PATH : "${ lib.makeBinPath [ + coreutils + gnugrep + gnused socat openssl curl @@ -25,6 +31,8 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then iproute2 else unixtools.netstat) ] }" + + runHook postInstall ''; meta = with lib; { From a7dbeef25977d4b790b8192b43939435e1858362 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 15:39:00 -0700 Subject: [PATCH 510/797] lego: 4.3.1 -> 4.4.0 (#126334) --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4553242d663..78f4b8cd2cb 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "0mmr7fcqgbmr0b1fc49p6wjn7axxayyj420fxhhdvkd4nv8fxh1q"; + sha256 = "sha256-+5uy6zVfC+utXfwBCEo597CRo4di73ff0eqHyDUxxII="; }; - vendorSha256 = "04d141kjzqcjiwv6sd0sbrgsr7a99dvblm19gwzczljkfgi60q8w"; + vendorSha256 = "sha256-JgGDP5H7zKQ8sk36JtM/FCWXl7oTScHNboQ/mE5AisU="; doCheck = false; From d5df1b0f5dad1b6d0970dbe6050ab63ba5da38dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 10 Jun 2021 01:11:47 +0200 Subject: [PATCH 511/797] alienarena: 7.65 -> 7.71.2 --- pkgs/games/alienarena/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 84badc8d853..39b232b267c 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg +{ lib, stdenv, fetchsvn, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, libGL }: -stdenv.mkDerivation { - name = "alienarena-7.65"; +stdenv.mkDerivation rec { + pname = "alienarena"; + version = "7.71.2"; - src = fetchurl { - url = "https://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz"; - sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg"; + src = fetchsvn { + url = "svn://svn.icculus.org/alienarena/trunk"; + rev = "5673"; + sha256 = "1qfrgrp7nznk5n1jqvjba6l1w8y2ixzyx9swkpvd02rdwlwrp9kw"; }; nativeBuildInputs = [ pkg-config ]; From 90d944e42fdd0e2ee641312286aad6d2bb769ce7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 10:05:57 +0000 Subject: [PATCH 512/797] byacc: 20200910 -> 20210109 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 4f6f00e968e..756d99c6e7f 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20200910"; + version = "20210109"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "0c6gbvlgzi6yflri22w7fa2w3k5m3jk0xb5a43f3vwpa783hcn8a"; + sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c="; }; configureFlags = [ From 6960d3b17088433c63a8f6e39ef9b64c27e2f34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 10 Jun 2021 01:37:30 +0200 Subject: [PATCH 513/797] ansible_2_10: 2.10.9 -> 2.10.10 --- pkgs/development/python-modules/ansible/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index f3470f80b50..99a63d69939 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.9"; + version = "2.10.10"; src = fetchPypi { inherit pname version; - sha256 = "0l91bwbavjnaqsnb4c6f17xl7r0cvglz3rxqfs63aagw10z5sqq4"; + sha256 = "046ynyk9ldw35jbyw6jp0dmms735cd5i1f046f2lis8xv27bci3p"; }; # ansible_connection is already wrapped, so don't pass it through From 53448012e83d6b9872b345ede9873e4ffbc4acea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 10 Jun 2021 01:38:20 +0200 Subject: [PATCH 514/797] ansible_2_9: 2.9.21 -> 2.9.22 --- pkgs/development/python-modules/ansible/legacy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 2779feffee8..174ab6dc6c4 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.21"; + version = "2.9.22"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "1pfiwq2wfw11vmxdq2yhk86hm5jljlrnphlzfjr01kwzfikkdp5m"; + sha256 = "0gkv59cfxzs0ahgkxmmx9sqnfb2xqr10q4yh2662nbzajmvqmfgm"; }; prePatch = '' From 13a30b8e022734ca2569eea35f17967724950143 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:40:52 -0700 Subject: [PATCH 515/797] python3Packages.azure-core: 1.14.0 -> 1.15.0 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index e5394a616e8..6718ca1d504 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.14.0"; + version = "1.15.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f32bb64aabe61f496255c16dd6c555a027da628109460bf27311cee0caf78f96"; + sha256 = "197917b98fec661c35392e32abec4f690ac2117371a814e25e57c224ce23cf1f"; }; propagatedBuildInputs = [ From 087792492b5d9cfc3762dc42f962b5e42a882626 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:41 -0700 Subject: [PATCH 516/797] python3Packages.azure-mgmt-cognitiveservices: 11.0.0 -> 12.0.0 --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 09800f9cef3..cb782c6e58e 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "71414e3cd7445e44fc18f217f2d22df05c36877e1233328b2297d07ddf27e82a"; + sha256 = "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; }; propagatedBuildInputs = [ From 15cb243d1ba88df9c3f8edc1d8bc39b2aece791d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:41 -0700 Subject: [PATCH 517/797] python3Packages.azure-mgmt-compute: 20.0.0 -> 21.0.0 --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index c03855f816f..171c45220d1 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "20.0.0"; + version = "21.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8"; + sha256 = "9227c3755a70bc377d70e35e1fc6f1fab109dd88974fd2c7129867ccaa10f813"; }; propagatedBuildInputs = [ From 5068a827c0d980269435d9681acff2ce3d02dd90 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 518/797] python3Packages.azure-mgmt-containerregistry: 2.8.0 -> 8.0.0 --- .../azure-mgmt-containerregistry/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 821c7db0d32..8bc79a7df2f 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -1,21 +1,22 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "2.8.0"; + version = "8.0.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "193k07a77z7bj61zn2gxvvfqi20cgxksvxp7if71bwsl1l2y2jxj"; + sha256 = "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ azure-common azure-mgmt-core msrest msrestazure ]; # no tests included doCheck = false; From d85d463ba8a7145f0340c6f0113275ebf37d13ee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 519/797] python3Packages.azure-mgmt-eventgrid: 8.0.0 -> 9.0.0 --- .../python-modules/azure-mgmt-eventgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index 1b244818f91..c3ba311d4c4 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a8a6e1bb105a14f1d3545ecb07c190370f21a145f8ba51599ed169f1dc8d5dcc"; + sha256 = "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; }; propagatedBuildInputs = [ From ef4b195922d5f194668ae129e796083b61b86bcd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 520/797] python3Packages.azure-mgmt-eventhub: 8.0.0 -> 9.0.0 --- .../python-modules/azure-mgmt-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 6b86973bccd..5bd45d3609e 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ae02b1e3ccbb9ec45849de544dea4d8ef36ea767707207d055ae2b4f756c0d79"; + sha256 = "181f72adf9287741ded8e386c8934a722d08399d781ce1c452f0482aac1f019b"; }; propagatedBuildInputs = [ From d669a902f27780fe2ed0c28aae47ea7c1902bb74 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 521/797] python3Packages.azure-mgmt-hdinsight: 7.0.0 -> 8.0.0 --- .../python-modules/azure-mgmt-hdinsight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 5547eb032d0..02d2c6a013c 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "7.0.0"; + version = "8.0.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d0070817ee2be611d45af91eabc5665dd53f024eaa7a55e490ace4f71a55c733"; + sha256 = "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; extension = "zip"; }; From a0eeb74cd6867d41a44c478d0943b6fa2acfbef1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 522/797] python3Packages.azure-mgmt-managementgroups: 0.2.0 -> 1.0.0 --- .../python-modules/azure-mgmt-managementgroups/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix index e09646373b6..eb744b78ff7 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-managementgroups"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3d5237947458dc94b4a392141174b1c1258d26611241ee104e9006d1d798f682"; + sha256 = "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; From 8fb0e5d638ca1e1f62b6c60cb36d94a33b11ffb7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 523/797] python3Packages.azure-mgmt-managementpartner: 0.1.1 -> 1.0.0 --- .../python-modules/azure-mgmt-managementpartner/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix index d42fb5b05c3..169f52c86d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix @@ -3,22 +3,24 @@ , fetchPypi , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-managementpartner"; - version = "0.1.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1bvcmx7dkf2adi26z7c2ga63ggpzdfqj8q1gzcic1yn03v6nb8i7"; + sha256 = "1cd591848454a115c216d216a3fb7802c1b5de04b105e2696e4237b0f8768f2f"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From 755d9be64aaf53c90a8182c912844c966d312fdd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 524/797] python3Packages.azure-mgmt-media: 3.1.0 -> 7.0.0 --- .../development/python-modules/azure-mgmt-media/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 6320588ed43..b4d25a14938 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "3.1.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c35316d3d63dc99feb97ad7f12a7b411046537f5c6d79ef14f6067bcc379292f"; + sha256 = "b45e82a594ed91cd5aa7a5cd5d01f038b7ac3cf12233e7ba2beaaa3477900e8e"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; From be4ff987a803627e8e4be9845fa4418904f1bfd2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 525/797] python3Packages.azure-mgmt-netapp: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 35dc7ef05ab..ccb7c559247 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "3.0.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e"; + sha256 = "5a293118c5089c4ec81f676b76aa95c60408a3443a46131d22978ffb81fe4605"; extension = "zip"; }; From 5d4ef7d5f0ddc3dbeb3de3df6de19f877ab348fc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 526/797] python3Packages.azure-mgmt-rdbms: 8.0.0 -> 8.1.0 --- pkgs/development/python-modules/azure-mgmt-rdbms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index c7cb274d68b..56e53142163 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8b018543048fc4fddb4155d9f22246ad0c4be2fb582a29dbb21ec4022724a119"; + sha256 = "b30003a94c306533ebfb741b824dd1cc6c0a1810200926675e6b808bd0459d19"; }; propagatedBuildInputs = [ From e5561e72fe66869aecdedeb2986fc09c4bec54f7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 527/797] python3Packages.azure-mgmt-recoveryservicesbackup: 0.11.0 -> 1.0.0 --- .../azure-mgmt-recoveryservicesbackup/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 4ce18c4ae3b..25aae3ffad0 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -4,23 +4,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.11.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; + sha256 = "fd915aa6a76ef9e0e963615d4c909400c8d5646e26273ae25fa1418ce61e28d2"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From 14afdb6d4b6190798d49266c4187c6f52c8261cd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 528/797] python3Packages.azure-mgmt-servicefabric: 0.5.0 -> 1.0.0 --- .../python-modules/azure-mgmt-servicefabric/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index abb117d0046..661a507291d 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -6,23 +6,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-servicefabric"; - version = "0.5.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5771f24516c8d4a27f5569f23f3a606f6f106e4ad502eec7f38aedfcd3eadc74"; + sha256 = "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From ce1a6f7e918623ff4bb962d80ce7ddf208ed8e49 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 529/797] python3Packages.azure-mgmt-sql: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index e41e13f2b58..83cffa0a295 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "191accd6e5b47f93a10cebb94e2ca5086f0b6f4afd0290b8596206cd4acb0d5c"; + sha256 = "5474387ec3417b0a277de2b42c6d1992256a6a9717ca1ada0e8dad01238b9919"; }; propagatedBuildInputs = [ From c8840a73c4b3291c892e38fa07d0ebf0e7ceef4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 530/797] python3Packages.azure-mgmt-web: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 9bd5371412d..b2643eb336c 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; + sha256 = "274239993a4705c9e1135842137d77a703f63d14ee5c1a5ee87fe1f8a471a061"; }; propagatedBuildInputs = [ From adb88eac2724aed21431c7d823724e799ed7bb74 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 531/797] python3Packages.knack: 0.8.0 -> 0.8.2 --- pkgs/development/python-modules/knack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 0b4c24afa4d..5a05449e610 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.8.0"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "16aa47240add6badd933a0b27576f3c090d7469177dc941e3ece05ca88123199"; + sha256 = "4eaa50a1c5e79d1c5c8e5e1705b661721b0b83a089695e59e229cc26c64963b9"; }; propagatedBuildInputs = [ From 0d977fbddb0cdef97b4e97e9c8f04820363c9ff3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:34:48 -0700 Subject: [PATCH 532/797] azure-cli: 2.23.0 -> 2.24.2 --- pkgs/tools/admin/azure-cli/default.nix | 5 +- .../tools/admin/azure-cli/python-packages.nix | 53 ++++++++++++------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index c037f661e61..ea0caf02055 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.23.0"; + version = "2.24.2"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-uIM1U9hub1A1YT6CzwQHmefNBuU4tDapu7VC6EP5kuM="; + sha256 = "sha256-4XmwM0/89hacA8ARs5Zq/ahzeqIc9wS18zT/ale+wQ4="; }; # put packages that needs to be overriden in the py package scope @@ -132,6 +132,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { mock paramiko pydocumentdb + PyGithub pygments pyopenssl pytz diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 421aa3da4a4..6dc575c6b60 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -153,8 +153,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip" "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.1.0" "zip" - "sha256-XPnO6OiwjTbfxz9Q3JkuCPnfTtmdU2cqP14w9ZVIcBE="; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "18.0.0" "zip" + "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; @@ -171,14 +171,14 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.1.0" "zip" - "sha256-7d9UlMudNd4hMcaNxJ+slL/tFyaI6BmBR6DlI3Blzq4="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.2.0" "zip" + "sha256-x2YJt+fX0B+YMn7+yYi4t21K518DQQ3kBHn1nCrDSqo="; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.2.0" "zip" - "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.3.0" "zip" + "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d"; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip" "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; @@ -192,8 +192,8 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip" - "187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.0.0" "zip" + "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; @@ -213,8 +213,8 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "18.0.0" "zip" - "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.0.0" "zip" + "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8"; azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "0.1.0" "zip" "sha256-wSDiELthdo2ineJNKLgvjUKuJOUjlutlabSZcJ4i8AY="; @@ -222,6 +222,9 @@ let azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; + azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "0.1.0" "zip" + "sha256-/2LZgu3aY0o2Fgyx0Vo2epVypay0GeXnrTcejIO9R8c="; + azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; @@ -231,8 +234,8 @@ let azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "0.1.0" "zip" - "sha256-0pz9jOyAbgZnPZOC0/V2b8Zdmp3nW0JHBQlKNKfbjSM="; + azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" + "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "2.0.0" "zip" "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; @@ -294,11 +297,11 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.1.0" "zip" - "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "18.0.0" "zip" + "d17beb34273797fa89863632ff0e1eb9b6a55198abb8c7f05d84980762e5f71f"; - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" - "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip" + "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; @@ -463,13 +466,25 @@ let doCheck = false; }); - knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.8.1"; + PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec { + version = "1.38"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-5h2a5OJxmaLXTCYfgen4L1NTpdHC4a0lYAp9UQkXTuA="; + sha256 = "sha256-HtCPd17FBnvIRStyveLbuVz05S/yvVDMMsackf+tknI="; + }; + + doCheck = false; + }); + + knack = super.knack.overridePythonAttrs(oldAttrs: rec { + version = "0.8.2"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-TqpQocXnnRxcjl4XBbZhchsLg6CJaV5Z4inMJsZJY7k="; }; }); From edbd277ddc86df69e935e9868e69913d45001609 Mon Sep 17 00:00:00 2001 From: Julien DOCHE Date: Wed, 9 Jun 2021 22:56:16 +0200 Subject: [PATCH 533/797] flawfinder: Add supported platforms The package cannot be installed otherwise. Signed-off-by: Julien DOCHE --- pkgs/development/tools/flawfinder/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/development/tools/flawfinder/default.nix index 28805b4abe4..554ca92b8c0 100644 --- a/pkgs/development/tools/flawfinder/default.nix +++ b/pkgs/development/tools/flawfinder/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://dwheeler.com/flawfinder/"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; + platforms = platforms.all; }; } From 03cd97a25df44b65dca08f7e14559f21d6316c27 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Fri, 4 Jun 2021 11:26:01 +0200 Subject: [PATCH 534/797] amdvlk: 2021.Q2.2 -> 2021.Q2.4 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 5693a5968b6..e3bc04a6d22 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q2.2"; + version = "2021.Q2.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "4k9ZkBxJGuNUO44F9D+u54eUREl5/8zxjxhaShhzGv0="; + sha256 = "KPWkwbD55BoztF6DPmvau9i1AMhR+5ad5VrrD8I2YyI="; }; buildInputs = [ From f81bfe459f85d594609e597119fd59381a367237 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Fri, 4 Jun 2021 11:32:38 +0200 Subject: [PATCH 535/797] nixos/manual: update for newer amdvlk versions --- nixos/doc/manual/configuration/gpu-accel.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml index 3695a5ff445..9aa9be86a06 100644 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ b/nixos/doc/manual/configuration/gpu-accel.xml @@ -178,9 +178,9 @@ GPU1: Core Next (GCN) GPUs are supported through either radv, which is part of mesa, or the amdvlk package. Adding the amdvlk package to - makes both drivers - available for applications and lets them choose. A specific driver can - be forced as follows: + makes amdvlk the + default driver and hides radv and lavapipe from the device list. A + specific driver can be forced as follows: = [ pkgs.amdvlk @@ -191,10 +191,9 @@ GPU1: pkgs.driversi686Linux.amdvlk ]; - # For amdvlk - .VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; - # For radv + # Force radv + .AMD_VULKAN_ICD = "RADV"; + # Or .VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; From 336130a90f64d34aa8465d200fdc1d2725fd31b9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 10 Jun 2021 02:33:10 +0200 Subject: [PATCH 536/797] nixos/gale: remove This should have been removed along the package in 3f7d959. --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/networking/gale.nix | 181 --------------------- 3 files changed, 2 insertions(+), 184 deletions(-) delete mode 100644 nixos/modules/services/networking/gale.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7ea2940292b..2cbbbc522e1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -252,7 +252,7 @@ in postsrsd = 220; opendkim = 221; dspam = 222; - gale = 223; + # gale = 223; removed 2021-06-10 matrix-synapse = 224; rspamd = 225; # rmilter = 226; # unused, removed 2019-08-22 @@ -562,7 +562,7 @@ in postsrsd = 220; opendkim = 221; dspam = 222; - gale = 223; + # gale = 223; removed 2021-06-10 matrix-synapse = 224; rspamd = 225; # rmilter = 226; # unused, removed 2019-08-22 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0c9a7055aa7..06f9a05cf66 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -692,7 +692,6 @@ ./services/networking/flannel.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix - ./services/networking/gale.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix ./services/networking/ghostunnel.nix diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix deleted file mode 100644 index cb954fd836b..00000000000 --- a/nixos/modules/services/networking/gale.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.gale; - # we convert the path to a string to avoid it being copied to the nix store, - # otherwise users could read the private key as all files in the store are - # world-readable - keyPath = toString cfg.keyPath; - # ...but we refer to the pubkey file using a path so that we can ensure the - # config gets rebuilt if the public key changes (we can assume the private key - # will never change without the public key having changed) - gpubFile = cfg.keyPath + "/${cfg.domain}.gpub"; - home = "/var/lib/gale"; - keysPrepared = cfg.keyPath != null && lib.pathExists cfg.keyPath; -in -{ - options = { - services.gale = { - enable = mkEnableOption "the Gale messaging daemon"; - - user = mkOption { - default = "gale"; - type = types.str; - description = "Username for the Gale daemon."; - }; - - group = mkOption { - default = "gale"; - type = types.str; - description = "Group name for the Gale daemon."; - }; - - setuidWrapper = mkOption { - default = null; - description = "Configuration for the Gale gksign setuid wrapper."; - }; - - domain = mkOption { - default = ""; - type = types.str; - description = "Domain name for the Gale system."; - }; - - keyPath = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - Directory containing the key pair for this Gale domain. The expected - filename will be taken from the domain option with ".gpri" and ".gpub" - appended. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be added to /etc/gale/conf. - ''; - }; - }; - }; - - config = mkMerge [ - (mkIf cfg.enable { - assertions = [{ - assertion = cfg.domain != ""; - message = "A domain must be set for Gale."; - }]; - - warnings = mkIf (!keysPrepared) [ - "You must run gale-install in order to generate a domain key." - ]; - - system.activationScripts.gale = mkIf cfg.enable ( - stringAfter [ "users" "groups" ] '' - chmod 755 ${home} - mkdir -m 0777 -p ${home}/auth/cache - mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub - mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub - mkdir -m 0755 -p ${home}/auth/trusted # ROOT - mkdir -m 0700 -p ${home}/.gale - mkdir -m 0700 -p ${home}/.gale/auth - mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri - - ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT" - chown ${cfg.user}:${cfg.group} ${home} ${home}/auth ${home}/auth/* - chown ${cfg.user}:${cfg.group} ${home}/.gale ${home}/.gale/auth ${home}/.gale/auth/private - '' - ); - - environment = { - etc = { - "gale/auth".source = home + "/auth"; # symlink /var/lib/gale/auth - "gale/conf".text = '' - GALE_USER ${cfg.user} - GALE_DOMAIN ${cfg.domain} - ${cfg.extraConfig} - ''; - }; - - systemPackages = [ pkgs.gale ]; - }; - - users.users.${cfg.user} = { - description = "Gale daemon"; - uid = config.ids.uids.gale; - group = cfg.group; - home = home; - createHome = true; - }; - - users.groups = [{ - name = cfg.group; - gid = config.ids.gids.gale; - }]; - }) - (mkIf (cfg.enable && keysPrepared) { - assertions = [ - { - assertion = cfg.keyPath != null - && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpub"); - message = "Couldn't find a Gale public key for ${cfg.domain}."; - } - { - assertion = cfg.keyPath != null - && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpri"); - message = "Couldn't find a Gale private key for ${cfg.domain}."; - } - ]; - - services.gale.setuidWrapper = { - program = "gksign"; - source = "${pkgs.gale}/bin/gksign"; - owner = cfg.user; - group = cfg.group; - setuid = true; - setgid = false; - }; - - security.wrappers.gksign = cfg.setuidWrapper; - - systemd.services.gale-galed = { - description = "Gale messaging daemon"; - wantedBy = [ "multi-user.target" ]; - wants = [ "gale-gdomain.service" ]; - after = [ "network.target" ]; - - preStart = '' - install -m 0640 -o ${cfg.user} -g ${cfg.group} ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/" - install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub" - install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub" - ''; - - serviceConfig = { - Type = "forking"; - ExecStart = "@${pkgs.gale}/bin/galed galed"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - }; - }; - - systemd.services.gale-gdomain = { - description = "Gale AKD daemon"; - wantedBy = [ "multi-user.target" ]; - requires = [ "gale-galed.service" ]; - after = [ "gale-galed.service" ]; - - serviceConfig = { - Type = "forking"; - ExecStart = "@${pkgs.gale}/bin/gdomain gdomain"; - User = cfg.user; - Group = cfg.group; - }; - }; - }) - ]; -} From 416dd41bad3de9e430d24bb3eff75c17100f7823 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Jun 2021 10:53:33 +1000 Subject: [PATCH 537/797] crun: 0.20 -> 0.20.1 https://github.com/containers/crun/releases/tag/0.20.1 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 2e7700d855c..e172248c8dd 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.20"; + version = "0.20.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-NlpgdRizQFt5T3CRxt0DVXTVPUbge9uPc9B7LuR3o1k="; + sha256 = "sha256-Fo8UCUwZ5RiJTXs1jWn1Mwq2qvK8p++ETxW9Tseokjw="; fetchSubmodules = true; }; From 90dcc956a1f87b634b361b99a76ca475f51df855 Mon Sep 17 00:00:00 2001 From: Oliver Evans Date: Wed, 9 Jun 2021 01:49:46 -0400 Subject: [PATCH 538/797] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 275 ++++++++++++++-------------- 1 file changed, 138 insertions(+), 137 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f1a06264688..5524c38ca2b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-06"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "00fe69a21e128d0378d1e00eb5334cde9cd7a227"; - sha256 = "0nrcxsf00x2ygh16965d6fp5lhjq7hg9wzqgail2l0pwjdxnizm4"; + rev = "eaee30fe7afdbce73f92d0c766f4b411c8de5525"; + sha256 = "0b73k55zfhd4ygqiwwps17fp9nksbs8km57vfl0y85vb3ajzg0l6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-06-04"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "06d950e547e8fa1a775399ae5eeb70603084b109"; - sha256 = "1fj8v8zm0w04fyxf12ck4lc3gwq6bxh5shmwc24j0sar3ki0i4rz"; + rev = "898335d52ed925e8dd5dd3da3c25470d352b2e11"; + sha256 = "19ks20v1mjm5yrhlrkxqpmsc8jz2nfz5w38ixfkpbhdj3qwdf5gg"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -617,12 +617,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2021-03-14"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "a7ce436b211a7ac1f47cfd440370653e33c2a1d5"; - sha256 = "1yfcbh9q35w1ckdv8isbwjwlgnjnjmqm8yc7bcbfirkx9pjlsw2z"; + rev = "6a00a2cabfb5ee3f49ff556ceea56892825c0397"; + sha256 = "0z2zr2mfc5m4xn8b0j0br7q96hs42md5wd53viv0zmw67i2pnbcs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -774,12 +774,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-05-31"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "31820e386ce7a32488ad6b19033c17a8f05c36bf"; - sha256 = "1p35blgnd99kggwyiag6drx3v6zqx50ypxnfvvij102ws50144fk"; + rev = "643ae9bf5f08e752a22027628b69a31ce271f1b5"; + sha256 = "0jbd1y0riq6xdyh0x5msw8475b7v0viapgkmawyda3ax8bczb3jv"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -810,12 +810,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-01"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "5f92ee08b9c0018df244de47dc6e2ed4ba232a64"; - sha256 = "16xfkblsn149v9rgqjcimaw380xv6l8gimfaj368gh9h2icaz9qc"; + rev = "2f1c81a86342e333a916a1bc7db5218cf115a191"; + sha256 = "0ysnsixa7zy4plxr2qm2phyvl63qnmszjh3d8cbr4852klmv0shw"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1304,12 +1304,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "e174aa0a1e8a65fd9699f190c67fd197c2afa09f"; - sha256 = "0skzir27vzg5h8w0c7hj2p2i0540m768i1vbgqwpgz7y7wkgpbcm"; + rev = "93c3aba19c54a7e68fab6c9864eff499a744b4cc"; + sha256 = "01s43bg2y0yb5h7gkr75j23i5jy5acaz0m65nbx5c6x1lbm7fy20"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1364,12 +1364,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-05-22"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "af858776b6faf81b9eb50f8bbb87c639ee483c93"; - sha256 = "07smppxp2wr4282vsz0zdx3kkhvrx9f5140dwx4h4p8chs1c1zc5"; + rev = "d1fa03e861b514aa485b6b1369ebb4cc34d4a817"; + sha256 = "1v28cl52bfxl9c12bk0hnr14nn8mp5wg6qqp5ycmsw44rbg18vh4"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1799,12 +1799,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-06-06"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0d8db4531a508f875d98b55f5e78bc1c560d6342"; - sha256 = "1avp9df2lbiczycgfiigbyny8s6srjw6h88a88161m29g2mznr2s"; + rev = "b5a6c6c0cbac430d61965be1fac5b984d3c9c469"; + sha256 = "19k96irs8saibjxah457ir418l3aih1rp3arj6b1m14p3yf2dxy3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1895,24 +1895,24 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat-nvim"; - version = "2021-05-28"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "521d9234d1c8c3a0e9dc782a8f2e5776483856b0"; - sha256 = "1k92z847ix3c7kwiyiw4x41z2sid2wyyjgv08myh93k0ivb5y4qh"; + rev = "0b27de51438f62870f1558ef9c27cb20caec69cf"; + sha256 = "0k9hqjw857ri0vbgjncbbfgh0yh1bpqr25vj0drp9wiakn5pywqf"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-06-05"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "ad076d46c76b884d7b555067d3434b3666c3b80b"; - sha256 = "0m4ks6gxh3clg4vg1rxyvhjjkmmwipb9s38zwbaidfqwifldjriy"; + rev = "2dc25bb14fbd69f888dd0615c5576dd730de869a"; + sha256 = "1i87f7vfgk1szy18cg7nng2yqvcny4v1wnh4dbw74lcqmmazgi7y"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -2123,12 +2123,12 @@ final: prev: indent-blankline-nvim-lua = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim-lua"; - version = "2021-04-28"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "ec5816267caa5fdde7a5e5a8359b9b19bc8ecf49"; - sha256 = "008q3rg6fz36k334ci30f1vci9hws4y04z8gr4wnq9q8qx57y7nh"; + rev = "4e1004b4efcb8f4bbb29d69dd4898ed14120a973"; + sha256 = "1y1skj9q29sk7dfza1s21gfwyjfk49v5b298br39xiankin1b8jx"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2292,12 +2292,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-05-20"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "2f35033a2141eea7a5a89ef8be438985781a9fcf"; - sha256 = "1d7xl7i5xl4mnpx7bl9cnf23x48lc6ambhgb98phzdsb0kzjhv3n"; + rev = "69673e40a3c9c6532c1500ba92fed93ccd55af90"; + sha256 = "07nh2pdl09z6k6bzfsbxyna1rccji7s1sz6z4lmhi6fdi7wjby7j"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2388,11 +2388,11 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-06-03"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "3849b6440299215e5168d569713d2a5540dfbf2b"; + rev = "183fa5f3203983fed87174e6f193f271133fe974"; sha256 = "17if75p3x4lkqncl296f3jdq0rcc69b0mgj0dbz6cl851bmqvy40"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; @@ -2400,12 +2400,12 @@ final: prev: lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2021-06-04"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "fdf448398335434f4b5c45aff5f4ee64a3d090fa"; - sha256 = "0wi7837yy4x89w6gw72qkaxbb0vdm3hlxnkjplg2g4ibpayxx3s4"; + rev = "48ac5798b74b8ef8212adc70048ff0ed6f4e1976"; + sha256 = "08n8zfglml4v983nnm8gg25vggg5cfjsqrm96k8s3j5wmzi95mhx"; }; meta.homepage = "https://github.com/leanprover/lean.vim/"; }; @@ -2592,12 +2592,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "5aca93b10b571a8dfafd2c9e850239dfa2094a6f"; - sha256 = "1k8k7zq03jnvh4328i0s0d87g9s5y2yc94wnpg059clmp1cizcq4"; + rev = "88272b6d89e8140a35099ea563978172f2776dc9"; + sha256 = "013ffydnhjwzj0y106m0x65zx31kabsxrs86ndq2vik3pc6vyslq"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3048,12 +3048,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-06-03"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "f0a22c4609e6f090afdcb147242a2e96ac763f4a"; - sha256 = "09y03krzg2wl0mlgvc3shvdbvjr8ga69amknbfzvnmplmqyji0g5"; + rev = "55dcb4206324e3f90dd9dd41bed22fc6d4887098"; + sha256 = "0iiblvqmn7xg3mpyppzng081wgpdfrdn9jpa3ijr2ly6w5jg0yqa"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3264,12 +3264,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-05-30"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "fb80ed60c642b1f3666125c3051bd2da34453eeb"; - sha256 = "1p87dc296icb2kpyzlflpzbaq5z2yg106mpsxxzmwzn949smsk7l"; + rev = "abf700104c0450bac10be3ece613ff88997f47e4"; + sha256 = "0s3z5kd2h8cx6lplvg3yqp2pacx8c7kcavpvwnl71vmi0s2ld85s"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3288,12 +3288,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-06-02"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "6965333869ca172a18606c93d6f6c1275fb9aabb"; - sha256 = "0nljk4ncxz5syf0wr29j3bdxdw5bjpjn879ls1r910hicn4lg468"; + rev = "f6464fa295005049c07650f41b06c0216c3c112d"; + sha256 = "124qxhi9ckjqhxwj8wlxd6srlalmhpr58pidpvvdpvzcpp205yr2"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3336,48 +3336,48 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-06-06"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "64c937940c2d890bd192a56e1a831e378fe0168b"; - sha256 = "05pa2zz7dwzfjsgz8chv0wkx202f8x3plbxyczlkp390sfhqk0nn"; + rev = "34a02b4f37a99b80eff03dff90c675b7374af54b"; + sha256 = "0vz610ifrzzish5qysz8pz7w0zcfhm0q0xvya3r48fgs12ipahmq"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-05-27"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "4388bb114a9c153cbe8c5745f6c3cb92edc9bf4b"; - sha256 = "0ivgdl0biiz91g5s0riva77ybzp33driwm7p7fwl94czqgyjjqc4"; + rev = "b53dbb4d33a77e1b9b16672565749d6990e84cf0"; + sha256 = "1fwb797jcp5xkrfcqqljlhpnggkj3wfrc6zb0h662i35yhbhnin8"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-06-06"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "85b05cdc0ce371b055504be5d16cdfb1ea110f22"; - sha256 = "0sr3rcy5mw0gx06x12dqc4bsb2ypc2xvcr6cqzw4w8w520ys7aid"; + rev = "2063533b0f496ac7047fa9c58937d2a35b995dbe"; + sha256 = "1k95dyrqcy88b0s8jsijgx7mpnfmw2ay2fzj3bhbdqagdghsgpp4"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-06-01"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "883cd1b0d8029c97bb6c3358b8e55c040b0c7bcb"; - sha256 = "06mcl11jx56wym2jfinpbklpfn55d6j35yy80dv9dy8072mb5f9f"; + rev = "7b510d5241fb29f5a5e985e02c4cfa046ec4ee3e"; + sha256 = "1ahy4v7z08l0z6c7v19dik8icw943kc243vlzhs1bfa4aj13nncs"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3408,12 +3408,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-06-02"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "310488302c6532646adfe8228e40187a80b36ac5"; - sha256 = "1anfrybaliyaxgi8iv55hncnac8xgizqw9b9047lw2grkybmrdn4"; + rev = "c459c3f3a18c7ff7a312593c481af2b90fa01655"; + sha256 = "148k41db7ncri3mgdhc13mi4xk7chdchbgf42zldhcrf05y3xd58"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3432,24 +3432,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-06-03"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "826a1931fdf1b3b67a0b456aa3abc1b72185a7a7"; - sha256 = "0g8x9vk9qv16zlbvx3h8w2vhnqyycssn5v4y8sdhsnhyjljsjygz"; + rev = "dfacc1fb7aeb0789c4fd27004e312cf363becba5"; + sha256 = "058kjgngg7l37q9zbfz0xfqajx526m4cp85i3chcsfrvp99c7mzv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-06-05"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "3c221fe2cc2d675ebf8c83bb62e0b44516ae34ae"; - sha256 = "0hcfs9c5m610sh5105kd4qbgj8ikfds7zfh2hcf1ly5ikkbz1ma4"; + rev = "9190b4a625a449927ffc3777b45db6cb392dc8f6"; + sha256 = "1gai54z6w4dw17irwnwfd35k8zy2aiws2ia9vqamzicaf0n8axr8"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3468,12 +3468,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-05-30"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "60994408e6684fb776bcfb80c456cbdf8bc6eb93"; - sha256 = "044bgiyhi4db5avajry9v168gz55xn6yzr83j610k95hh2aam08a"; + rev = "53bfce7a254651469ce9577349811bc76d9af46c"; + sha256 = "1xcwrjfvikb1qqyaic2m0fi12l0hmxj0y5mwx1h95karpydbb0rz"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3540,12 +3540,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "62c04242031ed65a8d29ebefaaf645e8e3375748"; - sha256 = "1g1s85dzz7lr3ky90m27m8f3s06xm4c87z96vwzaaajb28927774"; + rev = "f95be0c947237edb88df148dd61790988ab3a23e"; + sha256 = "1cddnkil9xid7xq3k0iszk12ma9pi396khqx6dzh2z9p7nkhk2rg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3624,24 +3624,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-06-05"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "82f1598bd4388c8089cf08007b17a3555c0328f0"; - sha256 = "1mpszdypmhw3zizm699rq1m3zfrzmn1ilqaha01zb3q64l7mddzc"; + rev = "906a35cd0e7520eaff369688cb0a090240d7c2b9"; + sha256 = "18nw0xm4dp45v9s9kn0cmjwxdwydgr5f1v2kgm6h6kc1wvvd5scj"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-06-04"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b5d603a876fe8c89e96a9cac2dac2dd375479dac"; - sha256 = "1x2cn0v7yyqlwz8g4vqxh0vai372946a1akbg50pldq24jxm8j0q"; + rev = "37ed50f28f8350de8dc70b56d8ac198aac9b1178"; + sha256 = "16mmjpk0pqqshlw1qj3zxx197iv4g7mscgfya17c7r03rybz0q19"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3840,12 +3840,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-06-03"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3715ce44c0aae69471511bd93789ccf578c9684c"; - sha256 = "1xcfmv7dn975hqa1izn4h80vpn3yksm8ali6nbxv62sij6m9na48"; + rev = "d21e0e2c157af0fad6c6752ca07a274632202710"; + sha256 = "0zww9975x8wkmcdxzg4b51v94iy9644lb1miaz9ra2nwzz4ljqzj"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4429,12 +4429,13 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-06-06"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "15acde01892efd6e8d2a5c452babe862ce05f74d"; - sha256 = "0bb06g2knzqj7himsvpfydq8yig2szz9q5pqds9yv83m3vh4kppl"; + rev = "bf19ffb2ea583516908ceb861e7c52a0c3260221"; + sha256 = "1mrqli7gpn3bzfjn3095ms9m8vkpf7zlia6m75c0ppxgmyry8ngs"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4501,12 +4502,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-06-01"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9dd432b1bce0bd448faf22375fcf6311ff0d4226"; - sha256 = "0asqmnyizcyg5drfhbm52l654q3s5ibvbnd8n45kbcn3cnaqb148"; + rev = "5c1fc0452387cae323692e3345238a780a942056"; + sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4609,12 +4610,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-04-24"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "f4773c0d2f7453fea23f5f69f433547f3d62ea0a"; - sha256 = "06fsfsvrq6sqyqpmj693vn810c6zvzn16781mw6bb2912cmyrs5z"; + rev = "a8c4af3d69839cd2c03d458044fb3d3b128e450d"; + sha256 = "0s87vzdb3j3hna5yda4jay1k4zw419mqd8yn3h4q22qhhsr36q0k"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -5116,12 +5117,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-05-18"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b3fd9022bdc3472dac114a8b2aa85b845189514b"; - sha256 = "0yss85xy3i6gfgpwy3h42db5q5gpmv9m3s64ygfix5f24lflsi98"; + rev = "b6c9a814a4fdfcad3ea53d8888746803a7218a9e"; + sha256 = "0iqirp8pmsrgrk3i0hkk1a66igc5ydi96scp62yl97nazhz45xxr"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -5464,12 +5465,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-06-04"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "82b1b2e87677b468a3b6140372839654d8c346e7"; - sha256 = "0vvaj84q72z5b473f4823laxdvqb1qqj83n05ixavzpjq2qnlmhq"; + rev = "49cdcb7b3ea76ee19c737885c0ab19e64e564169"; + sha256 = "17p0j9i6ylns66cx6qw4266yd6al1gvmran3k4v2mhjlynf5c4s3"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5560,12 +5561,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-06-05"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "31e47bb9ee7a8b7aa2d324723dac75ea02896044"; - sha256 = "1pw5iipr6yln1nspy2sn13cx7p1cn5485l8rkkkyqfwqgqsj3jfq"; + rev = "43ec20e20f21f4f4a5eccadef01186ee7bf1df98"; + sha256 = "0qa9a6l9snkvnf41924mvv5yhm8ywcz6mzdirsr43inp5hgv6r8n"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -5740,12 +5741,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-06"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "351ec86836986fb36e48ba414d65b62a7793374a"; - sha256 = "1gksn9s40fjzwp6v0cmss2mxhpprj8ycysy5rbfp8h3vdghkkya7"; + rev = "c7e013cb273597e37eb65b481cbeb7d1b92b01b7"; + sha256 = "1i33y3jqjqbrg2mgnz4sxvsckl1ggdg3aymxxz4l3qivnbn1fni5"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6580,12 +6581,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-06-03"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "68a8cb300c75eb1cd2173b2aac70515e99904ef3"; - sha256 = "0s4c1vb2z3manl2i768f48i2pww2d4dj41plx4mvvi7sczlma30n"; + rev = "0f98634b92da9a35580b618c11a6d2adc42d9f90"; + sha256 = "0l1f98zfmxq8xi2ii31ih0mbq5yilpc0l61qbprs1g5h5p4azjy8"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -7326,12 +7327,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-06-02"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "ddd5abb5b6491117c4b7ef4149e47945926eecd8"; - sha256 = "0xv687xzwqhwpmxr65sm3ln74y8mxww1q3fqj57va06ilxzac56c"; + rev = "516fd7ce956bdfa2fa6ee8ac6d77ad8a57616811"; + sha256 = "0anfwxq93ddmymdna692xz74h3kimwmw1ii6pq8ci08i3pkqjrf7"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8095,12 +8096,12 @@ final: prev: vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2021-03-29"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "127257057c4befb8c1026a7ba7e07713af1fb5c8"; - sha256 = "1ai915kfxq4m8ba304qpcc2qb5rcj2vsrfcdh3blb1slw3a90hiq"; + rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646"; + sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -8203,12 +8204,12 @@ final: prev: vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2021-04-12"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "662c00676abab9d7ce16bf9f202420bf86cc6554"; - sha256 = "1birkzysn8midk627zyp3pla51wmz4sp613gs5xxlms5imq4diaq"; + rev = "9a5ce8edc67cca36cc530ee27a805112ce7a7e9b"; + sha256 = "0zx1mzaiqwqyg7imahwy0mzp52b2dzp4qdnrsgcnkvkxf8v67bak"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -8467,12 +8468,12 @@ final: prev: vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2021-02-16"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "196d05f7152fb95c4613476368ebae9dd842d470"; - sha256 = "0lk9clnvrkjbxgszg52zdl28d313vk2fiyh86aa6xx5pr0nr9iw3"; + rev = "2cc8c80c0a88e0d47de85bef1d50df86e197c302"; + sha256 = "0djk8s8q4b72blw73r4m7z9gc15gys167xgnvd1avmfyfw8fb22a"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -8972,12 +8973,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-06-04"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "17e372f83238d5d85f6574c59d5d210a898e8623"; - sha256 = "084mn6zxc2x8gp938fpi5ylwqy2pgvn046xbsmyq8md36vqb6m7g"; + rev = "d864a6b2b0f394b9371246cad226adac7507e13d"; + sha256 = "0bvdhbla38mvq9x595h5mcvib13sb84mz3z9f7sqf4m3c9v9376m"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9200,12 +9201,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-05-29"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "ad80aa67958a31a254d8994c7a517c1123256721"; - sha256 = "07pd7wzyvch400i6kv0ld3bx2x90ycdjaapwc7aaqkwikk2slq3h"; + rev = "5e67677a4815bbf474b52f8aefcfa2090fe43768"; + sha256 = "17pb39zhzsmmibxmsbrsd3znky88sar2sl0h7b1418qqkaakx4p9"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -9392,12 +9393,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-05-25"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "a51b8b23c9b7e12c2899e423037458d46dbe196e"; - sha256 = "0w49lgmg880pzblwwkkrp24pyvd8dkjbqvsx9m6n3x5n4zmz1c1f"; + rev = "1cbb400d426760a63d5383e2574e9d8905bebe51"; + sha256 = "172kryvxphsvbh2f60ka21rjsrq4abgdh1ijyxp57p1qbbv9fhcc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9405,12 +9406,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-01"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b0d430b80504e847584664d83e879399647cd38f"; - sha256 = "0k44iv5fig0601bc1vglgbphiw0h6gq8379zsk1ca3fgzyi2ic0p"; + rev = "fef77c8edf655d947e4d9c78d7bd2740ccda70cd"; + sha256 = "06hdz4rwwnmm1hhhjhvcd50r04qnvmksriaw4csv3gfnkfkm5v9r"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From d7e65e2ebf58e47da53803c0a626f29bd5bacd04 Mon Sep 17 00:00:00 2001 From: Oliver Evans Date: Wed, 9 Jun 2021 02:08:53 -0400 Subject: [PATCH 539/797] vimPlugins.gleam-vim: init at 2020-06-24 gleam-lang is a type-safe language on the Erlang VM. See https://gleam.run --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5524c38ca2b..a7fdb5fd919 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1821,6 +1821,18 @@ final: prev: meta.homepage = "https://github.com/gregsexton/gitv/"; }; + gleam-vim = buildVimPluginFrom2Nix { + pname = "gleam-vim"; + version = "2020-06-24"; + src = fetchFromGitHub { + owner = "gleam-lang"; + repo = "gleam.vim"; + rev = "847a5ef57c2faef2774242c87f711d1131b89fe6"; + sha256 = "17kjby64zdnmhyia1cx9jnk4mss0gca1jz1m4hff9rl63i56bql1"; + }; + meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; + }; + glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; version = "2021-05-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1a2457d36d3..015504c5b45 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -159,6 +159,7 @@ GEverding/vim-hocon gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell gioele/vim-autoswap +gleam-lang/gleam.vim glepnir/dashboard-nvim glepnir/galaxyline.nvim@main glepnir/lspsaga.nvim@main From 753d6763982a93bac0af0c66f0af1aab3c1e4293 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 9 Jun 2021 20:57:10 +0900 Subject: [PATCH 540/797] vscode-extensions: switch name to lowercase --- pkgs/misc/vscode-extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1ca566bf7f2..1d6ba18200d 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -615,7 +615,7 @@ let }; }; - JakeBecker.elixir-ls = buildVscodeMarketplaceExtension { + jakebecker.elixir-ls = buildVscodeMarketplaceExtension { mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; @@ -1173,7 +1173,7 @@ let }; }; - VSpaceCode.vspacecode = buildVscodeMarketplaceExtension { + vspacecode.vspacecode = buildVscodeMarketplaceExtension { mktplcRef = { name = "vspacecode"; publisher = "VSpaceCode"; @@ -1185,7 +1185,7 @@ let }; }; - VSpaceCode.whichkey = buildVscodeMarketplaceExtension { + vspacecode.whichkey = buildVscodeMarketplaceExtension { mktplcRef = { name = "whichkey"; publisher = "VSpaceCode"; From 9d763ac7dd6edd6b50ba45785d4ed4acab3773ae Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Thu, 10 Jun 2021 08:30:02 +0530 Subject: [PATCH 541/797] xplr: 0.14.0 -> 0.14.1 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index fbd48287e32..51319838eda 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.0"; + version = "0.14.1"; src = fetchCrate { inherit pname version; - sha256 = "1cyybqb91n91h6nig7rxxxw9c7krz80jdfl25bdr7mlbzymssn0q"; + sha256 = "08gb4dnnzdy3whn2411xmar1wpvmc014scbniicksra8p1xizh0b"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1bj1rgsmkbby4ma325fhpb911bwabhd5bihyv9j0dfvgm1ffdm8a"; + cargoSha256 = "1yxbirqf6c4bc364gw0nnjrjvhvjy2j2pbmvlpakv0bmyfphhb95"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From 728ea2bbe4132538c7f80643cf74ebe64b00364a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 10 Jun 2021 01:02:52 +0200 Subject: [PATCH 542/797] alsa-firmware: 1.2.1 -> 1.2.4 The patch was applied upstream: https://github.com/alsa-project/alsa-firmware/commit/c9e5b369919a956cf56d50a6f0be076e364f7820 --- pkgs/os-specific/linux/alsa-firmware/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index a627a7762a8..8f53eefb1fd 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -1,18 +1,14 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: +{ lib, stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-firmware-1.2.1"; + pname = "alsa-firmware"; + version = "1.2.4"; src = fetchurl { - url = "mirror://alsa/firmware/${name}.tar.bz2"; - sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; + url = "mirror://alsa/firmware/${pname}-${version}.tar.bz2"; + sha256 = "1fymdjrsbndws3gy4ypm7id31261k65bh2pzyrz29z5w11ynsyxn"; }; - patches = [ (fetchpatch { - url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch"; - sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78"; - }) ]; - nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ]; configureFlags = [ From e73852975221721690e182ef6a6d4a0369301a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=9B=87=E5=B4=A9=E4=B9=83=E9=9F=B3?= Date: Wed, 9 Jun 2021 23:04:04 +0200 Subject: [PATCH 543/797] tailscale: 1.8.6 -> 1.8.7 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index be3b4209eb9..cc80acd4226 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1h3ry4y62wwcv4z3yjqal4ch4xy40k9s3rq20lqs3r58kblnaxs2"; + sha256 = "0mw0sizy30slgyd06syd9sqx22dxd08ncqx7srcinj1g7hxylm5z"; }; nativeBuildInputs = [ makeWrapper ]; From 8c5bd90f9b8e366e3a6c5f43bc1cb62da19dfcf5 Mon Sep 17 00:00:00 2001 From: Thomas Desrosiers Date: Wed, 9 Jun 2021 23:29:30 -0400 Subject: [PATCH 544/797] yubikey-manager: 4.0.1 -> 4.0.3 --- pkgs/tools/misc/yubikey-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 12b3aa0f05f..ed4f76fa627 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "4.0.1"; + version = "4.0.3"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E="; + hash = "sha256-p7tv/bj6PMCnCU5j8Vhi60LxLiPmR1Cuf8xVdDVtZvQ="; }; propagatedBuildInputs = From 351e0d0fd32c8b53af4260b52dc4f9f7c68a0643 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 9 Jun 2021 23:55:55 -0300 Subject: [PATCH 545/797] aliases.nix: fix the alphabetical ordering --- pkgs/top-level/aliases.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 08d8ed9494f..1686a8eb20b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -40,8 +40,9 @@ mapAliases ({ adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01 ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 - alienfx = throw "alienfx has been removed."; # added 2019-12-08 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 + alienfx = throw "alienfx has been removed."; # added 2019-12-08 + alsaLib = alsa-lib; # added 2021-06-09 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 From 7f7f2ef93a601eca84a0958f3b76d2b3f9db3391 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 9 Jun 2021 22:15:45 -0300 Subject: [PATCH 546/797] alsa-project: a small refactor Now, all ALSA projects reside in a dedicated directory, namely, pkgs/os-specific/linux/alsa-project/ --- .../alsa-firmware/cross.patch | 0 .../alsa-firmware/default.nix | 0 .../alsa-lib/alsa-plugin-conf-multilib.patch | 0 .../{ => alsa-project}/alsa-lib/default.nix | 0 .../{ => alsa-project}/alsa-oss/default.nix | 0 .../alsa-plugins/default.nix | 0 .../alsa-plugins/wrapper.nix | 0 .../{ => alsa-project}/alsa-tools/default.nix | 0 .../alsa-topology-conf/default.nix | 0 .../alsa-ucm-conf/default.nix | 0 .../{ => alsa-project}/alsa-utils/default.nix | 0 pkgs/top-level/all-packages.nix | 26 +++++++------------ 12 files changed, 9 insertions(+), 17 deletions(-) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-firmware/cross.patch (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-firmware/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-lib/alsa-plugin-conf-multilib.patch (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-lib/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-oss/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-plugins/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-plugins/wrapper.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-tools/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-topology-conf/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-ucm-conf/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-utils/default.nix (100%) diff --git a/pkgs/os-specific/linux/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch similarity index 100% rename from pkgs/os-specific/linux/alsa-firmware/cross.patch rename to pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-firmware/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix diff --git a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch similarity index 100% rename from pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch rename to pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-lib/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-oss/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-plugins/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-plugins/wrapper.nix rename to pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-tools/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-topology-conf/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-ucm-conf/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-utils/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..90cd0eeb052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20102,23 +20102,15 @@ in alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; - alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; - - alsaLib = callPackage ../os-specific/linux/alsa-lib { }; - - alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { }; - - alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; - - alsaUtils = callPackage ../os-specific/linux/alsa-utils { - fftw = fftwFloat; - }; - alsaOss = callPackage ../os-specific/linux/alsa-oss { }; - alsaTools = callPackage ../os-specific/linux/alsa-tools { }; - - alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; - - alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; + alsaLib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; + alsaPlugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; + alsaPluginWrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; + alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; + alsaOss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; + alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; + alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware From e9e5f5f84dedea81605e493ea6cec41275a9a8fd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 9 Jun 2021 23:57:09 -0300 Subject: [PATCH 547/797] Change all alsaLib references to alsa-lib --- .../audio/CHOWTapeModel/default.nix | 4 +- pkgs/applications/audio/a2jmidid/default.nix | 4 +- pkgs/applications/audio/adlplug/default.nix | 4 +- pkgs/applications/audio/aeolus/default.nix | 4 +- .../audio/aj-snapshot/default.nix | 4 +- pkgs/applications/audio/ams/default.nix | 4 +- pkgs/applications/audio/ardour/5.nix | 4 +- pkgs/applications/audio/ardour/default.nix | 4 +- pkgs/applications/audio/audacious/default.nix | 4 +- pkgs/applications/audio/audacity/default.nix | 4 +- .../audio/bitwig-studio/bitwig-studio1.nix | 4 +- .../audio/bitwig-studio/bitwig-studio3.nix | 4 +- pkgs/applications/audio/bristol/default.nix | 4 +- .../applications/audio/callaudiod/default.nix | 4 +- pkgs/applications/audio/carla/default.nix | 4 +- pkgs/applications/audio/cava/default.nix | 4 +- pkgs/applications/audio/chuck/default.nix | 4 +- .../applications/audio/clementine/default.nix | 4 +- pkgs/applications/audio/cmus/default.nix | 4 +- pkgs/applications/audio/csound/default.nix | 4 +- pkgs/applications/audio/deadbeef/default.nix | 6 +-- pkgs/applications/audio/diopser/default.nix | 4 +- pkgs/applications/audio/distrho/default.nix | 4 +- pkgs/applications/audio/drumgizmo/default.nix | 4 +- pkgs/applications/audio/drumkv1/default.nix | 4 +- pkgs/applications/audio/ecasound/default.nix | 4 +- pkgs/applications/audio/eflite/default.nix | 4 +- .../audio/ensemble-chorus/default.nix | 4 +- pkgs/applications/audio/faust/faust2alqt.nix | 4 +- pkgs/applications/audio/faust/faust2alsa.nix | 4 +- pkgs/applications/audio/faust/faust2jack.nix | 4 +- pkgs/applications/audio/faust/faust2jaqt.nix | 4 +- pkgs/applications/audio/faust/faustlive.nix | 4 +- .../applications/audio/fluidsynth/default.nix | 4 +- pkgs/applications/audio/fmit/default.nix | 6 +-- .../audio/freewheeling/default.nix | 4 +- pkgs/applications/audio/ft2-clone/default.nix | 4 +- pkgs/applications/audio/giada/default.nix | 4 +- .../default.nix | 4 +- .../applications/audio/grandorgue/default.nix | 4 +- pkgs/applications/audio/gwc/default.nix | 4 +- .../audio/helio-workstation/default.nix | 4 +- pkgs/applications/audio/helm/default.nix | 4 +- .../audio/hybridreverb2/default.nix | 4 +- pkgs/applications/audio/hydrogen/0.nix | 4 +- pkgs/applications/audio/hydrogen/default.nix | 4 +- pkgs/applications/audio/iannix/default.nix | 4 +- .../audio/industrializer/default.nix | 4 +- pkgs/applications/audio/jaaa/default.nix | 4 +- pkgs/applications/audio/jack-rack/default.nix | 4 +- pkgs/applications/audio/jackmix/default.nix | 4 +- pkgs/applications/audio/japa/default.nix | 4 +- .../applications/audio/kmetronome/default.nix | 4 +- pkgs/applications/audio/lash/default.nix | 4 +- pkgs/applications/audio/librespot/default.nix | 4 +- pkgs/applications/audio/lingot/default.nix | 4 +- .../audio/linuxsampler/default.nix | 4 +- pkgs/applications/audio/lmms/default.nix | 4 +- pkgs/applications/audio/mamba/default.nix | 4 +- .../applications/audio/mhwaveedit/default.nix | 4 +- pkgs/applications/audio/mid2key/default.nix | 4 +- pkgs/applications/audio/midas/generic.nix | 4 +- .../audio/milkytracker/default.nix | 4 +- pkgs/applications/audio/mimic/default.nix | 4 +- .../audio/miniaudicle/default.nix | 4 +- pkgs/applications/audio/moc/default.nix | 4 +- pkgs/applications/audio/mpg123/default.nix | 4 +- pkgs/applications/audio/mpg321/default.nix | 4 +- pkgs/applications/audio/munt/default.nix | 4 +- pkgs/applications/audio/muse/default.nix | 4 +- pkgs/applications/audio/musescore/default.nix | 4 +- pkgs/applications/audio/musikcube/default.nix | 4 +- pkgs/applications/audio/ncspot/default.nix | 4 +- .../audio/netease-music-tui/default.nix | 4 +- pkgs/applications/audio/nootka/default.nix | 4 +- pkgs/applications/audio/nootka/unstable.nix | 4 +- pkgs/applications/audio/ocenaudio/default.nix | 4 +- pkgs/applications/audio/osmid/default.nix | 4 +- pkgs/applications/audio/padthv1/default.nix | 4 +- pkgs/applications/audio/patchage/default.nix | 4 +- pkgs/applications/audio/petrifoo/default.nix | 4 +- .../audio/pianobooster/default.nix | 4 +- pkgs/applications/audio/picoloop/default.nix | 4 +- pkgs/applications/audio/pmidi/default.nix | 4 +- pkgs/applications/audio/polyphone/default.nix | 4 +- pkgs/applications/audio/praat/default.nix | 4 +- pkgs/applications/audio/pt2-clone/default.nix | 4 +- pkgs/applications/audio/puredata/default.nix | 4 +- pkgs/applications/audio/qjackctl/default.nix | 4 +- pkgs/applications/audio/qmidiarp/default.nix | 4 +- pkgs/applications/audio/qmidinet/default.nix | 4 +- .../applications/audio/qmidiroute/default.nix | 4 +- pkgs/applications/audio/qmmp/default.nix | 4 +- pkgs/applications/audio/qsynth/default.nix | 4 +- pkgs/applications/audio/qtractor/default.nix | 4 +- pkgs/applications/audio/rakarrack/default.nix | 4 +- pkgs/applications/audio/reaper/default.nix | 4 +- pkgs/applications/audio/renoise/default.nix | 4 +- .../applications/audio/rosegarden/default.nix | 4 +- pkgs/applications/audio/rymcast/default.nix | 4 +- pkgs/applications/audio/samplv1/default.nix | 4 +- .../audio/schismtracker/default.nix | 4 +- pkgs/applications/audio/scream/default.nix | 4 +- pkgs/applications/audio/seq24/default.nix | 4 +- pkgs/applications/audio/seq66/default.nix | 4 +- pkgs/applications/audio/setbfree/default.nix | 4 +- pkgs/applications/audio/sidplayfp/default.nix | 4 +- pkgs/applications/audio/snapcast/default.nix | 4 +- pkgs/applications/audio/snd/default.nix | 4 +- pkgs/applications/audio/sndpeek/default.nix | 4 +- pkgs/applications/audio/songrec/default.nix | 4 +- .../audio/sonic-lineup/default.nix | 4 +- .../audio/sonic-visualiser/default.nix | 4 +- .../audio/sooperlooper/default.nix | 4 +- .../audio/soundtracker/default.nix | 4 +- pkgs/applications/audio/spot/default.nix | 4 +- pkgs/applications/audio/spotify/default.nix | 4 +- pkgs/applications/audio/spotifyd/default.nix | 4 +- .../audio/squeezelite/default.nix | 4 +- pkgs/applications/audio/stochas/default.nix | 4 +- .../applications/audio/strawberry/default.nix | 4 +- pkgs/applications/audio/sunvox/default.nix | 4 +- pkgs/applications/audio/synthv1/default.nix | 4 +- pkgs/applications/audio/tony/default.nix | 4 +- .../applications/audio/transcribe/default.nix | 4 +- pkgs/applications/audio/traverso/default.nix | 4 +- pkgs/applications/audio/tunefish/default.nix | 4 +- pkgs/applications/audio/vcv-rack/default.nix | 4 +- .../audio/virtual-ans/default.nix | 4 +- pkgs/applications/audio/vkeybd/default.nix | 4 +- pkgs/applications/audio/xmp/default.nix | 4 +- .../audio/xsynth-dssi/default.nix | 4 +- pkgs/applications/audio/yoshimi/default.nix | 4 +- .../audio/zita-ajbridge/default.nix | 4 +- .../audio/zynaddsubfx/default.nix | 4 +- .../blockchains/exodus/default.nix | 4 +- .../blockchains/parity-ui/env.nix | 4 +- .../editors/android-studio/common.nix | 4 +- pkgs/applications/editors/atom/env.nix | 4 +- .../editors/bonzomatic/default.nix | 6 +-- pkgs/applications/editors/emacs/generic.nix | 4 +- .../editors/kodestudio/default.nix | 4 +- .../editors/lighttable/default.nix | 4 +- .../editors/music/tuxguitar/default.nix | 4 +- .../applications/graphics/avocode/default.nix | 4 +- pkgs/applications/graphics/drawio/default.nix | 4 +- pkgs/applications/graphics/fluxus/default.nix | 6 +-- .../graphics/foxotron/default.nix | 4 +- .../graphics/kodelife/default.nix | 4 +- .../graphics/openboard/default.nix | 4 +- pkgs/applications/graphics/pencil/default.nix | 4 +- pkgs/applications/kde/kmix.nix | 4 +- pkgs/applications/kde/kwave.nix | 4 +- .../misc/1password-gui/default.nix | 4 +- pkgs/applications/misc/airtame/default.nix | 4 +- pkgs/applications/misc/audio/sox/default.nix | 4 +- pkgs/applications/misc/authy/default.nix | 4 +- pkgs/applications/misc/free42/default.nix | 4 +- pkgs/applications/misc/houdini/runtime.nix | 4 +- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- .../misc/moonlight-embedded/default.nix | 4 +- .../misc/moonlight-qt/default.nix | 4 +- .../misc/polar-bookshelf/default.nix | 4 +- pkgs/applications/misc/polybar/default.nix | 4 +- pkgs/applications/misc/qlcplus/default.nix | 4 +- pkgs/applications/misc/sampler/default.nix | 4 +- pkgs/applications/misc/upwork/default.nix | 4 +- pkgs/applications/misc/yambar/default.nix | 4 +- .../networking/appgate-sdp/default.nix | 4 +- .../networking/browsers/brave/default.nix | 4 +- .../networking/browsers/chromium/common.nix | 6 +-- .../browsers/firefox-bin/default.nix | 4 +- .../networking/browsers/firefox/common.nix | 4 +- .../networking/browsers/firefox/wrapper.nix | 6 +-- .../browsers/google-chrome/default.nix | 4 +- .../networking/browsers/opera/default.nix | 4 +- .../networking/browsers/palemoon/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../browsers/webbrowser/default.nix | 4 +- .../networking/hpmyroom/default.nix | 4 +- .../instant-messengers/baresip/default.nix | 4 +- .../instant-messengers/bluejeans/default.nix | 4 +- .../instant-messengers/discord/base.nix | 6 +-- .../instant-messengers/franz/generic.nix | 4 +- .../instant-messengers/gitter/default.nix | 4 +- .../instant-messengers/hipchat/default.nix | 4 +- .../instant-messengers/jitsi/default.nix | 4 +- .../mattermost-desktop/default.nix | 4 +- .../ring-daemon/default.nix | 4 +- .../instant-messengers/ripcord/default.nix | 4 +- .../instant-messengers/seren/default.nix | 4 +- .../signal-desktop/default.nix | 4 +- .../skypeforlinux/default.nix | 4 +- .../instant-messengers/slack/default.nix | 4 +- .../instant-messengers/stride/default.nix | 4 +- .../instant-messengers/teamspeak/client.nix | 4 +- .../telegram/kotatogram-desktop/default.nix | 4 +- .../telegram/tdesktop/default.nix | 4 +- .../telegram/tdesktop/tg_owt.nix | 4 +- .../instant-messengers/twinkle/default.nix | 4 +- .../instant-messengers/viber/default.nix | 4 +- .../vk-messenger/default.nix | 4 +- .../instant-messengers/wavebox/default.nix | 4 +- .../instant-messengers/zoom-us/default.nix | 4 +- pkgs/applications/networking/insync/v3.nix | 4 +- .../mailreaders/mailspring/default.nix | 4 +- .../mailreaders/thunderbird-bin/default.nix | 4 +- .../mailreaders/thunderbird/default.nix | 4 +- .../networking/mullvad-vpn/default.nix | 4 +- .../networking/mumble/default.nix | 4 +- .../networking/pcloud/default.nix | 4 +- .../applications/networking/pjsip/default.nix | 4 +- .../remote/citrix-workspace/generic.nix | 4 +- .../networking/remote/freerdp/default.nix | 4 +- pkgs/applications/office/jabref/default.nix | 4 +- pkgs/applications/office/mendeley/default.nix | 4 +- .../office/onlyoffice-bin/default.nix | 4 +- .../applications/office/wpsoffice/default.nix | 4 +- pkgs/applications/radio/direwolf/default.nix | 4 +- pkgs/applications/radio/fldigi/default.nix | 4 +- pkgs/applications/radio/gnuradio/3.7.nix | 4 +- pkgs/applications/radio/gnuradio/3.8.nix | 4 +- pkgs/applications/radio/gnuradio/default.nix | 4 +- pkgs/applications/radio/gqrx/default.nix | 4 +- pkgs/applications/radio/minimodem/default.nix | 4 +- pkgs/applications/radio/pothos/default.nix | 4 +- pkgs/applications/radio/qsstv/default.nix | 4 +- pkgs/applications/radio/quisk/default.nix | 4 +- .../applications/radio/soapyaudio/default.nix | 4 +- .../applications/radio/soundmodem/default.nix | 4 +- pkgs/applications/radio/svxlink/default.nix | 4 +- pkgs/applications/radio/unixcw/default.nix | 4 +- .../electronics/dsview/libsigrok4dsl.nix | 4 +- .../science/electronics/eagle/eagle.nix | 6 +-- .../science/math/mathematica/10.nix | 4 +- .../science/math/mathematica/11.nix | 4 +- .../science/math/mathematica/9.nix | 4 +- .../science/math/mathematica/default.nix | 4 +- .../science/robotics/apmplanner2/default.nix | 4 +- .../terminal-emulators/hyper/default.nix | 4 +- .../terminal-emulators/terminus/default.nix | 4 +- .../version-management/gitkraken/default.nix | 4 +- pkgs/applications/video/aegisub/default.nix | 6 +-- pkgs/applications/video/avidemux/default.nix | 4 +- pkgs/applications/video/cinelerra/default.nix | 4 +- .../video/clickshare-csc1/default.nix | 4 +- pkgs/applications/video/droidcam/default.nix | 4 +- pkgs/applications/video/kodi/unwrapped.nix | 4 +- .../applications/video/lightworks/default.nix | 4 +- pkgs/applications/video/mplayer/default.nix | 6 +-- pkgs/applications/video/mpv/default.nix | 6 +-- pkgs/applications/video/mythtv/default.nix | 4 +- .../applications/video/obs-studio/default.nix | 4 +- .../video/openshot-qt/libopenshot-audio.nix | 4 +- pkgs/applications/video/qmplay2/default.nix | 4 +- .../video/simplescreenrecorder/default.nix | 4 +- .../video/streamlink-twitch-gui/bin.nix | 4 +- pkgs/applications/video/vdr/plugins.nix | 4 +- pkgs/applications/video/vlc/default.nix | 4 +- .../applications/video/vokoscreen/default.nix | 4 +- pkgs/applications/video/webcamoid/default.nix | 4 +- .../video/webtorrent_desktop/default.nix | 4 +- pkgs/applications/video/wxcam/default.nix | 4 +- pkgs/applications/video/xawtv/default.nix | 4 +- .../virtualization/qemu/default.nix | 4 +- .../virtualization/spice-vdagent/default.nix | 4 +- .../virtualization/virtualbox/default.nix | 6 +-- pkgs/applications/virtualization/xen/4.10.nix | 4 +- .../window-managers/i3/status.nix | 4 +- .../window-managers/wayfire/wf-shell.nix | 4 +- .../windowmaker/dockapps/AlsaMixer-app.nix | 4 +- .../window-managers/yabar/build.nix | 4 +- pkgs/build-support/appimage/default.nix | 2 +- pkgs/desktops/enlightenment/efl/default.nix | 4 +- .../enlightenment/enlightenment/default.nix | 4 +- .../core/gnome-settings-daemon/default.nix | 4 +- pkgs/desktops/lxde/core/lxpanel/default.nix | 4 +- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 +- pkgs/desktops/mate/libmatemixer/default.nix | 4 +- .../elementary-settings-daemon/default.nix | 4 +- .../adoptopenjdk-bin/jdk-linux-base.nix | 4 +- .../compilers/cudatoolkit/common.nix | 4 +- .../development/compilers/flutter/flutter.nix | 4 +- .../compilers/graalvm/community-edition.nix | 4 +- .../compilers/graalvm/enterprise-edition.nix | 4 +- pkgs/development/compilers/openjdk/11.nix | 4 +- pkgs/development/compilers/openjdk/12.nix | 4 +- pkgs/development/compilers/openjdk/13.nix | 4 +- pkgs/development/compilers/openjdk/14.nix | 4 +- pkgs/development/compilers/openjdk/15.nix | 4 +- pkgs/development/compilers/openjdk/16.nix | 4 +- pkgs/development/compilers/openjdk/8.nix | 4 +- .../compilers/openjdk/openjfx/11.nix | 4 +- .../compilers/openjdk/openjfx/15.nix | 4 +- .../compilers/oraclejdk/jdk-linux-base.nix | 4 +- .../compilers/oraclejdk/jdk11-linux.nix | 4 +- .../compilers/oraclejdk/jdk14-linux.nix | 4 +- pkgs/development/compilers/zulu/8.nix | 4 +- pkgs/development/compilers/zulu/default.nix | 4 +- .../haskell-modules/hackage-packages.nix | 50 +++++++++---------- .../interpreters/python/conda/default.nix | 2 +- .../interpreters/supercollider/default.nix | 4 +- pkgs/development/libraries/SDL/default.nix | 6 +-- pkgs/development/libraries/SDL2/default.nix | 6 +-- pkgs/development/libraries/allegro/5.nix | 4 +- .../development/libraries/allegro/default.nix | 4 +- pkgs/development/libraries/aubio/default.nix | 4 +- .../libraries/audio/rtaudio/default.nix | 4 +- .../libraries/audio/rtmidi/default.nix | 4 +- .../audio/zita-alsa-pcmi/default.nix | 4 +- .../libraries/audiofile/default.nix | 4 +- .../development/libraries/clanlib/default.nix | 4 +- .../libraries/drumstick/default.nix | 4 +- pkgs/development/libraries/dssi/default.nix | 4 +- .../libraries/ffmpeg-full/default.nix | 4 +- pkgs/development/libraries/ffmpeg/generic.nix | 4 +- pkgs/development/libraries/flite/default.nix | 4 +- .../libraries/gstreamer/base/default.nix | 4 +- pkgs/development/libraries/libao/default.nix | 4 +- .../libraries/libcanberra/default.nix | 4 +- pkgs/development/libraries/libcef/default.nix | 4 +- .../libraries/libmikmod/default.nix | 4 +- .../development/libraries/libqtav/default.nix | 4 +- .../libraries/libsoundio/default.nix | 4 +- .../libraries/libspotify/default.nix | 4 +- .../libraries/libtgvoip/default.nix | 4 +- pkgs/development/libraries/lirc/default.nix | 4 +- .../libraries/mediastreamer/default.nix | 4 +- .../libraries/openal-soft/default.nix | 6 +-- .../libraries/pcaudiolib/default.nix | 4 +- pkgs/development/libraries/pipewire/0.2.nix | 4 +- .../libraries/pipewire/default.nix | 4 +- .../libraries/portaudio/default.nix | 6 +-- .../libraries/portmidi/default.nix | 4 +- .../libraries/qt-4.x/4.8/default.nix | 2 +- .../libraries/qt-5/modules/qtmultimedia.nix | 4 +- .../libraries/qt-5/modules/qtwebengine.nix | 4 +- pkgs/development/libraries/raylib/default.nix | 6 +-- pkgs/development/libraries/snack/default.nix | 2 +- .../libraries/speech-tools/default.nix | 4 +- .../development/libraries/speechd/default.nix | 4 +- pkgs/development/libraries/spice/default.nix | 4 +- .../libraries/wildmidi/default.nix | 4 +- .../libraries/xine-lib/default.nix | 4 +- .../mobile/androidenv/emulator.nix | 2 +- .../octave-modules/audio/default.nix | 6 +-- pkgs/development/pharo/vm/build-vm-legacy.nix | 6 +-- pkgs/development/pharo/vm/build-vm.nix | 6 +-- pkgs/development/pharo/vm/vms.nix | 2 +- .../python-modules/py-desmume/default.nix | 4 +- .../python-modules/python-rtmidi/default.nix | 4 +- .../python-modules/rtmidi-python/default.nix | 4 +- .../python-modules/simpleaudio/default.nix | 4 +- .../python-modules/sipsimple/default.nix | 2 +- .../tools/analysis/codeql/default.nix | 4 +- pkgs/development/tools/godot/default.nix | 4 +- pkgs/development/tools/node-webkit/nw12.nix | 4 +- pkgs/development/tools/nwjs/default.nix | 4 +- .../tools/react-native-debugger/default.nix | 4 +- pkgs/development/tools/thrust/default.nix | 4 +- pkgs/development/tools/unity3d/default.nix | 4 +- pkgs/development/tools/unityhub/default.nix | 2 +- pkgs/development/web/cypress/default.nix | 4 +- pkgs/development/web/insomnia/default.nix | 4 +- pkgs/development/web/postman/default.nix | 4 +- pkgs/games/adom/default.nix | 4 +- pkgs/games/amoeba/default.nix | 4 +- pkgs/games/clonehero/default.nix | 4 +- pkgs/games/eduke32/default.nix | 4 +- pkgs/games/factorio/default.nix | 4 +- pkgs/games/gambatte/default.nix | 4 +- pkgs/games/ivan/default.nix | 4 +- pkgs/games/methane/default.nix | 4 +- pkgs/games/mindustry/default.nix | 4 +- pkgs/games/minecraft/default.nix | 6 +-- pkgs/games/nexuiz/default.nix | 4 +- pkgs/games/oh-my-git/default.nix | 4 +- pkgs/games/opendune/default.nix | 6 +-- pkgs/games/osu-lazer/default.nix | 4 +- pkgs/games/planetaryannihilation/default.nix | 4 +- pkgs/games/quake3/quake3e/default.nix | 6 +-- pkgs/games/residualvm/default.nix | 4 +- pkgs/games/scummvm/default.nix | 4 +- .../games/shticker-book-unwritten/default.nix | 2 +- pkgs/games/steam/fhsenv.nix | 2 +- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/games/stepmania/default.nix | 4 +- pkgs/games/teeworlds/default.nix | 4 +- pkgs/games/vessel/default.nix | 4 +- pkgs/games/xonotic/default.nix | 4 +- pkgs/games/zandronum/fmod.nix | 4 +- pkgs/misc/apulse/default.nix | 4 +- pkgs/misc/emulators/atari++/default.nix | 4 +- pkgs/misc/emulators/desmume/default.nix | 4 +- pkgs/misc/emulators/dolphin-emu/master.nix | 4 +- .../emulators/emulationstation/default.nix | 4 +- pkgs/misc/emulators/epsxe/default.nix | 4 +- pkgs/misc/emulators/higan/default.nix | 4 +- pkgs/misc/emulators/kega-fusion/default.nix | 4 +- pkgs/misc/emulators/mame/default.nix | 4 +- pkgs/misc/emulators/mednafen/default.nix | 4 +- pkgs/misc/emulators/nestopia/default.nix | 4 +- pkgs/misc/emulators/openmsx/default.nix | 4 +- pkgs/misc/emulators/pcem/default.nix | 4 +- pkgs/misc/emulators/pcsx2/default.nix | 4 +- pkgs/misc/emulators/punes/default.nix | 4 +- pkgs/misc/emulators/reicast/default.nix | 4 +- pkgs/misc/emulators/retroarch/cores.nix | 8 +-- pkgs/misc/emulators/retroarch/default.nix | 4 +- pkgs/misc/emulators/rpcs3/default.nix | 4 +- pkgs/misc/emulators/ruffle/default.nix | 4 +- pkgs/misc/emulators/uae/default.nix | 4 +- pkgs/misc/emulators/vice/default.nix | 4 +- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/misc/emulators/yuzu/base.nix | 4 +- pkgs/misc/jackaudio/default.nix | 4 +- pkgs/misc/jackaudio/jack1.nix | 4 +- pkgs/misc/sndio/default.nix | 4 +- .../linux/alsa-project/alsa-oss/default.nix | 4 +- .../alsa-project/alsa-plugins/default.nix | 4 +- .../linux/alsa-project/alsa-tools/default.nix | 4 +- .../linux/alsa-project/alsa-utils/default.nix | 4 +- pkgs/os-specific/linux/aseq2json/default.nix | 4 +- pkgs/os-specific/linux/bluez/default.nix | 4 +- pkgs/os-specific/linux/guvcview/default.nix | 4 +- .../linux/mwprocapture/default.nix | 4 +- .../linux/pommed-light/default.nix | 4 +- pkgs/os-specific/linux/v4l-utils/default.nix | 4 +- pkgs/servers/gonic/default.nix | 4 +- pkgs/servers/mpd/default.nix | 4 +- pkgs/servers/mumsi/default.nix | 4 +- pkgs/servers/pulseaudio/default.nix | 4 +- pkgs/servers/pulseaudio/pali.nix | 4 +- pkgs/servers/roon-server/default.nix | 4 +- pkgs/servers/shairport-sync/default.nix | 4 +- pkgs/tools/audio/alsaequal/default.nix | 4 +- pkgs/tools/audio/darkice/default.nix | 4 +- pkgs/tools/audio/gvolicon/default.nix | 4 +- pkgs/tools/audio/liquidsoap/full.nix | 4 +- pkgs/tools/audio/mididings/default.nix | 4 +- pkgs/tools/audio/opl3bankeditor/default.nix | 4 +- pkgs/tools/audio/pnmixer/default.nix | 4 +- pkgs/tools/audio/qastools/default.nix | 4 +- pkgs/tools/audio/trx/default.nix | 4 +- pkgs/tools/audio/volumeicon/default.nix | 4 +- pkgs/tools/bluetooth/bluez-alsa/default.nix | 4 +- pkgs/tools/misc/brltty/default.nix | 4 +- pkgs/tools/misc/mongodb-compass/default.nix | 4 +- pkgs/tools/misc/staruml/default.nix | 4 +- pkgs/tools/misc/sutils/default.nix | 4 +- pkgs/tools/misc/sweep-visualizer/default.nix | 4 +- pkgs/tools/misc/timidity/default.nix | 4 +- pkgs/tools/security/encryptr/default.nix | 4 +- pkgs/tools/security/keybase/gui.nix | 4 +- pkgs/top-level/all-packages.nix | 4 +- 455 files changed, 945 insertions(+), 945 deletions(-) diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix index 025563f98be..9b9649cf9f8 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/applications/audio/CHOWTapeModel/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , curl , fetchFromGitHub , freeglut @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib curl freeglut freetype diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 4f76178a29d..eafbfec9664 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsaLib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; - buildInputs = [ alsaLib dbus libjack2 ] ++ + buildInputs = [ alsa-lib dbus libjack2 ] ++ (with python3Packages; [ python dbus-python ]); postInstall = '' diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index 8d396d7f2a3..9b0fe1d80ff 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsaLib +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsa-lib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor , fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; buildInputs = [ - libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext + libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext libXcursor ]; nativeBuildInputs = [ cmake pkg-config fmt ]; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 000108b6de1..d8ef7d2b4fa 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 +{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsa-lib, libjack2 , libclxclient, libX11, libXft, readline }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient + libclthreads zita-alsa-pcmi alsa-lib libjack2 libclxclient libX11 libXft readline ]; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 418426530bf..00fde01859c 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, jack2, minixml, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib minixml jack2 ]; + buildInputs = [ alsa-lib minixml jack2 ]; meta = with lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 188584b8e73..388d8b44dcf 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , automake -, alsaLib +, alsa-lib , ladspaH , libjack2 , fftw @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib ladspaH libjack2 fftw diff --git a/pkgs/applications/audio/ardour/5.nix b/pkgs/applications/audio/ardour/5.nix index 9e8c075bfb0..b25f9339da1 100644 --- a/pkgs/applications/audio/ardour/5.nix +++ b/pkgs/applications/audio/ardour/5.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchgit -, alsaLib +, alsa-lib , aubio , boost , cairomm @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib aubio boost cairomm diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 8bb7430650d..8ebf4bf0fc4 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchgit -, alsaLib +, alsa-lib , aubio , boost , cairomm @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib aubio boost cairomm diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 82a2303e26b..db6e03f4741 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, fetchurl, fetchpatch, gettext, pkg-config, qtbase, - alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, + alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, @@ -29,7 +29,7 @@ mkDerivation rec { qtbase # Plugin dependencies - alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb + alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 0fee289021e..354bc0ebd76 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -18,7 +18,7 @@ , sqlite , sratom , suil -, alsaLib +, alsa-lib , libsndfile , soxr , flac @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib expat ffmpeg file diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index b1625868933..a66a5e6c9dc 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf +{ stdenv, fetchurl, alsa-lib, bzip2, cairo, dpkg, freetype, gdk-pixbuf , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg , libbsd, libjack2, libpng, ffmpeg , libxkbcommon @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsaLib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau + alsa-lib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 93fa00b827b..b041d7e1910 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype +{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype , gdk-pixbuf, glib, gtk3, lib, xorg , libglvnd, libjack2, ffmpeg , libxkbcommon, xdg-utils, zlib, pulseaudio @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsaLib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib ]; binPath = lib.makeBinPath [ diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index e86341a608e..0c9248b5f0b 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, pkg-config, libpulseaudio, xorg }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, pkg-config, libpulseaudio, xorg }: stdenv.mkDerivation rec { pname = "bristol"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext + alsa-lib libjack2 libpulseaudio xorg.libX11 xorg.libXext xorg.xorgproto ]; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 6529cd860c8..0cc1ccd2aca 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , glib -, alsaLib +, alsa-lib , libpulseaudio }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libpulseaudio glib ]; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 04c15eca599..38514e40d00 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, jack2, +{ lib, stdenv, fetchFromGitHub, alsa-lib, file, fluidsynth, jack2, liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ optional withFrontend pyqt5; buildInputs = [ - file liblo alsaLib fluidsynth jack2 libpulseaudio libsndfile + file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile ] ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index b32eb1b627d..cc431ff46b9 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsaLib, fftw, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsa-lib, fftw, libpulseaudio, ncurses }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.7.4"; buildInputs = [ - alsaLib + alsa-lib fftw libpulseaudio ncurses diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index f30b5dba5b6..e051d8585b5 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, alsaLib, bison, flex, libsndfile, which +{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which , AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison which ]; buildInputs = [ libsndfile ] - ++ lib.optional (!stdenv.isDarwin) alsaLib + ++ lib.optional (!stdenv.isDarwin) alsa-lib ++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; patches = [ ./darwin-limits.patch ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 4184f0eea8c..550100574db 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -42,7 +42,7 @@ , libsepol , orc -, alsaLib +, alsa-lib }: let @@ -107,7 +107,7 @@ let sqlite taglib - alsaLib + alsa-lib ] ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ] ++ lib.optionals (withMTP) [ libmtp ] diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index bfa8317c9f9..5fd0d88831a 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,7 +1,7 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null # simple fallback for everyone else , aoSupport ? !stdenv.isLinux, libao ? null , jackSupport ? false, libjack ? null @@ -55,7 +55,7 @@ let opts = [ # Audio output - (mkFlag alsaSupport "CONFIG_ALSA=y" alsaLib) + (mkFlag alsaSupport "CONFIG_ALSA=y" alsa-lib) (mkFlag aoSupport "CONFIG_AO=y" libao) (mkFlag jackSupport "CONFIG_JACK=y" libjack) (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index a63f7518494..13de229452e 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext -, alsaLib ? null +, alsa-lib ? null , libpulseaudio ? null , libjack2 ? null , liblo ? null @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] ++ builtins.filter (optional: optional != null) [ - alsaLib libpulseaudio libjack2 + alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen curl tcltk fltk ]; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 10b4256a858..c1cecc13ec5 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -25,7 +25,7 @@ , hotkeysSupport ? true, libX11 ? null , osdSupport ? true, dbus ? null # output plugins -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? true, alsa-lib ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null @@ -50,7 +50,7 @@ assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; assert osdSupport -> dbus != null; -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 ++ optional osdSupport dbus - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/applications/audio/diopser/default.nix index 0c97d64945b..339eae1a7ca 100644 --- a/pkgs/applications/audio/diopser/default.nix +++ b/pkgs/applications/audio/diopser/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, libjack2, alsaLib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor +, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor }: let @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext + libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext libXcursor ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 35825833330..258eec83724 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, alsaLib +, alsa-lib , fetchFromGitHub , fftwFloat , freetype @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = rpathLibs ++ [ - alsaLib + alsa-lib freetype libGL libX11 diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index ef4970a1608..7dd78e51318 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng +{ lib, stdenv, fetchurl, alsa-lib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs + alsa-lib expat glib libjack2 libXext libX11 libpng libpthreadstubs libsmf libsndfile lv2 zita-resampler ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index c175804a026..e15e4550e0e 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5 }: mkDerivation rec { pname = "drumkv1"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5"; }; - buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; + buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index e2ec9bf8ab2..47db2201648 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, alsaLib +, alsa-lib , audiofile , libjack2 , liblo @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib audiofile libjack2 liblo diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 6a974abb8aa..0c48c582c4f 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: +{ lib, stdenv, fetchurl, fetchpatch, flite, alsa-lib, debug ? false }: stdenv.mkDerivation rec { pname = "eflite"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci"; }; - buildInputs = [ flite alsaLib ]; + buildInputs = [ flite alsa-lib ]; configureFlags = [ "flite_dir=${flite}" diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 7858da25b7c..b3255126205 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fltk, alsa-lib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "ensemble-chorus"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2 + fltk alsa-lib freetype libXrandr libXinerama libXcursor lv2 libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix index 8ac26e488b3..111d1c9e557 100644 --- a/pkgs/applications/audio/faust/faust2alqt.nix +++ b/pkgs/applications/audio/faust/faust2alqt.nix @@ -1,5 +1,5 @@ { faust -, alsaLib +, alsa-lib , qt4 }: @@ -8,7 +8,7 @@ faust.wrapWithBuildEnv { baseName = "faust2alqt"; propagatedBuildInputs = [ - alsaLib + alsa-lib qt4 ]; diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix index 6af5af9bbaf..bb6121a5d70 100644 --- a/pkgs/applications/audio/faust/faust2alsa.nix +++ b/pkgs/applications/audio/faust/faust2alsa.nix @@ -1,5 +1,5 @@ { faust -, alsaLib +, alsa-lib , atk , cairo , fontconfig @@ -15,7 +15,7 @@ faust.wrapWithBuildEnv { baseName = "faust2alsa"; propagatedBuildInputs = [ - alsaLib + alsa-lib atk cairo fontconfig diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index ab2450f1e52..bd213bfcadb 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,7 +1,7 @@ { faust , gtk2 , jack2 -, alsaLib +, alsa-lib , opencv , libsndfile , which @@ -19,7 +19,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ gtk2 jack2 - alsaLib + alsa-lib opencv libsndfile which diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index f6bc4d485fd..6bebd97ddd2 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -2,7 +2,7 @@ , jack2 , qt4 , libsndfile -, alsaLib +, alsa-lib , which }: @@ -19,7 +19,7 @@ faust.wrapWithBuildEnv { jack2 qt4 libsndfile - alsaLib + alsa-lib which ]; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 2b4602f78cf..46d63c84314 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl , bc, coreutils, which, libsndfile, pkg-config, libxcb }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ]; buildInputs = [ - llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsaLib faust curl + llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl bc coreutils which libsndfile libxcb ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index a1fee315d44..1a6471397de 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake -, alsaLib, glib, libjack2, libsndfile, libpulseaudio +, alsa-lib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices , version ? "2" }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ glib libsndfile libpulseaudio libjack2 ] - ++ lib.optionals stdenv.isLinux [ alsaLib ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; cmakeFlags = [ "-Denable-framework=off" ]; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index b91c72a5c75..967c984bc50 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,9 +1,9 @@ { lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? true, alsa-lib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] - ++ optionals alsaSupport [ alsaLib ] + ++ optionals alsaSupport [ alsa-lib ] ++ optionals jackSupport [ libjack2 ] ++ optionals portaudioSupport [ portaudio ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 7bd063d9f53..75e44d8c4fa 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype -, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis +, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsa-lib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ freetype SDL SDL_gfx SDL_ttf - liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM + liblo libxml2 libjack2 alsa-lib libvorbis libsndfile libogg libSM (gnutls.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; })) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 781889f9fe3..5155a91e725 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , nixosTests -, alsaLib +, alsa-lib , SDL2 , libiconv , CoreAudio @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index c9b3216edef..b49335298e0 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -7,7 +7,7 @@ , libsamplerate , libsndfile , jack2 -, alsaLib +, alsa-lib , libpulseaudio , libXpm , libXinerama @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { rtmidi libXpm jack2 - alsaLib + alsa-lib libpulseaudio libXinerama libXcursor diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 9d891d30234..74286073b90 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +{ lib, stdenv, alsa-lib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype , fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: @@ -7,7 +7,7 @@ let version = "4.7.1"; deps = [ - alsaLib + alsa-lib atk at-spi2-atk cairo diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 2d660bc736c..30c6e57188a 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsaLib +{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsa-lib , zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 , includeDemo ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ] + buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix index 175d5e4cb51..aeb64b92c88 100644 --- a/pkgs/applications/audio/gwc/default.nix +++ b/pkgs/applications/audio/gwc/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, alsaLib +, alsa-lib , libpulseaudio , gtk2 , hicolor-icon-theme @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libpulseaudio gtk2 hicolor-icon-theme diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 6378a97f31d..012838eb436 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome +, alsa-lib, freetype, xorg, curl, libGL, libjack2, gnome , pkg-config, makeWrapper }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr + alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity ]; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 172f134907c..86497e090f4 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -3,7 +3,7 @@ , fetchpatch , xorg , freetype -, alsaLib +, alsa-lib , curl , libjack2 , lv2 @@ -26,7 +26,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2 + freetype alsa-lib curl libjack2 pkg-config libGLU libGL lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index b887615a30f..c539a316422 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsaLib, libjack2, +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core, dbus, curl, fftwFloat }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre + buildInputs = [ lv2 alsa-lib libjack2 freetype libX11 gtk3 pcre libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix index 1746715b834..ad3566571b0 100644 --- a/pkgs/applications/audio/hydrogen/0.nix +++ b/pkgs/applications/audio/hydrogen/0.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, cmake -, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +, alsa-lib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 + alsa-lib boost glib lash libjack2 libarchive libsndfile lrdf qt4 ]; meta = with lib; { diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 490591ec9e6..319ee7a5f98 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook -, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf +, alsa-lib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf , qtbase, qttools, qtxmlpatterns }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf + alsa-lib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf qtbase qttools qtxmlpatterns ]; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 304f67e85aa..f37150994fc 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkg-config, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsa-lib, pkg-config, qtbase, qtscript, qmake }: mkDerivation rec { @@ -13,7 +13,7 @@ mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ alsaLib qtbase qtscript ]; + buildInputs = [ alsa-lib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index f638eba3210..91f7175e391 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, alsaLib +, alsa-lib , audiofile , autoconf , automake @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib + alsa-lib audiofile autoconf automake diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 035e15abb23..48ffd5df515 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: +{ lib, stdenv, fetchurl, alsa-lib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { pname = "jaaa"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi + alsa-lib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi ]; makeFlags = [ diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index ec62cb04c85..520b55e96da 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsa-lib, libxml2, lrdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ]; + buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ]; NIX_LDFLAGS = "-ldl -lm -lpthread"; meta = { diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index eecafe9e501..e9d2abee91c 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib }: mkDerivation rec { pname = "jackmix"; @@ -18,7 +18,7 @@ mkDerivation rec { qtbase lash jack - alsaLib + alsa-lib ]; installPhase = '' diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index f45395eefa6..016f515ce13 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897"; }; - buildInputs = [ alsaLib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ]; + buildInputs = [ alsa-lib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ]; preConfigure = '' cd ./source/ diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 51c853809fd..70b06e72fba 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsaLib, drumstick, qtbase, qtsvg }: +{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsa-lib, drumstick, qtbase, qtsvg }: stdenv.mkDerivation rec { pname = "kmetronome"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; - buildInputs = [ alsaLib drumstick qtbase qtsvg ]; + buildInputs = [ alsa-lib drumstick qtbase qtsvg ]; dontWrapQtApps = true; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 74bbeb9b7bb..6c8ea6528f9 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 +{ lib, stdenv, fetchurl, alsa-lib, gtk2, libjack2, libuuid, libxml2 , makeWrapper, pkg-config, readline }: assert libuuid != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./socket.patch ./gcc-47.patch ]; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ]; + buildInputs = [ alsa-lib gtk2 libjack2 libxml2 readline ]; propagatedBuildInputs = [ libuuid ]; NIX_LDFLAGS = "-lm -lpthread -luuid"; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 858d8e795e1..61f709b33e1 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true -, withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null +, withALSA ? true, alsa-lib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: rustPlatform.buildRustPackage rec { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib + buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 17a28315f19..22cab165ccf 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -4,7 +4,7 @@ , intltool , gtk3 , wrapGAppsHook -, alsaLib +, alsa-lib , libjack2 , libpulseaudio , fftw @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - alsaLib + alsa-lib libpulseaudio fftw ] ++ lib.optional jackSupport libjack2; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 91f14879dc7..1c33bff5b76 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkg-config, which -, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: +, alsa-lib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { pname = "linuxsampler"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake bison libtool pkg-config which ]; - buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ]; + buildInputs = [ alsa-lib asio libjack2 libgig libsndfile lv2 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 11a7d0cf3c6..f791ad51bf9 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 +{ lib, fetchFromGitHub, cmake, pkg-config, alsa-lib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -18,7 +18,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools pkg-config ]; buildInputs = [ - alsaLib + alsa-lib fftwFloat fltk13 fluidsynth_1 diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index 04d5bb0a6dd..6f518dac9ca 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -6,7 +6,7 @@ , fluidsynth , libX11 , libjack2 -, alsaLib +, alsa-lib , liblo , libsigcxx , libsmf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config xxd ]; - buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ]; + buildInputs = [ cairo fluidsynth libX11 libjack2 alsa-lib liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 82f9b70c618..e6b21dff2dc 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH +{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsa-lib, autoreconfHook, gtk2, libjack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame , vorbis-tools }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preAutoreconf = "(cd docgen && sh gendocs.sh)"; buildInputs = [ - SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio + SDL alsa-lib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio ]; configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 2e72a011921..5db17b99d1c 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xorgproto }: +{ lib, stdenv, fetchurl, alsa-lib, libX11, libXi, libXtst, xorgproto }: stdenv.mkDerivation rec { name = "mid2key-r1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvzf $src"; - buildInputs = [ alsaLib libX11 libXi libXtst xorgproto ]; + buildInputs = [ alsa-lib libX11 libXi libXtst xorgproto ]; buildPhase = "make"; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 8f2e29ee95b..93a215e46b1 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, url, sha256, ... }: +{ stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }: stdenv.mkDerivation rec { inherit type; baseName = "${type}-Edit"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libX11 # libX11.so.6 libXext # libXext.so.6 - alsaLib # libasound.so.2 + alsa-lib # libasound.so.2 freetype # libfreetype.so.6 stdenv.cc.cc.lib # libstdc++.so.6 ]; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index b43694eb9c0..ce29a587d23 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper -, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: +, SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { version = "1.03.00"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; + buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ]; # Somehow this does not get set automatically cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 57af7a469a0..5ed51a99895 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config -, alsaLib, libtool, icu +, alsa-lib, libtool, icu , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libtool icu ] ++ lib.optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 9c49f26bb4a..90821b01476 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -4,7 +4,7 @@ , bison , flex , which -, alsaLib +, alsa-lib , libsndfile , qt4 , qscintilla @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib libsndfile qt4 qscintilla diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 783ef2dbb7d..1d26782b6ae 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config , ncurses, db , popt, libtool # Sound sub-systems -, alsaSupport ? true, alsaLib +, alsaSupport ? true, alsa-lib , pulseSupport ? true, libpulseaudio, autoreconfHook , jackSupport ? true, libjack2 , ossSupport ? true @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses db popt libtool ] # Sound sub-systems - ++ opt alsaSupport alsaLib + ++ opt alsaSupport alsa-lib ++ opt pulseSupport libpulseaudio ++ opt jackSupport libjack2 # Audio formats diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 153e8b9940b..8f9489befc5 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , makeWrapper -, alsaLib +, alsa-lib , perl , withConplay ? !stdenv.targetPlatform.isWindows }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals withConplay [ makeWrapper ]; buildInputs = lib.optionals withConplay [ perl ] - ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsaLib ]; + ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsa-lib ]; configureFlags = lib.optional (stdenv.hostPlatform ? mpg123) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 37f647a4a47..03aee52f2a9 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsaLib +{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsa-lib # Specify default libao output plugin to use (e.g. "alsa", "pulse" …). # If null, it will use the libao system default. , defaultAudio ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-default-audio=${defaultAudio}"); buildInputs = [libao libid3tag libmad zlib] - ++ lib.optional stdenv.isLinux alsaLib; + ++ lib.optional stdenv.isLinux alsa-lib; installTargets = [ "install" "install-man" ]; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index da8dcb0b0c1..773a9178c0b 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsa-lib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { @@ -26,7 +26,7 @@ in mkDerivation rec { dontFixCmake = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase alsaLib libjack2 ]; + buildInputs = [ qtbase alsa-lib libjack2 ]; meta = with lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 22d66b18ddd..f5a6bafe792 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook -, alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo +, alsa-lib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo , libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ - alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo + alsa-lib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord ]; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index b43b770b24f..c2a2e7b9603 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkg-config -, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis +, alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns @@ -35,7 +35,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis + alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis portaudio portmidi # tesseract qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 qtscript qtsvg qttools qtwebengine qtxmlpatterns diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index c8e18c03c1e..2824832ef60 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,6 +1,6 @@ { cmake , pkg-config -, alsaLib +, alsa-lib , boost , curl , fetchFromGitHub @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pkg-config ]; buildInputs = [ - alsaLib + alsa-lib boost curl ffmpeg diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index aa56c983558..0a887ebaf3d 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv -, withALSA ? true, alsaLib ? null +, withALSA ? true, alsa-lib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null , withMPRIS ? false, dbus ? null @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin libiconv - ++ lib.optional withALSA alsaLib + ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional withMPRIS dbus; diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index 61353f45fec..bf7d680ff15 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }: +{ fetchFromGitHub, rustPlatform, lib, alsa-lib, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "netease-music-tui"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib openssl ]; + buildInputs = [ alsa-lib openssl ]; cargoSha256 = "1pca0sz4rz8qls6k2vhf70ixhnvgk81c4hbx81q3pv106g5k205f"; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index 11424c0be18..8b2284f9b30 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase +, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase + alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index aa49daaa1e7..edfb1948364 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch +, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch , qtbase, qtdeclarative, qtquickcontrols2 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch + alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase qtdeclarative qtquickcontrols2 ]; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 68edf99e010..7ad1e319bff 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -5,7 +5,7 @@ , dpkg , qt5 , libjack2 -, alsaLib +, alsa-lib , bzip2 , libpulseaudio }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libjack2 libpulseaudio bzip2 - alsaLib + alsa-lib ]; buildInputs = [ dpkg ]; diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix index f16b146e616..1a65826dca3 100644 --- a/pkgs/applications/audio/osmid/default.nix +++ b/pkgs/applications/audio/osmid/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, alsaLib +, alsa-lib , libX11 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsaLib libX11 ]; + buildInputs = [ alsa-lib libX11 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index f238a687609..90e80f13ac4 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5"; }; - buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; + buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 573b2262e73..f37cf8c5b32 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm +{ lib, stdenv, alsa-lib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkg-config, python2, wafHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ - alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 + alsa-lib boost dbus-glib ganv glibmm gtkmm2 libjack2 pkg-config python2 wafHook ]; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index fb29f9b13e2..f76720aff90 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas +{ lib, stdenv, fetchurl, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkg-config, openssl }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs + buildInputs = [ alsa-lib gtk2 libjack2 libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 openssl ]; meta = with lib; { diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index f1d35d7e78e..2c58ecc5dcb 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools -, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook +, alsa-lib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; - buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ]; + buildInputs = [ alsa-lib ftgl libGLU libjack2 qtbase rtmidi ]; cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=GLVND" diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index 519888982ce..bd956963a46 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsa-lib, libjack2 }: stdenv.mkDerivation rec { pname = "picoloop"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { SDL2.dev SDL2_image SDL2_ttf - alsaLib + alsa-lib libjack2 ]; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 28e9788acbf..43f38ff84ed 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib +{ lib, stdenv, fetchurl, alsa-lib , version ? "1.7.1" , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = sourceSha256; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; meta = with lib; { homepage = "https://www.parabola.me.uk/alsa/pmidi.html"; diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index a331952aa81..4656db7257e 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; @@ -12,7 +12,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib libjack2 portaudio libogg diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 1d3fd534dd2..239b62a4026 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtk2, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "praat"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib gtk2 ]; + buildInputs = [ alsa-lib gtk2 ]; meta = { description = "Doing phonetics by computer"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 72e8ba135dd..22b2a355b5e 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , nixosTests -, alsaLib +, alsa-lib , SDL2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib; passthru.tests = { pt2-clone-opens = nixosTests.pt2-clone; diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 9bc6903e51b..ebdc0388b96 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsaLib, libjack2, tk, fftw +, alsa-lib, libjack2, tk, fftw }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsaLib libjack2 fftw ]; + buildInputs = [ alsa-lib libjack2 fftw ]; configureFlags = [ "--enable-alsa" diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 586dfeae733..7196829afa0 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras +, pkg-config, cmake, alsa-lib, libjack2, dbus, qtbase, qttools, qtx11extras # Enable jack session support , jackSession ? false }: @@ -21,7 +21,7 @@ mkDerivation rec { qtbase qtx11extras qttools - alsaLib + alsa-lib libjack2 dbus ]; diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 4fa165a05a9..618062dc2f3 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -5,7 +5,7 @@ , lv2 , pkg-config , qt5 -, alsaLib +, alsa-lib , libjack2 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib lv2 libjack2 ] ++ (with qt5; [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index ea5430a82a2..51772cc135b 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsa-lib, libjack2 }: mkDerivation rec { version = "0.9.1"; @@ -11,7 +11,7 @@ mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ qtbase qttools alsaLib libjack2 ]; + buildInputs = [ qtbase qttools alsa-lib libjack2 ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index e24824985fa..35aea5bd086 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, qt4, alsaLib }: +{ lib, stdenv, fetchurl, pkg-config, qt4, alsa-lib }: stdenv.mkDerivation rec { version = "0.4.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ qt4 alsaLib ]; + buildInputs = [ qt4 alsa-lib ]; meta = with lib; { description = "MIDI event processor and router"; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 2ff145d45cf..25d7857c353 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -6,7 +6,7 @@ , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi # output plugins -, alsaLib, libpulseaudio +, alsa-lib, libpulseaudio # effect plugins , libsamplerate }: @@ -46,7 +46,7 @@ mkDerivation rec { libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile libcdio cdparanoia libcddb faad2 ffmpeg wildmidi # output plugins - alsaLib libpulseaudio + alsa-lib libpulseaudio # effect plugins libsamplerate ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 417c478e9e5..6d75c32a666 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config +{ lib, fetchurl, alsa-lib, fluidsynth, libjack2, autoconf, pkg-config , mkDerivation, qtbase, qttools, qtx11extras }: @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ autoconf pkg-config ]; - buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; + buildInputs = [ alsa-lib fluidsynth libjack2 qtbase qttools qtx11extras ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index f19d0f70fdf..b1d0928b86a 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , aubio , cmake , dssi @@ -45,7 +45,7 @@ mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib aubio dssi flac diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 8b5dd869e82..d1166752fb0 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, alsaUtils, fltk, libjack2, libXft, +{ lib, stdenv, fetchurl, alsa-lib, alsaUtils, fltk, libjack2, libXft, libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./fltk-path.patch ]; - buildInputs = [ alsaLib alsaUtils fltk libjack2 libXft libXpm libjpeg + buildInputs = [ alsa-lib alsaUtils fltk libjack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; meta = with lib; { diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 48504a312c4..705685811ff 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -3,7 +3,7 @@ , autoPatchelfHook , makeWrapper -, alsaLib +, alsa-lib , gtk3 , lame , ffmpeg @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 gtk3 ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index e874b63898a..acd1d80c86d 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib +{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib , mpg123, releasePath ? null }: with lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { releasePath else throw "Platform is not supported. Use instalation native to your platform https://www.renoise.com/"; - buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ]; + buildInputs = [ alsa-lib libjack2 libX11 libXcursor libXext libXrandr ]; installPhase = '' cp -r Resources $out diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index b95e5fdc76d..38d8a876962 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook -, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib +, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsa-lib , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: stdenv.mkDerivation (rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation (rec { lirc lrdf qtbase - alsaLib + alsa-lib ]; meta = with lib; { diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 9f63dbe7bc2..92d3151c835 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper -, alsaLib, curl, gtk3, webkitgtk, zenity }: +, alsa-lib, curl, gtk3, webkitgtk, zenity }: stdenv.mkDerivation rec { pname = "rymcast"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ alsaLib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ]; + buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 8f0a4808121..8c707051686 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, pkg-config, libjack2 -, alsaLib, liblo, libsndfile, lv2, qtbase, qttools +, alsa-lib, liblo, libsndfile, lv2, qtbase, qttools , rubberband }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ qttools pkg-config ]; - buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; + buildInputs = [ libjack2 alsa-lib liblo libsndfile lv2 qtbase rubberband ]; meta = with lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 7e276e07224..ba193f70194 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , autoreconfHook -, alsaLib +, alsa-lib , python , SDL }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook python ]; - buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib; meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix index 976ede5803d..fb0ba9408d9 100644 --- a/pkgs/applications/audio/scream/default.nix +++ b/pkgs/applications/audio/scream/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, config, fetchFromGitHub, cmake, pkg-config -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = lib.optional pulseSupport libpulseaudio - ++ lib.optional alsaSupport alsaLib; + ++ lib.optional alsaSupport alsa-lib; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 84eebfac695..f586a1592f9 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, gtkmm2, libjack2, pkg-config }: stdenv.mkDerivation rec { pname = "seq24"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; - buildInputs = [ alsaLib gtkmm2 libjack2 ]; + buildInputs = [ alsa-lib gtkmm2 libjack2 ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 71d70c2dd58..0132b967900 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which -, alsaLib, libjack2, liblo, qtbase +, alsa-lib, libjack2, liblo, qtbase }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config qttools which ]; - buildInputs = [ alsaLib libjack2 liblo qtbase ]; + buildInputs = [ alsa-lib libjack2 liblo qtbase ]; postPatch = '' for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 613abbf3c12..67851611f76 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 +{ lib, stdenv, fetchzip, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 , libGLU, libGL, pkg-config, ttf_bitstream_vera }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL + alsa-lib freetype ftgl libjack2 libX11 lv2 libGLU libGL ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 65f21c13612..4f7e43ca004 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -6,7 +6,7 @@ , pkg-config , libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib +, alsa-lib , pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio , out123Support ? stdenv.hostPlatform.isDarwin @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook perl pkg-config ]; buildInputs = [ libsidplayfp ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio ++ lib.optional out123Support mpg123; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 9351d1b0db7..0299f66191e 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, alsaLib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr , nixosTests }: let @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # not needed buildInputs = [ boost17x - alsaLib asio avahi flac libogg libvorbis + alsa-lib asio avahi flac libogg libvorbis aixlog popl soxr ]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 164f266462a..4881360b82e 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, alsaLib, fftw, gsl, motif, xorg +, alsa-lib, fftw, gsl, motif, xorg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib fftw gsl motif ] + buildInputs = [ alsa-lib fftw gsl motif ] ++ (with xorg; [ libXext libXft libXpm libXt ]); configureFlags = [ "--with-motif" ]; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index a8dfe759d62..39f706d1f24 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu +{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu , libXext, libXi }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut - alsaLib + alsa-lib mesa libGLU libsndfile diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 81bd3c67d7d..2928771b3ec 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gtk3 , openssl -, alsaLib +, alsa-lib , pkg-config , ffmpeg }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib gtk3 openssl ffmpeg ]; + buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; meta = with lib; { description = "An open-source Shazam client for Linux, written in Rust"; diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index b88165f693a..711444651c3 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound +{ lib, stdenv, fetchurl, alsa-lib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkg-config @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo + [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile portaudio rubberband serd sord capnproto ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index f2df119fcc6..43254e6c2b0 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,6 +1,6 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ lib, stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo +{ lib, stdenv, fetchurl, alsa-lib, bzip2, fftw, libjack2, libX11, liblo , libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband - libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland + libsamplerate vamp-plugin-sdk alsa-lib librdf_raptor librdf_rasqal redland serd sord # optional diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 135c042d538..1cad71ae297 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -14,7 +14,7 @@ , rubberband , gettext , ncurses -, alsaLib +, alsa-lib , fftw }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { rubberband gettext ncurses - alsaLib + alsa-lib fftw ]; diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 71fc763a5c5..3dc9089b241 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -3,7 +3,7 @@ , pkg-config , autoconf , gtk2 -, alsaLib +, alsa-lib , SDL , jack2 , audiofile @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { jack2 audiofile goocanvas - ] ++ lib.optional stdenv.isLinux alsaLib; + ] ++ lib.optional stdenv.isLinux alsa-lib; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index afe669f3862..2859a2e942e 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -13,7 +13,7 @@ , libhandy , gtk3 , openssl -, alsaLib +, alsa-lib , libpulseaudio , wrapGAppsHook }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { gtk3 libhandy openssl - alsaLib + alsa-lib libpulseaudio ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 8656deb2f6a..db0f69c80ab 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -20,7 +20,7 @@ let rev = "46"; deps = [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 8a077918d4f..e9de6cb3cf7 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPackages, pkg-config, openssl -, withALSA ? true, alsaLib +, withALSA ? true, alsa-lib , withPulseAudio ? false, libpulseaudio , withPortAudio ? false, portaudio , withMpris ? false @@ -29,7 +29,7 @@ rustPackages.rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional withALSA alsaLib + ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional (withMpris || withKeyring) dbus; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 600ba95947a..31fe69b00de 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, flac, libmad, libvorbis, mpg123 +, alsa-lib, flac, libmad, libvorbis, mpg123 , dsdSupport ? true , faad2Support ? true, faad2 , ffmpegSupport ? true, ffmpeg @@ -33,7 +33,7 @@ in stdenv.mkDerivation { sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i"; }; - buildInputs = [ alsaLib flac libmad libvorbis mpg123 ] + buildInputs = [ alsa-lib flac libmad libvorbis mpg123 ] ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index aa4b4acf514..d295689716b 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsa-lib, libjack2 }: stdenv.mkDerivation rec { pname = "stochas"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libX11 libXrandr libXinerama libXext libXcursor freetype alsaLib libjack2 + libX11 libXrandr libXinerama libXext libXcursor freetype alsa-lib libjack2 ]; installPhase = '' diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index c8ffba2c2a7..5a5671ec773 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , pkg-config -, alsaLib +, alsa-lib , boost , chromaprint , fftw @@ -45,7 +45,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib boost chromaprint fftw diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 577175fcff2..7c5c378d2fa 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: +{ lib, stdenv, fetchurl, unzip, alsa-lib, libX11, libXi, SDL2 }: let - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libX11 libXi SDL2 ]; arch = if stdenv.isAarch64 then "arm64" diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 50e16c355e2..eecf8caee37 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsa-lib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix"; }; - buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; + buildInputs = [ qtbase qttools libjack2 alsa-lib liblo lv2 ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index d8265c3161b..aa18a5e397e 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, wrapQtAppsHook -, alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag +, alsa-lib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag , libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ - alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag + alsa-lib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag libjack2 liblo libmad libogg liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile qtbase qtsvg rubberband serd sord ]; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 26cfb818980..9061c38f19c 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf +{ stdenv, fetchzip, lib, wrapGAppsHook, alsa-lib, atk, cairo, gdk-pixbuf , glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; libPath = with gst_all_1; lib.makeLibraryPath [ - stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib + stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsa-lib libX11 libSM libpng12 gstreamer gst-plugins-base zlib ]; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 71a91dc3105..698a03b4a71 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, cmake, pkg-config -, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio +, alsa-lib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib fftw flac.dev libjack2 lame + buildInputs = [ alsa-lib fftw flac.dev libjack2 lame libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis portaudio qtbase wavpack ]; diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix index 6dc1eb33962..df7564abcf0 100644 --- a/pkgs/applications/audio/tunefish/default.nix +++ b/pkgs/applications/audio/tunefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3 -, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; postPatch = '' patchShebangs src/tunefish4/generate-lv2-ttl.py diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index c7e24b926c0..789b97507a1 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config -, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi +, alsa-lib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: let @@ -75,7 +75,7 @@ with lib; stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; + buildInputs = [ alsa-lib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; buildFlags = [ "Rack" ]; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 1cb9c0f18bf..c1e41e41284 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -3,7 +3,7 @@ , libX11 , libXi , libGL -, alsaLib +, alsa-lib , SDL2 , autoPatchelfHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libX11 libXi libGL - alsaLib + alsa-lib SDL2 ]; diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 943bd0d8032..ec639156217 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }: +{ lib, stdenv, fetchurl, alsa-lib, libX11, makeWrapper, tcl, tk }: stdenv.mkDerivation rec { pname = "vkeybd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ alsaLib libX11 tcl tk ]; + buildInputs = [ alsa-lib libX11 tcl tk ]; configurePhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index b6accf1993a..6158f33713a 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsaLib, libxmp }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }: stdenv.mkDerivation rec { name = "xmp-4.1.0"; @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libxmp ]; + buildInputs = [ alsa-lib libxmp ]; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index b994f197e67..0802a79df04 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, +{ lib, stdenv, fetchurl, alsa-lib, autoconf, automake, dssi, gtk2, libjack2, ladspaH, ladspaPlugins, liblo, pkg-config }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH + buildInputs = [ alsa-lib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo pkg-config ]; installPhase = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index e9e191112f9..dfb6a419c3d 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre +{ lib, stdenv, fetchFromGitHub , alsa-lib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre , libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL + alsa-lib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL minixml zlib xorg.libpthreadstubs pcre ]; diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix index 4b094864607..db6fc7d3381 100644 --- a/pkgs/applications/audio/zita-ajbridge/default.nix +++ b/pkgs/applications/audio/zita-ajbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, zita-alsa-pcmi, zita-resampler }: stdenv.mkDerivation rec { name = "zita-ajbridge-0.8.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw"; }; - buildInputs = [ alsaLib libjack2 zita-alsa-pcmi zita-resampler ]; + buildInputs = [ alsa-lib libjack2 zita-alsa-pcmi zita-resampler ]; preConfigure = '' cd ./source/ diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index dfc3e600ec2..986e3215b93 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -16,7 +16,7 @@ # Optional dependencies , alsaSupport ? true -, alsaLib +, alsa-lib , dssiSupport ? false , dssi , ladspaH @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ fftw liblo minixml zlib ] - ++ lib.optionals alsaSupport [ alsaLib ] + ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals dssiSupport [ dssi ladspaH ] ++ lib.optionals jackSupport [ libjack2 ] ++ lib.optionals lashSupport [ lash ] diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 8e32798dc43..08eeac760c0 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, -atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk, +atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsa-lib, dbus, at-spi2-atk, cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { util-linux xorg.libXrandr xorg.libXScrnSaver - alsaLib + alsa-lib dbus.lib at-spi2-atk at-spi2-core diff --git a/pkgs/applications/blockchains/parity-ui/env.nix b/pkgs/applications/blockchains/parity-ui/env.nix index a878bbf2e3e..8b7d706c013 100644 --- a/pkgs/applications/blockchains/parity-ui/env.nix +++ b/pkgs/applications/blockchains/parity-ui/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: let packages = [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss + fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 6d9182b9d61..42e3b7588af 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,6 +1,6 @@ { channel, pname, version, build ? null, sha256Hash }: -{ alsaLib +{ alsa-lib , bash , buildFHSUserEnv , cacert @@ -121,7 +121,7 @@ let libXrandr # For Android emulator - alsaLib + alsa-lib dbus expat libpulseaudio diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 53150e0ad61..1ff8ea3f416 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk , at-spi2-core, libdbusmenu, mesa @@ -7,7 +7,7 @@ let packages = [ stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index 9ccd549693b..5b1fc966dd9 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, makeWrapper -, alsaLib, fontconfig, mesa_glu, libXcursor, libXinerama, libXrandr, xorg +, alsa-lib, fontconfig, mesa_glu, libXcursor, libXinerama, libXrandr, xorg }: stdenv.mkDerivation rec { @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - alsaLib fontconfig mesa_glu + alsa-lib fontconfig mesa_glu libXcursor libXinerama libXrandr xorg.xinput xorg.libXi xorg.libXext ]; postFixup = '' - wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" + wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsa-lib}/lib" ''; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index ad044d3968e..1bae0a0c970 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz , dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params @@ -105,7 +105,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ] + [ ncurses gconf libxml2 gnutls alsa-lib acl gpm gettext jansson harfbuzz.dev ] ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index aa7b7b19448..38fb55ecf7b 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: - alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL + alsa-lib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL , openssl, xorg, zlib }: @@ -57,7 +57,7 @@ in $out/kodestudio patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 52acc8ee50b..b19b1ac2b68 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, lib, fetchurl, zlib, glib, alsa-lib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: @@ -6,7 +6,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf + fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gnome2.GConf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr xorg.libXcursor diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 90879b352e1..a48b5eae3de 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }: +{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 51593353334..657ea55da60 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { dbus nss nspr - alsaLib + alsa-lib cups expat udev diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index e8ef97f949c..05e94bb164c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, rpmextract, autoPatchelfHook, wrapGAppsHook # Dynamic libraries -, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat +, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat , gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst , libxcb, libuuid, libxshmfence, nspr, nss, pango, mesa @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index acec5293101..3db183b2531 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, alsaLib +, alsa-lib , bzip2 , fftw , freeglut @@ -23,7 +23,7 @@ }: let libs = [ - alsaLib + alsa-lib bzip2 fftw freeglut @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib fftw freeglut.dev freetype diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index d8862525030..2ccc6ed401d 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -13,7 +13,7 @@ , libXi , libXext , libGLU -, alsaLib +, alsa-lib , fontconfig , AVFoundation , Carbon @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsaLib fontconfig libGLU ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ]; installPhase = '' diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 2ac507dc870..1c4609ac55b 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchzip -, alsaLib +, alsa-lib , glib , gst_all_1 , libGLU, libGL @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib - alsaLib + alsa-lib glib gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index ca51d74a0a1..b30dbab1570 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler -, ffmpeg, libva, alsaLib, SDL, x264, libvpx, libvorbis, libtheora, libogg +, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let @@ -52,7 +52,7 @@ in mkDerivation rec { poppler ffmpeg libva - alsaLib + alsa-lib SDL x264 libvpx diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index be3b07bf4cc..5c5557d6d60 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, makeWrapper, wrapGAppsHook, # build dependencies - alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, + alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gtk3, libuuid, nspr, nss, pango, xorg, systemd }: let deps = [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index a3ae46cf138..a34f5a22d06 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, kglobalaccel, kxmlgui, kcoreaddons, - plasma-framework, libpulseaudio, alsaLib, libcanberra_kde + plasma-framework, libpulseaudio, alsa-lib, libcanberra_kde }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - alsaLib kglobalaccel kxmlgui kcoreaddons + alsa-lib kglobalaccel kxmlgui kcoreaddons libcanberra_kde libpulseaudio plasma-framework ]; cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ]; diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 125e79c2c3c..43f41c345fd 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig -, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsaLib, libpulseaudio, flac, id3lib +, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsa-lib, libpulseaudio, flac, id3lib , libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { extra-cmake-modules ]; buildInputs = [ - alsaLib + alsa-lib audiofile kcrash kdoctools diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 580f6eda87e..436e4d7831f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , makeWrapper -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { installPhase = let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 58fcf4cb10d..90373b6b00c 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype +, alsa-lib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype , gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite , libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender , libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264 }: let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf + alsa-lib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264 libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libpulseaudio libxcb diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 946150d2b88..9baf2d4d2f2 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, pkg-config, CoreAudio -, enableAlsa ? true, alsaLib ? null +, enableAlsa ? true, alsa-lib ? null , enableLibao ? true, libao ? null , enableLame ? config.sox.enableLame or false, lame ? null , enableLibmad ? true, libmad ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; buildInputs = - optional (enableAlsa && stdenv.isLinux) alsaLib ++ + optional (enableAlsa && stdenv.isLinux) alsa-lib ++ optional enableLibao libao ++ optional enableLame lame ++ optional enableLibmad libmad ++ diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 65200d85177..dc8786dcce2 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups +{ alsa-lib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups , dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib , libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper , nspr, nss, pango, squashfsTools, stdenv, systemd, xorg @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { rev = "5"; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index dab8ccb29b7..16344d975fe 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -5,7 +5,7 @@ , copyDesktopItems , pkg-config , gtk3 -, alsaLib +, alsa-lib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; - buildInputs = [ gtk3 alsaLib ]; + buildInputs = [ gtk3 alsa-lib ]; postPatch = '' sed -i -e "s|/bin/ls|ls|" gtk/Makefile diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b1c7949d258..c9be607b366 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: +{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: let ld_library_path = builtins.concatStringsSep ":" [ @@ -17,7 +17,7 @@ let xorg.libXcomposite xorg.libXdamage xorg.libXtst - alsaLib + alsa-lib fontconfig libSM libICE diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index c7238fb0155..19cb7f6c552 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -95,7 +95,7 @@ in buildFHSUserEnv { libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib - alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils + alsa-lib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader xdg-utils sqlite gnutls p11-kit libbsd harfbuzz diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index dd3fb854599..ef802361480 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, perl -, alsaLib, libevdev, libopus, udev, SDL2 +, alsa-lib, libevdev, libopus, udev, SDL2 , ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - alsaLib libevdev libopus udev SDL2 + alsa-lib libevdev libopus udev SDL2 ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index ad9baec8f99..b02abc2f229 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -10,7 +10,7 @@ , libva , libvdpau , libxkbcommon -, alsaLib +, alsa-lib , libpulseaudio , openssl , libopus @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libva libvdpau libxkbcommon - alsaLib + alsa-lib libpulseaudio openssl libopus diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 03a83c1179b..8fcd9e1a04f 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -27,7 +27,7 @@ , libXScrnSaver , nss , nspr -, alsaLib +, alsa-lib , cups , fontconfig , expat @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { libXScrnSaver nss nspr - alsaLib + alsa-lib cups fontconfig expat diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 2c431e68dee..099813483a4 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -19,7 +19,7 @@ , xcbutilxrm , makeWrapper , removeReferencesTo -, alsaLib +, alsa-lib , curl , libmpdclient , libpulseaudio @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { xcbutilwm xcbutilxrm ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional githubSupport curl ++ lib.optional mpdSupport libmpdclient ++ lib.optional pulseSupport libpulseaudio diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 439af2b8c01..d387468bcdd 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev -, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 +, qtmultimedia, qtscript, alsa-lib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ - udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad + udev qtmultimedia qtscript alsa-lib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; qmakeFlags = [ "INSTALLROOT=$(out)" ]; diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index b68a3a98e34..2e1b94b6b6c 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, alsaLib }: +{ lib, buildGoModule, fetchFromGitHub, alsa-lib }: buildGoModule rec { pname = "sampler"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; meta = with lib; { description = "Tool for shell commands execution, visualization and alerting"; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 6a60e81933b..976aae78171 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook -, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype +, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcxx systemd libpulseaudio - stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 47d02a0cec9..375b802d5c1 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -5,7 +5,7 @@ , meson , ninja , scdoc -, alsaLib +, alsa-lib , fcft , json_c , libmpdclient @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ - alsaLib + alsa-lib fcft json_c libmpdclient diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index e9e22741c41..2f52a432f4b 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -55,7 +55,7 @@ with lib; let deps = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index feff2a74b14..7d666f5ba9f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl , dpkg -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -46,7 +46,7 @@ let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 57cac091912..156932aa13f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -9,7 +9,7 @@ , python2, python3, perl, pkg-config , nspr, systemd, libkrb5 -, util-linux, alsaLib +, util-linux, alsa-lib , bison, gperf , glib, gtk3, dbus-glib , glibc @@ -144,7 +144,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd - util-linux alsaLib + util-linux alsa-lib bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL @@ -206,7 +206,7 @@ let substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ --replace \ '/usr/share/alsa/' \ - '${alsaLib}/share/alsa/' \ + '${alsa-lib}/share/alsa/' \ --replace \ '/usr/lib/x86_64-linux-gnu/gconv/' \ '${glibc}/lib/gconv/' \ diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index fc702993338..725205c5c20 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, config, wrapGAppsHook -, alsaLib +, alsa-lib , atk , cairo , curl @@ -93,7 +93,7 @@ stdenv.mkDerivation { libPath = lib.makeLibraryPath [ stdenv.cc.cc - alsaLib + alsa-lib atk cairo curl diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a44fb2032f4..2d2073b80b0 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -18,7 +18,7 @@ ## optional libraries -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook @@ -180,7 +180,7 @@ buildStdenv.mkDerivation ({ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ nspr nss_pkg ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport libkrb5 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 13becfc4f62..53c461641dc 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify , gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -68,9 +68,9 @@ let ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ]) ++ lib.optional (config.pulseaudio or true) libpulseaudio - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk2 ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index a7b9ddd07d0..ec03a77d268 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -3,7 +3,7 @@ # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb -, alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups +, alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, mesa , libxkbcommon, wayland # ozone/wayland @@ -59,7 +59,7 @@ let deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb - alsaLib libXdamage libXtst libXrandr libxshmfence expat cups + alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib systemd libexif diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 2028c5a7b20..0bad6c58d0a 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , atk , cairo , cups @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 63f1958f4a6..c76902acab6 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -5,7 +5,7 @@ , lib , fetchFromGitHub , writeScript -, alsaLib +, alsa-lib , autoconf213 , cairo , desktop-file-utils @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib cairo dbus dbus-glib diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index dabe0fd373e..4f8d813f055 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus, cups, libexif, ffmpeg, systemd +, alsa-lib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd + atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 327fc5f31e2..f9be7e9ec9a 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -5,7 +5,7 @@ # Runtime , xorg, zip, freetype, fontconfig, glibc, libffi -, dbus, dbus-glib, gtk2, alsaLib, jack2, ffmpeg +, dbus, dbus-glib, gtk2, alsa-lib, jack2, ffmpeg }: let @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 + alsa-lib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 gnome2.GConf xorg.libXt ]; diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index 63d0d0b2978..64a237480c6 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -1,5 +1,5 @@ { mkDerivation, stdenv, lib, fetchurl, rpmextract, autoPatchelfHook , libuuid -, libXtst, libXfixes, glib, gst_all_1, alsaLib, freetype, fontconfig , libXext +, libXtst, libXfixes, glib, gst_all_1, alsa-lib, freetype, fontconfig , libXext , libGL, libpng, libXScrnSaver, libxcb, xorg, libpulseaudio, libdrm }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { ]; buildInputs = [ - libuuid libXtst libXScrnSaver libXfixes alsaLib freetype fontconfig libXext + libuuid libXtst libXScrnSaver libXfixes alsa-lib freetype fontconfig libXext libGL libpng libxcb libpulseaudio libdrm glib # For libgobject stdenv.cc.cc # For libstdc++ diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 0c6b33e04a2..03f0bf63818 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 -, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +, cairo, mpg123, alsa-lib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, libvpx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [zlib openssl libre librem cairo mpg123 - alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid + alsa-lib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index b3cd9d8c140..6e57e0e9423 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -32,7 +32,7 @@ , libXft , libXcomposite , libXScrnSaver -, alsaLib +, alsa-lib , pulseaudio , makeWrapper , xdg-utils @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { libXft libXcomposite libXScrnSaver - alsaLib + alsa-lib pulseaudio ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a155737499e..a8b2b02f0bf 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -1,6 +1,6 @@ { pname, version, src, binaryName, desktopName , autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook -, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { inherit pname version src; nativeBuildInputs = [ - alsaLib + alsa-lib autoPatchelfHook cups libdrm @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libcxx systemd libpulseaudio libdrm mesa - stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 6fac3657c7c..d63318ecfaf 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -17,7 +17,7 @@ , dbus , nss , nspr -, alsaLib +, alsa-lib , cups , expat , udev @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { gnome2.GConf nss nspr - alsaLib + alsa-lib cups expat stdenv.cc.cc diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 6fe0e3b13b2..854cc18a47f 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl +{ lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl , fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx @@ -7,7 +7,7 @@ let gitterDirectorySuffix = "opt/gitter"; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk at-spi2-core cairo diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index cbbe74481c2..6a677c9e0d6 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat -, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd +, alsa-lib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd , libGL, xcbutilkeysyms, xdg-utils, libtool }: let @@ -28,7 +28,7 @@ let nss nspr dbus - alsaLib + alsa-lib zlib libtool libxml2 diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 5fa5c2a2864..e2ace1a5d35 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg +, alsa-lib, dbus, gtk2, libpulseaudio, openssl, xorg }: let jdk = jdk8; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath ([ stdenv.cc.cc # For libstdc++. - alsaLib + alsa-lib dbus gtk2 libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 058a96ea622..5b14fba5b42 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, -libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook, +libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index bad54f455b0..94e0dc9c8c2 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -7,7 +7,7 @@ , libtool , pjsip , libyamlcpp -, alsaLib +, alsa-lib , libpulseaudio , libsamplerate , libsndfile @@ -95,7 +95,7 @@ stdenv.mkDerivation { buildInputs = [ pjsip' libyamlcpp - alsaLib + alsa-lib libpulseaudio libsamplerate libsndfile diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 6d6e70ff26a..dbcd447d156 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchurl, makeFontsConf, appimageTools , qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats , autoPatchelfHook, desktop-file-utils, imagemagick -, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }: +, twemoji-color-font, xorg, libsodium, libopus, libGL, alsa-lib }: mkDerivation rec { pname = "ripcord"; @@ -19,7 +19,7 @@ mkDerivation rec { }; nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ]; - buildInputs = [ libsodium libopus libGL alsaLib ] + buildInputs = [ libsodium libopus libGL alsa-lib ] ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/applications/networking/instant-messengers/seren/default.nix index 63cefbd2ffd..ed02def3eb8 100644 --- a/pkgs/applications/networking/instant-messengers/seren/default.nix +++ b/pkgs/applications/networking/instant-messengers/seren/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, alsaLib +, alsa-lib , libopus , libogg , gmp @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "seren"; version = "0.0.21"; - buildInputs = [ alsaLib libopus libogg gmp ncurses ]; + buildInputs = [ alsa-lib libopus libogg gmp ncurses ]; src = fetchurl { url = "http://holdenc.altervista.org/seren/downloads/${pname}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 67a52113df3..616a0857102 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite -, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib +, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: , systemd, libnotify, libdbusmenu, libpulseaudio @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 8caafdd5762..4eb53625624 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -10,7 +10,7 @@ let version = "8.69.0.77"; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 4db4580f58a..13778355211 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ , undmg , makeWrapper , nodePackages -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -80,7 +80,7 @@ let passthru.updateScript = ./update.sh; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 47027da9a91..026dc5b6405 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }: let fullPath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index d2648eff57c..048d40082da 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsaLib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: let @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase qtwebengine qtwebchannel qtsvg + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index c88c97705fd..02330d11078 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy @@ -37,7 +37,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk tg_owt # Transitive dependencies: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 27af9698788..acdf4e660c7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, fetchpatch, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, libtgvoip # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy @@ -57,7 +57,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk tg_owt libtgvoip # Transitive dependencies: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 6bd72134e02..614183b72d0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , xorg, libXtst }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf xorg.libX11 libXtst ]; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 8b306c07506..01c83ba7b1c 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -12,7 +12,7 @@ , qtbase , qttools , qtquickcontrols2 -, alsaLib +, alsa-lib , speex , ilbc , fetchurl @@ -41,7 +41,7 @@ mkDerivation rec { qtbase qttools qtquickcontrols2 - alsaLib + alsa-lib speex ilbc ]; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 7496063c58e..66d33533a73 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,5 +1,5 @@ {fetchurl, lib, stdenv, dpkg, makeWrapper, - alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, + alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { dontUnpack = true; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib cups curl dbus diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 96ae3993b38..51b119aa6de 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook -, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify +, xorg, gtk3, gnome2, nss, alsa-lib, udev, libnotify , wrapGAppsHook }: let @@ -35,7 +35,7 @@ let nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ]; buildInputs = (with xorg; [ libXdamage libXtst libXScrnSaver libxkbfile - ]) ++ [ gtk3 nss alsaLib ]; + ]) ++ [ gtk3 nss alsa-lib ]; runtimeDependencies = [ (lib.getLib udev) libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ba0f867b2aa..371ac91120b 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify +{ alsa-lib, autoPatchelfHook, fetchurl, gtk3, libnotify , makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils , xorg }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation { buildInputs = with xorg; [ libXdmcp libXScrnSaver libXtst ] ++ [ - alsaLib gtk3 nss + alsa-lib gtk3 nss ]; runtimeDependencies = [ (getLib udev) libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 364e6e294ec..191176e539e 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -3,7 +3,7 @@ , fetchurl , makeWrapper # Dynamic libraries -, alsaLib +, alsa-lib , atk , cairo , dbus @@ -39,7 +39,7 @@ let libs = lib.makeLibraryPath ([ # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' - alsaLib + alsa-lib atk cairo dbus diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 0c18ec60ab6..ad202871b99 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -10,7 +10,7 @@ , nss , libthai , wayland -, alsaLib +, alsa-lib , qtvirtualkeyboard , qtwebchannel , qtwebsockets @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib + alsa-lib libGL libthai libxcb diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 29667eb52c6..6c0de05a740 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, alsaLib +, alsa-lib , coreutils , db , dpkg @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib db glib gtk3 diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index b81128545d5..f3634b744aa 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, config, makeWrapper -, alsaLib +, alsa-lib , at-spi2-atk , atk , cairo @@ -78,7 +78,7 @@ stdenv.mkDerivation { libPath = lib.makeLibraryPath [ stdenv.cc.cc - alsaLib + alsa-lib at-spi2-atk atk cairo diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 31a15d69487..8e28190fea4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -58,7 +58,7 @@ , debugBuild ? false -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libdrm @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { xorg.libXdamage zip zlib - ] ++ lib.optional alsaSupport alsaLib + ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional gtk3Support gtk3 ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 68a9362b87f..33030e0c7ee 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype +, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator }: let deps = [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 088391ba48f..e0c5b50be0f 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib, python3 +, alsa-lib, python3 , rnnoise , jackSupport ? false, libjack2 , speechdSupport ? false, speechd @@ -73,7 +73,7 @@ let nativeBuildInputs = [ qt5.qttools ]; buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional speechdSupport speechd ++ lib.optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index bd9371fff13..b3968ed8604 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev + alsa-lib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev }: let @@ -54,7 +54,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - alsaLib + alsa-lib dbus-glib fuse gtk3 diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index dc7b0b0a4c8..84e52128b66 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl libsamplerate ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AppKit; preConfigure = '' diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8a96cf84755..506f129d359 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 +, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib atk cairo dconf diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8e0f4dde816..942090f2bdf 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsa-lib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildInputs = with lib; [ - alsaLib + alsa-lib cairo cups ffmpeg diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 4eb39f4d1f8..b87e74c256f 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas -, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, cairo, freetype, pango, gdk-pixbuf, glib }: +, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { version = "5.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; - systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib cairo freetype pango gdk-pixbuf glib ]; + systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsa-lib cairo freetype pango gdk-pixbuf glib ]; systemLibPaths = lib.makeLibraryPath systemLibs; installPhase = '' diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b38b7e0e585..3b9963d8dbc 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, mkDerivation, dpkg, which , makeWrapper -, alsaLib +, alsa-lib , desktop-file-utils , dbus , libcap @@ -59,7 +59,7 @@ let qtquickcontrols qtwebkit qtwebengine - alsaLib + alsa-lib dbus freetype fontconfig diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index daa71bff061..75e6924db9c 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl # Alphabetic ordering below -, alsaLib +, alsa-lib , at-spi2-atk , atk , autoPatchelfHook @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk atk cairo diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index b18f22b6c1d..ada2804ccba 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -5,7 +5,7 @@ , dpkg , wrapGAppsHook , wrapQtAppsHook -, alsaLib +, alsa-lib , atk , bzip2 , cairo @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; [ - alsaLib + alsa-lib atk bzip2 cairo diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index 4f8ca550490..7b8f60819c4 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd +{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, glibc, gpsd , hamlib, perl, python3, udev }: with lib; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ espeak gpsd hamlib perl python3 - ] ++ (optionals stdenv.isLinux [alsaLib udev]); + ] ++ (optionals stdenv.isLinux [alsa-lib udev]); patches = [ ./udev-fix.patch diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index d14e0017f6d..36f020ed272 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: + libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsa-lib }: stdenv.mkDerivation rec { version = "4.1.18"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio - libsndfile libsamplerate libpulseaudio pkg-config alsaLib ]; + libsndfile libsamplerate libpulseaudio pkg-config alsa-lib ]; meta = { description = "Digital modem program"; diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index 50993dd6f8e..3e423e025b7 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -17,7 +17,7 @@ , codec2 , gsm , fftwFloat -, alsaLib +, alsa-lib , libjack2 , CoreAudio , uhd @@ -143,7 +143,7 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 9f90d3c0353..f20ffe01bdc 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -16,7 +16,7 @@ , codec2 , gsm , fftwFloat -, alsaLib +, alsa-lib , libjack2 , CoreAudio , uhd @@ -149,7 +149,7 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d622fef424d..528ea126453 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -16,7 +16,7 @@ , codec2 , gsm , fftwFloat -, alsaLib +, alsa-lib , libjack2 , CoreAudio , uhd @@ -151,7 +151,7 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index cccdff1f3cc..272c381db89 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -7,7 +7,7 @@ , log4cpp , mpir , fftwFloat -, alsaLib +, alsa-lib , libjack2 # drivers (optional): , rtl-sdr @@ -37,7 +37,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { log4cpp mpir fftwFloat - alsaLib + alsa-lib libjack2 gnuradio3_8Minimal.unwrapped.boost qt5.qtbase diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index 48068a342e2..c023e76b273 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, libtool -, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio +, fftw, fftwSinglePrec, alsa-lib, libsndfile, libpulseaudio }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; + buildInputs = [ fftw fftwSinglePrec alsa-lib libsndfile libpulseaudio ]; preConfigure = '' aclocal \ diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index 64f5093c4b9..77a7d8cf69f 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -13,7 +13,7 @@ , nlohmann_json , soapysdr-with-plugins , portaudio -, alsaLib +, alsa-lib , muparserx , python3 }: @@ -39,7 +39,7 @@ mkDerivation rec { buildInputs = [ pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json - soapysdr-with-plugins portaudio alsaLib muparserx python3 + soapysdr-with-plugins portaudio alsa-lib muparserx python3 ]; postInstall = '' diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index e6fa95b5dc7..555264ac485 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, - libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: + libpulseaudio, alsa-lib, hamlib, libv4l, fftwFloat }: mkDerivation rec { version = "9.4.4"; @@ -17,7 +17,7 @@ mkDerivation rec { pkg-config ]; - buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l + buildInputs = [ qtbase openjpeg fftw libpulseaudio alsa-lib hamlib libv4l fftwFloat ]; postInstall = '' diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 19a4e715013..75fb91d5ce6 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,5 +1,5 @@ { lib, python38Packages, fetchPypi -, fftw, alsaLib, pulseaudio, wxPython_4_0 }: +, fftw, alsa-lib, pulseaudio, wxPython_4_0 }: python38Packages.buildPythonApplication rec { pname = "quisk"; @@ -10,7 +10,7 @@ python38Packages.buildPythonApplication rec { sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8"; }; - buildInputs = [ fftw alsaLib pulseaudio ]; + buildInputs = [ fftw alsa-lib pulseaudio ]; propagatedBuildInputs = [ wxPython_4_0 ]; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index e12cced055c..74924de241d 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr +, hamlib, rtaudio, alsa-lib, libpulseaudio, libjack2, libusb1, soapysdr } : stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ hamlib rtaudio alsaLib libpulseaudio libjack2 libusb1 soapysdr ]; + buildInputs = [ hamlib rtaudio alsa-lib libpulseaudio libjack2 libusb1 soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix index 7f1332a45a6..bedcc8b02c4 100644 --- a/pkgs/applications/radio/soundmodem/default.nix +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsaLib, audiofile, gtk2, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }: stdenv.mkDerivation rec { name = "soundmodem"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib audiofile gtk2 libxml2 ]; + buildInputs = [ alsa-lib audiofile gtk2 libxml2 ]; patches = [ ./matFix.patch ]; diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index d6a82049a23..255f7761be9 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsaLib, speex +{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsa-lib, speex , libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools , wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config doxygen groff wrapQtAppsHook ]; buildInputs = [ - alsaLib + alsa-lib curl gsm libgcrypt diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index cdb84670c61..8d28215ae25 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkg-config, qt5}: +{lib, stdenv, fetchurl, libpulseaudio, alsa-lib , pkg-config, qt5}: stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; + buildInputs = [libpulseaudio alsa-lib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; dontWrapQtApps = true; diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index 8e04d72780c..c33bfd408b9 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkg-config, autoreconfHook, glib, libzip, libserialport, check, libusb1, libftdi, -systemd, alsaLib, dsview +systemd, alsa-lib, dsview }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - glib libzip libserialport libusb1 libftdi systemd check alsaLib + glib libzip libserialport libusb1 libftdi systemd check alsa-lib ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 58873b8a770..0628134d9df 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchurl, makeDesktopItem , libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb - , libGL, glib, nss, nspr, expat, alsaLib + , libGL, glib, nss, nspr, expat, alsa-lib , qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine }: let libPath = lib.makeLibraryPath [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb - libGL glib nss nspr expat alsaLib + libGL glib nss nspr expat alsa-lib qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; in @@ -32,7 +32,7 @@ let buildInputs = [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb - libGL glib nss nspr expat alsaLib + libGL glib nss nspr expat alsa-lib qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 9a8f05bc575..6fed10da18b 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -2,7 +2,7 @@ , coreutils , patchelf , requireFile -, alsaLib +, alsa-lib , fontconfig , freetype , gcc @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils patchelf - alsaLib + alsa-lib coreutils fontconfig freetype diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index b8270cca908..f6f0046d272 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -3,7 +3,7 @@ , patchelf , requireFile , callPackage -, alsaLib +, alsa-lib , dbus , fontconfig , freetype @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils patchelf - alsaLib + alsa-lib coreutils dbus fontconfig diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 43d7853e3d9..88db3c4b2e9 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -2,7 +2,7 @@ , coreutils , patchelf , requireFile -, alsaLib +, alsa-lib , fontconfig , freetype , gcc @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils patchelf - alsaLib + alsa-lib coreutils fontconfig freetype diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 497592f1c06..10301f062e5 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -4,7 +4,7 @@ , requireFile , callPackage , makeWrapper -, alsaLib +, alsa-lib , dbus , fontconfig , freetype @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { coreutils patchelf makeWrapper - alsaLib + alsa-lib coreutils dbus fontconfig diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index e048b881d33..0f5e7e6daa8 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake , qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2 -, alsaLib, libsndfile, flite, openssl, udev, SDL2 +, alsa-lib, libsndfile, flite, openssl, udev, SDL2 }: mkDerivation rec { @@ -15,7 +15,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib libsndfile flite openssl udev SDL2 + alsa-lib libsndfile flite openssl udev SDL2 qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2 ]; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 7dd495f977a..55798ed6099 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }: +, libxcb, nss, nspr, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio + libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio at-spi2-atk ]; in diff --git a/pkgs/applications/terminal-emulators/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix index 87394241ef7..7631282b3af 100644 --- a/pkgs/applications/terminal-emulators/terminus/default.nix +++ b/pkgs/applications/terminal-emulators/terminus/default.nix @@ -2,13 +2,13 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs -, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: +, nss, nspr, alsa-lib, cups, expat, systemd, libpulseaudio }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsa-lib cups expat systemd libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2f19e0693c4..c0cc9d5e2b1 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsa-lib , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nss nspr cups - alsaLib + alsa-lib expat gdk-pixbuf dbus diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 7d041f60f48..133840e066b 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -30,7 +30,7 @@ , openal ? null , alsaSupport ? stdenv.isLinux -, alsaLib ? null +, alsa-lib ? null , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio ? null @@ -42,7 +42,7 @@ assert spellcheckSupport -> (hunspell != null); assert automationSupport -> (lua != null); assert openalSupport -> (openal != null); -assert alsaSupport -> (alsaLib != null); +assert alsaSupport -> (alsa-lib != null); assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { wxGTK zlib ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional automationSupport lua ++ optional openalSupport openal ++ optional portaudioSupport portaudio diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 9b2073bc799..fe767759a82 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -2,7 +2,7 @@ , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook -, alsaLib +, alsa-lib , withX265 ? true, x265 , withX264 ? true, x264 , withXvid ? true, xvidcore @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ++ lib.optional withQT wrapQtAppsHook; buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig - freetype alsaLib libXext libGLU makeWrapper + freetype alsa-lib libXext libGLU makeWrapper ] ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 ++ lib.optional withXvid xvidcore diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index c81811ea937..75d3cdbcc66 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 +, pkg-config, faad2, faac, a52dec, alsa-lib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng @@ -31,7 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; buildInputs = [ faad2 faac - a52dec alsaLib fftw lame libavc1394 libiec61883 + a52dec alsa-lib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr libXext libXxf86vm libXv libXi libX11 libXft xorgproto diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix index e4e72704fb0..09b24663080 100644 --- a/pkgs/applications/video/clickshare-csc1/default.nix +++ b/pkgs/applications/video/clickshare-csc1/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, alsaLib +, alsa-lib , autoPatchelfHook , binutils-unwrapped , gnutar @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { unzip ]; buildInputs = [ - alsaLib + alsa-lib libav_0_8 libnotify libresample diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index dfb110795f4..38d3d6304c6 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, ffmpeg, libjpeg_turbo, gtk3, alsaLib, speex, libusbmuxd, libappindicator-gtk3 +, ffmpeg, libjpeg_turbo, gtk3, alsa-lib, speex, libusbmuxd, libappindicator-gtk3 , pkg-config }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ffmpeg libjpeg_turbo gtk3 - alsaLib + alsa-lib speex libusbmuxd libappindicator-gtk3 diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index ba35c24ecf5..c31eb244c52 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -6,7 +6,7 @@ , openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless , gtest, ncurses, spdlog , libxml2, systemd -, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl +, alsa-lib, libGLU, libGL, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -114,7 +114,7 @@ in stdenv.mkDerivation { gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh gtest ncurses spdlog - alsaLib libGL libGLU fontconfig freetype ftgl + alsa-lib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 81b5be75f3b..352af7754c7 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2 +, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsa-lib, udev, libjack2 }: let fullPath = lib.makeLibraryPath [ @@ -17,7 +17,7 @@ let zlib openssl libuuid - alsaLib + alsa-lib libjack2 udev ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index b6bfa9d0dcf..bdcd3fbc8fd 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -5,7 +5,7 @@ , x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? false, libvdpau ? null , cddaSupport ? !stdenv.isDarwin, cdparanoia ? null @@ -36,7 +36,7 @@ assert fribidiSupport -> (fribidi != null); assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert screenSaverSupport -> libXScrnSaver != null; assert vdpauSupport -> libvdpau != null; assert cddaSupport -> cdparanoia != null; @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext libGLU libGL ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional xvSupport libXv ++ optional theoraSupport libtheora ++ optional cacaSupport libcaca diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 99cb08a02a0..3bde1543057 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -30,7 +30,7 @@ , libdrm ? null , mesa ? null -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null , archiveSupport ? true, libarchive ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null @@ -61,7 +61,7 @@ with lib; let available = x: x != null; in -assert alsaSupport -> available alsaLib; +assert alsaSupport -> available alsa-lib; assert archiveSupport -> available libarchive; assert bluraySupport -> available libbluray; assert bs2bSupport -> available libbs2b; @@ -159,7 +159,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg freetype libass libpthreadstubs luaEnv libuchardet mujs - ] ++ optional alsaSupport alsaLib + ] ++ optional alsaSupport alsa-lib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray ++ optional bs2bSupport libbs2b diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 236aec2ee56..cf307f0da34 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper -, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype +, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders }: @@ -24,7 +24,7 @@ mkDerivation rec { buildInputs = [ freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL - perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC + perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 109744969c2..a50fe16660f 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -30,7 +30,7 @@ , python3 , alsaSupport ? stdenv.isLinux -, alsaLib +, alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio , libcef @@ -77,7 +77,7 @@ in mkDerivation rec { mbedtls ] ++ optionals scriptingSupport [ luajit swig python3 ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio ++ optional pipewireSupport pipewire; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 84f5ac56e7d..c3bcc09cd3f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen -, alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor +, alsa-lib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor , zlib, AGL, Cocoa, Foundation }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { [ pkg-config cmake doxygen ]; buildInputs = - optionals stdenv.isLinux [ alsaLib ] + optionals stdenv.isLinux [ alsa-lib ] ++ (if stdenv.isDarwin then [ zlib AGL Cocoa Foundation ] else diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index ecedd730094..0e0580b9f2a 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pkg-config , cmake -, alsaLib +, alsa-lib , ffmpeg , libass , libcddb @@ -36,7 +36,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - alsaLib + alsa-lib ffmpeg libass libcddb diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 14575a88dc1..34842b38743 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, alsaLib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja }: @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL libpulseaudio libv4l qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 4d90e6327b9..32a35eca920 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -7,7 +7,7 @@ , wrapGAppsHook , at-spi2-core , atk -, alsaLib +, alsa-lib , cairo , cups , dbus @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with xorg; [ at-spi2-core atk - alsaLib + alsa-lib autoPatchelfHook cairo cups.lib diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 395de891eb9..cb2338c0e18 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage @@ -54,7 +54,7 @@ in { buildInputs = [ vdr libxcb xcbutilwm ffmpeg_3 - alsaLib + alsa-lib libvdpau # vdpau libva # va-api ] ++ (with xorg; [ libxcb libX11 ]); diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index adb7ba970e2..ed597615130 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray -, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib +, zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # which are not included here for no other reason that nobody has mentioned # needing them buildInputs = [ - zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread + zlib a52dec libmad faad2 ffmpeg alsa-lib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 598a162f399..aeea52a4ff5 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, mkDerivation -, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr +, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsa-lib, libv4l, libXrandr , ffmpeg }: @@ -17,7 +17,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ - alsaLib + alsa-lib libv4l qtbase qtmultimedia diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index aea8266b1d0..63f1e885af3 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 +, ffmpeg-full, gst_all_1, libpulseaudio, alsa-lib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -18,7 +18,7 @@ mkDerivation rec { qtbase qtdeclarative qtquickcontrols qtquickcontrols2 ffmpeg-full gst_all_1.gstreamer gst_all_1.gst-plugins-base - alsaLib libpulseaudio jack2 + alsa-lib libpulseaudio jack2 v4l-utils ]; diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 7660edcc768..3b486654aeb 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,5 +1,5 @@ { - alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, + alsa-lib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core @@ -7,7 +7,7 @@ let rpath = lib.makeLibraryPath ([ - alsaLib + alsa-lib atk at-spi2-core at-spi2-atk diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index f197abacee0..5a6c6ff524e 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -7,7 +7,7 @@ , perlPackages , xvidcore , mjpegtools -, alsaLib +, alsa-lib , libv4l , cimg }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; buildInputs = with lib; - [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; + [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsa-lib libv4l cimg ]; NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 0945c5b3f3f..b046fbebaa2 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -4,7 +4,7 @@ , libjpeg , libX11 , libXt -, alsaLib +, alsa-lib , aalib , libXft , xorgproto @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { xorgproto libFS perl - alsaLib + alsa-lib aalib libXaw libXpm diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0a9de4eb10a..7fd01a8ffa9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib -, perl, pixman, vde2, alsaLib, texinfo, flex +, perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl, ninja, meson , makeWrapper, autoPatchelfHook , attr, libcap, libcap_ng @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ++ optionals smartcardSupport [ libcacard ] ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] - ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] + ++ optionals stdenv.isLinux [ alsa-lib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] ++ optionals glusterfsSupport [ glusterfs libuuid ] diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 2abb16298d4..2b27e3a7875 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, alsaLib, spice-protocol, glib, +{lib, stdenv, fetchurl, pkg-config, alsa-lib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib spice-protocol glib libdrm + buildInputs = [ alsa-lib spice-protocol glib libdrm libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 4f792b4eb6e..0bc3af364e6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -2,7 +2,7 @@ , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsaLib, curl, libvpx, nettools, dbus, substituteAll +, alsa-lib, curl, libvpx, nettools, dbus, substituteAll # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin ? null @@ -53,7 +53,7 @@ in stdenv.mkDerivation { buildInputs = [ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsaLib curl libvpx pam makeself perl + libcap glib lvm2 alsa-lib curl libvpx pam makeself perl libXmu libpng libopus python ] ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings @@ -82,7 +82,7 @@ in stdenv.mkDerivation { s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e ' - s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g' + s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g' export USER=nix set +x diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 765baa0a3b4..cb91d850563 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -10,7 +10,7 @@ # qemu , udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsaLib, glib, python2 +, alsa-lib, glib, python2 , ... } @ args: assert withInternalSeabios -> !withSeabios; @@ -33,7 +33,7 @@ let qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsaLib glib python2 + alsa-lib glib python2 ]; in diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 935a6c3c23b..8e9cb2d2b76 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "i3status-2.13"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; - buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ]; + buildInputs = [ libconfuse yajl alsa-lib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index cc99e79fca8..bd9bcb30d10 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git -, alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config +, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ - alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config + alsa-lib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config ]; mesonFlags = [ "--sysconfdir" "/etc" ]; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix index 43080f2eae7..e22b02825b7 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }: +{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsa-lib }: stdenv.mkDerivation rec { pname = "AlsaMixer.app"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = dockapps-sources; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXpm libXext alsaLib ]; + buildInputs = [ libX11 libXpm libXext alsa-lib ]; setSourceRoot = '' export sourceRoot=$(echo */${pname}) diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index ec15f7e3627..f9b5d227b0e 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config -, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl +, xcbutilwm, alsa-lib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version, patches ? [] }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl - alsaLib wirelesstools asciidoc libxslt makeWrapper + alsa-lib wirelesstools asciidoc libxslt makeWrapper ]; postPatch = '' diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 3a820853b1f..6ba5890885d 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -171,7 +171,7 @@ rec { librsvg xorg.libXft libvdpau - alsaLib + alsa-lib harfbuzz e2fsprogs diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index a68886d414b..7e716ddb5c1 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , SDL2 -, alsaLib +, alsa-lib , bullet , check , curl @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ SDL2 - alsaLib + alsa-lib bullet curl dbus diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 3b750bd08b7..84cadd20949 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , gettext -, alsaLib +, alsa-lib , acpid , bc , ddcutil @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib acpid # for systems with ACPI for lid events, AC/Battery plug in/out etc bc # for the Everything module calculator mode ddcutil # specifically libddcutil.so.2 for backlight control diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index e091cf2365a..4a1b7f4c20c 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -14,7 +14,7 @@ , libgnomekbd , lcms2 , libpulseaudio -, alsaLib +, alsa-lib , libcanberra-gtk3 , upower , colord @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { gnome-desktop lcms2 libpulseaudio - alsaLib + alsa-lib libcanberra-gtk3 upower colord diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 15a3d918b95..548f8938959 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -20,7 +20,7 @@ , lxmenu-data , wirelesstools , curl -, supportAlsa ? false, alsaLib +, supportAlsa ? false, alsa-lib }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { m4 wirelesstools curl - ] ++ lib.optional supportAlsa alsaLib; + ] ++ lib.optional supportAlsa alsa-lib; postPatch = '' substituteInPlace src/Makefile.in \ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index c565c5b4c30..34578e6bc5f 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, alsaLib +, alsa-lib , kguiaddons , kwindowsystem , libXdamage @@ -46,7 +46,7 @@ mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib kguiaddons kwindowsystem libXdamage diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 9d42c23c714..4fe73fadbc4 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, pkg-config, gettext, glib -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false , mateUpdateScript @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ glib ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio; configureFlags = lib.optional ossSupport "--enable-oss"; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 43fd7a69e8a..568414aab35 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -15,7 +15,7 @@ , libgnomekbd , lcms2 , libpulseaudio -, alsaLib +, alsa-lib , libcanberra-gtk3 , upower , colord @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice - alsaLib + alsa-lib colord gcr geoclue2 diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index e304f67bd75..f61d925036c 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -7,7 +7,7 @@ , makeWrapper , setJavaClassPath # minimum dependencies -, alsaLib +, alsa-lib , fontconfig , freetype , libffi @@ -44,7 +44,7 @@ let result = stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype stdenv.cc.cc.lib # libstdc++.so.6 diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 747de25142e..c8a1964814e 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -6,7 +6,7 @@ args@ , developerProgram ? false , runPatches ? [] , addOpenGLRunpath -, alsaLib +, alsa-lib , expat , fetchurl , fontconfig @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ ncurses5 expat python27 zlib glibc xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext - gtk2 glib fontconfig freetype unixODBC alsaLib + gtk2 glib fontconfig freetype unixODBC alsa-lib ]; rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 27436d8b614..5cab3b929f7 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -14,7 +14,7 @@ , stdenv , lib , fetchurl -, alsaLib +, alsa-lib , dbus , expat , libpulseaudio @@ -107,7 +107,7 @@ let libGLU # for android emulator - alsaLib + alsa-lib dbus expat libpulseaudio diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index 3a8fca2c1a0..0d12d5fe2df 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/pkgs/development/compilers/graalvm/community-edition.nix @@ -6,7 +6,7 @@ , makeWrapper # minimum dependencies , Foundation -, alsaLib +, alsa-lib , fontconfig , freetype , glibc @@ -82,7 +82,7 @@ let ]; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index eb3045d52ad..f3ca8a4f5bb 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, setJavaClassPath }: +{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsa-lib, setJavaClassPath }: let common = javaVersion: @@ -125,7 +125,7 @@ let }.${javaVersion} }:${ lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" + glib zlib bzip2 alsa-lib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 15238e63ecb..ef593422ff2 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 33169be5302..66aeff306e3 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk11 ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index d3db493c5fe..96a567895d6 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 3804999376e..fae27b8ca75 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 6430c970936..11333b1ef66 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk15-bootstrap , setJavaClassPath @@ -24,7 +24,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; buildInputs = [ - cpio perl zlib cups freetype alsaLib libjpeg giflib + cpio perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 9a710ed6fa4..99033e8738c 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, alsaLib, libjpeg, giflib +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap , setJavaClassPath @@ -28,7 +28,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 423c09d923a..7a69038d5e0 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip -, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib +, cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , openjdk8-bootstrap @@ -85,7 +85,7 @@ let nativeBuildInputs = [ pkg-config lndir unzip ]; buildInputs = [ - cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib + cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsa-lib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 306130a0991..228dbf9b14e 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index e5da2bc3fe0..c36cbaa03f9 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib , ffmpeg, python3, ruby }: let @@ -21,7 +21,7 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index ca8f4106f3d..713b32a349b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -26,7 +26,7 @@ , gtk2 , pango , cairo -, alsaLib +, alsa-lib , atk , gdk-pixbuf , setJavaClassPath @@ -168,7 +168,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; rpath = lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix index eafe23c8e76..a232b796a06 100644 --- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix @@ -3,7 +3,7 @@ , xorg , zlib , freetype -, alsaLib +, alsa-lib , setJavaClassPath }: @@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec { ''; postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" + rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix index b1655cd8b8f..6604ebbef82 100644 --- a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix @@ -3,7 +3,7 @@ , xorg , zlib , freetype -, alsaLib +, alsa-lib , setJavaClassPath }: @@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec { ''; postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}" + rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 591f10b3be9..6fcdacf535b 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -7,7 +7,7 @@ , setJavaClassPath , zulu # minimum dependencies -, alsaLib +, alsa-lib , fontconfig , freetype , xorg @@ -49,7 +49,7 @@ in stdenv.mkDerivation { }; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype stdenv.cc.cc # libstdc++.so.6 diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index cd118187748..81edb8b469a 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -7,7 +7,7 @@ , setJavaClassPath , zulu # minimum dependencies -, alsaLib +, alsa-lib , fontconfig , freetype , zlib @@ -50,7 +50,7 @@ in stdenv.mkDerivation { }; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib # libasound.so wanted by lib/libjsound.so + alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype stdenv.cc.cc # libstdc++.so.6 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 459821f253f..2d65d3355cc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15890,7 +15890,7 @@ self: { }) {}; "PortMidi" = callPackage - ({ mkDerivation, alsaLib, base }: + ({ mkDerivation, alsa-lib, base }: mkDerivation { pname = "PortMidi"; version = "0.2.0.0"; @@ -15898,13 +15898,13 @@ self: { revision = "1"; editedCabalFile = "0h3gql271mdz3kh0jgimxv8ada34b0h4n8wnyf5i759fqxpf6w86"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; description = "A binding for PortMedia/PortMidi"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "PortMidi-simple" = callPackage ({ mkDerivation, base, PortMidi }: @@ -17168,7 +17168,7 @@ self: { }) {}; "RtMidi" = callPackage - ({ mkDerivation, alsaLib, base, deepseq, pretty-simple, tasty + ({ mkDerivation, alsa-lib, base, deepseq, pretty-simple, tasty , tasty-hunit, unliftio-core, vector }: mkDerivation { @@ -17178,14 +17178,14 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq unliftio-core vector ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; executableHaskellDepends = [ base pretty-simple vector ]; testHaskellDepends = [ base tasty tasty-hunit vector ]; description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: @@ -26730,7 +26730,7 @@ self: { }) {}; "alsa" = callPackage - ({ mkDerivation, alsaLib, array, base, extensible-exceptions + ({ mkDerivation, alsa-lib, array, base, extensible-exceptions , sample-frame }: mkDerivation { @@ -26740,27 +26740,27 @@ self: { libraryHaskellDepends = [ array base extensible-exceptions sample-frame ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-core" = callPackage - ({ mkDerivation, alsaLib, base, extensible-exceptions }: + ({ mkDerivation, alsa-lib, base, extensible-exceptions }: mkDerivation { pname = "alsa-core"; version = "0.5.0.1"; sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b"; libraryHaskellDepends = [ base extensible-exceptions ]; - libraryPkgconfigDepends = [ alsaLib ]; + libraryPkgconfigDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API (Exceptions)"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-gui" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, midi, midi-alsa, wx @@ -26781,7 +26781,7 @@ self: { }) {}; "alsa-midi" = callPackage - ({ mkDerivation, alsaLib, array, base, event-list, midi + ({ mkDerivation, alsa-lib, array, base, event-list, midi , non-negative }: mkDerivation { @@ -26794,32 +26794,32 @@ self: { libraryHaskellDepends = [ array base event-list midi non-negative ]; - librarySystemDepends = [ alsaLib ]; - executableSystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; + executableSystemDepends = [ alsa-lib ]; description = "Bindings for the ALSA sequencer API (MIDI stuff)"; license = "GPL"; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-mixer" = callPackage - ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }: + ({ mkDerivation, alsa-core, alsa-lib, base, c2hs, unix }: mkDerivation { pname = "alsa-mixer"; version = "0.3.0"; sha256 = "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb"; libraryHaskellDepends = [ alsa-core base unix ]; - librarySystemDepends = [ alsaLib ]; + librarySystemDepends = [ alsa-lib ]; libraryToolDepends = [ c2hs ]; description = "Bindings to the ALSA simple mixer API"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-pcm" = callPackage - ({ mkDerivation, alsa-core, alsaLib, array, base + ({ mkDerivation, alsa-core, alsa-lib, array, base , extensible-exceptions, sample-frame, semigroups, storable-record }: mkDerivation { @@ -26832,13 +26832,13 @@ self: { alsa-core array base extensible-exceptions sample-frame semigroups storable-record ]; - libraryPkgconfigDepends = [ alsaLib ]; + libraryPkgconfigDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API (PCM audio)"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-pcm-tests" = callPackage ({ mkDerivation, alsa, base }: @@ -26855,7 +26855,7 @@ self: { }) {}; "alsa-seq" = callPackage - ({ mkDerivation, alsa-core, alsaLib, array, base, bytestring + ({ mkDerivation, alsa-core, alsa-lib, array, base, bytestring , data-accessor, enumset, extensible-exceptions, poll, transformers , utility-ht }: @@ -26869,13 +26869,13 @@ self: { alsa-core array base bytestring data-accessor enumset extensible-exceptions poll transformers utility-ht ]; - libraryPkgconfigDepends = [ alsaLib ]; + libraryPkgconfigDepends = [ alsa-lib ]; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsa-lib;}; "alsa-seq-tests" = callPackage ({ mkDerivation, alsa, base }: diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix index 5249ccce0d9..77bda13f266 100644 --- a/pkgs/development/interpreters/python/conda/default.nix +++ b/pkgs/development/interpreters/python/conda/default.nix @@ -4,7 +4,7 @@ # When installing a conda binary package, just extend # the `buildInputs` with `condaAutopatchLibs`. condaPatchelfLibs = builtins.map (p: p.lib or p) ([ - pkgs.alsaLib + pkgs.alsa-lib pkgs.cups pkgs.gcc-unwrapped pkgs.libGL diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index b7efc37ae04..fc8d8f1652d 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, alsaLib +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, alsa-lib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -27,7 +27,7 @@ mkDerivation rec { buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] - ++ optional (!stdenv.isDarwin) alsaLib + ++ optional (!stdenv.isDarwin) alsa-lib ++ optional useSCEL emacs; meta = with lib; { diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index b51bc3f7cdd..bf76bc1e857 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid , libXext, libICE, libXrandr , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio @@ -17,7 +17,7 @@ let extraPropagatedBuildInputs = [ ] ++ optionals x11Support [ libXext libICE libXrandr ] ++ optionals openglSupport [ libGL libGLU ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; rpath = makeLibraryPath extraPropagatedBuildInputs; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { # Please try revert the change that introduced this comment when updating SDL. ] ++ optional stdenv.isDarwin "--disable-x11-shared" ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"; + ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; patches = [ ./find-headers.patch diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f70a46e2f8e..d02dac1f562 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, config, fetchurl, pkg-config , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib , x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid , libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor , libXinerama, libXext, libXxf86vm, libXrandr @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ++ optionals x11Support [ libX11 xorgproto ]; dlopenBuildInputs = [ ] - ++ optionals alsaSupport [ alsaLib audiofile ] + ++ optionals alsaSupport [ alsa-lib audiofile ] ++ optional dbusSupport dbus ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-oss" ] ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib" + ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles" ++ optional stdenv.isDarwin "--disable-sdltest"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 31434741126..5cd6584f18f 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis +, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xorgproto libX11 libXpm libXt libXcursor - alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 9fefbe01ace..6abf632806a 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis +, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor - alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL ]; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index b1c6c6396c8..e1f2d326879 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate +{ lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate , libsndfile, pkg-config, python3, wafHook }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; + buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 03048abcc32..4f2f78f20cf 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -6,7 +6,7 @@ , cmake , pkg-config , alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib +, alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , jackSupport ? true @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optional alsaSupport alsaLib + buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional jackSupport jack ++ lib.optional coreaudioSupport CoreAudio; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index ccfafd36a8a..6c75b9866e8 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -5,7 +5,7 @@ , cmake , pkg-config , alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib +, alsa-lib , jackSupport ? true , jack , coremidiSupport ? stdenv.hostPlatform.isDarwin @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optional alsaSupport alsaLib + buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport jack ++ lib.optionals coremidiSupport [ CoreMIDI CoreAudio CoreServices ]; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 45f5fcfe3a4..afecd561b72 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl , alsaLib, }: +{ lib, stdenv, fetchurl , alsa-lib, }: stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; buildPhase = '' cd source diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 88b1840955d..54df6d7b255 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }: +{ stdenv, lib, fetchurl, fetchpatch, alsa-lib, AudioUnit, CoreServices }: let @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ - alsaLib + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit ]; diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix index 15fd9cd7286..0a0f976e0dc 100644 --- a/pkgs/development/libraries/clanlib/default.nix +++ b/pkgs/development/libraries/clanlib/default.nix @@ -10,7 +10,7 @@ , freetype , fontconfig , xlibsWrapper -, alsaLib +, alsa-lib , libXrender }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { freetype fontconfig xlibsWrapper - alsaLib + alsa-lib libXrender ]; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index fb0d6afc710..ba3768227f3 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook -, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio +, alsa-lib, fluidsynth, qtbase, qtsvg, libpulseaudio }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib fluidsynth libpulseaudio qtbase qtsvg + alsa-lib fluidsynth libpulseaudio qtbase qtsvg ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 9ce487b1b03..ca7ea10afff 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM +{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, qt4, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM + [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM libsamplerate libtool autoconf automake xorgproto libICE pkg-config ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index dcd1388143d..98d8ef434e0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -47,7 +47,7 @@ /* * External libraries options */ -, alsaLib ? null # Alsa in/output support +, alsa-lib ? null # Alsa in/output support #, avisynth ? null # Support for reading AviSynth scripts , bzip2 ? null , celt ? null # CELT decoder @@ -433,7 +433,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf - ++ optionals isLinux [ alsaLib libraw1394 libv4l vulkan-loader glslang ] + ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7e4a6a08098..d52abd4ab09 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm -, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg +, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU ? null, libGL ? null @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm - ++ optional isLinux alsaLib + ++ optional isLinux alsa-lib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL) diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index a80c317b06e..cd8eb538462 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, alsa-lib, fetchpatch }: stdenv.mkDerivation rec { pname = "flite"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = lib.optionals stdenv.isLinux [ alsaLib ]; + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ]; # https://github.com/festvox/flite/pull/60. # Replaces `ar` with `$(AR)` in config/common_make_rules. diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 7e9095ef0ed..699f70a0788 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -26,7 +26,7 @@ , wayland , wayland-protocols , enableAlsa ? stdenv.isLinux -, alsaLib +, alsa-lib # Enabling Cocoa seems to currently not work, giving compile # errors. Suspected is that a newer version than clang # is needed than 5.0 but it is not clear. @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { pango OpenGL ] ++ lib.optionals enableAlsa [ - alsaLib + alsa-lib ] ++ lib.optionals enableX11 [ libXext libXv diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 99d38f0cfc4..4a07ba9da7d 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsa-lib, libcap , CoreAudio, CoreServices, AudioUnit , usePulseAudio }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ lib.optional usePulseAudio libpulseaudio ++ - lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ + lib.optionals stdenv.isLinux [ alsa-lib libcap ] ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0127c1ebe8a..5d4bca0f1b9 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -2,7 +2,7 @@ , gtk ? null , libpulseaudio, gst_all_1, libvorbis, libcap , CoreServices -, withAlsa ? stdenv.isLinux, alsaLib }: +, withAlsa ? stdenv.isLinux, alsa-lib }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional stdenv.isDarwin CoreServices ++ lib.optional stdenv.isLinux libcap - ++ lib.optional withAlsa alsaLib; + ++ lib.optional withAlsa alsa-lib; configureFlags = [ "--disable-oss" ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index ec1a5ee3828..8f01958a9bc 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, cmake, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver , libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core @@ -7,7 +7,7 @@ let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 + alsa-lib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio systemd at-spi2-core at-spi2-atk diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index a734a4b8009..02ccf0c66fb 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: +{ lib, stdenv, fetchurl, texinfo, alsa-lib, libpulseaudio, CoreAudio }: let inherit (lib) optional optionalString; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optional stdenv.isLinux alsaLib + ++ optional stdenv.isLinux alsa-lib ++ optional stdenv.isDarwin CoreAudio; propagatedBuildInputs = optional stdenv.isLinux libpulseaudio; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index fc577d7e508..e9a54dc478c 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -2,7 +2,7 @@ , qtbase, qtmultimedia, qtquick1, qttools , libGL, libX11 , libass, openal, ffmpeg, libuchardet -, alsaLib, libpulseaudio, libva +, alsa-lib, libpulseaudio, libva }: with lib; @@ -16,7 +16,7 @@ mkDerivation rec { qtbase qtmultimedia qtquick1 libGL libX11 libass openal ffmpeg libuchardet - alsaLib libpulseaudio libva + alsa-lib libpulseaudio libva ]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index ac9f3b25654..2ef629e5467 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: +{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjack2 libpulseaudio ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AudioUnit; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 004460abe31..d9be4a2964f 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }: +{ lib, stdenv, fetchurl, libspotify, alsa-lib, readline, pkg-config, apiKey ? null, unzip, gnused }: let version = "12.1.51"; @@ -67,7 +67,7 @@ else stdenv.mkDerivation { src = libspotify.src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libspotify readline ] - ++ lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsa-lib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; patchPhase = "cp ${apiKey} appkey.c"; installPhase = '' diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 920315bb1bc..dcf8990a879 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook -, openssl, libopus, alsaLib, libpulseaudio +, openssl, libopus, alsa-lib, libpulseaudio }: with lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl libopus alsaLib libpulseaudio ]; + buildInputs = [ openssl libopus alsa-lib libpulseaudio ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 6b7f0c102ee..b93cc96bde0 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, - alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: + alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { name = "lirc-0.10.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; - buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; + buildInputs = [ alsa-lib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 452031dc924..5d9cc98b1a9 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , bctoolbox , bzrtp , cmake @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - alsaLib + alsa-lib bctoolbox bzrtp ffmpeg diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 43c781cf52c..2d469a406de 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake -, alsaSupport ? !stdenv.isDarwin, alsaLib ? null +, alsaSupport ? !stdenv.isDarwin, alsa-lib ? null , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , CoreServices, AudioUnit, AudioToolbox }: with lib; -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index ebdacdfc9bd..2c7dd440da8 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchFromGitHub , autoconf, automake, which, libtool, pkg-config -, portaudio, alsaLib +, portaudio, alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; buildInputs = [ portaudio ] - ++ lib.optionals stdenv.isLinux [ alsaLib ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index 1e686b98004..276ad6b8c49 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, alsa-lib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 + alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index b3e740f39c4..40f4e328c31 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -11,7 +11,7 @@ , valgrind , glib , dbus -, alsaLib +, alsa-lib , libjack2 , udev , libva @@ -85,7 +85,7 @@ let ]; buildInputs = [ - alsaLib + alsa-lib dbus glib libjack2 diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index c7de116e879..efa68146e8d 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, pkg-config, libjack2 +{ lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ] - ++ lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsa-lib; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation { make install '' + lib.optionalString (!stdenv.isDarwin) '' # fixup .pc file to find alsa library - sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc + sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc '' + lib.optionalString stdenv.isDarwin '' cp include/pa_mac_core.h $out/include/pa_mac_core.h ''; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index e9a868240bb..0151d461c13 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: +{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib }: stdenv.mkDerivation rec { pname = "portmidi"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip cmake ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 532a72c820c..ed93d86a197 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -3,7 +3,7 @@ , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, libGLU, openssl, dbus, cups, pkg-config , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi -, alsaLib +, alsa-lib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 0af773947f0..0d2d565fe7a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,5 +1,5 @@ { qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config -, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland +, alsa-lib, gstreamer, gst-plugins-base, libpulseaudio, wayland }: with lib; @@ -9,7 +9,7 @@ qtModule { qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] - ++ optional (stdenv.isLinux) alsaLib + ++ optional (stdenv.isLinux) alsa-lib ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 13ab7e35c5a..729c5f388f9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -8,7 +8,7 @@ , fontconfig, freetype, harfbuzz, icu, dbus, libdrm , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent -, alsaLib +, alsa-lib , libcap , pciutils , systemd @@ -156,7 +156,7 @@ qtModule { dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats - alsaLib + alsa-lib # Text rendering fontconfig freetype diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 16f6c324a7a..836bafd4280 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, cmake, mesa, libGLU, glfw, libX11, libXi, libXcursor, libXrandr, libXinerama, - alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib, + alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, sharedLib ? true, includeEverything ? true @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama - ] ++ lib.optional alsaSupport alsaLib + ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # fix libasound.so/libpulse.so not being found preFixup = '' - ${lib.optionalString alsaSupport "patchelf --add-needed ${alsaLib}/lib/libasound.so $out/lib/libraylib.so.${version}"} + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"} ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} ''; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 4948e481ff5..41d776c6869 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,4 +1,4 @@ -# alsaLib vorbis-tools python can be made optional +# alsa-lib vorbis-tools python can be made optional { lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index c54b4a3721f..8706b878922 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, ncurses }: +{ lib, stdenv, fetchurl, alsa-lib, ncurses }: stdenv.mkDerivation rec { name = "speech_tools-${version}.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; - buildInputs = [ alsaLib ncurses ]; + buildInputs = [ alsa-lib ncurses ]; preConfigure = '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 0f16a519169..80034a5a9cf 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -15,7 +15,7 @@ , libsndfile , withLibao ? true, libao , withPulse ? false, libpulseaudio -, withAlsa ? false, alsaLib +, withAlsa ? false, alsa-lib , withOss ? false , withFlite ? true, flite # , withFestival ? false, festival-freebsoft-utils @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { libsndfile libao libpulseaudio - alsaLib + alsa-lib python ] ++ optionals withEspeak [ espeak diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 584b1e15a8e..ff1f5eb8041 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , pixman -, alsaLib +, alsa-lib , openssl , libXrandr , libXfixes @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib cyrus_sasl glib gst_all_1.gst-plugins-base diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 880823a8473..81c1b51e658 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, alsaLib, freepats }: +{ lib, stdenv, fetchurl, cmake, alsa-lib, freepats }: stdenv.mkDerivation rec { name = "wildmidi-0.4.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsaLib stdenv.cc.libc/*couldn't find libm*/ ]; + buildInputs = [ alsa-lib stdenv.cc.libc/*couldn't find libm*/ ]; preConfigure = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 8915299a734..70fdf24dd9f 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , aalib -, alsaLib +, alsa-lib , ffmpeg , flac , libGL @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ aalib - alsaLib + alsa-lib ffmpeg flac libGL diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index c8fce166aa7..2746a60247b 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -26,7 +26,7 @@ deployAndroidPackage { pkgs.freetype pkgs.nss pkgs.nspr - pkgs.alsaLib + pkgs.alsa-lib ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/octave-modules/audio/default.nix b/pkgs/development/octave-modules/audio/default.nix index 4fafefd6f75..0cb03746085 100644 --- a/pkgs/development/octave-modules/audio/default.nix +++ b/pkgs/development/octave-modules/audio/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , jack2 -, alsaLib +, alsa-lib , rtmidi , pkg-config }: @@ -22,7 +22,7 @@ buildOctavePackage rec { propagatedBuildInputs = [ jack2 - alsaLib + alsa-lib rtmidi ]; @@ -31,6 +31,6 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Audio and MIDI Toolbox for GNU Octave"; - platforms = platforms.linux; # Because of run-time dependency on jack2 and alsaLib + platforms = platforms.linux; # Because of run-time dependency on jack2 and alsa-lib }; } diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index c00c92a6c33..88ef9f9efde 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -10,7 +10,7 @@ , libGL , freetype , xorg -, alsaLib +, alsa-lib , cairo , libuuid , libnsl @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; buildInputs = [ bash glibc openssl libGLU libGL freetype - xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libnsl ]; + xorg.libX11 xorg.libICE xorg.libSM alsa-lib cairo pharo-share libnsl ]; LD_LIBRARY_PATH = lib.makeLibraryPath - [ cairo libGLU libGL freetype openssl libuuid alsaLib + [ cairo libGLU libGL freetype openssl libuuid alsa-lib xorg.libICE xorg.libSM ]; preConfigure = '' diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index c1f703f7251..498e5c41472 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -8,7 +8,7 @@ , libGLU, libGL , freetype , xorg -, alsaLib +, alsa-lib , cairo , libuuid , autoreconfHook @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libICE xorg.libSM - alsaLib + alsa-lib cairo pharo-share libuuid @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { freetype openssl libuuid - alsaLib + alsa-lib xorg.libICE xorg.libSM ]; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index a8e3236a3a0..a51366820a9 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -11,7 +11,7 @@ , libGLU, libGL , freetype , xorg -, alsaLib +, alsa-lib , cairo , libuuid , autoreconfHook diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index a249b0aede1..e9cff7eb824 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, GitPython , libpcap, meson, ninja, pillow, pkg-config, pygobject3, SDL2 -, alsaLib, soundtouch, openal +, alsa-lib, soundtouch, openal }: let @@ -26,7 +26,7 @@ buildPythonPackage rec { cp -R --no-preserve=mode ${desmume} __build_desmume ''; - buildInputs = [ GitPython libpcap SDL2 alsaLib soundtouch openal ]; + buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ]; nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ pillow pygobject3 ]; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index aadf75d59f7..781231749fd 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, pkg-config, alsaLib, libjack2, tox, flake8, alabaster +, pkg-config, alsa-lib, libjack2, tox, flake8, alabaster }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libjack2 ]; + buildInputs = [ alsa-lib libjack2 ]; checkInputs = [ tox flake8 diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index 4e6da0b8d42..e1565fa6c30 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, alsaLib }: +{ lib, buildPythonPackage, fetchPypi, cython, alsa-lib }: buildPythonPackage rec { pname = "rtmidi-python"; @@ -14,7 +14,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ cython ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; setupPyBuildFlags = [ "--from-cython" ]; diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 948716a9b7c..4ab18efe332 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, buildPythonPackage, fetchFromGitHub, isPy27, lib }: +{ alsa-lib, buildPythonPackage, fetchFromGitHub, isPy27, lib }: buildPythonPackage rec { pname = "simpleaudio"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; meta = with lib; { homepage = "https://github.com/hamiltron/py-simple-audio"; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 568ce67d143..838ffd47184 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; + buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index d256b6e767a..25d61d2393e 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -3,7 +3,7 @@ , zlib , xorg , freetype -, alsaLib +, alsa-lib , jdk11 , curl , lttng-ust @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.libXrender freetype - alsaLib + alsa-lib jdk11 stdenv.cc.cc.lib curl diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 3a210ab174f..5e457227c8d 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11 , libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio , libXi, libXext, libXfixes, freetype, openssl -, alsaLib, libGLU, zlib, yasm +, alsa-lib, libGLU, zlib, yasm , withUdev ? true }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ scons udev libX11 libXcursor libXinerama libXrandr libXrender - libXi libXext libXfixes freetype openssl alsaLib libpulseaudio + libXi libXext libXfixes freetype openssl alsa-lib libpulseaudio libGLU zlib yasm ]; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 475c08eb169..f5276510e61 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig +, xorg, alsa-lib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -10,7 +10,7 @@ let name = "nwjs-env"; paths = [ xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk-pixbuf - freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 9cfb3c448e8..7d0175ac912 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig +, xorg, alsa-lib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify , ffmpeg, libxcb, cups @@ -16,7 +16,7 @@ let name = "nwjs-env"; paths = [ xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf - freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr xorg.libXScrnSaver cups diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ca8359a32a8..1db72dc1c8f 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core -, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem +, gtk3, glib, freetype, dbus, nss, nspr, alsa-lib, cups, expat, udev, makeDesktopItem }: let @@ -16,7 +16,7 @@ let dbus nss nspr - alsaLib + alsa-lib cups expat udev diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index fcb1edf153a..cc46f3f5d34 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk +{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsa-lib , dbus, gtk2, atk , pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss , xorg, libcap, unzip }: @@ -8,7 +8,7 @@ let name = "env-thrust"; paths = [ stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk-pixbuf - cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 + cairo cups expat alsa-lib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap ]; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 5c41a1dac93..9333864c69b 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, file, getopt , gtk2, gtk3, gdk-pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb -, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango +, alsa-lib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium @@ -10,7 +10,7 @@ let libPath64 = lib.makeLibraryPath [ gcc.cc gtk2 gdk-pixbuf glib libGL libGLU nss nspr - alsaLib GConf cups libcap fontconfig freetype pango + alsa-lib GConf cups libcap fontconfig freetype pango cairo dbus expat zlib libpng12 udev tbb libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index dc2f8022117..19cd15e7be4 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -6,7 +6,7 @@ in appimageTools.wrapType2 rec { name = "unityhub"; extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr - alsaLib cups gnome2.GConf libcap fontconfig freetype pango + alsa-lib cups gnome2.GConf libcap fontconfig freetype pango cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 287709bbbad..9563563bc42 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook, mesa }: +{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsa-lib, udev, unzip, wrapGAppsHook, mesa }: stdenv.mkDerivation rec { pname = "cypress"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = with xorg; [ libXScrnSaver libXdamage libXtst libxshmfence ] ++ [ - nss gtk2 alsaLib gnome2.GConf gtk3 + nss gtk2 alsa-lib gnome2.GConf gtk3 mesa # for libgbm ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 1c854368df7..3ba900f3f69 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat +{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat , fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3, gtk2 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { [ autoPatchelfHook dpkg makeWrapper gobject-introspection wrapGAppsHook ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk atk cairo diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index b8763c94323..6eb7eb1b58c 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook -, atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 +, atk, at-spi2-atk, at-spi2-core, alsa-lib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes , libXrender, libXtst, libXScrnSaver, libdrm, mesa @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { atk at-spi2-atk at-spi2-core - alsaLib + alsa-lib cairo cups dbus diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index dc4f1f47f7b..b40a608412e 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsaLib, libpulseaudio +{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsa-lib, libpulseaudio , xorg }: let @@ -6,7 +6,7 @@ let inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc.lib}/lib64:" + lib.makeLibraryPath [ - zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsaLib libpulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsa-lib libpulseaudio]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index d648ac85c60..61f5a5bf824 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: +{ lib, stdenv, fetchurl, amoeba-data, alsa-lib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; + buildInputs = [ alsa-lib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1/ diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix index 377e1d79bda..cf1fad8d945 100644 --- a/pkgs/games/clonehero/default.nix +++ b/pkgs/games/clonehero/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoPatchelfHook -, alsaLib +, alsa-lib , gtk2 , libXrandr , libXScrnSaver @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { zlib # Run-time libraries (loaded with dlopen) - alsaLib # ALSA sound + alsa-lib # ALSA sound libXrandr # X11 resolution detection libXScrnSaver # X11 screensaver prevention udev # udev input drivers diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index a5796f697ef..3fb8236947f 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem -, alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL +, alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; }; - buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; + buildInputs = [ alsa-lib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 879bbfa2311..9798d659322 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem -, alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL +, alsa-lib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , libSM, libICE, libXext, factorio-utils , releaseType , mods ? [] @@ -182,7 +182,7 @@ let buildInputs = [ libpulseaudio ]; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib libpulseaudio libX11 libXcursor diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index 4d6795070ca..07aad4a5b60 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, qt4, alsaLib }: +{ lib, stdenv, fetchFromGitHub, scons, qt4, alsa-lib }: stdenv.mkDerivation { pname = "gambatte"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0cc6zcvxpvi5hgcssb1zy0fkj9nk7n0d2xm88a4v05kpm5zw7sh2"; }; - buildInputs = [ scons qt4 alsaLib ]; + buildInputs = [ scons qt4 alsa-lib ]; patches = [ ./fix-scons-paths.patch ]; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 3ec196b7373..f16aa752632 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsaLib, libpng +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsa-lib, libpng , pcre, makeDesktopItem }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; + buildInputs = [ SDL2 SDL2_mixer alsa-lib libpng pcre ]; hardeningDisable = ["all"]; diff --git a/pkgs/games/methane/default.nix b/pkgs/games/methane/default.nix index 17c9dc42567..071e1a64b54 100644 --- a/pkgs/games/methane/default.nix +++ b/pkgs/games/methane/default.nix @@ -16,7 +16,7 @@ , clanlib , libXrender , libmikmod -, alsaLib +, alsa-lib }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { clanlib libXrender libmikmod - alsaLib + alsa-lib ]; installPhase = '' diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 7e1a0cba176..73207923839 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -12,7 +12,7 @@ , pkg-config , stb , ant -, alsaLib +, alsa-lib , glew # Make the build version easily overridable. @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals enableClient [ SDL2 glew - alsaLib + alsa-lib ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 3d0b53035ed..254c01fdf1b 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -15,7 +15,7 @@ , pango , cairo , expat -, alsaLib +, alsa-lib , cups , dbus , atk @@ -45,13 +45,13 @@ let curl libpulseaudio systemd - alsaLib # needed for narrator + alsa-lib # needed for narrator flite # needed for narrator libXxf86vm # needed only for versions <1.13 ]; libPath = lib.makeLibraryPath ([ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 84d8a620001..4082e853aa3 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -3,7 +3,7 @@ unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug , # glx - libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsa-lib , # sdl SDL }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ # glx - libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib + libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsa-lib # sdl SDL ]; diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 89dc1bdd50e..542effa6596 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeDesktopItem , stdenv -, alsaLib +, alsa-lib , gcc-unwrapped , git , godot-export-templates @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib gcc-unwrapped.lib git libGLU diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 0c9c71e38d2..32e1ef4fca9 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkg-config -, alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: +, alsa-lib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: # [opendune] @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { }; configureFlags = [ - "--with-alsa=${lib.getLib alsaLib}/lib/libasound.so" + "--with-alsa=${lib.getLib alsa-lib}/lib/libasound.so" "--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; + buildInputs = [ alsa-lib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; enableParallelBuilding = true; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4cde6b032ee..5f5dd5f45ca 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnetCorePackages, dotnetPackages, cacert -, ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins +, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsaPlugins }: let runtimeDeps = [ - ffmpeg_4 alsaLib SDL2 lttng-ust numactl + ffmpeg_4 alsa-lib SDL2 lttng-ust numactl ]; dotnet-sdk = dotnetCorePackages.sdk_5_0; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 7dbca783b67..c29af6d810f 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk +{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 691406160d1..25c6b4ddec0 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: +{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "Quake3e"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s"; }; - buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ]; + buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext ]; enableParallelBuilding = true; postPatch = '' sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c - sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsaLib}/lib/libasound.so.2" )#' code/unix/linux_snd.c + sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 51dd4f90860..9a836c59508 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib +{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsa-lib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGLU, libGL ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963"; }; - buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] + buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsa-lib ] ++ lib.optionals openglSupport [ libGL libGLU ]; configureFlags = [ "--enable-all-engines" ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 68ccb894d99..b22d292f207 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, nasm -, alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib +, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib , Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix index 0179c7c86e8..7dbd5c257e8 100644 --- a/pkgs/games/shticker-book-unwritten/default.nix +++ b/pkgs/games/shticker-book-unwritten/default.nix @@ -6,7 +6,7 @@ let in buildFHSUserEnv { name = "shticker_book_unwritten"; targetPkgs = pkgs: with pkgs; [ - alsaLib + alsa-lib xorg.libX11 xorg.libXcursor xorg.libXext diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index fe3dde7167b..a0557eed9b1 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -136,7 +136,7 @@ in buildFHSUserEnv rec { libGLU libuuid libbsd - alsaLib + alsa-lib # Loop Hero libidn2 diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 8e4f5b866bb..765ecbed28f 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -6,7 +6,7 @@ let overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [ libgpgerror libpulseaudio - alsaLib + alsa-lib openalSoft libva1 libvdpau diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 1512359d495..70e1acb1f34 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, nasm -, gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis +, gtk2, glib, ffmpeg, alsa-lib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; buildInputs = [ - gtk2 glib ffmpeg alsaLib libmad libogg libvorbis + gtk2 glib ffmpeg alsa-lib libmad libogg libvorbis glew libpulseaudio udev ]; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 19f562d54af..b0a49cc77d1 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsaLib +{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config icoutils ]; buildInputs = [ - python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack ]; postInstall = '' diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index a60ec15744c..4a25d26f8cc 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: +{ lib, stdenv, requireFile, SDL, libpulseaudio, alsa-lib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ld_preload = ./isatty.c; libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; + + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsa-lib ] ; installPhase = '' mkdir -p $out/libexec/strangeloop/vessel/ diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index fb6cb93f7f2..38a0450168e 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -3,7 +3,7 @@ , # required for both unzip, libjpeg, zlib, libvorbis, curl , # glx - libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib , # sdl SDL2 @@ -64,7 +64,7 @@ let nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl ] - ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ] + ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] ++ lib.optional withSDL [ SDL2.dev ]; sourceRoot = "Xonotic/source/darkplaces"; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 4b09cb170c0..59075d69c75 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }: +{ stdenv, lib, fetchurl, alsa-lib, libpulseaudio, undmg }: let bits = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 085ad7902f5..95beb8bcdf3 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkg-config, glib +{ lib, stdenv, fetchFromGitHub, alsa-lib, cmake, pkg-config, glib , tracingSupport ? true, logToStderr ? true }: let oz = x: if x then "1" else "0"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib glib ]; + buildInputs = [ alsa-lib glib ]; cmakeFlags = [ "-DWITH_TRACE=${oz tracingSupport}" diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 2019820510e..5e35dcaebd0 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: +{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsa-lib, gcc-unwrapped, libXext }: stdenv.mkDerivation rec { pname = "atari++"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "04fm2ic2qi4a52mi72wcaxyrpll4k8vvchx3qrik8rhg3jrxgm47"; }; - buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; + buildInputs = [ libSM libX11 SDL libICE alsa-lib gcc-unwrapped libXext ]; postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++" diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index ff17833f690..03e97743905 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -3,7 +3,7 @@ , libXmu , lua , tinyxml -, agg, alsaLib, soundtouch, openal +, agg, alsa-lib, soundtouch, openal , desktop-file-utils , gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive"; buildInputs = - [ pkg-config libtool intltool libXmu lua agg alsaLib soundtouch + [ pkg-config libtool intltool libXmu lua agg alsa-lib soundtouch openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 11627914560..8e08be28eda 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama -, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib +, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib , miniupnpc, enet, mbedtls, soundtouch, sfml , vulkan-loader ? null, libpulseaudio ? null @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase ] ++ lib.optionals stdenv.isLinux [ - bluez udev libevdev alsaLib vulkan-loader + bluez udev libevdev alsa-lib vulkan-loader ] ++ lib.optionals stdenv.isDarwin [ CoreBluetooth OpenGL ForceFeedback IOKit ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 458b27d3304..4cb5ca9ec2e 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive +, freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive , fetchpatch }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; installPhase = '' install -D ../emulationstation $out/bin/emulationstation diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 7cdd88d0b94..f70e90e9872 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, +{ lib, stdenv, fetchurl, alsa-lib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: with lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; buildInputs = [ - alsaLib + alsa-lib curl gdk-pixbuf glib diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index c7bc7e9f976..8e10b7bb315 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,7 @@ , udev , libGLU, libGL, SDL2 , libao, openal, libpulseaudio -, alsaLib +, alsa-lib , gtk2, gtksourceview , runtimeShell # Darwin dependencies @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ libicns ]; buildInputs = [ SDL2 libao ] - ++ optionals stdenv.isLinux [ alsaLib udev libpulseaudio openal + ++ optionals stdenv.isLinux [ alsa-lib udev libpulseaudio openal gtk2 gtksourceview libX11 libXv libGLU libGL ] ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index 1b00a55fe05..e8feb1ea7ed 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: let - libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation { pname = "kega-fusion"; diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index e803a130683..26abda81b30 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper -, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, python, pkg-config, SDL2, SDL2_ttf, alsa-lib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -41,7 +41,7 @@ in mkDerivation { buildInputs = [ SDL2 SDL2_ttf qtbase libXinerama ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] ; nativeBuildInputs = [ python pkg-config which makeWrapper installShellFiles ]; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index aaf736f3e5e..f76ddb78bd5 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }: stdenv.mkDerivation rec { pname = "mednafen"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libcdio libjack2 - alsaLib + alsa-lib libsamplerate libsndfile libX11 diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 502e5c64723..e19b97a477e 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils , epoxy, gdk-pixbuf, gnome, wrapGAppsHook }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 - alsaLib + alsa-lib epoxy gtk3 gdk-pixbuf diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index d34a921e177..61d416e17ac 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config , python -, alsaLib, glew, libGL, libpng +, alsa-lib, glew, libGL, libpng , libogg, libtheora, libvorbis , SDL2, SDL2_image, SDL2_ttf , freetype, tcl, zlib @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python ]; - buildInputs = [ alsaLib glew libGL libpng + buildInputs = [ alsa-lib glew libGL libpng libogg libtheora libvorbis freetype SDL2 SDL2_image SDL2_ttf tcl zlib ]; diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/misc/emulators/pcem/default.nix index 6e7e3bc6379..2e6aa683e4d 100644 --- a/pkgs/misc/emulators/pcem/default.nix +++ b/pkgs/misc/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsaLib, pkg-config +{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsa-lib, pkg-config , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ wxGTK31 coreutils SDL2 openal ] - ++ lib.optional withALSA alsaLib; + ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] ++ lib.optional withNetworking "--enable-networking" diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 476ea7122cb..13d2ea74f34 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , cmake , fetchFromGitHub , fmt @@ -71,7 +71,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper perl pkg-config wrapGAppsHook ]; buildInputs = [ - alsaLib + alsa-lib fmt gettext glib diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix index 68f48bc7b40..0d2a5b11798 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/misc/emulators/punes/default.nix @@ -11,7 +11,7 @@ , pkg-config , ffmpeg , libGLU -, alsaLib +, alsa-lib , sndio }: @@ -34,7 +34,7 @@ mkDerivation rec { nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; buildInputs = [ ffmpeg qtbase qtsvg libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsaLib ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; dontUseCmakeConfigure = true; diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/misc/emulators/reicast/default.nix index 8c0bc30d438..f9e8e4d6937 100644 --- a/pkgs/misc/emulators/reicast/default.nix +++ b/pkgs/misc/emulators/reicast/default.nix @@ -3,7 +3,7 @@ , cmake , pkg-config , curl -, alsaLib +, alsa-lib , libGLU , libX11 , libevdev @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl - alsaLib + alsa-lib libGLU libX11 libevdev diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 7153c378f8a..bddabede0a0 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch -, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL +, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl , buildPackages }: @@ -548,7 +548,7 @@ in with lib.licenses; description = "Port of MAME to libretro"; license = gpl2Plus; - extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ]; + extraBuildInputs = [ alsa-lib libGLU libGL portaudio python27 xorg.libX11 ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o @@ -617,7 +617,7 @@ in with lib.licenses; description = "Port of MAME ~2015 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; - extraBuildInputs = [ alsaLib ]; + extraBuildInputs = [ alsa-lib ]; makefile = "Makefile"; }; @@ -638,7 +638,7 @@ in with lib.licenses; description = "Port of MAME ~2016 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; - extraBuildInputs = [ alsaLib ]; + extraBuildInputs = [ alsa-lib ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index e6f1b4f1a78..86ca803d965 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper , ffmpeg, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation -, alsaLib ? null +, alsa-lib ? null , libdrm ? null , libpulseaudio ? null , libv4l ? null @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] - ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 + ++ optionals stdenv.isLinux [ alsa-lib libdrm libpulseaudio libv4l libX11 libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 8eab2f05720..bf1dc1c9573 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -4,7 +4,7 @@ , sdl2Support ? true, SDL2 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib +, alsaSupport ? true, alsa-lib }: let @@ -50,7 +50,7 @@ mkDerivation { libevdev zlib libusb1 curl python3 ] ++ lib.optional sdl2Support SDL2 ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional waylandSupport wayland; meta = with lib; { diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index 11be67b6d9e..84837322e97 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , fetchFromGitHub , makeWrapper , openssl @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - alsaLib + alsa-lib openssl wayland xorg.libX11 diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 75b86eaeebd..803efe5149c 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, gtk2, alsaLib, SDL}: +{lib, stdenv, fetchurl, pkg-config, gtk2, alsa-lib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 alsaLib SDL ]; + buildInputs = [ gtk2 alsa-lib SDL ]; hardeningDisable = [ "format" ]; LDFLAGS = [ "-lm" ]; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 7d63927e33f..f8b9e5906f3 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw +{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsa-lib, readline, libGLU, libGL, libXaw , pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL + buildInputs = [ bison flex perl libpng giflib libjpeg alsa-lib readline libGLU libGL pkg-config gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 8553ab83645..0023d9878b3 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional gphoto2Support pkgs.libgphoto2 ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig - ++ lib.optional alsaSupport pkgs.alsaLib + ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/misc/emulators/yuzu/base.nix index c2b8061485b..1160a5fc1e7 100644 --- a/pkgs/misc/emulators/yuzu/base.nix +++ b/pkgs/misc/emulators/yuzu/base.nix @@ -1,7 +1,7 @@ { pname, version, src, branchName , stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook , cmake, pkg-config -, libpulseaudio, libjack2, alsaLib, sndio +, libpulseaudio, libjack2, alsa-lib, sndio , vulkan-loader, vulkan-headers , qtbase, qtwebengine, qttools , nlohmann_json, rapidjson @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - libpulseaudio libjack2 alsaLib sndio + libpulseaudio libjack2 alsa-lib sndio vulkan-loader vulkan-headers qtbase qtwebengine qttools nlohmann_json rapidjson diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 865ab6ee1f3..7474a304f03 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -5,7 +5,7 @@ , aften, AudioUnit, CoreAudio, libobjc, Accelerate # Optional Dependencies -, dbus ? null, libffado ? null, alsaLib ? null +, dbus ? null, libffado ? null, alsa-lib ? null , libopus ? null # Extra options @@ -22,7 +22,7 @@ let optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus; optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; optLibffado = if libOnly then null else shouldUsePkg libffado; - optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; + optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; optLibopus = shouldUsePkg libopus; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index c1ccc668487..aebe32497c1 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config # Optional Dependencies -, alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null +, alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: let shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; - optAlsaLib = shouldUsePkg alsaLib; + optAlsaLib = shouldUsePkg alsa-lib; optDb = shouldUsePkg db; optLibuuid = shouldUsePkg libuuid; optLibffado = shouldUsePkg libffado; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 3b4c34702d3..9e4035801f1 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "sndio"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix index 9c87dbe8e8c..f600b52c5f3 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: +{lib, stdenv, fetchurl, alsa-lib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { pname = "alsa-oss"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; - buildInputs = [ alsaLib ncurses libsamplerate ]; + buildInputs = [ alsa-lib ncurses libsamplerate ]; nativeBuildInputs = [ gettext ]; configureFlags = [ "--disable-xmlto" ]; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix index 09dbdbc9b6f..684ecc23688 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: +{ stdenv, fetchurl, lib, pkg-config, alsa-lib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { pname = "alsa-plugins"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # ToDo: a52, etc.? buildInputs = - [ alsaLib libogg ] + [ alsa-lib libogg ] ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix index 897d8dd6c02..8b9abb74036 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }: +{ lib, stdenv, fetchurl, alsa-lib, pkg-config, gtk2, gtk3, fltk13 }: # Comes from upstream as as bundle of several tools, # some use gtk2, some gtk3 (and some even fltk13). @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; + buildInputs = [ alsa-lib gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index dd747bbbf6f..ae2a9f21a6d 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: +{lib, stdenv, fetchurl, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: stdenv.mkDerivation rec { pname = "alsa-utils"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gettext makeWrapper ]; - buildInputs = [ alsaLib ncurses libsamplerate fftw ]; + buildInputs = [ alsa-lib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix index 015419ee07a..646e9f7b7b9 100644 --- a/pkgs/os-specific/linux/aseq2json/default.nix +++ b/pkgs/os-specific/linux/aseq2json/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, alsaLib, glib, json-glib }: +{ stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }: stdenv.mkDerivation { pname = "aseq2json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sourceRoot = "source/aseq2json"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib glib json-glib ]; + buildInputs = [ alsa-lib glib json-glib ]; installPhase = '' install -D --target-directory "$out/bin" aseq2json diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 2e342fbc039..f995c8c5c1e 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, alsaLib +, alsa-lib , dbus , glib , json_c @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib dbus glib json_c diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index c241ac02a64..04eccaf0243 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -9,7 +9,7 @@ , udev , libusb1 , libv4l -, alsaLib +, alsa-lib , gsl , libpng , sfml @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 - alsaLib + alsa-lib ffmpeg libusb1 libv4l diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index e97dcad43db..ca5b82b8785 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel, alsaLib }: +{ lib, stdenv, fetchurl, kernel, alsa-lib }: with lib; @@ -7,7 +7,7 @@ let if stdenv.is64bit then "64" else "32"; - libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsaLib ]; + libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ]; in stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 9e9cf149fef..0797656f653 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pciutils , libconfuse -, alsaLib +, alsa-lib , audiofile , pkg-config , zlib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ pciutils libconfuse - alsaLib + alsa-lib audiofile zlib eject diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 81a5f74c42f..90a052fdef9 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkg-config, perl , libjpeg, udev , withUtils ? true -, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook +, withGUI ? true, alsa-lib, libX11, qtbase, libGLU, wrapQtAppsHook }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config perl ] ++ lib.optional withQt wrapQtAppsHook; - buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ]; + buildInputs = [ udev ] ++ lib.optionals withQt [ alsa-lib libX11 qtbase libGLU ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index 4be2bdfb5b8..1ff50079ebd 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -1,5 +1,5 @@ { lib, buildGoModule, fetchFromGitHub -, pkg-config, taglib, alsaLib +, pkg-config, taglib, alsa-lib , zlib # Disable on-the-fly transcoding, @@ -21,7 +21,7 @@ buildGoModule rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsaLib zlib ]; + buildInputs = [ taglib alsa-lib zlib ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; # TODO(Profpatsch): write a test for transcoding support, diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 56bf0ed5d2f..86c150991f7 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -11,7 +11,7 @@ # Filters , libsamplerate # Outputs -, alsaLib, libjack2, libpulseaudio, libshout +, alsa-lib, libjack2, libpulseaudio, libshout # Misc , icu, sqlite, avahi, dbus, pcre, libgcrypt, expat # Services @@ -63,7 +63,7 @@ let # Filter plugins libsamplerate = [ libsamplerate ]; # Output plugins - alsa = [ alsaLib ]; + alsa = [ alsa-lib ]; jack = [ libjack2 ]; pulse = [ libpulseaudio ]; shout = [ libshout ]; diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix index b4d1fda4090..c6fd2332c90 100644 --- a/pkgs/servers/mumsi/default.nix +++ b/pkgs/servers/mumsi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost -, log4cpp, pjsip, openssl, alsaLib, mumlib }: +, log4cpp, pjsip, openssl, alsa-lib, mumlib }: with lib; stdenv.mkDerivation { pname = "mumsi"; version = "unstable-2018-12-12"; @@ -11,7 +11,7 @@ with lib; stdenv.mkDerivation { sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; }; - buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsaLib ]; + buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsa-lib ]; nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 mumsi $out/bin/mumsi diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index bebe4801c65..10b18dd1ae1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, autoreconfHook , libsndfile, libtool, makeWrapper, perlPackages -, xorg, libcap, alsaLib, glib, dconf +, xorg, libcap, alsa-lib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , soxr, speexdsp, systemd, webrtc-audio-processing @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional jackaudioSupport libjack2 ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd - ++ lib.optionals stdenv.isLinux [ alsaLib udev ] + ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] ++ lib.optional airtunesSupport openssl ++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optional remoteControlSupport lirc diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix index cc11f98a829..b07c2fd4ac7 100644 --- a/pkgs/servers/pulseaudio/pali.nix +++ b/pkgs/servers/pulseaudio/pali.nix @@ -11,7 +11,7 @@ , perlPackages , xorg , libcap -, alsaLib +, alsa-lib , glib , dconf , avahi @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xlibsWrapper ] ++ lib.optionals stdenv.isLinux [ - alsaLib + alsa-lib systemd udev ] ++ lib.optional airtunesSupport openssl diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 3fcb8af65e2..771f6606ca7 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , alsaUtils , autoPatchelfHook , cifs-utils @@ -23,7 +23,7 @@ }; buildInputs = [ - alsaLib + alsa-lib alsaUtils cifs-utils ffmpeg diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index bae2f3aad79..7fdb4bbc869 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib , libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl avahi - alsaLib + alsa-lib libdaemon popt libconfig diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix index 12d590c4c76..c6c25fd3996 100644 --- a/pkgs/tools/audio/alsaequal/default.nix +++ b/pkgs/tools/audio/alsaequal/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, alsaLib, caps +, alsa-lib, caps }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli"; }; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index f7d74dc615c..1ff66e83e5a 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, libjack2, alsaLib, libpulseaudio +, libjack2, alsa-lib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame + libopus libvorbis libogg libpulseaudio alsa-lib libsamplerate libjack2 lame ]; NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 03ea3302d26..9ef8eb43772 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme + makeWrapper alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 3d05461121f..1c52e6796b7 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeWrapper, fetchurl, which, pkg-config , ocamlPackages -, libao, portaudio, alsaLib, libpulseaudio, libjack2 +, libao, portaudio, alsa-lib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, zlib , faad2, flac, ladspaH, ffmpeg, frei0r, dssi @@ -52,7 +52,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ which ocamlPackages.ocaml ocamlPackages.findlib - libao portaudio alsaLib libpulseaudio libjack2 + libao portaudio alsa-lib libpulseaudio libjack2 libsamplerate libmad taglib lame libogg libvorbis speex libtheora libopus zlib faad2 flac ladspaH ffmpeg frei0r dssi diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index 186f67f3504..f220fed208f 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: +{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2 }: pythonPackages.buildPythonApplication { version = "2015-11-17"; @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib alsaLib libjack2 pythonPackages.boost ]; + buildInputs = [ glib alsa-lib libjack2 pythonPackages.boost ]; propagatedBuildInputs = with pythonPackages; [ decorator ] # for livedings ++ [ tkinter pyliblo ] diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 0c82d09f99b..13f8dde680d 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsa-lib }: mkDerivation rec { version = "1.5.1"; @@ -13,7 +13,7 @@ mkDerivation rec { }; buildInputs = [ - alsaLib qttools + alsa-lib qttools ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 3aca8e8f619..da4654a3e5f 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsa-lib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { pname = "pnmixer"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config gettext ]; - buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; + buildInputs = [ alsa-lib gtk3 glib libnotify libX11 pcre ]; meta = with lib; { homepage = "https://github.com/nicklan/pnmixer"; diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 55dbba007f8..f8b705a8fa1 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, cmake, alsaLib, udev, qtbase, qtsvg, qttools }: +{ mkDerivation, lib, fetchFromGitLab, cmake, alsa-lib, udev, qtbase, qtsvg, qttools }: mkDerivation rec { pname = "qastools"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ alsaLib udev qtbase qtsvg qttools ]; + buildInputs = [ alsa-lib udev qtbase qtsvg qttools ]; meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index c7445f03fd3..b3ffee6419b 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }: +{ lib, stdenv, fetchurl, alsa-lib, libopus, ortp, bctoolbox }: stdenv.mkDerivation rec { pname = "trx"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./add_bctoolbox_ldlib.patch ]; - buildInputs = [ alsaLib libopus ortp bctoolbox ]; + buildInputs = [ alsa-lib libopus ortp bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 79dc5a356be..4d726cbd2a9 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsaLib }: +{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsa-lib }: stdenv.mkDerivation { pname = "volumeicon"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool alsaLib ]; + buildInputs = [ gtk3 intltool alsa-lib ]; meta = with lib; { description = "A lightweight volume control that sits in your systray"; diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 6867d7c8ce9..175fa92bad2 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, alsaLib, bluez, glib, sbc, dbus +, alsa-lib, bluez, glib, sbc, dbus # optional, but useful utils , readline, libbsd, ncurses @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - alsaLib bluez glib sbc dbus + alsa-lib bluez glib sbc dbus readline libbsd ncurses ] ++ optional aacSupport fdk_aac; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index c3bdbca7a59..fef13a89372 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez , tcl, acl, kmod, coreutils, shadow, util-linux, udev -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , systemdSupport ? stdenv.isLinux, systemd }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ]; buildInputs = [ bluez ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional systemdSupport systemd; meta = { diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 8ede0510487..8baeb1556b1 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let version = "1.25.0"; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index db3a065fdf4..847e8bb8428 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf -, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd +, gtk2, glib, gdk-pixbuf, alsa-lib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd , libXdamage, expat }: let LD_LIBRARY_PATH = lib.makeLibraryPath - [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; + [ glib gtk2 gdk-pixbuf alsa-lib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; in stdenv.mkDerivation rec { version = "2.8.1"; diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 78172c5ef75..f611b7adc07 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsa-lib }: stdenv.mkDerivation rec { version = "0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsa-lib ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index 12168bd07f0..1ead06ed6e8 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, - alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, + alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, gtk2-x11, nspr, nss, libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver, libXtst, @@ -32,7 +32,7 @@ preFixup = let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype + alsa-lib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 63c4fd36ff6..760284140b1 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkg-config }: +{ lib, stdenv, fetchurl, alsa-lib, libjack2, ncurses, pkg-config }: stdenv.mkDerivation { name = "timidity-2.15.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./timidity-iA-Oj.patch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libjack2 ncurses ]; + buildInputs = [ alsa-lib libjack2 ncurses ]; configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index e1a5de7754e..92d783dd5fd 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype , pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes -, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr +, libXrender, libXcomposite , alsa-lib, libXdamage, libXtst, libXrandr , expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify }: @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { rpath = lib.makeLibraryPath [ glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi - libXcursor libXext libXfixes libXrender libXcomposite alsaLib + libXcursor libXext libXfixes libXrender libXcomposite alsa-lib libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf libnotify stdenv.cc.cc ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 8894a77a86a..3032c18427a 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev, libdrm, mesa +{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, udev, libdrm, mesa , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90cd0eeb052..baeecda0a2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20103,7 +20103,7 @@ in alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; - alsaLib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; + alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; alsaPluginWrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; @@ -23342,7 +23342,7 @@ in libXaw = xorg.libXaw; Xaw3d = null; gconf = null; - alsaLib = null; + alsa-lib = null; acl = null; gpm = null; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; From 58fc582fe8b581d5401a5ce0c51b29e8dba3373d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 10 Jun 2021 00:06:35 -0300 Subject: [PATCH 548/797] Change all alsaOss references to alsa-oss --- pkgs/applications/audio/cmus/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 5fd0d88831a..ea7ad1015be 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -6,7 +6,7 @@ , aoSupport ? !stdenv.isLinux, libao ? null , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null -, ossSupport ? false, alsaOss ? null +, ossSupport ? false, alsa-oss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null , mprisSupport ? stdenv.isLinux, systemd ? null @@ -59,7 +59,7 @@ let (mkFlag aoSupport "CONFIG_AO=y" libao) (mkFlag jackSupport "CONFIG_JACK=y" libjack) (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) - (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) + (mkFlag ossSupport "CONFIG_OSS=y" alsa-oss) (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) (mkFlag mprisSupport "CONFIG_MPRIS=y" systemd) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1686a8eb20b..a1a4379be7b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -43,6 +43,7 @@ mapAliases ({ aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 alienfx = throw "alienfx has been removed."; # added 2019-12-08 alsaLib = alsa-lib; # added 2021-06-09 + alsaOss = alsa-oss; # added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index baeecda0a2c..b48159f8848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20104,10 +20104,10 @@ in alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; + alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; alsaPlugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; alsaPluginWrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; - alsaOss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; From a192797f61e149864de36144541ce73f0f2d70a8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 10 Jun 2021 04:20:00 +0000 Subject: [PATCH 549/797] tmux: 3.2 -> 3.2a --- pkgs/tools/misc/tmux/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 629cf548c26..c76912e3c90 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , bison @@ -21,7 +20,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.2"; + version = "3.2a"; outputs = [ "out" "man" ]; @@ -29,18 +28,9 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p"; + sha256 = "0143ylfk7zsl3xmiasb768238gr582cfhsgv3p0h0f13bp8d6q09"; }; - patches = [ - # Fix cross-compilation - # https://github.com/tmux/tmux/pull/2651 - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/bb6242675ad0c7447daef148fffced882e5b4a61.patch"; - sha256 = "1acr3xv3gqpq7qa2f8hw7c4f42hi444lfm1bz6wqj8f3yi320zjr"; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook From 0b045a37fc7a03d4aeb44914d2d14b8a52c36b15 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 10 Jun 2021 00:24:32 -0300 Subject: [PATCH 550/797] Change all alsaPlugins references to alsa-plugins Also, refactor alsa-plugins to make it more readable. --- pkgs/games/osu-lazer/default.nix | 2 +- .../linux/alsa-project/alsa-plugins/wrapper.nix | 12 +++++++++--- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 5f5dd5f45ca..8a7573dd584 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnetCorePackages, dotnetPackages, cacert -, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsaPlugins +, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsa-plugins }: let diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix index 8271088a501..992f4886e26 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix @@ -1,4 +1,10 @@ -{ writeShellScriptBin, stdenv, alsaPlugins }: -writeShellScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" '' - ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@" +{ stdenv +, alsa-plugins +, writeShellScriptBin +}: +let + arch = if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"; +in +writeShellScriptBin "ap${arch}" '' + ALSA_PLUGIN_DIRS=${alsa-plugins}/lib/alsa-lib "$@" '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a1a4379be7b..3a7aafef554 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -44,6 +44,8 @@ mapAliases ({ alienfx = throw "alienfx has been removed."; # added 2019-12-08 alsaLib = alsa-lib; # added 2021-06-09 alsaOss = alsa-oss; # added 2021-06-10 + alsaPlugins = alsa-plugins; # added 2021-06-10 + alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b48159f8848..d30355989fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20105,8 +20105,8 @@ in alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; - alsaPlugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; - alsaPluginWrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; + alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; + alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; From 7b8a56a57725ec45a0a951a67398e48c5a3e4310 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 10 Jun 2021 00:31:13 -0300 Subject: [PATCH 551/797] Change all alsaTools references to alsa-tools --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a7aafef554..9af719b2e92 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -46,6 +46,7 @@ mapAliases ({ alsaOss = alsa-oss; # added 2021-06-10 alsaPlugins = alsa-plugins; # added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 + alsaTools = alsa-tools; # added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d30355989fb..6387f80c01b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20107,8 +20107,8 @@ in alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; + alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; - alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; From f1242006c9674520e0a733885cf6f7d67908ad19 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 10 Jun 2021 01:10:52 -0300 Subject: [PATCH 552/797] Change all alsaUtils references to alsa-utils --- pkgs/applications/audio/MMA/default.nix | 12 ++++++------ pkgs/applications/audio/rakarrack/default.nix | 4 ++-- .../instant-messengers/mikutter/default.nix | 6 +++--- pkgs/applications/window-managers/dwm/dwm-status.nix | 4 ++-- pkgs/applications/window-managers/i3/blocks-gaps.nix | 4 ++-- .../development/python-modules/notify-py/default.nix | 4 ++-- .../development/python-modules/py3status/default.nix | 4 ++-- pkgs/misc/solfege/default.nix | 4 ++-- pkgs/servers/roon-server/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 25cb9696509..3034de750cf 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: +{ lib, stdenv, fetchurl, makeWrapper, python3, alsa-utils, timidity }: stdenv.mkDerivation rec { version = "20.12"; @@ -10,13 +10,13 @@ }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python3 alsaUtils timidity ]; + buildInputs = [ python3 alsa-utils timidity ]; patchPhase = '' - sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec - sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' util/mma-splitrec.py - sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' mma-splitrec - sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py + sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' mma-splitrec + sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' util/mma-splitrec.py + sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' mma-splitrec + sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' util/mma-splitrec.py sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index d1166752fb0..6d5d1ca860d 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-lib, alsaUtils, fltk, libjack2, libXft, +{ lib, stdenv, fetchurl, alsa-lib, alsa-utils, fltk, libjack2, libXft, libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./fltk-path.patch ]; - buildInputs = [ alsa-lib alsaUtils fltk libjack2 libXft libXpm libjpeg + buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 111a3ed091e..c20ec46f266 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , bundlerEnv -, alsaUtils +, alsa-utils , atk , copyDesktopItems , gobject-introspection @@ -87,11 +87,11 @@ with mikutterPaths; stdenv.mkDerivation rec { libnotify which # some plugins use it at runtime wrappedRuby - ] ++ lib.optionals stdenv.isLinux [ alsaUtils ]; + ] ++ lib.optionals stdenv.isLinux [ alsa-utils ]; scriptPath = lib.makeBinPath ( [ wrappedRuby libnotify which ] - ++ lib.optionals stdenv.isLinux [ alsaUtils ] + ++ lib.optionals stdenv.isLinux [ alsa-utils ] ); postUnpack = '' diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index ba284b76867..7b22eb39925 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,9 +1,9 @@ { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg -, enableAlsaUtils ? true, alsaUtils, coreutils +, enableAlsaUtils ? true, alsa-utils, coreutils , enableNetwork ? true, dnsutils, iproute2, wirelesstools }: let - bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] + bins = lib.optionals enableAlsaUtils [ alsa-utils coreutils ] ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ]; in diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index df774aa417f..4acc2fb669c 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, perl, makeWrapper -, iproute2, acpi, sysstat, alsaUtils +, iproute2, acpi, sysstat, alsa-utils , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" "load_average" "memory" "volume" "wifi" ] }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wrapProgram $out/libexec/i3blocks/iface \ --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)} wrapProgram $out/libexec/i3blocks/volume \ - --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} + --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsa-utils)} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index ea9f0485bef..ba4725c9aaa 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsaUtils +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsa-utils , libnotify, which, jeepney, loguru, pytestCheckHook }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedNativeBuildInputs = [ which ] - ++ lib.optionals stdenv.isLinux [ alsaUtils libnotify ]; + ++ lib.optionals stdenv.isLinux [ alsa-utils libnotify ]; propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.isLinux [ jeepney ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 9967394d28e..b41b7ddf320 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -14,7 +14,7 @@ , file , acpi , coreutils -, alsaUtils +, alsa-utils , i3 , procps , lm_sensors @@ -40,7 +40,7 @@ buildPythonPackage rec { sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py - sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py + sed -i -e "s|'amixer|'${alsa-utils}/bin/amixer|" py3status/modules/volume_status.py sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index af2ce3f53cf..fc7062d904c 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook , buildPythonApplication, pycairo, pygobject3 , gobject-introspection, gtk3, librsvg -, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond +, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond }: buildPythonApplication rec { @@ -24,7 +24,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pycairo pygobject3 ]; preBuild = '' - sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ + sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \ -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \ -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \ -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \ diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 771f6606ca7..c26ae1e6416 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -1,5 +1,5 @@ { alsa-lib -, alsaUtils +, alsa-utils , autoPatchelfHook , cifs-utils , fetchurl @@ -24,7 +24,7 @@ buildInputs = [ alsa-lib - alsaUtils + alsa-utils cifs-utils ffmpeg freetype @@ -48,7 +48,7 @@ ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} ''; wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]} + wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]} ''; in '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9af719b2e92..3eb72cefa12 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -47,6 +47,7 @@ mapAliases ({ alsaPlugins = alsa-plugins; # added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 alsaTools = alsa-tools; # added 2021-06-10 + alsaUtils = alsa-utils; # added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6387f80c01b..cad86d7a6fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20108,7 +20108,7 @@ in alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; - alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; + alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; From 822606864bff2e6c8217dcdbd0b8b08edec6316d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 10 Jun 2021 01:21:46 -0300 Subject: [PATCH 553/797] Reorder alsa-project expressions in all-packages.nix --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad86d7a6fc..6f7d052b1c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20108,9 +20108,11 @@ in alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; - alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; - alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; + alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { + fftw = fftwFloat; + }; inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware From b4fd0a9118f91a0b8523dc48c22b18c82409ae68 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 10 Jun 2021 07:56:22 +0200 Subject: [PATCH 554/797] nixos/tests/printing: fix after setting pipefail It failed since pipefail (b7749c7, PR #125683), due to `systemctl status` not exiting with code=0 for inactive units (apparently). That command is meant for humans anyway. --- nixos/tests/printing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index b2f2540fb7a..badcb99a57a 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -63,7 +63,7 @@ in { ): serviceClient.sleep(20) socketActivatedClient.wait_until_succeeds( - "systemctl status ensure-printers | grep -q -E 'code=exited, status=0/SUCCESS'" + "systemctl show ensure-printers | grep -q -E 'code=exited ; status=0'" ) From 983bcc84a9bb701d0f7b1dbd62299cd4718ead13 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 9 Jun 2021 23:04:56 -0700 Subject: [PATCH 555/797] roon-server: 1.8-790 -> 1.8-795 --- pkgs/servers/roon-server/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index c26ae1e6416..a6592ee235c 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -10,16 +10,16 @@ , stdenv , zlib }: stdenv.mkDerivation rec { - name = "roon-server"; - version = "100800790"; + pname = "roon-server"; + version = "1.8-795"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20210428204513/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "1jhj52fmkdgr9qfang1i9qrl1z56h56x07k31n3kllknkv02lc8p"; + url = "https://web.archive.org/web/20210610060249/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "sha256-gC+UquDMyDpgCEYKPp2RRIkHD/4itJssl0hcSEQO5Rc="; }; buildInputs = [ @@ -64,6 +64,7 @@ meta = with lib; { description = "The music player for music lovers"; + changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18"; homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault steell ]; From 2db2aa2b957dd121dbe9fdb743fdd2a6c0df8586 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 10 Jun 2021 08:28:07 +0200 Subject: [PATCH 556/797] phpPackages.composer: 2.1.2 -> 2.1.3 https://github.com/composer/composer/releases/tag/2.1.3 --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index b86980031fb..aaa698e6d0c 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.2"; + version = "2.1.3"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0gd4hxkxdds3nxpbcd38chrkijha31p6nygdq3f73mbb984h3v1d"; + sha256 = "04ad2zsnf8qi6hzs9sak6y8xxyx8l0f7crmcimnp7nn8vsc2x9zq"; }; dontUnpack = true; From bcacc9b854dfa308f3eea8e3953605444502f201 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 9 Jun 2021 23:31:24 -0700 Subject: [PATCH 557/797] python3Packages.jsonstreams: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/jsonstreams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix index 9042498664a..82152a8d112 100644 --- a/pkgs/development/python-modules/jsonstreams/default.nix +++ b/pkgs/development/python-modules/jsonstreams/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "jsonstreams"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dcbaker"; repo = pname; rev = version; - sha256 = "0c85fdqkj5k4b0v0ngx2d9qbmzdsvglh4j9k9h7508bvn7l8fa4b"; + sha256 = "0qw74wz9ngz9wiv89vmilbifsbvgs457yn1bxnzhrh7g4vs2wcav"; }; propagatedBuildInputs = [ six ]; From 053f1dc49028f8f438506b187739d80d83984c16 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 10 Jun 2021 08:43:28 +0200 Subject: [PATCH 558/797] chromium: 91.0.4472.77 -> 91.0.4472.101 https://chromereleases.googleblog.com/2021/06/stable-channel-update-for-desktop.html This update includes 14 security fixes. Google is aware that an exploit for CVE-2021-30551 exists in the wild. CVEs: CVE-2021-30544 CVE-2021-30545 CVE-2021-30546 CVE-2021-30547 CVE-2021-30548 CVE-2021-30549 CVE-2021-30550 CVE-2021-30551 CVE-2021-30552 CVE-2021-30553 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index be7a84576b3..5d888fc0649 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": "91.0.4472.77", - "sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5", - "sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad", + "version": "91.0.4472.101", + "sha256": "1d3y621iclkq6nvxrapk5aihv50x13hjha0c2gcp2xxfma96253q", + "sha256bin64": "12j5q5b9v0jpiznjnh89831w8lv399vd1z4ljhbsnsidbsygrbr1", "deps": { "gn": { "version": "2021-04-06", From bbd7d2b887955eeeba7a83d7452d74fe9fec9124 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Jun 2021 08:45:05 +0200 Subject: [PATCH 559/797] python3Packages.bitarray: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index c3965b10a2a..e83a7919238 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7DpPbXEaee0jrqlUFjjTNT3D8IPyk6ExgLFLSC4+Ge8="; + sha256 = "sha256-lyJKGTJezuSaO/TfPuBTHTr5zyiLZ9CJp+9Eo8TqODk="; }; checkPhase = '' From db5fdb71074b0cb21b176a5d288bde9c204022f4 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Thu, 10 Jun 2021 09:02:26 +0200 Subject: [PATCH 560/797] butane: 0.11.0 -> 0.12.0 --- pkgs/development/tools/butane/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index fc42f311af8..f8b2a27dfc4 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc"; + sha256 = "0wjnzxjv71pmn88f6fm20xhsmdib6jwn9839n1xw9px9w95qg0yy"; }; vendorSha256 = null; From 9c885c9091e7fdc5df35784b18ae94d61ffcd53d Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 9 Jun 2021 21:58:50 +0800 Subject: [PATCH 561/797] redfang: init at 2.5 --- pkgs/tools/networking/redfang/default.nix | 35 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/networking/redfang/default.nix diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/tools/networking/redfang/default.nix new file mode 100644 index 00000000000..9e18d687dc0 --- /dev/null +++ b/pkgs/tools/networking/redfang/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitLab, fetchpatch, bluez }: + +stdenv.mkDerivation rec { + pname = "redfang"; + version = "2.5"; + + src = fetchFromGitLab { + group = "kalilinux"; + owner = "packages"; + repo = pname; + rev = "upstream/${version}"; + sha256 = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE="; + }; + + patches = [ + # make install rule + (fetchpatch { + url = "https://gitlab.com/kalilinux/packages/redfang/-/merge_requests/1.diff"; + sha256 = "sha256-oxIrUAucxsBL4+u9zNNe2XXoAd088AEAHcRB/AN7B1M="; + }) + ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + NIX_CFLAGS_COMPILE = "-Wno-format-security"; + + buildInputs = [ bluez ]; + + meta = with lib; { + description = "A small proof-of-concept application to find non discoverable bluetooth devices"; + homepage = "https://gitlab.com/kalilinux/packages/redfang"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f324ca75eb3..9065404e273 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -872,6 +872,8 @@ in quich = callPackage ../tools/misc/quich { } ; + redfang = callPackage ../tools/networking/redfang { }; + tfk8s = callPackage ../tools/misc/tfk8s { }; tnat64 = callPackage ../tools/networking/tnat64 { }; From dc30d972bbaceb89fe3cd473f708e8071c70294c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 10 Jun 2021 09:13:16 +0200 Subject: [PATCH 562/797] palemoon: 29.2.0 -> 29.2.1 --- .../networking/browsers/palemoon/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 63f1958f4a6..e1352c9f336 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,3 @@ -# Compiler in stdenv MUST be a supported one for official branding -# See https://developer.palemoon.org/build/linux/ -# TODO assert if stdenv.cc is supported? { stdenv , lib , fetchFromGitHub @@ -37,6 +34,15 @@ , gtk3 }: +# Only specific GCC versions are supported with branding +# https://developer.palemoon.org/build/linux/ +assert stdenv.cc.isGNU; +assert with lib.strings; ( + versionAtLeast stdenv.cc.version "4.9" + && !hasPrefix "6" stdenv.cc.version + && versionOlder stdenv.cc.version "11" +); + let libPath = lib.makeLibraryPath [ ffmpeg @@ -46,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.2.0"; + version = "29.2.1"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "0pa9j41bbfarwi60a6hxi5vpn52mwgr4p05l98acv4fcs1ccb427"; + sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq"; fetchSubmodules = true; }; @@ -142,7 +148,6 @@ stdenv.mkDerivation rec { ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools - # Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767 ac_add_options --enable-av1 ac_add_options --disable-eme @@ -188,7 +193,7 @@ stdenv.mkDerivation rec { ./mach install # Fix missing icon due to wrong WMClass - # TODO report upstream + # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 substituteInPlace ./palemoon/branding/official/palemoon.desktop \ --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' desktop-file-install --dir=$out/share/applications \ @@ -202,7 +207,7 @@ stdenv.mkDerivation rec { done # Remove unneeded SDK data from installation - # TODO: move to a separate output? + # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} runHook postInstall @@ -231,6 +236,7 @@ stdenv.mkDerivation rec { extensions and themes to make the browser truly your own. ''; homepage = "https://www.palemoon.org/"; + changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; license = licenses.mpl20; maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; platforms = [ "i686-linux" "x86_64-linux" ]; From 5f16549ccfcc896af2c7041e474c8fb55b1218bf Mon Sep 17 00:00:00 2001 From: Milan Date: Thu, 10 Jun 2021 09:32:50 +0200 Subject: [PATCH 563/797] libubox, ubus, uci, netifd: update (#121543) These packages originating from OpenWRT don't see regular releases, so this bumps them to their latest commits. Also implements some suggestions like removing spaces from cmakeFlags and replacing the legacy lgpl21 license with the appropriate lgpl21Only. --- pkgs/development/libraries/libubox/default.nix | 6 +++--- pkgs/development/libraries/ubus/default.nix | 10 +++++----- pkgs/development/libraries/uci/default.nix | 10 +++++----- pkgs/tools/networking/netifd/default.nix | 17 ++++++----------- 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index f8dfa80a959..9261d1b81ba 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2020-01-20"; + version = "unstable-2021-03-09"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "43a103ff17ee5872669f8712606578c90c14591d"; - sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4"; + rev = "551d75b5662cccd0466b990d58136bdf799a804d"; + sha256 = "05cnjjqjv9nvrs1d8pg4xxxf27jryiv6xk8plmdpmm7r2wkvwn3r"; }; cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index db947d373a2..4bbec39291a 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2020-01-05"; + version = "unstable-2021-02-15"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee"; - sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4"; + rev = "2537be01858710e714c329153760c64fe3f8a73e"; + sha256 = "03ljxsn4w87bfrilccxhrkzqmd30hy6ihkvsinw0i3l7rpp5m4a7"; }; - cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + cmakeFlags = [ "-DBUILD_LUA=OFF" ]; buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; meta = with lib; { description = "OpenWrt system message/RPC bus"; homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.all; maintainers = with maintainers; [ petabyteboy ]; }; diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index 0a5af8b907b..49aba6cd183 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -2,23 +2,23 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2020-04-27"; + version = "unstable-2021-04-14"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "ec8d3233948603485e1b97384113fac9f1bab5d6"; - sha256 = "0p765l8znvwhzhgkq7dp36w62k5rmzav59vgdqmqq1bjmlz1yyi6"; + rev = "4b3db1179747b6a6779029407984bacef851325c"; + sha256 = "1zflxazazzkrycpflzfg420kzp7kgy4dlz85cms279vk07dc1d52"; }; hardeningDisable = [ "all" ]; - cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + cmakeFlags = [ "-DBUILD_LUA=OFF" ]; buildInputs = [ libubox ]; nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { description = "OpenWrt Unified Configuration Interface"; homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.all; maintainers = with maintainers; [ petabyteboy ]; }; diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index efa05591f52..dc343e563a7 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -1,27 +1,22 @@ -{ runCommand, lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: +{ lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c, pkg-config }: stdenv.mkDerivation { pname = "netifd"; - version = "unstable-2020-07-11"; + version = "unstable-2021-04-03"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; - rev = "3d9bd73e8c2d8a1f78effbe92dd2495bbd2552c4"; - sha256 = "085sx1gsigbi1jr19l387rc5p6ja1np6q2gb84khjd4pyiqwk840"; + rev = "327da9895327bc56b23413ee91a6e6b6e0e4329d"; + sha256 = "0jvk2hx8kbkc6d72gh9rwap8ds6qgnmny6306vvzxy68v03xikwv"; }; buildInputs = [ libnl libubox uci ubus json_c ]; - nativeBuildInputs = [ cmake ]; - - preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${lib.getDev libnl}"/include/libnl*/)" - ''; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { description = "OpenWrt Network interface configuration daemon"; homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ petabyteboy ]; }; From 2a85a9835b724b218eff80d45c801d2ecf0dfcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 4 Jun 2021 08:21:42 +0200 Subject: [PATCH 564/797] common-licenses: init at 11.1 Co-authored-by: Sandro --- pkgs/data/misc/common-licenses/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/misc/common-licenses/default.nix diff --git a/pkgs/data/misc/common-licenses/default.nix b/pkgs/data/misc/common-licenses/default.nix new file mode 100644 index 00000000000..a0c21b5d900 --- /dev/null +++ b/pkgs/data/misc/common-licenses/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +, lib +}: + +stdenv.mkDerivation rec { + pname = "common-licenses"; + version = "11.1"; + + src = fetchurl { + url = "http://deb.debian.org/debian/pool/main/b/base-files/base-files_${version}.tar.xz"; + sha256 = "1i3hgd9vs14k819k441iibcgmi2zavnpqbnppyn2cz70kd830nbm"; + }; + + installPhase = '' + mkdir -p $out/share + cp -r licenses $out/share/common-licenses + cat debian/base-files.links | grep common-licenses | sed -e "s|usr|$out|g" -e "s|^|ln -s |g" | bash -x + ''; + + meta = with lib; { + description = "common-licenses extracted from debian base-files package"; + homepage = "https://tracker.debian.org/pkg/base-files"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..7e37eafe3e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2228,6 +2228,8 @@ in commitizen = callPackage ../applications/version-management/commitizen {}; + common-licenses = callPackage ../data/misc/common-licenses {}; + compactor = callPackage ../applications/networking/compactor { }; consul = callPackage ../servers/consul { }; From 7d49ffbbe62a821886f0251daf3a3a930d68f4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 4 Jun 2021 08:22:26 +0200 Subject: [PATCH 565/797] cinnamon.bulky: init at 1.1 Co-authored-by: Sandro --- pkgs/desktops/cinnamon/bulky/default.nix | 60 ++++++++++++++++++++++++ pkgs/desktops/cinnamon/default.nix | 1 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/desktops/cinnamon/bulky/default.nix diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix new file mode 100644 index 00000000000..03b1cca9fd8 --- /dev/null +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, fetchFromGitHub +, wrapGAppsHook +, python3 +, gsettings-desktop-schemas +, gettext +, gtk3 +, glib +, common-licenses +}: + +stdenv.mkDerivation rec { + pname = "bulky"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "bulky"; + rev = version; + sha256 = "NBlP10IM/+u8IRds4bdFyGWg3pJLRmlSLsdlndMVQqg="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gsettings-desktop-schemas + gettext + ]; + + buildInputs = [ + (python3.withPackages(p: with p; [ pygobject3 magic setproctitle ])) + gsettings-desktop-schemas + gtk3 + glib + ]; + + postPatch = '' + substituteInPlace usr/lib/bulky/bulky.py \ + --replace "/usr/share/locale" "$out/share/locale" \ + --replace /usr/share/bulky "$out/share/bulky" \ + --replace /usr/share/common-licenses "${common-licenses}/share/common-licenses" \ + --replace __DEB_VERSION__ "${version}" + ''; + + installPhase = '' + runHook preInstall + chmod +x usr/share/applications/* + cp -ra usr $out + ln -sf $out/lib/bulky/bulky.py $out/bin/bulky + runHook postInstall + ''; + + meta = with lib; { + description = "Bulk rename app"; + homepage = "https://github.com/linuxmint/bulky"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 2a52b83f046..4d148fdcdb0 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -13,6 +13,7 @@ lib.makeScope pkgs.newScope (self: with self; { }); # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix + bulky = callPackage ./bulky {}; cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; From e108e51d25726efd7c656b154474373852d6392f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 4 Jun 2021 08:22:08 +0200 Subject: [PATCH 566/797] nixos/desktop-managers/cinnamon: add bulky as default app --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 101c64c7b3e..d201c1a5334 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -198,6 +198,7 @@ in environment.systemPackages = (with pkgs // pkgs.gnome // pkgs.cinnamon; pkgs.gnome.removePackagesByName [ # cinnamon team apps + bulky blueberry warpinator From cfdf7c4be4846289a969ee8e2f2c9a3e928de2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 4 Jun 2021 08:34:51 +0200 Subject: [PATCH 567/797] cinnamon.cinnamon-gsettings-override: add bulky to override --- pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 832a534e5da..6f54515569e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -15,6 +15,7 @@ , cinnamon-session , cinnamon-settings-daemon , cinnamon-common +, bulky }: let @@ -24,6 +25,7 @@ let mint-artwork # on + bulky muffin nemo xapps From 2ee781417e9da2b553db0ab777aa89cd81fab54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 10 Jun 2021 09:27:31 +0200 Subject: [PATCH 568/797] nixos/*: replace alsa* aliases The attributes got renamed in PR #126440 and in some places this caused evaluation errors, e.g. the tarball job was saying (locally) > attribute 'alsaUtils' missing, at /build/source/nixos/modules/services/audio/alsa.nix:6:4 and I suspect that trunk-combined jobset's failure to evaluate was also caused. --- doc/builders/special/fhs-environments.section.md | 4 ++-- nixos/modules/config/pulseaudio.nix | 12 ++++++------ nixos/modules/services/audio/alsa.nix | 16 ++++++++-------- nixos/modules/services/audio/jack.nix | 8 ++++---- nixos/modules/services/hardware/actkbd.nix | 2 +- nixos/tests/firefox.nix | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/builders/special/fhs-environments.section.md b/doc/builders/special/fhs-environments.section.md index 512a31cae0f..146ded53240 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/builders/special/fhs-environments.section.md @@ -28,7 +28,7 @@ One can create a simple environment using a `shell.nix` like that: name = "simple-x11-env"; targetPkgs = pkgs: (with pkgs; [ udev - alsaLib + alsa-lib ]) ++ (with pkgs.xorg; [ libX11 libXcursor @@ -36,7 +36,7 @@ One can create a simple environment using a `shell.nix` like that: ]); multiPkgs = pkgs: (with pkgs; [ udev - alsaLib + alsa-lib ]); runScript = "bash"; }).env diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 0266bbfb121..3f7ae109e8c 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -17,9 +17,9 @@ let binary = "${getBin overriddenPackage}/bin/pulseaudio"; binaryNoDaemon = "${binary} --daemonize=no"; - # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps + # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); myConfigFile = @@ -62,18 +62,18 @@ let # plugin. alsaConf = writeText "asound.conf" ('' pcm_type.pulse { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} } pcm.!default { type pulse hint.description "Default Audio Device (via PulseAudio)" } ctl_type.pulse { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} } ctl.!default { type pulse diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index aff3fe2ba42..0d743ed31da 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -5,7 +5,7 @@ with lib; let - inherit (pkgs) alsaUtils; + inherit (pkgs) alsa-utils; pulseaudioEnabled = config.hardware.pulseaudio.enable; @@ -88,13 +88,13 @@ in config = mkIf config.sound.enable { - environment.systemPackages = [ alsaUtils ]; + environment.systemPackages = [ alsa-utils ]; environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "") { "asound.conf".text = config.sound.extraConfig; }; # ALSA provides a udev rule for restoring volume settings. - services.udev.packages = [ alsaUtils ]; + services.udev.packages = [ alsa-utils ]; boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss"; @@ -107,7 +107,7 @@ in Type = "oneshot"; RemainAfterExit = true; ExecStart = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa"; - ExecStop = "${alsaUtils}/sbin/alsactl store --ignore"; + ExecStop = "${alsa-utils}/sbin/alsactl store --ignore"; }; }; @@ -115,16 +115,16 @@ in enable = true; bindings = [ # "Mute" media key - { keys = [ 113 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Master toggle"; } + { keys = [ 113 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Master toggle"; } # "Lower Volume" media key - { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; } + { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; } # "Raise Volume" media key - { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; } + { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; } # "Mic Mute" media key - { keys = [ 190 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Capture toggle"; } + { keys = [ 190 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Capture toggle"; } ]; }; diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix index f341b432f75..d0a95b87ee1 100644 --- a/nixos/modules/services/audio/jack.nix +++ b/nixos/modules/services/audio/jack.nix @@ -8,7 +8,7 @@ let pcmPlugin = cfg.jackd.enable && cfg.alsa.enable; loopback = cfg.jackd.enable && cfg.loopback.enable; - enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsaLib != null; + enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12"; bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12"; @@ -129,9 +129,9 @@ in { (mkIf pcmPlugin { sound.extraConfig = '' pcm_type.jack { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;"} } pcm.!default { @func getenv @@ -234,7 +234,7 @@ in { environment = { systemPackages = [ cfg.jackd.package ]; - etc."alsa/conf.d/50-jack.conf".source = "${pkgs.alsaPlugins}/etc/alsa/conf.d/50-jack.conf"; + etc."alsa/conf.d/50-jack.conf".source = "${pkgs.alsa-plugins}/etc/alsa/conf.d/50-jack.conf"; variables.JACK_PROMISCUOUS_SERVER = "jackaudio"; }; diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix index daa407ca1f0..f7770f85da3 100644 --- a/nixos/modules/services/hardware/actkbd.nix +++ b/nixos/modules/services/hardware/actkbd.nix @@ -75,7 +75,7 @@ in type = types.listOf (types.submodule bindingCfg); default = []; example = lib.literalExample '' - [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; } + [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsa-utils}/bin/amixer -q set Master toggle"; } ] ''; description = '' diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 4262f5443bf..2e27ac302af 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -46,7 +46,7 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { systemd.services.audio-recorder = { description = "Record NixOS test audio to /tmp/record.wav"; - script = "${pkgs.alsaUtils}/bin/arecord -D recorder -f S16_LE -r48000 /tmp/record.wav"; + script = "${pkgs.alsa-utils}/bin/arecord -D recorder -f S16_LE -r48000 /tmp/record.wav"; }; }; From 233087eb79260b55720b2a50b6d1d7e3b0c14bab Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Wed, 9 Jun 2021 21:15:39 +0800 Subject: [PATCH 569/797] haskellPackages.nvfetcher: move overrideCabal to configuration-nix.nix --- .../haskell-modules/configuration-nix.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 8 +------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 538d5381a96..238f7c38bc1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -833,4 +833,16 @@ self: super: builtins.intersectAttrs super { sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs '' + (drv.postPatch or ""); }); + + # Runtime dependencies and CLI completion + nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal + super.nvfetcher (drv: { + buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; + postInstall = drv.postInstall or "" + '' + wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${ + pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ] + }" + ''; + })); + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c537b0545a3..2b33d4b98f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7202,13 +7202,7 @@ in nvchecker = with python3Packages; toPythonApplication nvchecker; - nvfetcher = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.nvfetcher) (drv: { - executableToolDepends = [ makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/nvfetcher \ - --prefix PATH ":" "${nvchecker}/bin:${nix-prefetch-git}/bin" - ''; - }); + nvfetcher = haskell.lib.justStaticExecutables haskellPackages.nvfetcher; miller = callPackage ../tools/text/miller { }; From a90479bec772710c2d8fdfcd7f29c91f7d514365 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 9 Jun 2021 16:12:55 +0200 Subject: [PATCH 570/797] zsh-fast-syntax-highlighting: 1.54 -> 1.55 --- pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix index 452419bf8b0..d1791e4962f 100644 --- a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "zsh-fast-syntax-highlighting"; - version = "1.54"; + version = "1.55"; src = fetchFromGitHub { owner = "zdharma"; repo = "fast-syntax-highlighting"; rev = "v${version}"; - sha256 = "019hda2pj8lf7px4h1z07b9l6icxx4b2a072jw36lz9bh6jahp32"; + sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d"; }; dontConfigure = true; @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { plugindir="$out/share/zsh/site-functions" mkdir -p "$plugindir" - cp -r -- {,_,-}fast-* chroma themes "$plugindir"/ + cp -r -- {,_,-,.}fast-* *chroma themes "$plugindir"/ ''; meta = with lib; { From 4cfb2eb32140946222b67bd456271e42bd816f14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Jun 2021 11:31:02 +0200 Subject: [PATCH 571/797] python3Packages.aiosyncthing: 0.5.1 -> 0.6.3 --- pkgs/development/python-modules/aiosyncthing/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix index 553876a48cf..7bbf740c78e 100644 --- a/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "aiosyncthing"; - version = "0.5.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; rev = "v${version}"; - sha256 = "0704qbg3jy80vaw3bcvhy988s1qs3fahpfwkja71fy70bh0vc860"; + sha256 = "sha256-vn8S2/kRW5C2Hbes9oLM4LGm1jWWK0zeLdujR14y6EI="; }; propagatedBuildInputs = [ @@ -34,6 +34,11 @@ buildPythonPackage rec { pytest-mock ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiosyncthing --cov-report=html" "" + ''; + pythonImportsCheck = [ "aiosyncthing" ]; meta = with lib; { From 1d7d3009e5d0fbd97df0c5035129e52cf5ac3a37 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 10 Jun 2021 01:01:03 -0500 Subject: [PATCH 572/797] vscode-extensions._4ops.terraform: init at 0.2.1 --- pkgs/misc/vscode-extensions/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1d6ba18200d..06fa1e264e7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -12,6 +12,19 @@ let # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { + _4ops.terraform = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "4ops"; + name = "terraform"; + version = "0.2.1"; + sha256 = "196026a89pizj8p0hqdgkyllj2spx2qwpynsaqjq17s8v15vk5dg"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-ron"; From d4cda78a55fca5a10e2bf6f827e136563b48a859 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 10 Jun 2021 01:02:06 -0500 Subject: [PATCH 573/797] vscode-extensions.jkillian.custom-local-formatters: init at 0.0.4 --- pkgs/misc/vscode-extensions/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 06fa1e264e7..17a5e03f13b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -508,6 +508,19 @@ let }; }; + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jkillian"; + name = "custom-local-formatters"; + version = "0.0.4"; + sha256 = "1pmqnc759fq86g2z3scx5xqpni9khcqi5z2kpl1kb7yygsv314gm"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + github = { github-vscode-theme = buildVscodeMarketplaceExtension { mktplcRef = { From 25b4cfd31dc1b9310026a04881008b9a04fb809e Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 10 Jun 2021 01:02:40 -0500 Subject: [PATCH 574/797] vscode-extensions.mads-hartmann.bash-ide-vscode: init at 1.11.0 --- pkgs/misc/vscode-extensions/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 17a5e03f13b..969f2bc59cb 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -742,6 +742,19 @@ let }; }; + mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mads-hartmann"; + name = "bash-ide-vscode"; + version = "1.11.0"; + sha256 = "1hq41fy2v1grjrw77mbs9k6ps6gncwlydm03ipawjnsinxc9rdkp"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + mikestead.dotenv = buildVscodeMarketplaceExtension { mktplcRef = { name = "dotenv"; From 70b0cf36d640f390c883ae5c2656dbc18bcfb70d Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 10 Jun 2021 01:02:57 -0500 Subject: [PATCH 575/797] vscode-extensions.shardulm94.trailing-spaces: init at 0.3.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 969f2bc59cb..98a3a35edfb 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1021,6 +1021,18 @@ let }; }; + shardulm94.trailing-spaces = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "shardulm94"; + name = "trailing-spaces"; + version = "0.3.1"; + sha256 = "0h30zmg5rq7cv7kjdr5yzqkkc1bs20d72yz9rjqag32gwf46s8b8"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension { mktplcRef = { From fcaf6b10a96cdb7e5eab5ec0c728ab208c791619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 10 Jun 2021 02:27:58 +0200 Subject: [PATCH 576/797] atom: 1.54.0 -> 1.57.0 Also updated beta sources, but it is still broken. --- pkgs/applications/editors/atom/default.nix | 8 ++++---- pkgs/applications/editors/atom/env.nix | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 875f8612fde..03a46479871 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.54.0"; - sha256 = "sha256-21AURgomEjuiTzeJ4MIx0mkyVi0b0mVdmFsFGNLXRP4"; + version = "1.57.0"; + sha256 = "1jzxjvaljk8p3gzjvs5bn3d128x37pcgn6by7srhs9qclc5j2664"; }; atom-beta = { - version = "1.55.0"; + version = "1.58.0"; beta = 0; - sha256 = "sha256-PICkTt54cPkDJVnXBTtSHUQVbmosOpZfVAiD5A3/n+Q="; + sha256 = "0amhilmpiwn2jfn0nrcrhzminqdp3xm5p3w3ldc3qk761pn3lbpd"; broken = true; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 1ff8ea3f416..253518b276b 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,7 +1,7 @@ { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core, libdbusmenu, mesa +, at-spi2-core, libdbusmenu, libdrm, mesa }: let @@ -12,6 +12,7 @@ let xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu + libdrm mesa # required for libgbm ]; From 6de7be454aae2605e15a26b4e4c010d625f997b8 Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Thu, 10 Jun 2021 18:51:33 +0900 Subject: [PATCH 577/797] Revert "alsa-firmware: 1.2.1 -> 1.2.4" This reverts commit 728ea2bbe4132538c7f80643cf74ebe64b00364a. --- .../linux/alsa-project/alsa-firmware/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index 8f53eefb1fd..a627a7762a8 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl }: +{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - pname = "alsa-firmware"; - version = "1.2.4"; + name = "alsa-firmware-1.2.1"; src = fetchurl { - url = "mirror://alsa/firmware/${pname}-${version}.tar.bz2"; - sha256 = "1fymdjrsbndws3gy4ypm7id31261k65bh2pzyrz29z5w11ynsyxn"; + url = "mirror://alsa/firmware/${name}.tar.bz2"; + sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; }; + patches = [ (fetchpatch { + url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch"; + sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78"; + }) ]; + nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ]; configureFlags = [ From c02ac479ba55d802d6232cdb743f5228984e2ff9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 10 Jun 2021 12:00:34 +0200 Subject: [PATCH 578/797] chromium: get-commit-message.py: Support a new 0-day sentence The current stable release announcement [0] uses a slightly different message/structure. [0]: https://chromereleases.googleblog.com/2021/06/stable-channel-update-for-desktop.html --- .../networking/browsers/chromium/get-commit-message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index e14e3642643..2768e31bd03 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -27,7 +27,7 @@ for entry in feed.entries: print('\n' + url) if fixes := re.search(r'This update includes .+ security fixes\.', content): fixes = html_tags.sub('', fixes.group(0)) - zero_days = re.search(r'Google is aware of reports that .+ in the wild\.', content) + zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) From 1d6a0d3cf24f2edcf6755fd4db1901f9e1db1ac6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Jun 2021 11:53:22 +0200 Subject: [PATCH 579/797] chromiumDev: Install crashpad_handler This executable is required to fix a startup error: [990:990:0609/092114.482805:FATAL:double_fork_and_exec.cc(131)] execv /nix/store/k02xhxzn6sn2cihaal68wwsyk8cg9pkg-chromium-unwrapped-93.0.4535.3/libexec/chromium/crashpad_handler: No such file or directory (2) Unfortunately Chromium M93 still segfaults in the VM test: machine # [0610/100626.225850:ERROR:process_memory_range.cc(75)] read out of range machine # [0610/100626.227312:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq: No such file or directory (2) machine # [0610/100626.240410:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq: No such file or directory (2) machine # [ 19.810981] systemd-coredump[1015]: Process 987 (chromium) of user 1000 dumped core. --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index dcac873b849..cc443764447 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,6 +62,8 @@ mkChromiumDerivation (base: rec { -e '/\[Desktop Entry\]/a\' \ -e 'StartupWMClass=chromium-browser' \ $out/share/applications/chromium-browser.desktop + '' + lib.optionalString (channel == "dev") '' + cp -v "$buildPath/crashpad_handler" "$libExecPath/" ''; passthru = { inherit sandboxExecutableName; }; From 02ac0fd5171f069908815201e1bbebdd0b66406f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Jun 2021 12:19:28 +0200 Subject: [PATCH 580/797] python3Packages.pre-commit: 2.11.0 -> 2.13.0 --- .../python-modules/pre-commit/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 1b5af02dca0..0cb853abf2d 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,11 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , aspy-yaml , cached-property , cfgv , identify , importlib-metadata , importlib-resources -, isPy27 , nodeenv , python , six @@ -15,13 +17,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.11.0"; - disabled = isPy27; + version = "2.13.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06"; + sha256 = "sha256-dklyxgaT3GaLqOhuspZU7DFEUBMQ9xmHQqdnvsOFo3g="; }; patches = [ @@ -53,6 +55,8 @@ buildPythonPackage rec { --subst-var-by nodeenv ${nodeenv} ''; + pythonImportsCheck = [ "pre_commit" ]; + meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; homepage = "https://pre-commit.com/"; From 432fc2d9a67f92e05438dff5fdc2b39d33f77997 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 10 Jun 2021 12:20:19 +0900 Subject: [PATCH 581/797] vscode-extension.kahole.magit: 0.6.13 -> 0.6.15 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 98a3a35edfb..7951636c60c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -734,8 +734,8 @@ let mktplcRef = { name = "magit"; publisher = "kahole"; - version = "0.6.13"; - sha256 = "sha256-/SeGQV0UEqBk69cAmUXFc/OfPxNssvzZqa7NmAMQD1k="; + version = "0.6.15"; + sha256 = "sha256-fRXm70FXnHduoywI4YC9ya6/J7wyd6EBzbnrcijBIbA="; }; meta = { license = lib.licenses.mit; From 75a47625ad3fcd357ca1f12920c2db75e4f2da56 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 10 Jun 2021 13:48:27 +0200 Subject: [PATCH 582/797] lastpass-cli: Add gitcredentials helper and format --- pkgs/tools/security/lastpass-cli/default.nix | 28 +++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 8d2074f9835..3da3342e379 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,5 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkg-config -, bash-completion, openssl, curl, libxml2, libxslt }: +{ stdenv +, lib +, fetchFromGitHub +, asciidoc +, cmake +, docbook_xsl +, pkg-config +, bash-completion +, openssl +, curl +, libxml2 +, libxslt +}: stdenv.mkDerivation rec { pname = "lastpass-cli"; @@ -15,7 +26,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoc cmake docbook_xsl pkg-config ]; buildInputs = [ - bash-completion curl openssl libxml2 libxslt + bash-completion + curl + openssl + libxml2 + libxslt ]; installTargets = [ "install" "install-doc" ]; @@ -23,13 +38,14 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish + install -Dm755 -T ../contrib/examples/git-credential-lastpass $out/bin/git-credential-lastpass ''; meta = with lib; { description = "Stores, retrieves, generates, and synchronizes passwords securely"; - homepage = "https://github.com/lastpass/lastpass-cli"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + homepage = "https://github.com/lastpass/lastpass-cli"; + license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } From 7a9080d774595523b5e97fc7e3ebf318c51df1d6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 10 Jun 2021 13:56:45 +0200 Subject: [PATCH 583/797] haskellPackages.cabal2nix-unstable: 2021-05-28 -> 2021-06-10 --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 00bd9061f01..a250a792679 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-05-28"; + version = "unstable-2021-06-10"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/5fb325e094af91328e02cc2ecfd211feaeb135a7.tar.gz"; - sha256 = "1zbd336s99rgk24yjqlp012d0f66s5nf190sjmsl7mfhqx9j2y4l"; + url = "https://github.com/NixOS/cabal2nix/archive/f63eb780e9c946a5037580e29d8b4effa09da905.tar.gz"; + sha256 = "1xjdghhbryqhm39z1p8z804mcraia33jvfl8v02yfk7q9xk0bpq2"; }; isLibrary = true; isExecutable = true; From 35a73693f4132b5bc135bd650b8b03d6a08cd774 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 10 Jun 2021 14:10:39 +0200 Subject: [PATCH 584/797] haskellPackages: remove deprecated aliases mysql and utillinux These attribute names were converted into aliases in the following changes: * https://github.com/NixOS/nixpkgs/commit/62733b37b4a866cabafe1fc8bb7415240126eb0b * https://github.com/NixOS/nixpkgs/pull/104776 cabal2nix-unstable has been updated to be aware of these changes in 7a9080d774595523b5e97fc7e3ebf318c51df1d6, so these aliases should no longer cause issues when evaluating with `allowAliases = false`. --- .../haskell-modules/configuration-nix.nix | 2 +- .../haskell-modules/hackage-packages.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 238f7c38bc1..b5868586f66 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super { # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; }); + mysql = dontCheck super.mysql; # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cf40d4c78ba..44069b6a40c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -115325,7 +115325,7 @@ self: { , parsec, process, QuickCheck, random, regex-tdfa, resourcet , scientific, tagsoup, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, unordered-containers, utillinux, vector, wai + , time-locale-compat, unordered-containers, util-linux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { @@ -115349,11 +115349,11 @@ self: { base bytestring containers filepath QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text unordered-containers yaml ]; - testToolDepends = [ utillinux ]; + testToolDepends = [ util-linux ]; description = "A static website compiler library"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ erictapen ]; - }) {inherit (pkgs) utillinux;}; + }) {inherit (pkgs) util-linux;}; "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process @@ -182663,7 +182663,8 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql + ({ mkDerivation, base, bytestring, Cabal, containers, hspec + , libmysqlclient }: mkDerivation { pname = "mysql"; @@ -182671,11 +182672,11 @@ self: { sha256 = "16m8hv9yy2nf4jwgqg6n9z53n2pzskbc3gwbp2i3kgff8wsmf8sd"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; + librarySystemDepends = [ libmysqlclient ]; testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; license = lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; + }) {inherit (pkgs) libmysqlclient;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql From de470025e57dee8f6aba6d300bfd0b5f5b3ec4a4 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 22 Aug 2020 11:02:58 -0400 Subject: [PATCH 585/797] tensorflow-lite: init at v2.5.0 --- .../science/math/tensorflow-lite/default.nix | 159 ++++++++++++++++++ .../tensorflow-lite/eigen_include_dir.patch | 45 +++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 206 insertions(+) create mode 100644 pkgs/development/libraries/science/math/tensorflow-lite/default.nix create mode 100644 pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix new file mode 100644 index 00000000000..848a07dc456 --- /dev/null +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -0,0 +1,159 @@ +{ stdenv +, bash +, abseil-cpp +, fetchFromGitHub +, fetchFromGitLab +, fetchpatch +, fetchurl +, flatbuffers +, hostPlatform +, lib +, zlib +}: +let + tflite-eigen = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = "3d9051ea84a5089b277c88dac456b3b1576bfa7f"; + sha256 = "1y3f2jvimb5i904f4n37h23cv2pkdlbz8656s0kga1y7c0p50wif"; + }; + + gemmlowp-src = fetchFromGitHub { + owner = "google"; + repo = "gemmlowp"; + rev = "fda83bdc38b118cc6b56753bd540caa49e570745"; + sha256 = "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"; + }; + + neon-2-sse-src = fetchFromGitHub { + owner = "intel"; + repo = "ARM_NEON_2_x86_SSE"; + rev = "1200fe90bb174a6224a525ee60148671a786a71f"; + sha256 = "0fhxch711ck809dpq1myxz63jiiwfcnxvj45ww0kg8s0pqpn5kv6"; + }; + + farmhash-src = fetchFromGitHub { + owner = "google"; + repo = "farmhash"; + rev = "816a4ae622e964763ca0862d9dbd19324a1eaf45"; + sha256 = "1mqxsljq476n1hb8ilkrpb39yz3ip2hnc7rhzszz4sri8ma7qzp6"; + }; + + fft2d-src = fetchurl { + url = "http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz"; + sha256 = "ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9"; + }; + + fp16-src = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "FP16"; + rev = "4dfe081cf6bcd15db339cf2680b9281b8451eeb3"; + sha256 = "06a8dfl3a29r93nxpp6hpywsajz5d555n3sqd3i6krybb6swnvh7"; + }; + + ruy-src = fetchFromGitHub { + owner = "google"; + repo = "ruy"; + rev = "23633b37099b614a2f836ef012cafc8087fdb98c"; + sha256 = "14k9hz6ss8qy8nsajk6lrq25f6qxrldxky31ijw0dpqnfnnswrx4"; + }; + + cpuinfo-src = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; + sha256 = "0q6760xdxsg18acdv8vq3yrq7ksr7wsm8zbyan01zf2khnb6fw4x"; + }; +in +stdenv.mkDerivation rec { + pname = "tensorflow-lite"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v${version}"; + sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l"; + }; + + buildInputs = [ zlib flatbuffers ]; + + dontConfigure = true; + + postPatch = '' + substituteInPlace ./tensorflow/lite/tools/make/Makefile \ + --replace /bin/bash ${bash}/bin/bash \ + --replace /bin/sh ${bash}/bin/sh + ''; + + makefile = "tensorflow/lite/tools/make/Makefile"; + + preBuild = + let + includes = + lib.concatMapStringsSep + " " + (subdir: "-I $PWD/tensorflow/lite/tools/make/downloads/${subdir}") + [ + "neon_2_sse" + "gemmlowp" + "absl" + "fp16/include" + "farmhash/src" + "ruy" + "cpuinfo" + "cpuinfo/src" + "cpuinfo/include" + "cpuinfo/deps/clog/include" + "eigen" + ]; + in + '' + # enter the vendoring lair of doom + + prefix="$PWD/tensorflow/lite/tools/make/downloads" + + mkdir -p "$prefix" + + tar xzf ${fft2d-src} -C "$prefix" + + ln -s ${ruy-src} "$prefix/ruy" + ln -s ${gemmlowp-src} "$prefix/gemmlowp" + ln -s ${neon-2-sse-src} "$prefix/neon_2_sse" + ln -s ${farmhash-src} "$prefix/farmhash" + ln -s ${cpuinfo-src} "$prefix/cpuinfo" + ln -s ${fp16-src} "$prefix/fp16" + ln -s ${tflite-eigen} "$prefix/eigen" + + # tensorflow lite is using the *source* of flatbuffers + ln -s ${flatbuffers.src} "$prefix/flatbuffers" + + # tensorflow lite expects to compile abseil into `libtensorflow-lite.a` + ln -s ${abseil-cpp.src} "$prefix/absl" + + buildFlagsArray+=(INCLUDES="-I $PWD ${includes}" TARGET_TOOLCHAIN_PREFIX="" -j$NIX_BUILD_CORES all) + ''; + + installPhase = '' + mkdir "$out" + + # copy the static lib and binaries into the output dir + cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out" + + find ./tensorflow/lite -type f -name '*.h' | while read f; do + path="$out/include/''${f/.\//}" + install -D "$f" "$path" + + # remove executable bit from headers + chmod -x "$path" + done + ''; + + meta = with lib; { + description = "An open source deep learning framework for on-device inference."; + homepage = "https://www.tensorflow.org/lite"; + license = licenses.asl20; + maintainers = with maintainers; [ cpcloud ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch b/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch new file mode 100644 index 00000000000..6fa3c703efa --- /dev/null +++ b/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28103856e..a36909c0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -449,13 +449,6 @@ install(FILES + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel + ) + +-if(EIGEN_BUILD_PKGCONFIG) +- configure_file(eigen3.pc.in eigen3.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc +- DESTINATION ${PKGCONFIG_INSTALL_DIR} +- ) +-endif() +- + install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) + + add_subdirectory(doc EXCLUDE_FROM_ALL) +@@ -570,8 +563,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) + set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) + set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) + set ( EIGEN_DEFINITIONS "") +-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) + set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) ++GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) ++ ++if(EIGEN_BUILD_PKGCONFIG) ++ configure_file(eigen3.pc.in eigen3.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc ++ DESTINATION ${PKGCONFIG_INSTALL_DIR} ++ ) ++endif() + + # Interface libraries require at least CMake 3.0 + if (NOT CMAKE_VERSION VERSION_LESS 3.0) +diff --git a/eigen3.pc.in b/eigen3.pc.in +index 3368a3aa1..d6778bf06 100644 +--- a/eigen3.pc.in ++++ b/eigen3.pc.in +@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r + Requires: + Version: @EIGEN_VERSION_NUMBER@ + Libs: +-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ ++Cflags: -I@EIGEN_INCLUDE_DIR@ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e794f99b7e5..67492bdcd5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1950,6 +1950,8 @@ in cudaSupport = config.cudaSupport or false; }; + tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bfetch = callPackage ../tools/misc/bfetch { }; From e29b0036219cccfe943304ccc3712dae8d3b7041 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 10 Jun 2021 19:23:21 +0700 Subject: [PATCH 586/797] trealla: 1.7.65 -> 1.8.74 --- pkgs/development/interpreters/trealla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 165251c8c5c..4321130044c 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.7.65"; + version = "1.8.74"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-uCDACBwdiCeAwF6IZHz7s5pD83JXTP7jAQDjGld8tt0="; + sha256 = "sha256-pg9SfEFUTuyAnhP+Q1vR/QImZuLuRb8NpaOiCEcTFj8="; }; postPatch = '' From 00ec76bb24d9b0af65ed04475cda9bf4e4d9c3db Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 9 Jun 2021 23:17:03 +0200 Subject: [PATCH 587/797] libfprint-2-tod1-vfs0090: init at 0.8.5 --- ...ing-explicit-dependencies-in-meson.b.patch | 28 +++++++++++++ ...0-add-missing-linux-limits.h-include.patch | 26 ++++++++++++ .../libfprint-2-tod1-vfs0090/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 98 insertions(+) create mode 100644 pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch create mode 100644 pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch create mode 100644 pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch new file mode 100644 index 00000000000..ac06e83ab93 --- /dev/null +++ b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch @@ -0,0 +1,28 @@ +From c02f2e040dd1e7664777c5a705272e4eb7bfb569 Mon Sep 17 00:00:00 2001 +From: Vincent Breitmoser +Date: Thu, 10 Jun 2021 14:09:19 +0200 +Subject: [PATCH] vfs0090: add missing explicit dependencies in meson.build + +Make all dependencies explicit, so they can be found when building with Nix. + +--- + meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/meson.build b/meson.build +index 54a7ca4..88f8793 100644 +--- a/meson.build ++++ b/meson.build +@@ -17,6 +17,9 @@ udev_dep = dependency('udev') + vfs009x_deps += libfprint_tod_dep + vfs009x_deps += dependency('nss') + vfs009x_deps += dependency('openssl') ++vfs009x_deps += dependency('gusb') ++vfs009x_deps += dependency('libfprint-2') ++vfs009x_deps += dependency('glib-2.0') + + vfs0090_deps += dependency('pixman-1') + +-- +2.31.1 + diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch new file mode 100644 index 00000000000..6111cf0ad29 --- /dev/null +++ b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch @@ -0,0 +1,26 @@ +From 5405e02c629e689449e852424aed8cca217ed309 Mon Sep 17 00:00:00 2001 +From: Vincent Breitmoser +Date: Thu, 10 Jun 2021 14:10:52 +0200 +Subject: [PATCH] vfs0090: add missing include + +This header is needed for the NAME_MAX constant used in this file. + +--- + vfs0090.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vfs0090.c b/vfs0090.c +index 8034faf..6070df7 100644 +--- a/vfs0090.c ++++ b/vfs0090.c +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.31.1 + diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix new file mode 100644 index 00000000000..840f8e22715 --- /dev/null +++ b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitLab, pkg-config, libfprint, libfprint-tod, gusb, udev, nss, openssl, meson, pixman, ninja, glib }: +stdenv.mkDerivation { + pname = "libfprint-2-tod1-vfs0090"; + version = "0.8.5"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "3v1n0"; + repo = "libfprint-tod-vfs0090"; + rev = "6084a1545589beec0c741200b18b0902cca225ba"; + sha256 = "sha256-tSML/8USd/LuHF/YGLvNgykixF6VYtfE4SXzeV47840="; + }; + + patches = [ + # TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/1 is merged + ./0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch + # TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/2 is merged + ./0002-vfs0090-add-missing-linux-limits.h-include.patch + ]; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ libfprint libfprint-tod glib gusb udev nss openssl pixman ]; + + installPhase = '' + runHook preInstall + + install -D -t "$out/lib/libfprint-2/tod-1/" libfprint-tod-vfs009x.so + install -D -t "$out/lib/udev/rules.d/" $src/60-libfprint-2-tod-vfs0090.rules + + runHook postInstall + ''; + + passthru.driverPath = "/lib/libfprint-2/tod-1"; + + meta = with lib; { + description = "A libfprint-2-tod Touch OEM Driver for 2016 ThinkPad's fingerprint readers"; + homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ valodim ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..e86fa51ae96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16111,6 +16111,8 @@ in libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { }; + libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { }; + libfpx = callPackage ../development/libraries/libfpx { }; libgadu = callPackage ../development/libraries/libgadu { }; From c145f7930df909d583fe6d7fc862ff963a095f7a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 10 Jun 2021 14:52:55 +0200 Subject: [PATCH 588/797] haskellPackages.hackage-db: downgrade to 2.1.0 if Cabal < 3.4 Stackage Nighly recently upgraded their version of hackage-db from 2.1.0 to 2.1.1. 2.1.1 had a compatibility fix for Cabal 3.4 [1]. However it did not increase the version bound on Cabal nor fails to compile with Cabal 3.2, so Stackage was able to update it. Unfortunately hackage-db with Cabal 3.2 causes observable issues [2] in cabal2nix, so we need to downgrade it for all compilers that still ship a Cabal version < 3.4. Also ideally we should update the constraints for hackage-db 2.1.0 and hackage-db 2.1.1 on hackage. See also [3]. [1]: https://github.com/peti/hackage-db/pull/12 [2]: https://github.com/NixOS/cabal2nix/issues/501 [3]: https://github.com/peti/hackage-db/pull/14 --- .../configuration-ghc-8.10.x.nix | 4 ++++ .../configuration-ghc-8.6.x.nix | 4 ++++ .../configuration-ghc-8.8.x.nix | 4 ++++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 22 +++++++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 36fe13151f3..2c4612daac3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -87,4 +87,8 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; + # hackage-db 2.1.1 is incompatible with Cabal < 3.4 + # See https://github.com/NixOS/cabal2nix/issues/501 + hackage-db = super.hackage-db_2_1_0; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 99b53b9f14f..42fa603d331 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -106,4 +106,8 @@ self: super: { # https://github.com/haskellari/time-compat/issues/23 time-compat = dontCheck super.time-compat; + # hackage-db 2.1.1 is incompatible with Cabal < 3.4 + # See https://github.com/NixOS/cabal2nix/issues/501 + hackage-db = super.hackage-db_2_1_0; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index aab26897cca..7908066ebb5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -135,4 +135,8 @@ self: super: { # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers vector = dontCheck super.vector; + + # hackage-db 2.1.1 is incompatible with Cabal < 3.4 + # See https://github.com/NixOS/cabal2nix/issues/501 + hackage-db = super.hackage-db_2_1_0; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 02739f83c4e..3dc1a40c9de 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -125,6 +125,7 @@ extra-packages: - gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4 - gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4 - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version + - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 44069b6a40c..2bf76a6f2e0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -114128,6 +114128,28 @@ self: { broken = true; }) {}; + "hackage-db_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.1.0"; + sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l"; + revision = "1"; + editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filepath tar time utf8-string + ]; + description = "Access cabal-install's Hackage database via Data.Map"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string From c6ed4577ab6776971537a48671c9f03240014e01 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 10 Jun 2021 15:33:30 +0200 Subject: [PATCH 589/797] haskell.packages.ghc901.memory: 0.15 -> 0.16 Upgrade to 0.16 which has GHC 9.0.x support. Interesting since cabal2nix depends on memory. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 16c85d1fef7..fb3ba8b401f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -101,4 +101,7 @@ self: super: { # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet lens = super.lens_5_0_1; + # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 + memory = super.memory_0_16_0; + } From b492f2f3b2b088180b3c7bef2c31f0ecbcbb542a Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 10 Jun 2021 10:16:06 +0200 Subject: [PATCH 590/797] staticjinja: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/staticjinja/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 1f9a63927bb..90ba99fe0ac 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , buildPythonPackage , poetry -, isPy27 , docopt , easywatch , jinja2 @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; # No tests in pypi @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "0z5y4l4sv4c7zmp6pj1ws3psq7i87xqbcmk648bmsa1d6prr1hil"; + sha256 = "sha256-sGon3+So4EuVRTUqcP9omfJ91wBzJSm7CSkuefX3S+8="; }; nativeBuildInputs = [ From 362c8da80976fdf44302c57c8facd68e944adacd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 10 Jun 2021 15:34:27 +0200 Subject: [PATCH 591/797] haskell.packages.ghc901.cryptonite: 0.28 -> 0.29 0.29 supports GHC 9.0.x which is why we upgrade. Interesting because cabal2nix depends on cryptonite. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index fb3ba8b401f..401dc05fe83 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -104,4 +104,7 @@ self: super: { # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 memory = super.memory_0_16_0; + # 0.29 introduced support for GHC 9.0.x, stackage has 0.28 + cryptonite = super.cryptonite_0_29; + } From f8c8bb04a5a89a2c0221b7616fa5ff5392822f85 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 10 Jun 2021 15:35:50 +0200 Subject: [PATCH 592/797] haskell.packages.ghc901.mono-traversable: unbreak GHC 9.0.x seems to require that the `Main` module also defines the `main` IO action and does not just import it. This is the case with mono-traversable's test suite which is why we (temporarily) disable it. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 401dc05fe83..5dea75bb218 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -107,4 +107,8 @@ self: super: { # 0.29 introduced support for GHC 9.0.x, stackage has 0.28 cryptonite = super.cryptonite_0_29; + # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs + # https://github.com/snoyberg/mono-traversable/issues/192 + mono-traversable = dontCheck super.mono-traversable; + } From 1c52961b0cb51ba415623b7af8c2f36ff8a1db30 Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Thu, 10 Jun 2021 08:59:55 -0500 Subject: [PATCH 593/797] vivaldi: 3.8.2259.37-1 -> 4.0.2312.24-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 4f8d813f055..dba21d2f21c 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.8.2259.37-1"; + version = "4.0.2312.24-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1lpia3jm6l2yvbhrw5khws28n653w22bszzd44y6zv6zwbw7y127"; + sha256 = "0cyvnabjhcn1bm5py4nhfb1yhpz5nm9qm39vb4y1fwhjd0jv38hi"; }; unpackPhase = '' From d5564db46a2596b4feeb61046fa3b4fdb7f30d2c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Jun 2021 12:57:49 +0000 Subject: [PATCH 594/797] cvs-fast-export: rename from cvs_fast_export cvs-fast-export is the canonical name of the software that users would expect the package to be called in Nixpkgs. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3eb72cefa12..3e5dfc51cfa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -158,6 +158,7 @@ mapAliases ({ cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 + cvs_fast_export = cvs-fast-export; # added 2021-06-10 d1x_rebirth = dxx-rebirth; # added 2018-04-25 d2x_rebirth = dxx-rebirth; # added 2018-04-25 dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e794f99b7e5..ad5474958ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3939,7 +3939,7 @@ in cwebbin = callPackage ../development/tools/misc/cwebbin { }; - cvs_fast_export = callPackage ../applications/version-management/cvs-fast-export { }; + cvs-fast-export = callPackage ../applications/version-management/cvs-fast-export { }; dadadodo = callPackage ../tools/text/dadadodo { }; From db733deeedcf0fdef48d0b425dfb7bd1c942b319 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Jun 2021 12:50:44 +0000 Subject: [PATCH 595/797] cvs-fast-export: clean up; fix cross Style was unidiomatic for modern Nixpkgs, there was no nativeBuildInputs/buildInputs separation, and some dependencies were unused. I've removed doCheck here, because the default Nixpkgs checkPhase wasn't actually running the tests (need to cd into tests first), and when I did write a checkPhase to run the tests, they didn't work and I couldn't make them work. A note on RCS: There is code in cvsconvert that calls RCS, but I analyzed it quite carefully, and came to the conclusion that all such code is unreachable, so I removed the RCS dependency. --- .../cvs-fast-export/default.nix | 60 +++++++++---------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index ffd583585c0..3aee0adc6eb 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,31 +1,23 @@ -{lib, stdenv, fetchurl, makeWrapper, flex, bison, - asciidoc, docbook_xml_dtd_45, docbook_xsl, - libxml2, libxslt, - python3, rcs, cvs, git, - coreutils, rsync}: -with stdenv; with lib; -mkDerivation rec { - name = "cvs-fast-export-${meta.version}"; - meta = { - version = "1.56"; - description = "Export an RCS or CVS history as a fast-import stream"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dfoxfranke ]; - homepage = "http://www.catb.org/esr/cvs-fast-export/"; - platforms = platforms.all; - }; +{ lib, stdenv, fetchurl, makeWrapper, asciidoc, docbook_xml_dtd_45, docbook_xsl +, coreutils, cvs, diffutils, findutils, git, python3, rsync +}: + +stdenv.mkDerivation rec { + pname = "cvs-fast-export"; + version = "1.56"; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.56.tar.gz"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; sha256 = "sha256-TB/m7kd91+PyAkGdFCCgeb9pQh0kacq0QuTZa8f9CxU="; }; - buildInputs = [ - flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - python3 rcs cvs git makeWrapper - ]; + strictDeps = true; + nativeBuildInputs = [ makeWrapper asciidoc ]; + buildInputs = [ python3 ]; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs . + ''; preBuild = '' makeFlagsArray=( @@ -35,16 +27,18 @@ mkDerivation rec { ) ''; - doCheck = true; + postInstall = '' + wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]} + wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [ + coreutils cvs diffutils findutils git + ]} + ''; - postInstall = - let - binpath = makeBinPath [ out rcs cvs git coreutils rsync ]; - in '' - for prog in cvs-fast-export cvsconvert cvssync; do - wrapProgram $out/bin/$prog \ - --prefix PATH : ${binpath} - done - '' - ; + meta = with lib; { + description = "Export an RCS or CVS history as a fast-import stream"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dfoxfranke ]; + homepage = "http://www.catb.org/esr/cvs-fast-export/"; + platforms = platforms.unix; + }; } From cf1f499e7e3d4da1365ba052c6fc7a7c936ba4a3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Jun 2021 13:59:58 +0000 Subject: [PATCH 596/797] cvs-fast-export: 1.56 -> 1.57 --- .../version-management/cvs-fast-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 3aee0adc6eb..a14af17c01c 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.56"; + version = "1.57"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "sha256-TB/m7kd91+PyAkGdFCCgeb9pQh0kacq0QuTZa8f9CxU="; + sha256 = "0y1fzsicga19nsarpmn2ms69sq26b2d3d8a1169qbqz1kzr0jji8"; }; strictDeps = true; From 3912cf9371ea8d9141e6c09a37939a3f6fdcb028 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:23:06 +0200 Subject: [PATCH 597/797] ocamlPackages.bz2: init at 0.7.0 Closes #126469 --- .../development/ocaml-modules/bz2/default.nix | 38 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bz2/default.nix diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix new file mode 100644 index 00000000000..7de24c13462 --- /dev/null +++ b/pkgs/development/ocaml-modules/bz2/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitLab, ocaml, findlib, bzip2, autoreconfHook }: + +if !lib.versionAtLeast ocaml.version "4.02" +then throw "bz2 is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-bz2"; + version = "0.7.0"; + + src = fetchFromGitLab { + owner = "irill"; + repo = "camlbz2"; + rev = version; + sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U="; + }; + + autoreconfFlags = "-I ."; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + ocaml + findlib + bzip2 + ]; + + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; + + meta = with lib; { + description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library"; + downloadPage = "https://gitlab.com/irill/camlbz2"; + license = licenses.lgpl21; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 92894bf7a3b..4feaf9f6f74 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -80,6 +80,8 @@ let bos = callPackage ../development/ocaml-modules/bos { }; + bz2 = callPackage ../development/ocaml-modules/bz2 { }; + ca-certs = callPackage ../development/ocaml-modules/ca-certs { }; ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { }; From 72842f7ed9a8eda6b0d738fafd6f871aa4b701f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Jun 2021 17:25:27 +0200 Subject: [PATCH 598/797] libdeltachat: 1.55.0 -> 1.56.0 https://github.com/deltachat/deltachat-core-rust/blob/1.56.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index a5c0752b9ae..77315776aca 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "sha256-D30usAVpyiqXQMrTvmdaGFig7jhyb3rMTBQL/E2UL50="; + sha256 = "sha256-ZyVEI6q+GzHLEFH01TxS7NqwT7zqVgg0vduyf/fibB8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1hf7lrqbv0ba9c0kmnjn5x1fispyyjip1gmllq77z6nsjpn0f9w8"; + sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8"; }; nativeBuildInputs = [ From d312374f6fce01575aa46cdc88901178d52f0399 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 10 Jun 2021 22:28:33 +0700 Subject: [PATCH 599/797] oksh: 6.8.1 -> 6.9 --- pkgs/shells/oksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index e0165fb3022..35bd3a62b62 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oksh"; - version = "6.8.1"; + version = "6.9"; src = fetchFromGitHub { owner = "ibara"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0lny550qfanysc4pqs0mxxx8zyz6plv9ll8y05gz0xmq9vx5384r"; + sha256 = "sha256-b5b6xYqlmjWAT8kTq6YraVLawV/k3ugHZUjXD1LJyhs="; }; meta = with lib; { From c2a3bd904e10d18107584f650c9abf8e27b652ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Jun 2021 17:29:11 +0200 Subject: [PATCH 600/797] python3Packages.pytube: 10.8.3 -> 10.8.4 https://github.com/pytube/pytube/releases/tag/v10.8.4 --- pkgs/development/python-modules/pytube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index 086c3a8671b..6d7435d12cf 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.8.3"; + version = "10.8.4"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-U/TXA/0y5tsuj0q3kxacHk76wjYG6k8mPX5F3MpADmk="; + sha256 = "sha256-07roF/rHBvGv50XL5KBOsk2WFITAWDput+KNgfTtXlI="; }; checkInputs = [ From e9216e573360ee5bf5e94a6c1f6cf2fc1f348c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Jun 2021 17:39:25 +0200 Subject: [PATCH 601/797] angelfish: 21.05 -> 21.06 --- pkgs/applications/networking/browsers/angelfish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/networking/browsers/angelfish/default.nix index 7fb2703199a..391993617da 100644 --- a/pkgs/applications/networking/browsers/angelfish/default.nix +++ b/pkgs/applications/networking/browsers/angelfish/default.nix @@ -20,17 +20,17 @@ mkDerivation rec { pname = "angelfish"; - version = "21.05"; + version = "21.06"; src = fetchurl { url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz"; - sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075"; + sha256 = "sha256-iHgmG/DeaUPnRXlVIU8P/oUcYINienYmR2zI9Q4Yd3s="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "05xvh7yxndqm2bqpm06jsxiv4v02mqxaazll8wllp367qapvr21g"; + sha256 = "0zh0kli7kav18v9znq2f5jklhf3m1kyb41jzmivjx70g9xyfzlwk"; }; nativeBuildInputs = [ From 26aa7e08802e5285ebee82e5f98d3728bbb2e53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Jun 2021 17:58:48 +0200 Subject: [PATCH 602/797] gpg-tui: 0.4.0 -> 0.4.1 https://github.com/orhun/gpg-tui/blob/v0.4.1/CHANGELOG.md --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 8b45a675b1f..4aae027f015 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-5noaBfOpUck8+FQQDohKfThN3jJ9ogvZ8iMdySlwENE="; + sha256 = "sha256-PLKBkOwhp8Os2yAx+nzfWs41d3v12nnUVFB6oDfl00Y="; }; - cargoSha256 = "sha256-OMbyoAVKnnLbFSO7gqxjBXmIjJg4K2ioE0ClYu9UyW4="; + cargoSha256 = "sha256-lHrA4TlaOcMhO2a8lnd8hc6X2cDnWKMNLWEzlezIcNE="; nativeBuildInputs = [ gpgme # for gpgme-config From 576c0f0cf2b44b5f83ec3c2031a37d86da7d3233 Mon Sep 17 00:00:00 2001 From: Mattherix Date: Thu, 10 Jun 2021 18:42:08 +0200 Subject: [PATCH 603/797] gnomeExtensions.night-theme-switcher: 40 -> 50 (#125725) --- .../gnome/extensions/night-theme-switcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index fd0d2dbb578..a7ee6d566d4 100644 --- a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; - version = "40"; + version = "50"; src = fetchFromGitLab { owner = "rmnvgr"; repo = "nightthemeswitcher-gnome-shell-extension"; rev = "v${version}"; - sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0"; + sha256 = "0rs08kr3wizs1vpkmm6pbcvnn7rz47yrq7vnb1s8d58yda9a850d"; }; nativeBuildInputs = [ unzip ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Automatically change the GTK theme to dark variant when Night Light activates"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jonafato ]; homepage = "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/"; }; From 462730dd7f39c793e64b8f96928cc5d975f245ab Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 9 Jun 2021 23:13:36 -0700 Subject: [PATCH 604/797] jbofihe: Init at 0.43 --- pkgs/tools/text/jbofihe/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/text/jbofihe/default.nix diff --git a/pkgs/tools/text/jbofihe/default.nix b/pkgs/tools/text/jbofihe/default.nix new file mode 100644 index 00000000000..111b019c3b1 --- /dev/null +++ b/pkgs/tools/text/jbofihe/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, bison, flex, perl, }: + +stdenv.mkDerivation rec { + pname = "jbofihe"; + version = "0.43"; + + src = fetchFromGitHub { + owner = "lojban"; + repo = "jbofihe"; + rev = "v${version}"; + sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98"; + }; + + nativeBuildInputs = [ bison flex perl ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + (cd tests && ./run *.in) + runHook postCheck + ''; + + meta = with lib; { + description = "Parser & analyser for Lojban"; + homepage = "https://github.com/lojban/jbofihe"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ chkno ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfdcf9bfe78..3a425471961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6478,6 +6478,9 @@ in ispell = callPackage ../tools/text/ispell {}; iodash = callPackage ../development/libraries/iodash { }; + + jbofihe = callPackage ../tools/text/jbofihe {}; + jumanpp = callPackage ../tools/text/jumanpp {}; jump = callPackage ../tools/system/jump {}; From 237a38e126c8b49bddb8081f622e7eaa248f3d4d Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 10 Jun 2021 17:57:07 +0100 Subject: [PATCH 605/797] dockle: 0.3.14 -> 0.3.15 --- pkgs/development/tools/dockle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index 55869b02295..437f7f2da58 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xe5qgM0yPBVtH9S4OSiNnkKxcH0W89aABJF6PVRBEhQ="; + sha256 = "sha256-jxFlbGJ95cSv08HcqrVufpTE5KkvAC9zOTQ2+JZWe5A="; }; vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw="; From 9916bf0b6785b357d18bd4a3de8b7fa496cf5a22 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 10 Jun 2021 18:08:25 +0100 Subject: [PATCH 606/797] boundary: 0.2.3 -> 0.3.0 --- pkgs/tools/networking/boundary/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 32dcea9682a..ab26a39035e 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.2.3"; + version = "0.3.0"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-tfTyhuQaVh0F1HvFS+ToDk/lJEHEYMQVNFpdEjABer4="; - aarch64-linux = "sha256-0g6nYoNgu3C/r4fgKuZBrzTjpt14lQf2rpbVMS9CEZE="; - x86_64-darwin = "sha256-er1bDqi+PDucwUSsWDi8z1fUZTz7epq6HE6cOLTN3SE="; + x86_64-linux = "sha256-vBXNDd9p9g1joBMcwt87uI/EIAeKa+QrndCh1kTwZyM="; + aarch64-linux = "sha256-Xompe1Q8Q3gAqpQQT04CWDx/f0Yc8HbnkZQbN+faB0g="; + x86_64-darwin = "sha256-cE4YrZPNAldCR31O3gI4W/y4RgV7+64yL15obb5uRcY="; }; in fetchzip { From a655b712015f1a37466371234620b8958887e9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 May 2021 18:17:36 +0200 Subject: [PATCH 607/797] nixos/jenkins: test declarative jobs --- nixos/tests/jenkins.nix | 85 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 5898adab759..cb4207c6e77 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -2,6 +2,7 @@ # 1. jenkins service starts on master node # 2. jenkins user can be extended on both master and slave # 3. jenkins service not started on slave node +# 4. declarative jobs can be added and removed import ./make-test-python.nix ({ pkgs, ...} : { name = "jenkins"; @@ -13,7 +14,45 @@ import ./make-test-python.nix ({ pkgs, ...} : { master = { ... }: - { services.jenkins.enable = true; + { services.jenkins = { + enable = true; + jobBuilder = { + enable = true; + nixJobs = [ + { job = { + name = "job-1"; + builders = [ + { shell = '' + echo "Running job-1" + ''; + } + ]; + }; + } + + { job = { + name = "folder-1"; + project-type = "folder"; + }; + } + + { job = { + name = "folder-1/job-2"; + builders = [ + { shell = '' + echo "Running job-2" + ''; + } + ]; + }; + } + ]; + }; + }; + + specialisation.noJenkinsJobs.configuration = { + services.jenkins.jobBuilder.nixJobs = pkgs.lib.mkForce []; + }; # should have no effect services.jenkinsSlave.enable = true; @@ -32,7 +71,12 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; - testScript = '' + testScript = { nodes, ... }: + let + configWithoutJobs = "${nodes.master.config.system.build.toplevel}/specialisation/noJenkinsJobs"; + jenkinsPort = nodes.master.config.services.jenkins.port; + jenkinsUrl = "http://localhost:${toString jenkinsPort}"; + in '' start_all() master.wait_for_unit("jenkins") @@ -45,5 +89,42 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert "users" in groups slave.fail("systemctl is-enabled jenkins.service") + + with subtest("jobs are declarative"): + # Check that jobs are created on disk. + master.wait_for_unit("jenkins-job-builder") + master.wait_until_fails("systemctl is-active jenkins-job-builder") + master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/job-1/config.xml") + master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml") + master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") + + # Wait until jenkins is ready, reload configuration and verify it also + # sees the jobs. + master.succeed("curl --fail ${jenkinsUrl}/cli") + master.succeed("curl ${jenkinsUrl}/jnlpJars/jenkins-cli.jar -O") + master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) reload-configuration") + out = master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs") + jobs = [x.strip() for x in out.splitlines()] + # Seeing jobs inside folders requires the Folders plugin + # (https://plugins.jenkins.io/cloudbees-folder/), which we don't have + # in this vanilla jenkins install, so limit ourself to non-folder jobs. + assert jobs == ['job-1'], f"jobs != ['job-1']: {jobs}" + + master.succeed( + "${configWithoutJobs}/bin/switch-to-configuration test >&2" + ) + + # Check that jobs are removed from disk. + master.wait_for_unit("jenkins-job-builder") + master.wait_until_fails("systemctl is-active jenkins-job-builder") + master.wait_until_fails("test -f /var/lib/jenkins/jobs/job-1/config.xml") + master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml") + master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") + + # Reload jenkins' configuration and verify it also sees the jobs as removed. + master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) reload-configuration") + out = master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs") + jobs = [x.strip() for x in out.splitlines()] + assert jobs == [], f"jobs != []: {jobs}" ''; }) From 16cbc80a9370b13db95a75b74d20e1d2beb578b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 9 Jun 2021 21:01:16 +0200 Subject: [PATCH 608/797] qcachegrind: fix fatal Could not find the Qt platform plugin "xcb" in "" --- pkgs/development/tools/analysis/qcachegrind/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 75729d1eea4..195596d3c19 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind }: +{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }: let name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { buildInputs = [ qtbase perl python php ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; dontWrapQtApps = true; @@ -33,6 +33,10 @@ in stdenv.mkDerivation { install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" ''); + preFixup = '' + wrapQtApp "$out/bin/qcachegrind" + ''; + meta = with lib; { description = "A Qt GUI to visualize profiling data"; license = licenses.gpl2; From 1b1f196fe6f46e6f713946e5c423bbbc90771328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 10 Jun 2021 07:20:50 +0200 Subject: [PATCH 609/797] qcachegrind: license gpl2 -> gpl2Plus According to https://apps.kde.org/kcachegrind/. --- pkgs/development/tools/analysis/qcachegrind/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 195596d3c19..1f7c6641b1c 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "A Qt GUI to visualize profiling data"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ periklis ]; }; From 41756934db77a275e83d7b03d7a639dc0e76541e Mon Sep 17 00:00:00 2001 From: V Date: Thu, 10 Jun 2021 11:32:46 +0200 Subject: [PATCH 610/797] libcef: 75.1.14 -> 90.6.7 --- pkgs/development/libraries/libcef/default.nix | 78 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 8f01958a9bc..c3d6516a3df 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -1,26 +1,66 @@ -{ lib, stdenv, fetchurl, cmake, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig -, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor -, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver -, libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, cmake +, glib +, nss +, nspr +, atk +, at-spi2-atk +, libdrm +, expat +, libxcb +, libxkbcommon +, libX11 +, libXcomposite +, libXdamage +, libXext +, libXfixes +, libXrandr +, mesa +, gtk3 +, pango +, cairo +, alsa-lib +, dbus +, at-spi2-core +, cups +, libxshmfence }: let - libPath = - lib.makeLibraryPath [ - alsa-lib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 - libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi - libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio - systemd at-spi2-core at-spi2-atk - ]; -in -stdenv.mkDerivation rec { + rpath = lib.makeLibraryPath [ + glib + nss + nspr + atk + at-spi2-atk + libdrm + expat + libxcb + libxkbcommon + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + mesa + gtk3 + pango + cairo + alsa-lib + dbus + at-spi2-core + cups + libxshmfence + ]; +in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "75.1.14-gc81164e"; + version = "90.6.7"; + gitRevision = "19ba721"; + chromiumVersion = "90.0.4430.212"; src = fetchurl { - name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2"; - url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2"; - sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg"; + url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_linux64_minimal.tar.bz2"; + sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; }; nativeBuildInputs = [ cmake ]; @@ -32,7 +72,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ $out/share/cef/ cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ cp ../Release/libcef.so $out/lib/ - patchelf --set-rpath "${libPath}" $out/lib/libcef.so + patchelf --set-rpath "${rpath}" $out/lib/libcef.so cp ../Release/*.bin $out/share/cef/ cp -r ../Resources/* $out/share/cef/ cp -r ../include $out/ @@ -40,7 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; - homepage = "http://opensource.spotify.com/cefbuilds/index.html"; + homepage = "https://cef-builds.spotifycdn.com/index.html"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; platforms = with platforms; linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad5474958ba..e7aa60b0052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15915,7 +15915,7 @@ in libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; - libcef = callPackage ../development/libraries/libcef { inherit (gnome2) GConf; }; + libcef = callPackage ../development/libraries/libcef {}; libcello = callPackage ../development/libraries/libcello {}; From 40e8cd7214bab9087d5bcb6aba6c31667fb5c78b Mon Sep 17 00:00:00 2001 From: V Date: Thu, 10 Jun 2021 19:18:46 +0200 Subject: [PATCH 611/797] obs-studio: Fix compilation with latest CEF --- ...roduct_version-to-user_agent_product.patch | 26 ++++++++++++++ ...ss-and-universal-access-for-file-URL.patch | 36 +++++++++++++++++++ .../applications/video/obs-studio/default.nix | 8 +++++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch create mode 100644 pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch diff --git a/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch b/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch new file mode 100644 index 00000000000..0bc79624860 --- /dev/null +++ b/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch @@ -0,0 +1,26 @@ +From 635772c4c5ecf11a0f84e6c9fc273dce6b9a5688 Mon Sep 17 00:00:00 2001 +From: V +Date: Thu, 10 Jun 2021 18:36:22 +0200 +Subject: [PATCH] Change product_version to user_agent_product + +This is its name as of CEF 91.1.0. +--- + obs-browser-plugin.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp +index 1a6a009..5eb379e 100644 +--- a/plugins/obs-browser/obs-browser-plugin.cpp ++++ b/plugins/obs-browser/obs-browser-plugin.cpp +@@ -298,7 +298,7 @@ static void BrowserInit(void) + prod_ver << std::to_string(obs_maj) << "." << std::to_string(obs_min) + << "." << std::to_string(obs_pat); + +- CefString(&settings.product_version) = prod_ver.str(); ++ CefString(&settings.user_agent_product) = prod_ver.str(); + + #ifdef USE_QT_LOOP + settings.external_message_pump = true; +-- +2.31.1 + diff --git a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch new file mode 100644 index 00000000000..49d01bacbd1 --- /dev/null +++ b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch @@ -0,0 +1,36 @@ +From 0de0a90f8fe5e1e48fa4ec7aa7c825ef88770f9d Mon Sep 17 00:00:00 2001 +From: Ryan Foster +Date: Mon, 9 Sep 2019 23:55:02 -0400 +Subject: [PATCH] Enable file access and universal access for file URLs + +When loading a local file, instead of disabling CEF's web security, +enable file access and universal access for file URLs. This should allow +local files to make CORS requests without completely disabling CEF's +security model. +--- + obs-browser-source.cpp | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp +index ab1181e..c775283 100644 +--- a/plugins/obs-browser/obs-browser-source.cpp ++++ b/plugins/obs-browser/obs-browser-source.cpp +@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser() + + #if ENABLE_LOCAL_FILE_URL_SCHEME + if (is_local) { +- /* Disable web security for file:// URLs to allow +- * local content access to remote APIs */ +- cefBrowserSettings.web_security = STATE_DISABLED; ++ /* Enable file access and universal access from file:// ++ * URLs to allow local content access to remote APIs */ ++ cefBrowserSettings.file_access_from_file_urls = ++ STATE_ENABLED; ++ cefBrowserSettings.universal_access_from_file_urls = ++ STATE_ENABLED; + } + #endif + +-- +2.31.1 + diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a50fe16660f..ff56fa1c0fb 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -53,6 +53,14 @@ in mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Lets obs-browser build against CEF 90.1.0+ + ./Enable-file-access-and-universal-access-for-file-URL.patch + + # Lets obs-browser build against CEF 91.1.0+ + ./Change-product_version-to-user_agent_product.patch + ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ]; buildInputs = [ From 1c80856545fd1234ba84b8981d26ca8e786376c2 Mon Sep 17 00:00:00 2001 From: Chuck Date: Thu, 10 Jun 2021 10:27:14 -0700 Subject: [PATCH 612/797] nixos-rebuild: Pass flakes flags when doing local flakes build --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 02614aea6d0..7441be07af3 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -215,7 +215,7 @@ nixBuild() { nixFlakeBuild() { if [ -z "$buildHost" ]; then - nix build "$@" --out-link "${tmpDir}/result" + nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result" readlink -f "${tmpDir}/result" else local attr="$1" From cf6f92292453ca44c9e40daba8c590c915d77a12 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 9 Jun 2021 14:21:39 -0300 Subject: [PATCH 613/797] clojure-lsp: 2021.04.13-12.47.33 -> 2021.06.01-16.19.44 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index dc342e501e4..3f51136c65c 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.04.13-12.47.33"; + version = "2021.06.01-16.19.44"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1la0d28pvp1fqnxp3scb2vawcblilwyx42djxn379vag403p1i2d"; + sha256 = "sha256-dACvjm+uEVWotoeYhA4gCenKeprpF2dI0PGNRAVALao="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar"; - sha256 = "059gz7y2rzwdxpyqy80w4lghzgxi5lb4rxmks1721yq6k7ljjyqy"; + sha256 = "sha256-V12rSYv/Yu12ZpLSROd+4pyGiEGRfJ7lmRqCeikcQ5Q="; }; GRAALVM_HOME = graalvm11-ce; @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck + export HOME="$(mktemp -d)" + ./clojure-lsp --version | fgrep -q '${version}' ${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp runHook postCheck From 845f700a92dd814a91ae562035e7a42a8d80acea Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 10 Jun 2021 20:04:05 +0200 Subject: [PATCH 614/797] terraform-providers.ct: 0.6.1 -> 0.8.0 Bumps the Terraform SDK from 1.8.0 to 2.3.0, ensuring compatibility with future versions of terraform. Adds Fedora CoreOS Config v1.3.0 support. --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5c713b6b92a..6e8a80ebdd5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -235,10 +235,11 @@ }, "ct": { "owner": "poseidon", + "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.6.1", - "sha256": "0hh3hvi8lwb0h8x9viz5p991w94gn7354nw95b51rdmir9qi2x89", - "version": "0.6.1" + "rev": "v0.8.0", + "sha256": "1mm86q3rl81dm2yfg2hdf88x8g5mhwwixrxgrffpkjvjqy42a8h7", + "version": "0.8.0" }, "datadog": { "owner": "terraform-providers", From 6419fc3f21907ff0e4234f26b350550faabab4ce Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 10 Jun 2021 19:09:10 +0100 Subject: [PATCH 615/797] terraform-ls: 0.16.2 -> 0.18.0 Set buildFlagsArray in bash Ensure pre-release is empty Remove the check that requires networking so we can run tests Add changelog Add myself as a maintainer --- .../tools/misc/terraform-ls/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 0c52a89229d..ac7d2e3132e 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,25 +2,30 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.16.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY="; + sha256 = "sha256-JctiWJ2HeFtrrOwCe1MCzxTkE2855FsgFocaAgK4fMk="; }; - vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os="; + vendorSha256 = "sha256-r4/WTzI1unvmjKOSJsaHVkws2/qWLuRrHLlzwckrm2Q="; - # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com - doCheck = false; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version} -X main.prerelease=") + ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + preCheck = '' + # Remove test that requires networking + rm internal/terraform/exec/exec_test.go + ''; meta = with lib; { description = "Terraform Language Server (official)"; homepage = "https://github.com/hashicorp/terraform-ls"; + changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ mbaillie ]; + maintainers = with maintainers; [ mbaillie jk ]; }; } From 022d7873684e209460237829aecd302002df419b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Jun 2021 20:11:15 +0200 Subject: [PATCH 616/797] ipinfo: 1.1.5 -> 2.0.1 --- pkgs/tools/networking/ipinfo/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 32f897bbe8e..91bc654c83a 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -5,17 +5,20 @@ buildGoModule rec { pname = "ipinfo"; - version = "1.1.5"; + version = "2.0.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - sha256 = "16i5vmx39j7l5mhs28niapki9530nsbw6xik8rsky55v9i5pr72d"; + sha256 = "00rqqkybvzxcpa6fy799fxmn95xqx7s3z3mqfryzi35dlmjdfzqy"; }; vendorSha256 = null; + # Tests require network access + doCheck = false; + meta = with lib; { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; From f62847d5655a6954fc946e5d9c81424171cc281e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 10 Jun 2021 20:23:21 +0200 Subject: [PATCH 617/797] coreboot-utils: 4.13 -> 4.14 --- pkgs/tools/misc/coreboot-utils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 39e6e6f211a..d1735268224 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "4.13"; + version = "4.14"; commonMeta = with lib; { description = "Various coreboot-related tools"; @@ -16,13 +16,14 @@ let src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "0sl50aajnah4a138sr3jjm3ydc8gfh5vvlhviz3ypp95b9jdlya7"; + sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr"; }; enableParallelBuilding = true; postPatch = '' cd ${path} + patchShebangs . ''; makeFlags = [ From d05d2113bbd392c4b904f5942e0028bfd2276679 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Thu, 10 Jun 2021 19:53:58 +0200 Subject: [PATCH 618/797] flutter: 2.0.3 -> 2.2.1 --- .../development/compilers/flutter/default.nix | 29 ++++++++++++-- .../flutter/patches/disable-auto-update.patch | 15 +++++-- .../flutter/patches/move-cache.patch | 40 +++++++++++-------- 3 files changed, 61 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 736178e76ca..bcc1a07f679 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -4,18 +4,41 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.0.3"; + version = "2.2.1"; + dartVersion = "2.13.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; + dartStable = dart.override { + version = dartVersion; + sources = { + "${dartVersion}-x86_64-darwin" = fetchurl { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; + sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya"; + }; + "${dartVersion}-x86_64-linux" = fetchurl { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; + sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq"; + }; + "${dartVersion}-i686-linux" = fetchurl { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-ia32-release.zip"; + sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj"; + }; + "${dartVersion}-aarch64-linux" = fetchurl { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; + sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc"; + }; + }; + }; in { mkFlutter = mkFlutter; stable = mkFlutter rec { - inherit dart version; + dart = dartStable; + inherit version; pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = "14a63cpkp78rgymmlrppds69jsrdarg33dr43nb7s61r0xfh9icm"; + sha256 = "009pwk2casz10gibgjpz08102wxmkq9iq3994b3c2q342g6526g0"; }; patches = getPatches ./patches; }; diff --git a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index 1fe09813684..d0fd363d3c6 100644 --- a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch @@ -1,5 +1,5 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index c44f867746..c9eda34e26 100644 +index be9320210e..6eb50aae95 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh @@ -218,8 +218,6 @@ function shared::execute() { @@ -12,16 +12,23 @@ index c44f867746..c9eda34e26 100644 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 3dc7929dd1..e65d70d55b 100644 +index 550a75bc65..c98a4591cc 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -246,11 +246,7 @@ class FlutterCommandRunner extends CommandRunner { +@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner { globals.flutterUsage.suppressAnalytics = true; } - globals.flutterVersion.ensureVersionFile(); final bool machineFlag = topLevelResults['machine'] as bool; -- if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { + final bool ci = await globals.botDetector.isRunningOnBot; + final bool redirectedCompletion = !globals.stdio.hasTerminal && +@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner { + final bool versionCheckFlag = topLevelResults['version-check'] as bool; + final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; + +- if (topLevelResults.command?.name != 'upgrade' && +- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { - await globals.flutterVersion.checkFlutterVersionFreshness(); - } diff --git a/pkgs/development/compilers/flutter/patches/move-cache.patch b/pkgs/development/compilers/flutter/patches/move-cache.patch index d6a45a97e58..2610c155804 100644 --- a/pkgs/development/compilers/flutter/patches/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/move-cache.patch @@ -1,24 +1,24 @@ diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index a6c59bae07..21f6c9812a 100644 +index 80fb16673f..5723f93f9f 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -5,6 +5,7 @@ +@@ -7,6 +7,7 @@ import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; +import 'base/common.dart'; import 'base/context.dart'; + import 'base/deferred_component.dart'; import 'base/file_system.dart'; - import 'base/logger.dart'; -@@ -14,6 +15,7 @@ import 'cache.dart'; +@@ -16,6 +17,7 @@ import 'build_info.dart'; + import 'cache.dart'; import 'convert.dart'; import 'dart/package_map.dart'; - import 'devfs.dart'; +import 'globals.dart' as globals; + import 'devfs.dart'; import 'flutter_manifest.dart'; import 'license_collector.dart'; - import 'project.dart'; -@@ -377,7 +379,7 @@ class ManifestAssetBundle implements AssetBundle { +@@ -449,7 +451,7 @@ class ManifestAssetBundle implements AssetBundle { for (final Map font in family['fonts'] as List>) { final Uri entryUri = _fileSystem.path.toUri(font['asset'] as String); result.add(_Asset( @@ -28,32 +28,40 @@ index a6c59bae07..21f6c9812a 100644 entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 11e3bf3e11..39d6fae0d1 100644 +index 152d4e75e5..1fcff7e2bd 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -321,8 +321,15 @@ class Cache { +@@ -9,6 +9,7 @@ import 'package:file/memory.dart'; + import 'package:meta/meta.dart'; + import 'package:process/process.dart'; + ++import 'globals.dart' as globals; + import 'base/common.dart'; + import 'base/error_handling_io.dart'; + import 'base/file_system.dart'; +@@ -298,8 +299,15 @@ class Cache { return; } assert(_lock == null); + -+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); ++ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); + if (!dir.existsSync()) { + dir.createSync(recursive: true); + globals.os.chmod(dir, '755'); + } + final File lockFile = -- _fileSystem.file(_fileSystem.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); -+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); +- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile')); ++ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile')); try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -424,7 +431,7 @@ class Cache { +@@ -404,7 +412,7 @@ class Cache { if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); + return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); } else { -- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); -+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); +- return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache')); ++ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); } } From c046e7c5614ecfd8aba2316100204d11d5d2cd9d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 10 Jun 2021 20:37:52 +0200 Subject: [PATCH 619/797] fileshare: stop using vulnerable libmicrohttpd 0.9.70 libmicrohttpd 0.9.70 has a known criticial security issue (CVE-2021-3466) and should be avoided. --- pkgs/servers/fileshare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 88c14a220d9..7141efef305 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkg-config, git, libmicrohttpd_0_9_70 }: +{ stdenv, lib, fetchgit, pkg-config, git, libmicrohttpd }: stdenv.mkDerivation rec { pname = "fileshare"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config git ]; - buildInputs = [ libmicrohttpd_0_9_70 ]; + buildInputs = [ libmicrohttpd ]; makeFlags = [ "BUILD=release" ]; From f8fe3cbe9cc11eb5946b480d5bf45e1ffe235218 Mon Sep 17 00:00:00 2001 From: Kho-Dialga <55767703+Kho-Dialga@users.noreply.github.com> Date: Thu, 10 Jun 2021 13:13:24 -0600 Subject: [PATCH 620/797] proton-caller: 2.2.3 -> 2.3.0 (#126501) Co-authored-by: Sandro --- pkgs/misc/emulators/proton-caller/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/misc/emulators/proton-caller/default.nix index f8295c6c5b4..a69c1b3763e 100644 --- a/pkgs/misc/emulators/proton-caller/default.nix +++ b/pkgs/misc/emulators/proton-caller/default.nix @@ -1,31 +1,23 @@ -{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "proton-caller"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "caverym"; repo = pname; rev = version; - sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z"; + sha256 = "1rj0f8jzmrvj6gz1rcdjmxdqk2i5cxhz9ji4217kwyb6h1h0jmdk"; }; - cargoSha256 = "1vp2vvgy8z350a59k1c3s5ww6w2wikiha4s7jkkz9khl0spn19a8"; - - nativeBuildInputs = [ installShellFiles ]; - - outputs = [ "out" "man" ]; - - postInstall = '' - installManPage manual/proton-call.6 - ''; + cargoSha256 = "165kzza1m8h37y1ir0d0hp0z645h4ihkyj83fii69f18gk47r3kg"; meta = with lib; { description = "Run Windows programs with Proton"; changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}"; homepage = "https://github.com/caverym/proton-caller"; - license = licenses.gpl3Only; + license = licenses.mit; maintainers = with maintainers; [ kho-dialga ]; }; } From 19ff8bd9435336715fc5f046119106fd404861c5 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 10 Jun 2021 19:13:30 +0000 Subject: [PATCH 621/797] vgmstream: init at r1050-3738-g7cfa1f29 (#125492) Co-authored-by: Sandro --- pkgs/applications/audio/vgmstream/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/vgmstream/default.nix diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix new file mode 100644 index 00000000000..a3518f23984 --- /dev/null +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config +, mpg123, ffmpeg, libvorbis, libao, jansson +}: +stdenv.mkDerivation rec { + pname = "vgmstream"; + version = "r1050-3448-g77cc431b"; + + src = fetchFromGitHub { + owner = "vgmstream"; + repo = "vgmstream"; + rev = version; + sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ]; + + # There's no nice way to build the audacious plugin without a circular dependency + cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ]; + + preConfigure = '' + echo "#define VERSION \"${version}\"" > cli/version.h + ''; + + meta = with lib; { + description = "A library for playback of various streamed audio formats used in video games"; + homepage = "https://vgmstream.org"; + maintainers = with maintainers; [ zane ]; + license = with licenses; isc; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2739cb57333..8bd04e2bbb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31299,6 +31299,8 @@ in vbam = callPackage ../misc/emulators/vbam { }; + vgmstream = callPackage ../applications/audio/vgmstream { }; + vice = callPackage ../misc/emulators/vice { }; ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; From 93b0baca0378ac126fcd03d9107f71b93d9f4f1d Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 10 Jun 2021 21:28:07 +0200 Subject: [PATCH 622/797] nncp: 6.4.0 -> 6.5.0 --- pkgs/tools/misc/nncp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index dbc709dd41c..fc02431c768 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "16xrwhr7avss238k83ih1njl0gfca57ghg360ba9ixlssrb1239x"; + sha256 = "16hbcwwf65h2avgdyya2bk42bmmqnfl1m5v7y23cyp174ykjl794"; }; nativeBuildInputs = [ go redo-apenwarr ]; From 489959099fc23a11540830c7d0978b5a122d4e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 9 Jun 2021 15:14:17 +0200 Subject: [PATCH 623/797] mkCoqDerivation: fix useDune2 --- pkgs/build-support/coq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 03922303ee3..ba300f2f8cf 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -57,7 +57,7 @@ let append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; var-coqlib-install = (optionalString (versions.isGe "8.7" coq.coq-version) "COQMF_") + "COQLIB"; - useDune2 = args.useDune2 or useDune2ifVersion fetched.version; + useDune2 = args.useDune2 or (useDune2ifVersion fetched.version); in stdenv.mkDerivation (removeAttrs ({ From 674a24e5bbf3149e710d46af06c4fa22ac8ee2a6 Mon Sep 17 00:00:00 2001 From: tcmal Date: Thu, 10 Jun 2021 21:01:10 +0100 Subject: [PATCH 624/797] lldb: fix 8&9 --- .../compilers/llvm/8/lldb/gnu-install-dirs.patch | 13 +++++++++++++ .../compilers/llvm/9/lldb/gnu-install-dirs.patch | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch index ffc946816b0..08b6fae654e 100644 --- a/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch @@ -105,3 +105,16 @@ index a9059dd..d76a47d 100644 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) set(LLDB_BUILT_STANDALONE 1) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 3598247..bd60451 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -47,7 +47,7 @@ if(NOT LLDB_BUILD_FRAMEWORK) + endif() + + set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir}) +- set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX}) ++ set(SWIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + + # Install the LLDB python module + install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR}) diff --git a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch index 7876220e4d3..6ceb29ced92 100644 --- a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch @@ -89,3 +89,17 @@ index b726797..1f057ac 100644 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) set(LLDB_BUILT_STANDALONE 1) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 7de7973..b70aecc 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -50,7 +50,8 @@ if(NOT LLDB_BUILD_FRAMEWORK) + OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} +- -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True, False, ''))" ++ -c "import distutils.sysconfig, sys; print(distutils.sysconfig.get_python_lib(True, False, sys.argv[1]))" ++ ${CMAKE_INSTALL_LIBDIR}/../ + OUTPUT_VARIABLE SWIG_INSTALL_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) + From 660be4bfb228e4f3502443598edd25e2ab5304fa Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 10 Jun 2021 22:05:03 +0200 Subject: [PATCH 625/797] olm: 3.2.2 -> 3.2.4 --- pkgs/development/libraries/olm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index ca3a081aee0..e7642e16c95 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy"; + sha256 = "1rl7j26li1irb1lqnnkzan7jrj38kvmdn69rlwbbp390v3z15lvh"; }; nativeBuildInputs = [ cmake ]; From 2a7b1e82fd0fb97887196850644f03a0af12e5ee Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 10 Jun 2021 22:09:28 +0200 Subject: [PATCH 626/797] pythonPackages.flask-httpauth: 4.3.0 -> 4.4.0 Support for Python 2 was dropped for this release: https://github.com/miguelgrinberg/Flask-HTTPAuth/commit/e690ce56827de9d669718fa5d0fcda63112f8008 --- .../development/python-modules/flask-httpauth/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index ba8e0d0f11e..988ae52aa0e 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -1,12 +1,14 @@ -{ lib, python, buildPythonPackage, fetchPypi, flask }: +{ lib, python, isPy3k, buildPythonPackage, fetchPypi, flask }: buildPythonPackage rec { pname = "Flask-HTTPAuth"; - version = "4.3.0"; + version = "4.4.0"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "05j1mckwhgicrlj4j7ni2rhcf9w4i7phll06jbjjyvs3rj1l4q1f"; + sha256 = "0fl1if91hg2c92b6sic7h2vhxxvb06ri7wflmwp0pfiwbaisgamw"; }; propagatedBuildInputs = [ flask ]; From b7abce543af256de7c88a255cb722d0b2ec51657 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 9 Jun 2021 23:52:22 +0000 Subject: [PATCH 627/797] apacheHttpd: 2.4.47 -> 2.4.48 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 3fff2ac9fce..a8caf1da17b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -17,12 +17,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.47"; + version = "2.4.48"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-I9AG28jleBFqETj6RX7qgkBIRY6JyECHIZ8DcogMA8o="; + sha256 = "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v"; }; # FIXME: -dev depends on -doc From 35c00c0e39c0e1ef72b32ab84cff59201afae460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 6 Jun 2021 12:30:13 +0200 Subject: [PATCH 628/797] pleroma: init at 2.3.50 --- pkgs/servers/pleroma/default.nix | 224 +++++ pkgs/servers/pleroma/mix.nix | 1520 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 1746 insertions(+) create mode 100644 pkgs/servers/pleroma/default.nix create mode 100644 pkgs/servers/pleroma/mix.nix diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix new file mode 100644 index 00000000000..25d2da63243 --- /dev/null +++ b/pkgs/servers/pleroma/default.nix @@ -0,0 +1,224 @@ +{ lib, beamPackages +, fetchFromGitHub, fetchFromGitLab +, file, cmake +, nixosTests, writeText +, ... +}: + +beamPackages.mixRelease rec { + pname = "pleroma"; + version = "2.3.50"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + owner = "pleroma"; + repo = "pleroma"; + rev = "94687e23938b808a3fff95c92956ec337160cd0b"; + sha256 = "160ss6qhx3007lyb0f5cjzbm5dzxq9q8rfn83l8qfxgan8hliag6"; + }; + + mixNixDeps = import ./mix.nix { + inherit beamPackages lib; + overrides = (final: prev: { + # mix2nix does not support git dependencies yet, + # so we need to add them manually + prometheus_ex = beamPackages.buildMix rec { + name = "prometheus_ex"; + version = "3.0.5"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "prometheus.ex"; + rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; + sha256 = "1v0q4bi7sb253i8q016l7gwlv5562wk5zy3l2sa446csvsacnpjk"; + }; + beamDeps = with final; [ prometheus ]; + }; + eblurhash = beamPackages.buildRebar3 rec { + name = "eblurhash"; + version = "0.0.0"; + + src = fetchFromGitHub { + owner = "zotonic"; + repo = "eblurhash"; + rev = "04a0b76eadf4de1be17726f39b6313b88708fd12"; + sha256 = "1b9r41scg9rn3skx65ssv1q5lczmg0ky6h1y39qajsvdi5w3swyx"; + }; + beamDeps = with final; [ ]; + }; + captcha = beamPackages.buildMix rec { + name = "captcha"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "elixir-captcha"; + rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab"; + sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c"; + }; + beamDeps = with final; [ ]; + }; + remote_ip = beamPackages.buildMix rec { + name = "remote_ip"; + version = "0.1.5"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "remote_ip"; + rev = "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"; + sha256 = "0c7vmakcxlcs3j040018i7bfd6z0yq6fjfig02g5fgakx398s0x6"; + }; + beamDeps = with final; [ combine plug inet_cidr ]; + }; + concurrent_limiter = beamPackages.buildMix rec { + name = "concurrent_limiter"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "concurrent_limiter"; + rev = "d81be41024569330f296fc472e24198d7499ba78"; + sha256 = "1nci8zz1gy7dnvxf5ydjqbagf4g9f7z5x1v9kdyy7jz9f37z6qw9"; + }; + beamDeps = with final; [ telemetry ]; + }; + prometheus_phx = beamPackages.buildMix rec { + name = "prometheus_phx"; + version = "0.1.1"; + + preBuild = '' + touch config/prod.exs + ''; + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "prometheus-phx"; + rev = "9cd8f248c9381ffedc799905050abce194a97514"; + sha256 = "0211z4bxb0bc0zcrhnph9kbbvvi1f2v95madpr96pqzr60y21cam"; + }; + beamDeps = with final; [ prometheus_ex ]; + }; + majic = beamPackages.buildMix rec { + name = "majic"; + version = "1.0.0"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "majic"; + rev = "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"; + sha256 = "15605lsdd74bmsp5z96f76ihn7m2g3p1hjbhs2x7v7309n1k108n"; + }; + patchPhase = '' + substituteInPlace lib/majic/server.ex --replace "erlang.now" "erlang.time" + ''; + buildInputs = [ file ]; + + beamDeps = with final; [ nimble_pool mime plug elixir_make ]; + }; + crypt = beamPackages.buildRebar3 rec { + name = "crypt"; + version = "0.4.3"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "crypt"; + rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"; + sha256 = "0fnzljxy9pwabh1nzx0vawn131d5pdfb0p98kvpkqs441jr0ii73"; + }; + + postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so"; + + beamDeps = with final; [ elixir_make ]; + }; + web_push_encryption = beamPackages.buildMix rec { + name = "web_push_encryption"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "lanodan"; + repo = "elixir-web-push-encryption"; + rev = "026a043037a89db4da8f07560bc8f9c68bcf0cc0"; + sha256 = "0a4x6njqp8v579bc965c9ipsr1z3klrc0pvgj8x1xf69r77gs6sj"; + }; + beamDeps = with final; [ httpoison jose ]; + }; + + # Some additional build inputs and build fixes + http_signatures = prev.http_signatures.override { + patchPhase = '' + substituteInPlace mix.exs --replace ":logger" ":logger, :public_key" + ''; + }; + fast_html = prev.fast_html.override { + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + }; + syslog = prev.syslog.override { + buildPlugins = with beamPackages; [ pc ]; + }; + + # This needs a different version (1.0.14 -> 1.0.18) to build properly with + # our Erlang/OTP version. + eimp = beamPackages.buildRebar3 rec { + name = "eimp"; + version = "1.0.18"; + + src = beamPackages.fetchHex { + pkg = name; + inherit version; + sha256 = "0fnx2pm1n2m0zs2skivv43s42hrgpq9i143p9mngw9f3swjqpxvx"; + }; + + patchPhase = '' + echo '{plugins, [pc]}.' >> rebar.config + ''; + buildPlugins = with beamPackages; [ pc ]; + + beamDeps = with final; [ p1_utils ]; + }; + + mime = prev.mime.override { + patchPhase = let + cfgFile = writeText "config.exs" '' + use Mix.Config + config :mime, :types, %{ + "application/activity+json" => ["activity+json"], + "application/jrd+json" => ["jrd+json"], + "application/ld+json" => ["activity+json"], + "application/xml" => ["xml"], + "application/xrd+xml" => ["xrd+xml"] + } + ''; + in '' + mkdir config + cp ${cfgFile} config/config.exs + ''; + }; + }); + }; + + passthru = { + tests.pleroma = nixosTests.pleroma; + inherit mixNixDeps; + }; + + meta = with lib; { + description = "ActivityPub microblogging server"; + homepage = https://git.pleroma.social/pleroma/pleroma; + license = licenses.agpl3; + maintainers = with maintainers; [ petabyteboy ninjatrappeur ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix new file mode 100644 index 00000000000..d32e20b3123 --- /dev/null +++ b/pkgs/servers/pleroma/mix.nix @@ -0,0 +1,1520 @@ +{ lib, beamPackages, overrides ? (x: y: {}) }: + +let + buildRebar3 = lib.makeOverridable beamPackages.buildRebar3; + buildMix = lib.makeOverridable beamPackages.buildMix; + buildErlangMk = lib.makeOverridable beamPackages.buildErlangMk; + + self = packages // (overrides self packages); + + packages = with beamPackages; with self; { + accept = buildRebar3 rec { + name = "accept"; + version = "0.3.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1f0vmjjyyz8klhdb3k8zrcxpidhfy6706327nmisnbnc1ci8rc8i"; + }; + + beamDeps = []; + }; + + base62 = buildMix rec { + name = "base62"; + version = "1.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1fvpygkdmd7l737lv7svir8n1vhk0m094i8ygwcvx9gam2ykc4yl"; + }; + + beamDeps = [ custom_base ]; + }; + + base64url = buildRebar3 rec { + name = "base64url"; + version = "0.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1yf1m1587vd9l6w4x5b36g4kxrxqfpwbqk2l4mkqinzmwch9pc7s"; + }; + + beamDeps = []; + }; + + bbcode_pleroma = buildMix rec { + name = "bbcode_pleroma"; + version = "0.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1hyixcxhcf2j2gyavmmnvfslnl6z60dz1qa9xysfspws85s1118r"; + }; + + beamDeps = [ nimble_parsec ]; + }; + + bcrypt_elixir = buildMix rec { + name = "bcrypt_elixir"; + version = "2.3.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0s9psinz913l690xbcrl21m23zwinw4r2ypjgg7ybl3f9wfxd09c"; + }; + + beamDeps = [ comeonin elixir_make ]; + }; + + benchee = buildMix rec { + name = "benchee"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1nxd6blgmalb1qm9n11yaq24din2grc3pnnfsx6wkiz9hzkqmm9s"; + }; + + beamDeps = [ deep_merge ]; + }; + + bunt = buildMix rec { + name = "bunt"; + version = "0.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0lw3v9kwbbcy1v6ygziiky887gffwwmxvyg4r1v0zm71kzhcgxbs"; + }; + + beamDeps = []; + }; + + cachex = buildMix rec { + name = "cachex"; + version = "3.3.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "189irin4xkbnj6b3ih1h5fvli1xq6m1sz1xiyqryyk71vphmw3nr"; + }; + + beamDeps = [ eternal jumper sleeplocks unsafe ]; + }; + + calendar = buildMix rec { + name = "calendar"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0vqa1zpzsdgr6i3yx8j9b6qscvgrbvzn43p5bqm930hcja0ra3lr"; + }; + + beamDeps = [ tzdata ]; + }; + + castore = buildMix rec { + name = "castore"; + version = "0.1.10"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0r96zwva2g6q59vyar8swaka0vxx27xfpf17xar2ss25rgh190x4"; + }; + + beamDeps = []; + }; + + certifi = buildRebar3 rec { + name = "certifi"; + version = "2.6.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0zmvagzisnk7lj5pfipl19mjq9wn70i339hpbkfljf0vk6s9fk2j"; + }; + + beamDeps = []; + }; + + combine = buildMix rec { + name = "combine"; + version = "0.10.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + }; + + beamDeps = []; + }; + + comeonin = buildMix rec { + name = "comeonin"; + version = "5.3.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "012zr4s7b5bipng6yszqxkqr1lcv7imf8gyvxad56jachh1396fh"; + }; + + beamDeps = []; + }; + + connection = buildMix rec { + name = "connection"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + }; + + beamDeps = []; + }; + + cors_plug = buildMix rec { + name = "cors_plug"; + version = "2.0.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1sls8rns2k48qrga0ngysbn9aknapmn3xfn28by1gqbcir0y2jpf"; + }; + + beamDeps = [ plug ]; + }; + + cowboy = buildErlangMk rec { + name = "cowboy"; + version = "2.9.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1phv0a1zbgk7imfgcm0dlacm7hbjcdygb0pqmx4s26jf9f9rywic"; + }; + + beamDeps = [ cowlib ranch ]; + }; + + cowboy_telemetry = buildRebar3 rec { + name = "cowboy_telemetry"; + version = "0.3.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1bzhcdq12p837cii2jgvzjyrffiwgm5bsb1pra2an3hkcqrzsvis"; + }; + + beamDeps = [ cowboy telemetry ]; + }; + + cowlib = buildRebar3 rec { + name = "cowlib"; + version = "2.11.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1ac6pj3x4vdbsa8hvmbzpdfc4k0v1p102jbd39snai8wnah9sgib"; + }; + + beamDeps = []; + }; + + credo = buildMix rec { + name = "credo"; + version = "1.5.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1pj7h9fk3i3rhxs65z8d64nwbnddhqj0dwy9bn2nm5cif2mj71nx"; + }; + + beamDeps = [ bunt file_system jason ]; + }; + + crontab = buildMix rec { + name = "crontab"; + version = "1.1.8"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1gkb7ps38j789acj8dw2q7jnhhw43idyvh36fb3i52yjkhli7ra8"; + }; + + beamDeps = [ ecto ]; + }; + + custom_base = buildMix rec { + name = "custom_base"; + version = "0.2.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0qx47d4w2mxa3rr6mrxdasgk7prxqwd0y9zpjhz61jayrkx1kw4d"; + }; + + beamDeps = []; + }; + + db_connection = buildMix rec { + name = "db_connection"; + version = "2.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1j6psw0dxq1175b6zcqpm6vavv4n6sv72ji57l8b6qczmlhnqhdd"; + }; + + beamDeps = [ connection telemetry ]; + }; + + decimal = buildMix rec { + name = "decimal"; + version = "2.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0xzm8hfhn8q02rmg8cpgs68n5jz61wvqg7bxww9i1a6yanf6wril"; + }; + + beamDeps = []; + }; + + deep_merge = buildMix rec { + name = "deep_merge"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0c2li2a3hxcc05nwvy4kpsal0315yk900kxyybld972b15gqww6f"; + }; + + beamDeps = []; + }; + + earmark = buildMix rec { + name = "earmark"; + version = "1.4.15"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1vlrk5zmx1v5jnkkmchxwns8yy1kclzkcz0g6xpmiwy9bfw0j4iv"; + }; + + beamDeps = [ earmark_parser ]; + }; + + earmark_parser = buildMix rec { + name = "earmark_parser"; + version = "1.4.13"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1fhlh9bnph5nqdhy7w69xzb7lra1b3v16mk4yb947bx0ydmc40nn"; + }; + + beamDeps = []; + }; + + ecto = buildMix rec { + name = "ecto"; + version = "3.4.6"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "02zpyd5mm2zfkz4b839nz1x3ias5av3by1vjzkfc4x9flviaj4vg"; + }; + + beamDeps = [ decimal jason telemetry ]; + }; + + ecto_enum = buildMix rec { + name = "ecto_enum"; + version = "1.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + }; + + beamDeps = [ ecto ecto_sql postgrex ]; + }; + + ecto_explain = buildMix rec { + name = "ecto_explain"; + version = "0.1.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0c3366grl2r7k29a7sxwgqmq670c98sya4p96k7g9v1hmsc7f3hx"; + }; + + beamDeps = []; + }; + + ecto_sql = buildMix rec { + name = "ecto_sql"; + version = "3.4.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1hlar4r206szv84qbxc4igg2grvmqaa4mls110y6mcvr6mm0r69i"; + }; + + beamDeps = [ db_connection ecto postgrex telemetry ]; + }; + + eimp = buildRebar3 rec { + name = "eimp"; + version = "1.0.14"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1dl3xdfd42y389fc3sbssva163jgpy48pni2kqnvjy9027rk64ah"; + }; + + beamDeps = [ p1_utils ]; + }; + + elixir_make = buildMix rec { + name = "elixir_make"; + version = "0.6.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1na8agkks1hrwq1lxfj4yd96bvfcs4hk7mbra9z6lli2vanrxr03"; + }; + + beamDeps = []; + }; + + esshd = buildMix rec { + name = "esshd"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "10cryiv674p2mn9gvncl9j3rzgv0523chz9q6sm91lq960g38gnp"; + }; + + beamDeps = []; + }; + + eternal = buildMix rec { + name = "eternal"; + version = "1.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + }; + + beamDeps = []; + }; + + ex2ms = buildMix rec { + name = "ex2ms"; + version = "1.5.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "13vh9yrs60cifqxzw52n6xxdp174w704vm1ks45k4avrzla763b7"; + }; + + beamDeps = []; + }; + + ex_aws = buildMix rec { + name = "ex_aws"; + version = "2.1.9"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "040dmj94xg3wnk9wplm0myr2q12zad4w1xz1zc0n01y90dkpfv1y"; + }; + + beamDeps = [ hackney jason sweet_xml ]; + }; + + ex_aws_s3 = buildMix rec { + name = "ex_aws_s3"; + version = "2.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1g91dd4jfmqp9ds8ji5kqlgcm2bk6ajci3mpi0grxqki6dhmq5qm"; + }; + + beamDeps = [ ex_aws sweet_xml ]; + }; + + ex_const = buildMix rec { + name = "ex_const"; + version = "0.2.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0rwppain0bd36krph1as0vxlxb42psc6mlkfi67jp6fc21k39zcn"; + }; + + beamDeps = []; + }; + + ex_doc = buildMix rec { + name = "ex_doc"; + version = "0.24.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1nmpdxydbc1khcayab98gfv7km2qrqmgp1s64kjdkf11x3cy2d71"; + }; + + beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; + }; + + ex_machina = buildMix rec { + name = "ex_machina"; + version = "2.7.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + }; + + beamDeps = [ ecto ecto_sql ]; + }; + + ex_syslogger = buildMix rec { + name = "ex_syslogger"; + version = "1.5.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "16c376cvw0bcjz8a6gs3nhmg037i894gl5kgxi8jdinv6r0sp7xb"; + }; + + beamDeps = [ poison syslog ]; + }; + + excoveralls = buildMix rec { + name = "excoveralls"; + version = "0.12.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1nnsr9dv7mybcxx3y5p2gqzyy3p479w21c55vvsq6hi6dihkx2jn"; + }; + + beamDeps = [ hackney jason ]; + }; + + fast_html = buildMix rec { + name = "fast_html"; + version = "2.0.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1sk1fwib6x5isb3sy8g5i6gw0n6pfqrza12r89gas0pw3ma9vd1v"; + }; + + beamDeps = [ elixir_make nimble_pool ]; + }; + + fast_sanitize = buildMix rec { + name = "fast_sanitize"; + version = "0.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0rj4x64rl7pspagp30dhw9yzal4q2c8937am1m5akbshjbdh9wk9"; + }; + + beamDeps = [ fast_html plug ]; + }; + + file_system = buildMix rec { + name = "file_system"; + version = "0.2.10"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + }; + + beamDeps = []; + }; + + flake_id = buildMix rec { + name = "flake_id"; + version = "0.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "09yq3dlqqrb7v4ysblwpz1al0q5qcmryldkwq1kx5b71zn881z1i"; + }; + + beamDeps = [ base62 ecto ]; + }; + + floki = buildMix rec { + name = "floki"; + version = "0.30.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1f3b2wd1pmsgkl8np13pwgp57161p0wxfwnnrjzlq73x8hj3bh79"; + }; + + beamDeps = [ html_entities ]; + }; + + gen_smtp = buildRebar3 rec { + name = "gen_smtp"; + version = "0.15.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "03s40l97j6z4mx6a84cbl9w94v3dvfw4f97dqx4hi61hh2l19g99"; + }; + + beamDeps = []; + }; + + gen_stage = buildMix rec { + name = "gen_stage"; + version = "0.14.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0xld8m2l9a7pbzmq7vp0r9mz4pkisrjpslgbjs9ikhwlkllf4lw4"; + }; + + beamDeps = []; + }; + + gen_state_machine = buildMix rec { + name = "gen_state_machine"; + version = "2.0.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1j21ih8cm0kkirjd2dh0gcxhngf5h3dvv4gqw6khj9ibww2x9b2w"; + }; + + beamDeps = []; + }; + + gettext = buildMix rec { + name = "gettext"; + version = "0.18.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1igmn69xzj5wpkblg3k9v7wa2fjc2j0cncwx0grk1pag7nqkgxgr"; + }; + + beamDeps = []; + }; + + gun = buildRebar3 rec { + name = "gun"; + version = "2.0.0-rc.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1z2lsbbpl2925z8x2ri0rhp30ccn9d08pgqd2hkxf4342jp1x7bb"; + }; + + beamDeps = [ cowlib ]; + }; + + hackney = buildRebar3 rec { + name = "hackney"; + version = "1.17.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "05kbk3rpw2j3cb9pybikydxmi2nm5pidpx0jsm48av2mjr4zy5ny"; + }; + + beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; + }; + + html_entities = buildMix rec { + name = "html_entities"; + version = "0.5.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; + }; + + beamDeps = []; + }; + + html_sanitize_ex = buildMix rec { + name = "html_sanitize_ex"; + version = "1.3.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1mhr2jnyzrqv0298m6vghnc9v2iwck11kwfhyh07gmc8v0x3kyxb"; + }; + + beamDeps = [ mochiweb ]; + }; + + http_signatures = buildMix rec { + name = "http_signatures"; + version = "0.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "097q5jffswcaav40i8dhlds6hgdhsz53yd3fz8w7vl9z3rrv79zq"; + }; + + beamDeps = []; + }; + + httpoison = buildMix rec { + name = "httpoison"; + version = "1.8.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0fiwkdrbj7mmz449skp7laz2jdwsqn3svddncmicd46gk2m9w218"; + }; + + beamDeps = [ hackney ]; + }; + + idna = buildRebar3 rec { + name = "idna"; + version = "6.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + }; + + beamDeps = [ unicode_util_compat ]; + }; + + inet_cidr = buildMix rec { + name = "inet_cidr"; + version = "1.0.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + }; + + beamDeps = []; + }; + + jason = buildMix rec { + name = "jason"; + version = "1.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0y91s7q8zlfqd037c1mhqdhrvrf60l4ax7lzya1y33h5y3sji8hq"; + }; + + beamDeps = [ decimal ]; + }; + + joken = buildMix rec { + name = "joken"; + version = "2.3.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "07mwnzzb9slhzqjmd0nbs4dyjkbb3v06km82mhvdbi8fkjkn7cjp"; + }; + + beamDeps = [ jose ]; + }; + + jose = buildMix rec { + name = "jose"; + version = "1.11.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1i8szzpmiqc7xdv0lp38ng9fild7c5182b4pzkx4qbydnfgnr3q7"; + }; + + beamDeps = []; + }; + + jumper = buildMix rec { + name = "jumper"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0cvlbfkapkvbwaijmjq3cxg5m6yv4rh69wvss9kfj862i83mk31i"; + }; + + beamDeps = []; + }; + + libring = buildMix rec { + name = "libring"; + version = "1.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "10bvf64jkviyyyff12hlhq4p2439gphyvmya8z85m0c6x1gg1shz"; + }; + + beamDeps = []; + }; + + linkify = buildMix rec { + name = "linkify"; + version = "0.5.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1mzjkn0f2svn44fhazkhpaxnwn9hbnqha7z2i4fcbrxfa21rbkac"; + }; + + beamDeps = []; + }; + + makeup = buildMix rec { + name = "makeup"; + version = "1.0.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1a9cp9zp85yfybhdxapi9haa1yykzq91bw8abmk0qp1z5p05i8fg"; + }; + + beamDeps = [ nimble_parsec ]; + }; + + makeup_elixir = buildMix rec { + name = "makeup_elixir"; + version = "0.14.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "04fyrd0fcyfvv4i3ngm3gbykhfrp9z6l2p1bhgg9xv7ah0d8nhzj"; + }; + + beamDeps = [ makeup ]; + }; + + makeup_erlang = buildMix rec { + name = "makeup_erlang"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1fvw0zr7vqd94vlj62xbqh0yrih1f7wwnmlj62rz0klax44hhk8p"; + }; + + beamDeps = [ makeup ]; + }; + + meck = buildRebar3 rec { + name = "meck"; + version = "0.9.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + }; + + beamDeps = []; + }; + + metrics = buildRebar3 rec { + name = "metrics"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + }; + + beamDeps = []; + }; + + mime = buildMix rec { + name = "mime"; + version = "1.6.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "19qrpnmaf3w8bblvkv6z5g82hzd10rhc7bqxvqyi88c37xhsi89i"; + }; + + beamDeps = []; + }; + + mimerl = buildRebar3 rec { + name = "mimerl"; + version = "1.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + }; + + beamDeps = []; + }; + + mochiweb = buildRebar3 rec { + name = "mochiweb"; + version = "2.18.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "16j8cfn3hq0g474xc5xl8nk2v46hwvwpfwi9rkzavnsbaqg2ngmr"; + }; + + beamDeps = []; + }; + + mock = buildMix rec { + name = "mock"; + version = "0.3.7"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0p3yrx049fdw88kjidngd2lkwqkkyck5r51ng2dxj7z41539m92d"; + }; + + beamDeps = [ meck ]; + }; + + mogrify = buildMix rec { + name = "mogrify"; + version = "0.7.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1hwry2498qflc4g7fdwmxmzb2l0gr5c814ggzddwjsxsgwrrxmsh"; + }; + + beamDeps = []; + }; + + mox = buildMix rec { + name = "mox"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1pzlqq9y4i9i7d0dm8ah2c5a7y2h9649gkz9hfqamnmbnwh0l6r0"; + }; + + beamDeps = []; + }; + + nimble_parsec = buildMix rec { + name = "nimble_parsec"; + version = "0.5.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1cx9p22kkywkg40yqy9xswy4ighdw7i8cc9x1481pzy1d620n12w"; + }; + + beamDeps = []; + }; + + nimble_pool = buildMix rec { + name = "nimble_pool"; + version = "0.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1ygkr9ddzd3msif7hkqd75q27zlryhm9zww3191z7p0dcam1wfil"; + }; + + beamDeps = []; + }; + + oban = buildMix rec { + name = "oban"; + version = "2.3.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1prgpp7v03lgkia63j60jz3ds479ymm4991f882iizaq8x1s0367"; + }; + + beamDeps = [ ecto_sql jason postgrex telemetry ]; + }; + + open_api_spex = buildMix rec { + name = "open_api_spex"; + version = "3.10.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0rc7q857b8zb9vc4c699arjihca353rzm3bfjc31z0ib7pg2pfrd"; + }; + + beamDeps = [ jason plug poison ]; + }; + + p1_utils = buildRebar3 rec { + name = "p1_utils"; + version = "1.0.18"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "120znzz0yw1994nk6v28zql9plgapqpv51n9g6qm6md1f4x7gj0z"; + }; + + beamDeps = []; + }; + + parse_trans = buildRebar3 rec { + name = "parse_trans"; + version = "3.3.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + }; + + beamDeps = []; + }; + + pbkdf2_elixir = buildMix rec { + name = "pbkdf2_elixir"; + version = "1.2.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "07s862m4y74fyv9gwdhrhx04rvpfrwgqkjlyy51b9w1h8r50md6k"; + }; + + beamDeps = [ comeonin ]; + }; + + phoenix = buildMix rec { + name = "phoenix"; + version = "1.5.9"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0za2fpplmdq3axwng8736h6vz9wzlifhxy8apcgjy0bwlqhcwjvy"; + }; + + beamDeps = [ jason phoenix_html phoenix_pubsub plug plug_cowboy plug_crypto telemetry ]; + }; + + phoenix_ecto = buildMix rec { + name = "phoenix_ecto"; + version = "4.2.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1h23fy3pylaszh3l2zafq1a7fjwlwb3yw7dy09p0mb4wi6p1p2j7"; + }; + + beamDeps = [ ecto phoenix_html plug ]; + }; + + phoenix_html = buildMix rec { + name = "phoenix_html"; + version = "2.14.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "03z8r285znlg25yi47d4l59s7jq58y4dnhvbxgp16npkzykrgmpg"; + }; + + beamDeps = [ plug ]; + }; + + phoenix_pubsub = buildMix rec { + name = "phoenix_pubsub"; + version = "2.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0wgpa19l6xar0k2m117iz2kq3cw433llp07sqswpf5969y698bf5"; + }; + + beamDeps = []; + }; + + phoenix_swoosh = buildMix rec { + name = "phoenix_swoosh"; + version = "0.3.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1k81cvhbzbc3czvin45j1rqagzp7drk3s0rp2xa5clz06bm0qm2a"; + }; + + beamDeps = [ hackney phoenix phoenix_html swoosh ]; + }; + + plug = buildMix rec { + name = "plug"; + version = "1.11.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "07w83cx4xx90x4l1kmil4lpby55lpw83jfw3y08pqn5vxx7lwli3"; + }; + + beamDeps = [ mime plug_crypto telemetry ]; + }; + + plug_cowboy = buildMix rec { + name = "plug_cowboy"; + version = "2.5.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "06p7rmx01fknkf0frvjjaqs3qsz6066aa41qyd378n72lljqjb2v"; + }; + + beamDeps = [ cowboy cowboy_telemetry plug telemetry ]; + }; + + plug_crypto = buildMix rec { + name = "plug_crypto"; + version = "1.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1nxnxj62iv4yvm4771jbxpj3l4brn2crz053y12s998lv5x1qqw7"; + }; + + beamDeps = []; + }; + + plug_static_index_html = buildMix rec { + name = "plug_static_index_html"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1kxm1flxw3rnsj5jj24c2p23wq1wyblbl32n4rf6046i6k7lzzbr"; + }; + + beamDeps = [ plug ]; + }; + + poison = buildMix rec { + name = "poison"; + version = "3.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1kng8xadrs03i77irxvdk9vfncrqzncmgxc5gc8y8gkknw76dj7y"; + }; + + beamDeps = []; + }; + + poolboy = buildRebar3 rec { + name = "poolboy"; + version = "1.5.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + }; + + beamDeps = []; + }; + + postgrex = buildMix rec { + name = "postgrex"; + version = "0.15.9"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1vmd63vxwz8knid424b0rbp200vj7q7rz3xp98yj5cjc7q81j1v1"; + }; + + beamDeps = [ connection db_connection decimal jason ]; + }; + + pot = buildRebar3 rec { + name = "pot"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0vgvpiwiy1gm2npfm3qdybwvg39jllw13aig8ll1bn9icnbzb1zd"; + }; + + beamDeps = []; + }; + + prometheus = buildMix rec { + name = "prometheus"; + version = "4.8.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1dgwd8wxw2cifwmsmjvkbgr1n686n125ssm4b0vxngh70dqy3hhg"; + }; + + beamDeps = []; + }; + + prometheus_ecto = buildMix rec { + name = "prometheus_ecto"; + version = "1.4.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "10pd5cmm6m62xwlfp7al8yj62zn181rjizc1v9zb64zrfygjhrld"; + }; + + beamDeps = [ ecto prometheus_ex ]; + }; + + prometheus_phoenix = buildMix rec { + name = "prometheus_phoenix"; + version = "1.3.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0xccdidbzffgy2mpy18p017ijcgav2kv47b0v9ixklz9qi541lf4"; + }; + + beamDeps = [ phoenix prometheus_ex ]; + }; + + prometheus_plugs = buildMix rec { + name = "prometheus_plugs"; + version = "1.1.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0ybazh6r52vjpf14gjcphsavl3ggk9iapc0rr9wnv4yb7i4acwq2"; + }; + + beamDeps = [ accept plug prometheus_ex ]; + }; + + quack = buildMix rec { + name = "quack"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0hr5ppds4a9vih14hzs3lfj07r5069w8ifr7022fn4j18jkvydnp"; + }; + + beamDeps = [ poison tesla ]; + }; + + ranch = buildRebar3 rec { + name = "ranch"; + version = "1.8.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + }; + + beamDeps = []; + }; + + recon = buildMix rec { + name = "recon"; + version = "2.5.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0j26nin8h3zzypppkdxsjiwgjc8jm8n73b6cikvdh8h1snvcc8ap"; + }; + + beamDeps = []; + }; + + sleeplocks = buildRebar3 rec { + name = "sleeplocks"; + version = "1.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1q823i5bisc83pyssgrqkggyxiasm7b8dygzj2r943adzyp3gvl4"; + }; + + beamDeps = []; + }; + + ssl_verify_fun = buildRebar3 rec { + name = "ssl_verify_fun"; + version = "1.1.6"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; + }; + + beamDeps = []; + }; + + sweet_xml = buildMix rec { + name = "sweet_xml"; + version = "0.6.6"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0wrm3wx1c4wg8xj8lx1pg9xdpxhsbbry71l3kwgsizwjz1cc87if"; + }; + + beamDeps = []; + }; + + swoosh = buildMix rec { + name = "swoosh"; + version = "1.3.11"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1bqkp41sh4h0q5yjmk0ywf5x979rwxshz16gp619jks5vd4a1qpi"; + }; + + beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy ]; + }; + + syslog = buildRebar3 rec { + name = "syslog"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1qarnqappln4xhlr700rhnhfnfvgvv9l3y1ywdxmh83y7hvl2sjc"; + }; + + beamDeps = []; + }; + + telemetry = buildRebar3 rec { + name = "telemetry"; + version = "0.4.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0hc0fr2bh97wah9ycpm7hb5jdqr5hnl1s3b2ibbbx9gxbwvbhwpb"; + }; + + beamDeps = []; + }; + + tesla = buildMix rec { + name = "tesla"; + version = "1.4.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "06i0rshkm1byzgsphbr3al4hns7bcrpl1rxy8lwlp31cj8sxxxcm"; + }; + + beamDeps = [ castore gun hackney jason mime poison telemetry ]; + }; + + timex = buildMix rec { + name = "timex"; + version = "3.7.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1r3l50p8f8mxgghh079v1y5g02kzqr15ijbi7mkfzwl0lvf0hmm1"; + }; + + beamDeps = [ combine gettext tzdata ]; + }; + + trailing_format_plug = buildMix rec { + name = "trailing_format_plug"; + version = "0.0.7"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0gv9z8m1kpfs5f5zcsh9m6vr36s88x1xc6g0k6lr7sgk2m6dwkxx"; + }; + + beamDeps = [ plug ]; + }; + + tzdata = buildMix rec { + name = "tzdata"; + version = "1.0.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0nia83zpk0pb4jkpvhkmmgw8i5p6kd6cf776q6aj0pcym6i9llam"; + }; + + beamDeps = [ hackney ]; + }; + + ueberauth = buildMix rec { + name = "ueberauth"; + version = "0.6.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0q0vz7vlbw66a32d7yij3p5l4a59bi0sygiynn8na38ll7c97hmg"; + }; + + beamDeps = [ plug ]; + }; + + unicode_util_compat = buildRebar3 rec { + name = "unicode_util_compat"; + version = "0.7.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + }; + + beamDeps = []; + }; + + unsafe = buildMix rec { + name = "unsafe"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1rahpgz1lsd66r7ycns1ryz2qymamz1anrlps986900lsai2jxvc"; + }; + + beamDeps = []; + }; + }; +in self + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bd04e2bbb3..6d512e2d4ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7878,6 +7878,8 @@ in pleroma-otp = callPackage ../servers/pleroma-otp { }; + pleroma = callPackage ../servers/pleroma { }; + ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; }; From 55cd291bbd43e6f9a6d1426a57b3dde3df955dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 7 Jun 2021 14:33:08 +0200 Subject: [PATCH 629/797] pleroma-otp: remove --- nixos/modules/services/networking/pleroma.nix | 2 +- pkgs/servers/pleroma-otp/default.nix | 71 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 pkgs/servers/pleroma-otp/default.nix diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index 2687230a158..bd75083a4a7 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -8,7 +8,7 @@ in { package = mkOption { type = types.package; - default = pkgs.pleroma-otp; + default = pkgs.pleroma; description = "Pleroma package to use."; }; diff --git a/pkgs/servers/pleroma-otp/default.nix b/pkgs/servers/pleroma-otp/default.nix deleted file mode 100644 index 10fd2627743..00000000000 --- a/pkgs/servers/pleroma-otp/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, autoPatchelfHook -, fetchurl -, file -, makeWrapper -, ncurses -, nixosTests -, openssl -, unzip -, zlib -}: -stdenv.mkDerivation { - pname = "pleroma-otp"; - version = "2.3.0"; - - # To find the latest binary release stable link, have a look at - # the CI pipeline for the latest commit of the stable branch - # https://git.pleroma.social/pleroma/pleroma/-/tree/stable - src = { - aarch64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182392/artifacts/download"; - sha256 = "1drpd6xh7m2damxi5impb8jwvjl6m3qv5yxynl12i8g66vi3rbwf"; - }; - x86_64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182388/artifacts/download"; - sha256 = "0glr0iiqmylwwsn5r946yqr9kx97j2zznrc0imyxm3j0vhz8xzl4"; - }; - }."${stdenv.hostPlatform.system}"; - - nativeBuildInputs = [ unzip ]; - - buildInputs = [ - autoPatchelfHook - file - makeWrapper - ncurses - openssl - zlib - ]; - - # mkDerivation fails to detect the zip nature of $src due to the - # missing .zip extension. - # Let's unpack the archive explicitely. - unpackCmd = "unzip $curSrc"; - - installPhase = '' - mkdir $out - cp -r * $out''; - - # Pleroma is using the project's root path (here the store path) - # as its TMPDIR. - # Patching it to move the tmp dir to the actual tmpdir - postFixup = '' - wrapProgram $out/bin/pleroma \ - --set-default RELEASE_TMP "/tmp" - wrapProgram $out/bin/pleroma_ctl \ - --set-default RELEASE_TMP "/tmp"''; - - passthru.tests = { - pleroma = nixosTests.pleroma; - }; - - meta = with lib; { - description = "ActivityPub microblogging server"; - homepage = https://git.pleroma.social/pleroma/pleroma; - license = licenses.agpl3; - maintainers = with maintainers; [ ninjatrappeur ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42b633250cb..40d74332618 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -601,6 +601,7 @@ mapAliases ({ pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02 + pleroma-otp = pleroma; # added 2021-07-10 pltScheme = racket; # just to be sure plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d512e2d4ce..3eef7577800 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7876,8 +7876,6 @@ in tautulli = python3Packages.callPackage ../servers/tautulli { }; - pleroma-otp = callPackage ../servers/pleroma-otp { }; - pleroma = callPackage ../servers/pleroma { }; ploticus = callPackage ../tools/graphics/ploticus { From a6d113ad1b17b731972a0550ee14fa333bac2644 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:53:25 +0000 Subject: [PATCH 630/797] linux: 4.14.235 -> 4.14.236 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7c986259dff..9f40429f0ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.235"; + version = "4.14.236"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03k793hj294zf7jncs1h8zh5dh6xagkfvnydd9jadxvq2z8vvl8f"; + sha256 = "0albmgxj3cb1dvjagj54l0ffa7kwi8brh7bqwj6gvzpylsby5sp4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 89a533e7df2274b173dfa145eb2f224cffc2b606 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:53:31 +0000 Subject: [PATCH 631/797] linux: 4.19.193 -> 4.19.194 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 3a31ad473cf..e42a1646791 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.193"; + version = "4.19.194"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17ci49ak5iw01kfkn3fcgncg9hm4j188417bxi3bnsq9il5ymhl4"; + sha256 = "15l80psfgffa756vpjxmjkwjqif2gpx441hpzr473xwryp6bvbma"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From a31fb792707b189b3ec4c87e9cf7afdb410db72e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:53:38 +0000 Subject: [PATCH 632/797] linux: 4.4.271 -> 4.4.272 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9bc01eeff49..4fc2985b586 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.271"; + version = "4.4.272"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0n5h2lv1p542a45pas3pi0vkhgrk096vwrps79a7v3a6c1q2dxx6"; + sha256 = "1ar468ymk96v2pq9x209z2z4wbypppb91jpw8g22aa30pr9aagyi"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 2961093d9b231fb085d74696d09334b7a1bedbc6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:53:44 +0000 Subject: [PATCH 633/797] linux: 4.9.271 -> 4.9.272 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4be4b6fb222..d0cb868f172 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.271"; + version = "4.9.272"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1480miixphkf0b8w00m753ar7yp1rnl3zyr9wp4inngi2f90553r"; + sha256 = "0n0hrszaijdpnbdvd8bvz15m7g268is0zw84w4vaf37418whrgzq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 121dbb96538e04b1e54559a7728a5e4653a52e82 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:53:52 +0000 Subject: [PATCH 634/797] linux: 5.10.42 -> 5.10.43 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index ec7b16f9f3f..50ef93c04b9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.42"; + version = "5.10.43"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1r86v6q7ml7zv001f25w3h667nqqy39439s94vnqsyyn7g3jg84b"; + sha256 = "00yl1g6irpwy3sy0d43qvlk7x1gfk4v1dyv460afxy527d1ixf43"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From fd44ed986cad429e42cb985a78e847895438e89d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:53:59 +0000 Subject: [PATCH 635/797] linux: 5.12.9 -> 5.12.10 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 85a69f0c5ad..6ae39a84891 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.9"; + version = "5.12.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0vg71h8r90fl01a8khyf1776y76rgqisxafky89cswa2fpsvxyn7"; + sha256 = "03v3wzpbxb78gf4wsnc5wv6683g439cm2bzcjj4q657dagy9km68"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 7cf65d0f4a9a1200bdc2dd2d63b572dfb8350db6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:54:06 +0000 Subject: [PATCH 636/797] linux: 5.4.124 -> 5.4.125 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4cf7c2bfafd..94d5f6bd3ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.124"; + version = "5.4.125"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "10kxa1ng9w9xd2d5xh48fbhp1kri650p90nihrcpnb845gd9vwpp"; + sha256 = "0g73xfkmj4sahrk7gx72hm2i4m98gqghswqyf8yqh77b9857bvhp"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From e77f16cbcb80456b3874b649ddf35bd6183e4b43 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:54:19 +0000 Subject: [PATCH 637/797] linux/hardened/patches/4.14: 4.14.235-hardened1 -> 4.14.236-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bb668a6e904..f89b85df169 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.235-hardened1.patch", - "sha256": "0m49pg27pnp6kwkbawg0fw3lzm5nchqjhqkfgprckwgb9v5bgbcc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.235-hardened1/linux-hardened-4.14.235-hardened1.patch" + "name": "linux-hardened-4.14.236-hardened1.patch", + "sha256": "08wnc1acx8fnnrpaz5hxw9gakgk7qxf3kq1pycljl7396dnsy6xg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.236-hardened1/linux-hardened-4.14.236-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 940bf55cab197e373102be460d6d7fd737fbd8e3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:54:21 +0000 Subject: [PATCH 638/797] linux/hardened/patches/4.19: 4.19.193-hardened1 -> 4.19.194-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f89b85df169..e979734646f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.193-hardened1.patch", - "sha256": "0r2rxl08x2l1yimaqksrc79s36rnp77xm5in9cvp7ff24y9r9g0j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.193-hardened1/linux-hardened-4.19.193-hardened1.patch" + "name": "linux-hardened-4.19.194-hardened1.patch", + "sha256": "102w5algxybffy5176zzgz7knafpdc0lp9y5wjdrf6yr65l4j5rj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.194-hardened1/linux-hardened-4.19.194-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 0879f36d2b5269d1ca097761601c5b7f26c2e3d7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:54:22 +0000 Subject: [PATCH 639/797] linux/hardened/patches/5.10: 5.10.42-hardened1 -> 5.10.43-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e979734646f..47239feac4d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.42-hardened1.patch", - "sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch" + "name": "linux-hardened-5.10.43-hardened1.patch", + "sha256": "0hx2g4brpk32phiin96w4kgsbibrcb69a22p0rsqcanxl76v48sz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.43-hardened1/linux-hardened-5.10.43-hardened1.patch" }, "5.12": { "extra": "-hardened1", From 889319446ce58456ad06165748bf7d302181c3cc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:54:23 +0000 Subject: [PATCH 640/797] linux/hardened/patches/5.12: 5.12.9-hardened1 -> 5.12.10-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 47239feac4d..7ef8a027f5f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.9-hardened1.patch", - "sha256": "08ijifhl8sl858ik32ny47h7pq0r160sv55a07igkbhrh60arfqa", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.9-hardened1/linux-hardened-5.12.9-hardened1.patch" + "name": "linux-hardened-5.12.10-hardened1.patch", + "sha256": "0wyw33kg3xih2j19hsff9mapxjll8ad38il74gkcbnhwci0ys1mc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.10-hardened1/linux-hardened-5.12.10-hardened1.patch" }, "5.4": { "extra": "-hardened1", From c22128ed44db5b8c2fa0c66ed8a33e1660421739 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 20:54:24 +0000 Subject: [PATCH 641/797] linux/hardened/patches/5.4: 5.4.124-hardened1 -> 5.4.125-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 7ef8a027f5f..f9c25f12368 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.124-hardened1.patch", - "sha256": "1bn7fa09kzgv6v9d3gl66l8wg6z23chjhk6g219cqb7mfd4m5ykl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.124-hardened1/linux-hardened-5.4.124-hardened1.patch" + "name": "linux-hardened-5.4.125-hardened1.patch", + "sha256": "1vc6jgiglc4i5my9iw24yw16wi0x1lxkvyb6i619z3k3zh39gm04", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.125-hardened1/linux-hardened-5.4.125-hardened1.patch" } } From f6984fbe37d8a1dfc540aa05a3a95425bfc063f6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 10 Jun 2021 22:27:57 +0200 Subject: [PATCH 642/797] svtplay-dl: 3.7 -> 3.9.1 --- pkgs/tools/misc/svtplay-dl/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 1d78759761d..ac8bd2c91c1 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -4,22 +4,23 @@ let inherit (python3Packages) - python nose cryptography pyyaml requests mock python-dateutil setuptools; + python pytest nose cryptography pyyaml requests mock python-dateutil setuptools; in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "3.7"; + version = "3.9.1"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0krskxbmlglkipqzjwgm2nmq118m8l0djgh0f8l6n2w3bjblhyfx"; + sha256 = "0b207l3dnkpixjhxzis77cfhwd5mjiwrmj8cngxpx2wl1i83xw54"; }; pythonPaths = [ cryptography pyyaml requests ]; - buildInputs = [ python perl nose mock python-dateutil setuptools ] ++ pythonPaths; + buildInputs = [ python perl mock python-dateutil setuptools ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip makeWrapper ]; + checkInputs = [ nose pytest ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ From 93e321b96b4d3afb6c255f7c4b0378831788357e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Jun 2021 23:15:29 +0200 Subject: [PATCH 643/797] python3Packages.yangson: 1.4.8 -> 1.4.9 --- pkgs/development/python-modules/yangson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 44ac6cf9fe1..1b63a94cb27 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.8"; + version = "1.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "11w4aq0w2rnkz1axgmw003z2snd4kc49dil6kp1ajlqnfh1pcx8m"; + sha256 = "1qb8zssyj504yrj1jnkrzv65xlfv5bl14knan76pjzbpl0xpaq6z"; }; nativeBuildInputs = [ From 0dd2289d32272fc5e5daaf6eae4a1b2e72d4671f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Jun 2021 23:18:47 +0200 Subject: [PATCH 644/797] python3Packages.mocket: 3.9.41 -> 3.9.42 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index b05260930f1..73a3b07a64c 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.41"; + version = "3.9.42"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "19zxqh0xk08gj0jf6im9vh53z22yf17ywzykk0fjs9g7m29x8i5j"; + sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; }; propagatedBuildInputs = [ From cdcc058b27a897dddb40a425ef0bba4395bb5382 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Jun 2021 21:46:51 +0000 Subject: [PATCH 645/797] rsync: use availableOn to determine acl support We don't want to be adding every non-Linux platform to this list one at a time. --- pkgs/applications/networking/sync/rsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index a38352a328a..54417e6ef4b 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, libiconv, zlib, popt -, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null +, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null , enableLZ4 ? true, lz4 ? null , enableOpenSSL ? true, openssl ? null , enableXXHash ? true, xxHash ? null From d930bfd5fad757b96412c530b860ec9d22e1095b Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 8 Jun 2021 22:08:57 -0300 Subject: [PATCH 646/797] ocamlPackages.cudf: init 0.9 --- .../ocaml-modules/cudf/default.nix | 52 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cudf/default.nix diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix new file mode 100644 index 00000000000..5bd768e6451 --- /dev/null +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -0,0 +1,52 @@ +{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, ocaml_extlib, glib, perl, pkg-config, stdlib-shims, ounit }: + +stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-cudf"; + version = "0.9"; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; + sha256 = "sha256-mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw="; + }; + + buildFlags = [ + "all" + "opt" + ]; + nativeBuildInputs = [ + findlib + ocaml + ocamlbuild + pkg-config + ]; + buildInputs = [ + glib + perl + stdlib-shims + ]; + propagatedBuildInputs = [ + ocaml_extlib + ]; + + checkTarget = [ + "all" + "test" + ]; + checkInputs = [ + ounit + ]; + doCheck = true; + + preInstall = "mkdir -p $OCAMLFIND_DESTDIR"; + installFlags = "BINDIR=$(out)/bin"; + + # passthru.tests = { inherit dose3; }; # To-Do: To be enabled when Dose3 PR is accepted. + + meta = with lib; { + description = "A library for CUDF format"; + homepage = "http://www.mancoosi.org/cudf/"; + downloadPage = "https://gforge.inria.fr/projects/cudf/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4feaf9f6f74..8314014e937 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -233,6 +233,8 @@ let csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { }; + cudf = callPackage ../development/ocaml-modules/cudf { }; + curly = callPackage ../development/ocaml-modules/curly { inherit (pkgs) curl; }; From 17721bc55d4c1b77dd3cb7c30b66a85f39007e4c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 10 Jun 2021 19:09:16 -0300 Subject: [PATCH 647/797] babashka: 0.4.3 -> 0.4.5 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index e52d6c20b97..58ed4c689b1 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.4.3"; + version = "0.4.5"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-teZKAwSv9wliVFKdT76yQjMC5g7SGPAqcq/jZ07sYjQ="; + sha256 = "sha256-SnKs30c6VTp1yzW2Glooi6ghSUIZgF6nsob1hDljTA8="; }; dontUnpack = true; From dfe732d3c1cd5b92ef634d9d5878554f300af74e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 11 Jun 2021 00:39:37 +0200 Subject: [PATCH 648/797] nomad_1_0: 1.0.6 -> 1.0.7 --- pkgs/applications/networking/cluster/nomad/1.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 9e7341e55bf..0c9ced385fe 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.6"; - sha256 = "1nzaw4014bndxv042dkxdj492b21r5v5f06vav2kr1azk4m9sf07"; + version = "1.0.7"; + sha256 = "12izilr2x9qw8dxhjqcivakwzhf6jc86g0pmxf52fr9rwaqmpc95"; } From cca2cdbb23ff94723a639f6b0feb2e2fdf83af7e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 11 Jun 2021 00:39:53 +0200 Subject: [PATCH 649/797] nomad_1_1: 1.1.0 -> 1.1.1 --- pkgs/applications/networking/cluster/nomad/1.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index 9e2966856eb..7c14ca5f4b3 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.1.0"; - sha256 = "0sz6blyxyxi5iq170s9v4nndb1hpz603z5ps2cxkdkaafal39767"; + version = "1.1.1"; + sha256 = "0y7p85dvxfgzaafgzdmnw3fp9h87zx3z8m1ka4qaiacwah5xwqlv"; } From 188a11521b5c537626e88be5488a5cf8e8884b82 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 23:04:28 +0000 Subject: [PATCH 650/797] electron_13: 13.1.0 -> 13.1.2 https://github.com/electron/electron/releases/tag/v13.1.1 https://github.com/electron/electron/releases/tag/v13.1.2 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 0b2cdbe9c04..5da08d2da1a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6"; }; - electron_13 = mkElectron "13.1.0" { - x86_64-linux = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4"; - x86_64-darwin = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de"; - i686-linux = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355"; - armv7l-linux = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a"; - aarch64-linux = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb"; - aarch64-darwin = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea"; - headers = "1h4saavsy97kmbfaw6xcya5l0iybr37vyw7bv539c7a064kam07b"; + electron_13 = mkElectron "13.1.2" { + x86_64-linux = "1391bae19ff6446fb56f00ba5597bb92a509b6e808534087c153b9fcebddbeef"; + x86_64-darwin = "b8c5eca90864ce4a91e1fdb8a932598fad31922407b502eeb868a508fd26347f"; + i686-linux = "40d6c373b5e77b80285715fb66acb6562ea1d685f6644d463fb427f846f09fdc"; + armv7l-linux = "ce31a8d455663f6e85ed75fa9ac1007b55d6fd0b9445d9e51e2a103706e49e94"; + aarch64-linux = "06965ade2aaf4dce78b5d5b075fc09c225d7d83817297338fc26eb4d33ebb289"; + aarch64-darwin = "dde2b3fd2ac52097481ff5bfd54c358432f7f2402b0b20ae32681ae6e5a4d451"; + headers = "1qrw1cpj63757c582zzz0gchaq0w0xq1mm5702q34xyv06mh5h93"; }; } From fc8db5e7c23f6e9e2e13619d2ba3aaf51cd33cf3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 23:05:14 +0000 Subject: [PATCH 651/797] electron_12: 12.0.10 -> 12.0.11 https://github.com/electron/electron/releases/tag/v12.0.11 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 5da08d2da1a..ab137b72f23 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry"; }; - electron_12 = mkElectron "12.0.10" { - x86_64-linux = "b5383b5818062de42536a7966df875ae781433a7ee991da34643bc6fda4ad038"; - x86_64-darwin = "3d4111280bf50dbfb141b46551974b0e4e39eb0d1f8ef789d71f7d3295a8e24f"; - i686-linux = "6fd10db8d896ef82ac8f2a1d796942dc56f5b41e504c86121d83eababa0cccb8"; - armv7l-linux = "5820ac7e70488507417122aaa0381439f929da1819c2c710ba74569a609cc972"; - aarch64-linux = "022ff009969d9f270704e918fe2dda6cd395c3e9d9e9515e99eca628d996a503"; - aarch64-darwin = "d2af4870a79866621469043e44a2a0e995abc5530d4aaf1add567b00eb286b01"; - headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6"; + electron_12 = mkElectron "12.0.11" { + x86_64-linux = "e3bac4b81f0d99447f8ff7edf88f2e9941699d30cf1f41a41af7a93b199e805b"; + x86_64-darwin = "eeee59eb751e0d95538a40c74aa1563ee4485903eb028c462872004cc8dfdabb"; + i686-linux = "97fe1b7f7414a9cf1416d4a2d61139cc71f50765f48df02b6ccb4c1af62f0d97"; + armv7l-linux = "c43b28d5d15b303a7643e7d2320f03577e27d90a13f4fa1dc3e14f81630ab62e"; + aarch64-linux = "b5f17959b8cb55f0557f4a0a37cd99c1c6d1d48fad839402383d9087175b4f44"; + aarch64-darwin = "e5f88751bfb1344ea2f1345b56e95093ebfa850761b53752fbcf8c6d8de0f824"; + headers = "11801qplb7s7zs0yjmk4436yp3xg2szn7hzag75v3g026k2ay1xz"; }; electron_13 = mkElectron "13.1.2" { From c430731cc33acf80d74eed504748b9a608a46ed3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 23:06:01 +0000 Subject: [PATCH 652/797] electron_11: 11.4.7 -> 11.4.8 https://github.com/electron/electron/releases/tag/v11.4.8 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index ab137b72f23..8377e7c4431 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -95,14 +95,14 @@ rec { headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; - electron_11 = mkElectron "11.4.7" { - x86_64-linux = "05005d351a1b08a550a8186efba6f4fdd96842355a634934d9a9d7d31c2cd539"; - x86_64-darwin = "e6445ad3d7e851fc3227785788d0706d58c9c8ea3821afa7f871c6254c463043"; - i686-linux = "5473f36eb2a9772da7e4f1a162a724b4a5335e8f78fb51d585bac3bd50ff12fc"; - armv7l-linux = "0de0d74b1206f7ffd9e4c75754bbf6fdf27c83a0ce6b4cd8a6b5af81d7a20ba7"; - aarch64-linux = "f2261dde71197c358aff85d7a320cbd2315a5adf228218fd9a2f5c8561589323"; - aarch64-darwin = "a2abc83c21402e30f4f42f4615cccc4369884faa2f2fa576d71f423834988622"; - headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry"; + electron_11 = mkElectron "11.4.8" { + x86_64-linux = "742cfa025fa64cfa02c4eb8584e9f2f15321b795688a5c1a6597b1e1da1e98e7"; + x86_64-darwin = "b251b02f70a9a0e63866836c0638200cca05392cdec1b5271ebbe0c016276364"; + i686-linux = "a7813cfa785e8e9a440db4cfb0d98dcd5ba52041fb018856d9c544a43ae55357"; + armv7l-linux = "a72e346a569f582fc40e9ebbfd6f6faf5c32dd6e83fdcd5335c46e332dbe5ee6"; + aarch64-linux = "acd4e32851cc0fdfe1a62df90a6c8b02139e510b7c3212bd4ac57f767e85dfe4"; + aarch64-darwin = "ee28b1d525ae5be60253430200692f3fe6b4d588921aedd246bfc851014127ea"; + headers = "0l8pc4grabj641wf1q37bc19w0y9913v4c9s8pbniz7py1a6rpmn"; }; electron_12 = mkElectron "12.0.11" { From 9f396c9584ddb202b5b9c537c504ab4a6fa694a5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 10 Jun 2021 06:50:51 +0300 Subject: [PATCH 653/797] nixos/corectrl: init module --- nixos/modules/hardware/corectrl.nix | 62 +++++++++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 63 insertions(+) create mode 100644 nixos/modules/hardware/corectrl.nix diff --git a/nixos/modules/hardware/corectrl.nix b/nixos/modules/hardware/corectrl.nix new file mode 100644 index 00000000000..3185f6486c7 --- /dev/null +++ b/nixos/modules/hardware/corectrl.nix @@ -0,0 +1,62 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.corectrl; +in +{ + options.programs.corectrl = { + enable = mkEnableOption '' + A tool to overclock amd graphics cards and processors. + Add your user to the corectrl group to run corectrl without needing to enter your password + ''; + + gpuOverclock = { + enable = mkEnableOption '' + true + ''; + ppfeaturemask = mkOption { + type = types.str; + default = "0xfffd7fff"; + example = "0xffffffff"; + description = '' + Sets the `amdgpu.ppfeaturemask` kernel option. + In particular, it is used here to set the overdrive bit. + Default is `0xfffd7fff` as it is less likely to cause flicker issues. + Setting it to `0xffffffff` enables all features. + ''; + }; + }; + }; + + config = mkIf cfg.enable (lib.mkMerge [ + { + environment.systemPackages = [ pkgs.corectrl ]; + + services.dbus.packages = [ pkgs.corectrl ]; + + users.groups.corectrl = { }; + + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if ((action.id == "org.corectrl.helper.init" || + action.id == "org.corectrl.helperkiller.init") && + subject.local == true && + subject.active == true && + subject.isInGroup("corectrl")) { + return polkit.Result.YES; + } + }); + ''; + } + + (lib.mkIf cfg.gpuOverclock.enable { + # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169 + # The overdrive bit + boot.kernelParams = [ "amdgpu.ppfeaturemask=${cfg.gpuOverclock.ppfeaturemask}" ]; + }) + ]); + + meta.maintainers = with lib.maintainers; [ artturin ]; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 06f9a05cf66..b350bcfedae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -44,6 +44,7 @@ ./hardware/ckb-next.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/corectrl.nix ./hardware/digitalbitbox.nix ./hardware/device-tree.nix ./hardware/i2c.nix From e14843556cb4ed2286c6752a32abf85beec0e19c Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 8 Jun 2021 22:10:55 +0300 Subject: [PATCH 654/797] hunspellDicts: add Hebrew dictionary --- pkgs/development/libraries/hunspell/dictionaries.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index f1bcd4ad00c..f2c6165df84 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -784,4 +784,15 @@ in rec { maintainers = with maintainers; [ louisdk1 ]; }; }; + + /* HEBREW */ + + he_IL = he-il; + he-il = mkDictFromLibreOffice { + shortName = "he-il"; + dictFileName = "he_IL"; + shortDescription = "Hebrew (Israel)"; + readmeFile = "README_he_IL.txt"; + license = with lib.licenses; [ agpl3Plus ]; + }; } From 5f706ec7aeee069eef125b8dc3cc4adfd921d63e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Jun 2021 04:20:00 +0000 Subject: [PATCH 655/797] postgresqlPackages.pgvector: 0.1.5 -> 0.1.6 --- pkgs/servers/sql/postgresql/ext/pgvector.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 88f1b1ebad0..a3be7d50a01 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "0zrb9r9yh05nip2gwg96fhfk766hwqwa8plcvj2b4x4hhjk6q1ps"; + sha256 = "108qf5pvqhz4vh31sijikajf4hrrk7rknrqzwj999psr33acag4z"; }; buildInputs = [ postgresql ]; From beb3446a1b30319b1c3afe28087f86a97b0b4da4 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Tue, 8 Jun 2021 20:34:10 -0700 Subject: [PATCH 656/797] tqdm: Disable pandas on RISC-V --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index b941727189e..fe16fb6ddec 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -34,8 +34,8 @@ buildPythonPackage rec { rich tkinter ] ++ - # pandas is not supported on i686 - lib.optional (!stdenv.isi686) pandas; + # pandas is not supported on i686 or risc-v + lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; # Remove performance testing. # Too sensitive for on Hydra. From c4100d81bdbfb28f63f326204a4ee19133233a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 10 Jun 2021 06:49:33 +0200 Subject: [PATCH 657/797] x2goclient: unstable-2019-07-24 -> 4.1.2.2, fix #78907 Co-authored-by: Sandro --- .../networking/remote/x2goclient/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 4156c82f91b..d40d8032c29 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,20 +1,20 @@ -{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh +{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: -mkDerivation { +mkDerivation rec { pname = "x2goclient"; - version = "unstable-2019-07-24"; + version = "4.1.2.2"; - src = fetchgit { - url = "git://code.x2go.org/x2goclient.git"; - rev = "704c4ab92d20070dd160824c9b66a6d1c56dcc49"; - sha256 = "1pndp3lfzwifyxqq0gps3p1bwakw06clbk6n8viv020l4bsfmq5f"; + src = fetchurl { + url = "https://code.x2go.org/releases/source/${pname}/${pname}-${version}.tar.gz"; + sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So="; }; buildInputs = [ cups libssh libXpm nx-libs openldap openssh qtbase qtsvg qtx11extras qttools phonon pkg-config ]; postPatch = '' + substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd" substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ @@ -33,6 +33,7 @@ mkDerivation { meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = "http://x2go.org/"; + maintainers = with maintainers; [ mkg20001 ]; license = licenses.gpl2; platforms = platforms.linux; }; From c7937f0a3de21705b5a0d5bd2442a02a9edbc7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 10 Jun 2021 06:50:09 +0200 Subject: [PATCH 658/797] x2goserver: add missing FileWhich dep (errors with new client) Co-authored-by: Sandro --- .../applications/networking/remote/x2goserver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix index 0b8e858d255..6d7923872ec 100644 --- a/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -8,8 +8,8 @@ let version = "4.1.0.3"; src = fetchurl { - url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz"; - sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"; + url = "https://code.x2go.org/releases/source/${pname}/${pname}-${version}.tar.gz"; + sha256 = "Z3aqo1T1pE40nws8F21JiMiKYYwu30bJijeuicBp3NA="; }; x2go-perl = perlPackages.buildPerlPackage rec { @@ -26,7 +26,7 @@ let }; perlEnv = perl.withPackages (p: with p; [ - x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch + x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch FileWhich ]); binaryDeps = [ @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "http://x2go.org/"; platforms = lib.platforms.linux; license = licenses.gpl2; - maintainers = [ maintainers.averelld ]; + maintainers = with maintainers; [ averelld mkg20001 ]; }; } From 03071fd5e3426df007b524fba97d29a788ef4757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 10 Jun 2021 06:50:29 +0200 Subject: [PATCH 659/797] nixos/xrdp: add openFirewall option --- nixos/modules/services/networking/xrdp.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index b7dd1c5d99d..9be7c3233e2 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -61,6 +61,12 @@ in ''; }; + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified RDP port."; + }; + sslKey = mkOption { type = types.str; default = "/etc/xrdp/key.pem"; @@ -99,6 +105,8 @@ in config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + # xrdp can run X11 program even if "services.xserver.enable = false" xdg = { autostart.enable = true; From 6dbeea0b40c4f82e827c09c78c9e4970080c1692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 10 Jun 2021 07:00:05 +0200 Subject: [PATCH 660/797] nixos/x2goserver: put into networking, like xrdp --- nixos/modules/module-list.nix | 2 +- .../networking}/x2goserver.nix | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) rename nixos/modules/{programs => services/networking}/x2goserver.nix (92%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b350bcfedae..2938f79fb16 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -198,7 +198,6 @@ ./programs/waybar.nix ./programs/wireshark.nix ./programs/wshowkeys.nix - ./programs/x2goserver.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/xss-lock.nix @@ -854,6 +853,7 @@ ./services/networking/xandikos.nix ./services/networking/xinetd.nix ./services/networking/xl2tpd.nix + ./services/networking/x2goserver.nix ./services/networking/xrdp.nix ./services/networking/yggdrasil.nix ./services/networking/zerobin.nix diff --git a/nixos/modules/programs/x2goserver.nix b/nixos/modules/services/networking/x2goserver.nix similarity index 92% rename from nixos/modules/programs/x2goserver.nix rename to nixos/modules/services/networking/x2goserver.nix index 05707a56542..6d6151f0f4b 100644 --- a/nixos/modules/programs/x2goserver.nix +++ b/nixos/modules/services/networking/x2goserver.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.programs.x2goserver; + cfg = config.services.x2goserver; defaults = { superenicer = { enable = cfg.superenicer.enable; }; @@ -17,7 +17,11 @@ let ''; in { - options.programs.x2goserver = { + imports = [ + (mkAliasOptionModule [ "programs" "x2goserver" "enable" ] [ "services" "x2goserver" "enable" ]) + ]; + + options.services.x2goserver = { enable = mkEnableOption "x2goserver" // { description = '' Enables the x2goserver module. @@ -63,6 +67,14 @@ in { config = mkIf cfg.enable { + # x2goserver can run X11 program even if "services.xserver.enable = false" + xdg = { + autostart.enable = true; + menus.enable = true; + mime.enable = true; + icons.enable = true; + }; + environment.systemPackages = [ pkgs.x2goserver ]; users.groups.x2go = {}; From b9763370a940d7ed37b12f57e43716eba0a2ad19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 10 Jun 2021 07:01:21 +0200 Subject: [PATCH 661/797] release-notes: mention x2goserver rename --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 8 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 070e7b14293..781734a189a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -226,6 +226,12 @@ + + + programs.x2goserver is now + services.x2goserver + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index c1fde5a032b..3a29b29f106 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -64,4 +64,6 @@ In addition to numerous new and upgraded packages, this release has the followin - ExcelDnaRegistration - MathNetNumerics +* `programs.x2goserver` is now `services.x2goserver` + ## Other Notable Changes From 9afd1530d735f58b169e6aaa690b9056817377cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 11 Jun 2021 08:56:51 +0200 Subject: [PATCH 662/797] radare2: 5.3.0 -> 5.3.1 --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index f51f0f9368d..a8e7c10ce44 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "radare2"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-xndnRVlqTB/NH1ROo7xkftLP7DufsJu4CCA9MCOEeng="; + sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE="; }; postInstall = '' From 3737a26a1812f215d6ba05d6728e31f34184dda3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 11 Jun 2021 06:58:53 +0000 Subject: [PATCH 663/797] trezor-suite: 21.5.1 -> 21.6.1 https://github.com/trezor/trezor-suite/releases/tag/v21.6.1 --- pkgs/applications/blockchains/trezor-suite/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 585f01290bb..bd9e26ae73a 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.5.1"; + version = "21.6.1"; name = "${pname}-${version}"; suffix = { @@ -20,8 +20,8 @@ let url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml sha512 = { - aarch64-linux = "sha512-nqwfonWySc+wBSJjC8BW9vm+v5zHbKqbbrTTRmoZdEYBJg2SthMtTULNLVpXaX9NHxr6guZnOWdBlzVk2dQkfQ=="; - x86_64-linux = "sha512-tfvdNXsjMe8YXJwTuujz4tKTdfsCuR/9VECF8EkcRP95YM7vuDV8dumru1jKtdiv0gaS1GT3SPEeAfmczY5jGg=="; + aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA=="; + x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -57,6 +57,7 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "Trezor Suite - Desktop App for managing crypto"; homepage = "https://suite.trezor.io"; + changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}"; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; From 3f062397a5998a838fe61347b394bc199dffe96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 11 Jun 2021 09:07:23 +0200 Subject: [PATCH 664/797] x2goserver: fix rename whole module --- nixos/modules/services/networking/x2goserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/x2goserver.nix b/nixos/modules/services/networking/x2goserver.nix index 6d6151f0f4b..48020fc1cec 100644 --- a/nixos/modules/services/networking/x2goserver.nix +++ b/nixos/modules/services/networking/x2goserver.nix @@ -18,7 +18,7 @@ let in { imports = [ - (mkAliasOptionModule [ "programs" "x2goserver" "enable" ] [ "services" "x2goserver" "enable" ]) + (mkRenamedOptionModule [ "programs" "x2goserver" ] [ "services" "x2goserver" ]) ]; options.services.x2goserver = { From e819542fd4ab962683f937a3e25ff1a3ebbf845e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 11 Jun 2021 09:20:23 +0200 Subject: [PATCH 665/797] rainloop: 1.14.0 -> 1.16.0 --- pkgs/servers/rainloop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index f86254e93b1..bc1f0905c6b 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -2,7 +2,7 @@ common = { edition, sha256 }: stdenv.mkDerivation (rec { pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; - version = "1.14.0"; + version = "1.16.0"; nativeBuildInputs = [ unzip ]; @@ -50,10 +50,10 @@ in { rainloop-community = common { edition = "community"; - sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; + sha256 = "sha256-25ScQ2OwSKAuqg8GomqDhpebhzQZjCk57h6MxUNiymc="; }; rainloop-standard = common { edition = ""; - sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; + sha256 = "sha256-aYCwqFqhJEeakn4R0MUDGcSp+M47JbbCrbYaML8aeSs="; }; } From 337eedb0667e35a30ce55e1826f37651f522d422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Jun 2021 10:46:17 +0200 Subject: [PATCH 666/797] act: 0.2.22 -> 0.2.23 --- pkgs/development/tools/misc/act/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 8c01aea284e..38520b4b3e5 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a+yw7QSLNX3hO2GnFCifYMbPWYwtleUZS1AqPsxw9t8="; + sha256 = "sha256-PBhlBWycAYuczfP0D+Gf1pDvrfI9gz3JyGe5FBq782Y="; }; - vendorSha256 = "sha256-6jD+gY/TmO/Ot507IlTLNdWv7G4BHYlk/E9rVoRD65A="; + vendorSha256 = "sha256-dLIsVWN/PjcH0CUYRmn4YaF8Pczf/gaWhD3lulqGiuA="; doCheck = false; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 ]; }; } From fc5b141004c16c3e8089d7f59cb2aab8a8b31399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Jun 2021 10:58:34 +0200 Subject: [PATCH 667/797] ctop: 0.7.5 -> 0.7.6 --- pkgs/tools/system/ctop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 2b538d66322..45cbca172fa 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctop"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "bcicen"; repo = pname; - rev = "v${version}"; - sha256 = "0mm1gapnz67mwc346jr530xwpiajq1b2f295s8gz5nrb2a23mqln"; + rev = version; + sha256 = "sha256-ceRyYrqmgdTnV8m9LkLlR6iTrC5F81X/V3fWI2CiKBw="; }; - vendorSha256 = "0a5rwnf251jbp7jz2ln8z9hqp0112c6kx0y09nncvlcki35qq9sh"; + vendorSha256 = "sha256-UCeMy4iT0c2sTcCDPg0TIYCLYfrIUvHluUuGIpzluSg="; doCheck = false; @@ -21,6 +21,6 @@ buildGoModule rec { description = "Top-like interface for container metrics"; homepage = "https://ctop.sh/"; license = licenses.mit; - maintainers = with maintainers; [ apeyroux marsam ]; + maintainers = with maintainers; [ apeyroux marsam SuperSandro2000 ]; }; } From b2a8e40881f7b37fca1a5945bd85627d94737e7c Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Fri, 11 Jun 2021 01:58:55 -0700 Subject: [PATCH 668/797] github-to-sqlite: init at 2.8.2 (#126563) Co-authored-by: Sandro --- .../github-to-sqlite/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/github-to-sqlite/default.nix diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix new file mode 100644 index 00000000000..7853854ccd8 --- /dev/null +++ b/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +, pyyaml +, requests +, requests-mock +, sqlite-utils +}: + +buildPythonPackage rec { + pname = "github-to-sqlite"; + version = "2.8.2"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "dogsheep"; + repo = pname; + rev = version; + sha256 = "16mw429ppnhgsa98qs3fhprqvdpqbr5q1biq3ql8rsf38difdbl8"; + }; + + propagatedBuildInputs = [ + sqlite-utils + pyyaml + requests + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + disabledTests = [ + "test_scrape_dependents" + ]; + + meta = with lib; { + description = "Save data from GitHub to a SQLite database"; + homepage = "https://github.com/dogsheep/github-to-sqlite"; + license = licenses.asl20; + maintainers = with maintainers; [ sarcasticadmin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eef7577800..ef91641dd58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1529,6 +1529,8 @@ in github-commenter = callPackage ../development/tools/github-commenter { }; + github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; + gitless = callPackage ../applications/version-management/gitless { python = python3; }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49d91c177a6..a6acf4896e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2797,8 +2797,9 @@ in { github3_py = callPackage ../development/python-modules/github3_py { }; - github-webhook = callPackage ../development/python-modules/github-webhook { }; + github-to-sqlite = callPackage ../development/python-modules/github-to-sqlite { }; + github-webhook = callPackage ../development/python-modules/github-webhook { }; GitPython = callPackage ../development/python-modules/GitPython { }; git-revise = callPackage ../development/python-modules/git-revise { }; From 7b436f3378efa3c58162c63c5b165733f9414e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 11 Jun 2021 06:02:38 -0300 Subject: [PATCH 669/797] libsForQt5.qtstyleplugin-kvantum: 0.11.2 -> 0.20.0 (#126476) --- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index c2fa32b6d05..80998e6ef19 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.11.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; + sha256 = "133m5ifs8ylhdh78m99n0y76q0nix68xsqfwcsrak4yr1n5pj9qp"; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl3; platforms = platforms.linux; + broken = lib.versionOlder qtbase.version "5.14"; maintainers = [ maintainers.bugworm ]; }; } From 15807923f9a9f4dd29f29f37b454a07220bdc922 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 10 Jun 2021 11:17:11 -0300 Subject: [PATCH 670/797] build-support.ocaml.dune: handle minimalOCamlVersion typo --- pkgs/build-support/ocaml/dune.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 56fe8a60484..c049878d013 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -4,8 +4,8 @@ let Dune = if args.useDune2 or false then dune_2 else dune_1; in -if args ? minimumOCamlVersion && - ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion +if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) || + (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion) then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else @@ -29,7 +29,7 @@ stdenv.mkDerivation ({ runHook postInstall ''; -} // args // { +} // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; From df6d55ce69b3a5866e2d8c7767d489edee2d7713 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 11 Jun 2021 11:34:42 +0200 Subject: [PATCH 671/797] grafana: 8.0.0 -> 8.0.1 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.1 Also correctly set the version in the UI by declaring `-X main.version`. --- pkgs/servers/monitoring/grafana/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c2d18ae2396..1043b70b584 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.0"; + version = "8.0.1"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-HtubiSx4Orf9knZcuYy4eF2qwclX/JVd2Ba9L33tM74="; + sha256 = "sha256-Vs/4urH/XuoVly26YfhFbf/T3x5jdS4BgrVStuTHaHo="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-bwBpkPy4kwfnkRsLOktUgQx+Sm8WJA2d65efMBCnGp4="; + sha256 = "sha256-b05nUApLjdQW5vbS56HUK+/GXKcHo2UAHybfe6ZTr3U="; }; - vendorSha256 = "sha256-Hon5WrhXUvZUtMRxx3XcBDQe3rkRkfqbnXjY3xCzuuM="; + vendorSha256 = "sha256-iwB1JtekxFYSHjaV+TqBDqnyE5zt3RJ4dQmf12AA53U="; preBuild = '' # The testcase makes an API call against grafana.com: @@ -38,6 +38,10 @@ buildGoModule rec { rm -r scripts/go ''; + buildFlagsArray = '' + -ldflags=-s -w -X main.version=${version} + ''; + postInstall = '' tar -xvf $srcStatic mkdir -p $out/share/grafana From ac803ebef31f1f3d0373d8b3912a248647854a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Jun 2021 11:36:47 +0200 Subject: [PATCH 672/797] kdeltachat: unstable-2021-05-31 -> unstable-2021-06-06 --- .../networking/instant-messengers/kdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index dfd4f266f81..87ffa16736e 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-05-31"; + version = "unstable-2021-06-06"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "318ae67c17f3e64532bad23c2a61a93446db553d"; - sha256 = "1qy0hlp0r91sqn26ai9isxw4rl8kcmmb10a2p9yqynhm8py3dfn4"; + rev = "321c19b7415e837acc4e66d535e82518618bc096"; + sha256 = "19py9mxpjz09fhyyvxf75s77nq0jwwfiljq9289192p61grk6625"; }; nativeBuildInputs = [ From 453c4bd42139ca6e4986f075fcab8fc67102d264 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 00:46:13 +0200 Subject: [PATCH 673/797] python3Packages.roonapi: rename from pyroon --- .../python-modules/{pyroon => roonapi}/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{pyroon => roonapi}/default.nix (96%) diff --git a/pkgs/development/python-modules/pyroon/default.nix b/pkgs/development/python-modules/roonapi/default.nix similarity index 96% rename from pkgs/development/python-modules/pyroon/default.nix rename to pkgs/development/python-modules/roonapi/default.nix index c27c70be589..dc31ea4a038 100644 --- a/pkgs/development/python-modules/pyroon/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { - pname = "pyroon"; + pname = "roonapi"; version = "0.0.37"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pavoni"; - repo = pname; + repo = "pyroon"; rev = version; sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6acf4896e9..c59c142713a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6257,8 +6257,6 @@ in { pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; - pyroon = callPackage ../development/python-modules/pyroon { }; - pyroute2 = callPackage ../development/python-modules/pyroute2 { }; pyroute2-core = callPackage ../development/python-modules/pyroute2-core { }; @@ -7391,6 +7389,8 @@ in { roombapy = callPackage ../development/python-modules/roombapy { }; + roonapi = callPackage ../development/python-modules/roonapi { }; + ronin = callPackage ../development/python-modules/ronin { }; rope = callPackage ../development/python-modules/rope { }; From b86e821a3aaf9e76a99b1d0a5b41bbdf338d5bf5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 00:55:16 +0200 Subject: [PATCH 674/797] home-assistant: ignore aliases in parse-requirements.py Fixes duplicate packages found when there is also an alias. We already account for PEP518 normalization ourselves. Traceback (most recent call last): File "./parse-requirements.py", line 226, in main() File "./parse-requirements.py", line 174, in main attr_path = name_to_attr_path(name, packages) File "./parse-requirements.py", line 142, in name_to_attr_path assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format( AssertionError: google-api-python-client matches more than one derivation: {'python3Packages.google_api_python_client', 'python3Packages.google-api-python-client'} --- .../home-assistant/component-packages.nix | 48 ++++++++++--------- .../home-assistant/parse-requirements.py | 1 + 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 98e0781186b..e344e95110c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.5.5"; + version = "2021.6.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -40,7 +40,7 @@ "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv pyroute2 zeroconf ]; + "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr netdisco pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib "aqualogic" = ps: with ps; [ aqualogic ]; @@ -96,6 +96,7 @@ "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bond" = ps: with ps; [ ]; # missing inputs: bond-api + "bosch_shc" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; # missing inputs: boschshcpy "braviatv" = ps: with ps; [ bravia-tv ]; "broadlink" = ps: with ps; [ broadlink ]; "brother" = ps: with ps; [ brother ]; @@ -110,7 +111,7 @@ "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; "canary" = ps: with ps; [ ha-ffmpeg py-canary ]; - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pyroute2 zeroconf ]; + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -156,7 +157,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow pyroute2 scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa ifaddr netdisco pillow scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -167,7 +168,7 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; - "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api pyroute2 zeroconf ]; + "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api ifaddr zeroconf ]; "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; "dht" = ps: with ps; [ ]; # missing inputs: adafruit-circuitpython-dht @@ -177,7 +178,7 @@ "directv" = ps: with ps; [ ]; # missing inputs: directv "discogs" = ps: with ps; [ discogs_client ]; "discord" = ps: with ps; [ discordpy ]; - "discovery" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; + "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 @@ -197,7 +198,7 @@ "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors libpurecool pyroute2 zeroconf ]; + "dyson" = ps: with ps; [ aiohttp-cors ifaddr libpurecool zeroconf ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -234,7 +235,7 @@ "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors pyroute2 zeroconf ]; + "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors ifaddr zeroconf ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside @@ -256,7 +257,7 @@ "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "filter" = ps: with ps; [ sqlalchemy ]; "fints" = ps: with ps; [ fints ]; "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota "firmata" = ps: with ps; [ pymata-express ]; @@ -264,7 +265,7 @@ "fixer" = ps: with ps; [ fixerio ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit - "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant + "flic" = ps: with ps; [ ]; # missing inputs: pyflic "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; @@ -282,7 +283,7 @@ "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms "freebox" = ps: with ps; [ freebox-api ]; "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection xmltodict ]; + "fritz" = ps: with ps; [ fritzconnection ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; @@ -291,11 +292,12 @@ "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; - "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect + "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; + "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect_aio "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs "generic" = ps: with ps; [ ]; - "generic_thermostat" = ps: with ps; [ ]; + "generic_thermostat" = ps: with ps; [ sqlalchemy ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client "geo_json_events" = ps: with ps; [ geojson-client ]; "geo_location" = ps: with ps; [ ]; @@ -311,7 +313,7 @@ "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero - "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api + "gogogate2" = ps: with ps; [ ]; # missing inputs: ismartgate "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -348,15 +350,15 @@ "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "history_stats" = ps: with ps; [ sqlalchemy ]; "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ]; "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ]; "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg pyroute2 zeroconf ]; - "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors pyroute2 zeroconf ]; + "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg ifaddr zeroconf ]; + "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks @@ -400,7 +402,7 @@ "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; - "ios" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ]; + "ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma @@ -430,6 +432,7 @@ "kodi" = ps: with ps; [ pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore + "kraken" = ps: with ps; [ ]; # missing inputs: krakenex pykrakenapi "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; @@ -438,12 +441,11 @@ "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches "lcn" = ps: with ps; [ pypck ]; - "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant + "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal "life360" = ps: with ps; [ ]; # missing inputs: life360 "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; - "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights "light" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave "limitlessled" = ps: with ps; [ limitlessled ]; @@ -498,6 +500,7 @@ "met_eireann" = ps: with ps; [ pymeteireann ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi + "meteoclimatic" = ps: with ps; [ ]; # missing inputs: pymeteoclimatic "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor @@ -540,8 +543,8 @@ "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns - "n26" = ps: with ps; [ ]; # missing inputs: n26 "nad" = ps: with ps; [ nad-receiver ]; + "nam" = ps: with ps; [ ]; # missing inputs: nettigo-air-monitor "namecheapdns" = ps: with ps; [ defusedxml ]; "nanoleaf" = ps: with ps; [ pynanoleaf ]; "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; @@ -554,6 +557,7 @@ "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio + "network" = ps: with ps; [ aiohttp-cors ifaddr ]; "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio "nexia" = ps: with ps; [ nexia ]; "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext @@ -583,7 +587,7 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ pyobihai ]; - "octoprint" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; + "octoprint" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index b6ff5662f9e..6629005b07d 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -104,6 +104,7 @@ def dump_packages() -> Dict[str, Dict[str, str]]: "-qa", "-A", PKG_SET, + "--arg", "config", "{ allowAliases = false; }", "--json", ] ) From 2f76491b28bcbb72dd6cdfbd0e2644c483942120 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 May 2021 08:52:53 +0200 Subject: [PATCH 675/797] python3Packages.simplisafe-python: 9.6.10 -> 10.0.0 --- .../python-modules/simplisafe-python/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 9592d37fed0..3e2a90b496b 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -6,45 +6,37 @@ , fetchFromGitHub , poetry-core , pytest-asyncio -, pytest-cov , pytestCheckHook -, python-engineio -, python-socketio , pythonOlder , pytz , voluptuous -, websockets }: buildPythonPackage rec { pname = "simplisafe-python"; - version = "9.6.10"; + version = "10.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0cc5kxxishxhkg1nqmgbh36yxs8yjfynmimzjnaqkqfrs9iq46mr"; + sha256 = "sha256-VF8R+dty54GuWvYs/OqWhfGtOVieuxtfndQUxHhu5lc="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - python-engineio - python-socketio pytz voluptuous - websockets ]; checkInputs = [ aresponses asynctest pytest-asyncio - pytest-cov pytestCheckHook ]; @@ -52,6 +44,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "simplipy" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python library the SimpliSafe API"; homepage = "https://simplisafe-python.readthedocs.io/"; From 0bfdf9aa0e3f02b6078ea5ec15f71dd5ff54db9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 11:58:12 +0200 Subject: [PATCH 676/797] python3Packages.nexia: 0.9.6 -> 0.9.7 --- pkgs/development/python-modules/nexia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index dbd1c798a3f..14b888428aa 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.6"; + version = "0.9.7"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "1k8h1p2zqm8gghff03jh8q3zik7jw2l686cyyg36r3qrgz6zi19q"; + sha256 = "sha256-1oBrDr8QAUe6LLBliR/sNwDlLuisxOWPeI9sxuJtGxU="; }; propagatedBuildInputs = [ From c091f0e35e8e2ca582136dafb98d4cb4b441a916 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 10:37:35 +0200 Subject: [PATCH 677/797] python3Packages.zwave-js-server-python: 0.25.0 -> 0.26.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index f11ff6bece4..7b42905c75e 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.25.0"; + version = "0.26.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-frhmyla3neFVZILDy7HnKloMqNLRjm3gxS88xZdu29w="; + sha256 = "0rwd95y0kgbn3r9zcbqph053cjfipii3yg2sbpg9mr4hq5xynh9z"; }; propagatedBuildInputs = [ From 7c3ecb286f84e18a798a34a4a273b57dcbf9df97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 11:19:35 +0200 Subject: [PATCH 678/797] python3Packages.venstarcolortouch: 0.13 -> 0.14 --- pkgs/development/python-modules/venstarcolortouch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index 713059ad908..85634d16849 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.13"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "04y9gmxb0vsmc5c930x9ziis5v83b29kfzsgjlww3pssj69lmw1s"; + sha256 = "sha256-wrsu1SffD4/RvDiE6yABfZN/oSDH8Ao/RJK7yL2QKy8="; }; propagatedBuildInputs = [ From 903a45791a8d7b45b57062377bea86f9cf4f31d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 11:25:31 +0200 Subject: [PATCH 679/797] home-assistant: enable venstar tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f0c00550381..33c6cf51839 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -610,6 +610,7 @@ in with py.pkgs; buildPythonApplication rec { "uvc" "vacuum" "velbus" + "venstar" "vera" "verisure" "version" From 5a819352ad668f08fc06b8aa558c5878fa1ec78c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 May 2021 09:13:44 +0200 Subject: [PATCH 680/797] python3Packages.bravia-tv: 1.0.8 -> 1.0.11 --- .../python-modules/bravia-tv/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index 15f292953b6..849f7e0b0a7 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -1,20 +1,25 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy27, requests }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.8"; - disabled = isPy27; + version = "1.0.11"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "0djwy4z1y173q3mnbngp754yrwzmm6h3x0rshvrvd64b78x1bsmp"; + sha256 = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U="; }; propagatedBuildInputs = [ requests ]; - # package does not include tests + # Package does not include tests doCheck = false; pythonImportsCheck = [ "bravia_tv" ]; From 11531689279217163f89c6d50240e7b04599547b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 09:20:40 +0200 Subject: [PATCH 681/797] python3Packages.gios: init at 1.0.1 --- .../python-modules/gios/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/gios/default.nix diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix new file mode 100644 index 00000000000..71aae7b66ad --- /dev/null +++ b/pkgs/development/python-modules/gios/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "gios"; + version = "1.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "031z5j1j961pcw8s4ajj5z2xn2jxb2hyfn3x3bxbaagwl9a5qkvn"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov --cov-report term-missing " "" + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + disabledTests = [ + # Test requires network access + "test_invalid_station_id" + ]; + + pythonImportsCheck = [ "gios" ]; + + meta = with lib; { + description = "Python client for getting air quality data from GIOS"; + homepage = "https://github.com/bieniu/gios"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c59c142713a..bda7bf67185 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2786,6 +2786,8 @@ in { gin-config = callPackage ../development/python-modules/gin-config { }; + gios = callPackage ../development/python-modules/gios { }; + gipc = callPackage ../development/python-modules/gipc { }; git-annex-adapter = From 4ae94a79614f2ac0a07839833ffe852783c15d77 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 09:21:12 +0200 Subject: [PATCH 682/797] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e344e95110c..a7dcd9894b2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -305,7 +305,7 @@ "geofency" = ps: with ps; [ aiohttp-cors ]; "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano - "gios" = ps: with ps; [ ]; # missing inputs: gios + "gios" = ps: with ps; [ gios ]; "github" = ps: with ps; [ PyGithub ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy From d497487acae762382790e7be7b50b8fa877bede8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 09:21:51 +0200 Subject: [PATCH 683/797] home-assistant: enable gios tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 33c6cf51839..9bed35bddee 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -359,6 +359,7 @@ in with py.pkgs; buildPythonApplication rec { "geo_location" "geofency" "glances" + "gios" "google" "google_assistant" "google_domains" From 5f16f26d93eaae3dd9edad893284eab1432f7539 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:44:37 +0200 Subject: [PATCH 684/797] python3Packages.growattserver: init at 1.0.1 --- .../python-modules/growattserver/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/growattserver/default.nix diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix new file mode 100644 index 00000000000..64c6e7bf2b1 --- /dev/null +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "growattserver"; + version = "1.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "indykoning"; + repo = "PyPi_GrowattServer"; + rev = version; + sha256 = "1vgb92axlz1kkszmamjbsqgi74afnbr2mc1np3pmbn3bx5rmk1d9"; + }; + + propagatedBuildInputs = [ + requests + ]; + + postPatch = '' + # https://github.com/indykoning/PyPi_GrowattServer/issues/2 + substituteInPlace setup.py \ + --replace "tag = os.environ['LATEST_TAG']" "" \ + --replace "version=tag," 'version="${version}",' + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "growattServer" ]; + + meta = with lib; { + description = "Python package to retrieve information from Growatt units"; + homepage = "https://github.com/indykoning/PyPi_GrowattServer"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bda7bf67185..4f7eeaedfbf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3019,6 +3019,8 @@ in { gremlinpython = callPackage ../development/python-modules/gremlinpython { }; + growattserver = callPackage ../development/python-modules/growattserver { }; + grip = callPackage ../development/python-modules/grip { }; grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; From b2c343ef6fdb75c4c31af7e3e984a758a08eb26f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:46:06 +0200 Subject: [PATCH 685/797] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a7dcd9894b2..fac50abe82c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -331,7 +331,7 @@ "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality "group" = ps: with ps; [ ]; - "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer + "growatt_server" = ps: with ps; [ growattserver ]; "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player "gtfs" = ps: with ps; [ pygtfs ]; "guardian" = ps: with ps; [ aioguardian ]; From d94868a441b219ecfc7b53af71d85f31148b6c53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:46:24 +0200 Subject: [PATCH 686/797] home-assistant: enable growatt_server tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9bed35bddee..b6f3d9129f9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -370,6 +370,7 @@ in with py.pkgs; buildPythonApplication rec { "gpslogger" "graphite" "group" + "growatt_server" "guardian" "harmony" "hassio" From 438fadd2ea780669ac361778b25c2bc53b91ce09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 13:08:57 +0200 Subject: [PATCH 687/797] python3Packages.ismartgate: init at 4.0.1 --- .../python-modules/ismartgate/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/ismartgate/default.nix diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix new file mode 100644 index 00000000000..594764bae0f --- /dev/null +++ b/pkgs/development/python-modules/ismartgate/default.nix @@ -0,0 +1,60 @@ +{ lib +, asynctest +, buildPythonPackage +, click +, defusedxml +, dicttoxml +, fetchFromGitHub +, httpx +, pycryptodome +, pytest-asyncio +, pytest-raises +, pytestCheckHook +, pythonOlder +, respx +, typing-extensions +}: + +buildPythonPackage rec { + pname = "ismartgate"; + version = "4.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + sha256 = "1kxlcjnppsk8m93gfcpy3asig1frhp1k5rfqx3rszhkcxmni95m2"; + }; + + propagatedBuildInputs = [ + click + defusedxml + dicttoxml + httpx + pycryptodome + typing-extensions + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytest-raises + pytestCheckHook + respx + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner>=5.2",' "" + ''; + + pythonImportsCheck = [ "ismartgate" ]; + + meta = with lib; { + description = "Python module to work with the ismartgate and gogogate2 API"; + homepage = "https://github.com/bdraco/ismartgate"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f7eeaedfbf..6acd64cd19b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3480,6 +3480,8 @@ in { iso3166 = callPackage ../development/python-modules/iso3166 { }; + ismartgate = callPackage ../development/python-modules/ismartgate { }; + iso-639 = callPackage ../development/python-modules/iso-639 { }; iso8601 = callPackage ../development/python-modules/iso8601 { }; From 26eecaaf05235d392607af74aad78a0491e109fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 13:28:05 +0200 Subject: [PATCH 688/797] python3Packages.boschshcpy: init at 0.2.18 --- .../python-modules/boschshcpy/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/boschshcpy/default.nix diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix new file mode 100644 index 00000000000..0ac1cbc83c7 --- /dev/null +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, getmac +, pythonOlder +, requests +, zeroconf +}: + +buildPythonPackage rec { + pname = "boschshcpy"; + version = "0.2.18"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tschamm"; + repo = pname; + rev = version; + sha256 = "08bfg3g0hifjaa17d4zmws2ikbijdm0b98svgj8jdcl8v0nlqx69"; + }; + + propagatedBuildInputs = [ + cryptography + getmac + requests + zeroconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "boschshcpy" ]; + + meta = with lib; { + description = "Python module to work with the Bosch Smart Home Controller API"; + homepage = "https://github.com/tschamm/boschshcpy"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6acd64cd19b..fa02008c33b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1124,6 +1124,8 @@ in { enablePython = true; }); + boschshcpy = callPackage ../development/python-modules/boschshcpy { }; + boto3 = callPackage ../development/python-modules/boto3 { }; boto = callPackage ../development/python-modules/boto { }; From 8aff25d21de76fd3f8b1403e907c41df82eb32c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 08:51:33 +0200 Subject: [PATCH 689/797] python3Packages.aiohomekit: 0.2.62 -> 0.2.66 --- .../python-modules/aiohomekit/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 2d76d033231..731272d5bad 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , cryptography , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytestCheckHook , pythonAtLeast @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.2.62"; + version = "0.2.66"; format = "pyproject"; disabled = pythonAtLeast "3.9"; @@ -19,10 +19,12 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "sha256-01IzeR0iukPTkz8I7h93wZkgjz6flRAJN8unEX6d+cs="; + sha256 = "186cc2ybpg0xd09vf35v7qcfn70k8f5l9vpf15wkbvksm58v4s0v"; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ cryptography @@ -34,11 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - # Some test requires network access - disabledTests = [ - "test_remove_pairing" - "test_pair" - "test_add_and_remove_pairings" + disabledTestPaths = [ + # Tests require network access + "tests/test_ip_pairing.py" ]; pythonImportsCheck = [ "aiohomekit" ]; From 5113edee2343130ba96c101a9389e3bbde027c73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 12:23:40 +0200 Subject: [PATCH 690/797] python3Packages.hap-python: 3.4.1 -> 3.5.0 --- .../python-modules/{HAP-python => hap-python}/default.nix | 8 ++++---- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{HAP-python => hap-python}/default.nix (89%) diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix similarity index 89% rename from pkgs/development/python-modules/HAP-python/default.nix rename to pkgs/development/python-modules/hap-python/default.nix index 8380832abd6..946f0039a0a 100644 --- a/pkgs/development/python-modules/HAP-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,16 +16,16 @@ }: buildPythonPackage rec { - pname = "HAP-python"; - version = "3.4.1"; + pname = "hap-python"; + version = "3.5.0"; disabled = pythonOlder "3.5"; # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; - repo = pname; + repo = "HAP-python"; rev = "v${version}"; - sha256 = "sha256-tZ6Zwlx5J62Xqpxxmt8Phdd9ngtKYhP/p3uor1dRfK8="; + sha256 = "1vzlfx0gpidl0rzv4z94pziwm6rj4lrilly5pykgq984y708pcqf"; }; propagatedBuildInputs = [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f11a9dc3c0b..566176eb48c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + HAP-python = hap-python; # added 2021-06-01 MechanicalSoup = mechanicalsoup; # added 2021-06-01 setuptools_scm = setuptools-scm; # added 2021-06-03 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa02008c33b..f8743eeed35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3110,7 +3110,7 @@ in { handout = callPackage ../development/python-modules/handout { }; - HAP-python = callPackage ../development/python-modules/HAP-python { }; + hap-python = callPackage ../development/python-modules/hap-python { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; From bb9615fce46dccfc62776d0deb86a9a79a9023ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 11:11:51 +0200 Subject: [PATCH 691/797] python3Packages.aiohue: 2.3.1 -> 2.5.0 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 65baaec3719..7072e9249da 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.3.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm"; + sha256 = "sha256-4q5JvkUmEoOomcwblXhvB/5Qdr6aMR0lDb4t4bjDjw8="; }; propagatedBuildInputs = [ From 00b196112253c4da4eb45a39139b4784f4e2e294 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 May 2021 11:52:44 +0200 Subject: [PATCH 692/797] python3Packages.openhomedevice: 1.0.0 -> 2.0.1 --- pkgs/development/python-modules/openhomedevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index 625980b3b9d..57c0182abd7 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "openhomedevice"; - version = "1.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bazwilliams"; repo = pname; rev = version; - sha256 = "04qdlyzc8xsk7qxyn9l59pbwnlw49zknw0r5lqwx402va12g4ra0"; + sha256 = "sha256-BQgwXg15+xEGfPm0HJWpKXbNuCgc0VcAD5AuVSDXd8g="; }; propagatedBuildInputs = [ From eac2367067aca1438388a8cbdaa419edff3565ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 01:41:43 +0200 Subject: [PATCH 693/797] python3Packages.garages-amsterdam: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/garages-amsterdam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index eeb68b9bbbd..08a687d7060 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "garages-amsterdam"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; rev = version; - sha256 = "1lg66g0im6v0m294j82229n2b7bhs6kkrp0d9nh87k2rz7zgllil"; + sha256 = "1m0bc3bzb83apprk412s7k5r2g6p5br2hrak2a976lh9ifk1d8hj"; }; propagatedBuildInputs = [ From 552184431bcc3b93dccc64a44f35af9518c002ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 01:45:39 +0200 Subject: [PATCH 694/797] python3Packages.pyatmo: 4.2.3 -> 5.0.1 --- pkgs/development/python-modules/pyatmo/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index ea6e8522177..12449d4fa2b 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -2,24 +2,26 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, aiohttp , oauthlib , requests , requests_oauthlib , freezegun +, pytest-asyncio , pytestCheckHook , requests-mock }: buildPythonPackage rec { pname = "pyatmo"; - version = "4.2.3"; + version = "5.0.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "sha256-hbs+1x/pwv00dhm+1Yj1effddJZHDjs2K3oeBmdCY+k="; + sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh"; }; postPatch = '' @@ -29,6 +31,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + aiohttp oauthlib requests requests_oauthlib @@ -36,6 +39,7 @@ buildPythonPackage rec { checkInputs = [ freezegun + pytest-asyncio pytestCheckHook requests-mock ]; From 5684cd0c64cf2624408fdb3c7b4581061823036e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 01:53:15 +0200 Subject: [PATCH 695/797] python3Packages.pydroid-ipcam: unstable-2021-04-16 -> unstable-2021-06-01 --- pkgs/development/python-modules/pydroid-ipcam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydroid-ipcam/default.nix b/pkgs/development/python-modules/pydroid-ipcam/default.nix index ca171edde44..3d9b4188172 100644 --- a/pkgs/development/python-modules/pydroid-ipcam/default.nix +++ b/pkgs/development/python-modules/pydroid-ipcam/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pydroid-ipcam"; - version = "unstable-2021-04-16"; + version = "unstable-2021-06-01"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; - rev = "9f22682c6f9182aa5e42762f52223337b8b6909c"; - sha256 = "1lvppyzmwg0fp8zch11j51an4sb074yl9shzanakvjmbqpnif6s6"; + rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1"; + sha256 = "0w81pl5fya17hg5xgba2vgxnylfd8jc70il575wdz2pw6z6ihj3s"; }; propagatedBuildInputs = [ From dfa53e1aff5f1cbf427d76b7d628e9a4ce9d1010 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 01:57:14 +0200 Subject: [PATCH 696/797] python3Packages.python-smarttub: 0.0.24 -> 0.0.25 --- pkgs/development/python-modules/python-smarttub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 380b1738964..0d7a15aec91 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.24"; + version = "0.0.25"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XWZbfPNZ1cPsDwtJRuOwIPTHmNBMzFSYHDDcbBrXjtk="; + sha256 = "13yf75vmn15g2hrbiv78mws96qbk40p5pz7vc6ljyp41y2lc9wpm"; }; propagatedBuildInputs = [ From d370824442bfcd0f9192b67e774d7b3fc291bf7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 03:43:31 +0200 Subject: [PATCH 697/797] home-assistant: 2021.5.5 -> 2021.6.0 --- .../home-assistant/component-packages.nix | 31 +++++++------ pkgs/servers/home-assistant/default.nix | 44 +++++++++++++++++-- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fac50abe82c..488fed80fd5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -96,7 +96,7 @@ "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bond" = ps: with ps; [ ]; # missing inputs: bond-api - "bosch_shc" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; # missing inputs: boschshcpy + "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ]; "braviatv" = ps: with ps; [ bravia-tv ]; "broadlink" = ps: with ps; [ broadlink ]; "brother" = ps: with ps; [ brother ]; @@ -313,7 +313,7 @@ "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero - "gogogate2" = ps: with ps; [ ]; # missing inputs: ismartgate + "gogogate2" = ps: with ps; [ ismartgate ]; "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -357,7 +357,7 @@ "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ]; "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ]; "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg ifaddr zeroconf ]; + "homekit" = ps: with ps; [ hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg ifaddr zeroconf ]; "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; @@ -705,7 +705,7 @@ "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ rokuecp ]; "roomba" = ps: with ps; [ roombapy ]; - "roon" = ps: with ps; [ pyroon ]; + "roon" = ps: with ps; [ roonapi ]; "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; @@ -719,10 +719,10 @@ "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; # missing inputs: pysabnzbd + "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj - "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; + "samsungtv" = ps: with ps; [ samsungctl samsungtvws wakeonlan ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter @@ -736,7 +736,7 @@ "sense" = ps: with ps; [ ]; # missing inputs: sense_energy "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo - "sensor" = ps: with ps; [ ]; + "sensor" = ps: with ps; [ sqlalchemy ]; "sentry" = ps: with ps; [ sentry-sdk ]; "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor @@ -750,6 +750,7 @@ "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 + "sia" = ps: with ps; [ ]; # missing inputs: pysiaalarm "sigfox" = ps: with ps; [ ]; "sighthound" = ps: with ps; [ pillow simplehound ]; "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi @@ -789,18 +790,17 @@ "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch pyroute2 zeroconf ]; + "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; "spider" = ps: with ps; [ ]; # missing inputs: spiderpy "splunk" = ps: with ps; [ ]; # missing inputs: hass_splunk - "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ pysqueezebox ]; "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy - "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco pyroute2 zeroconf ]; + "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr netdisco zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict ]; @@ -825,11 +825,13 @@ "switchbot" = ps: with ps; [ pyswitchbot ]; "switcher_kis" = ps: with ps; [ aioswitcher ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate + "syncthing" = ps: with ps; [ aiosyncthing ]; "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; + "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ]; "system_health" = ps: with ps; [ aiohttp-cors ]; "system_log" = ps: with ps; [ aiohttp-cors ]; "systemmonitor" = ps: with ps; [ psutil ]; @@ -937,11 +939,12 @@ "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 "wake_on_lan" = ps: with ps; [ wakeonlan ]; + "wallbox" = ps: with ps; [ ]; # missing inputs: wallbox "waqi" = ps: with ps; [ waqiasync ]; "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ waterfurnace ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf - "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson + "watson_tts" = ps: with ps; [ ibm-watson ]; "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -968,7 +971,7 @@ "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco pyroute2 zeroconf ]; + "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors ifaddr netdisco zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; @@ -984,10 +987,10 @@ "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ]; + "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ aiohttp-cors bellows pyroute2 pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; + "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b6f3d9129f9..42e265d5944 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , python3 , inetutils +, tzdata , nixosTests # Look up dependencies of specified components in component-packages.nix @@ -21,7 +22,31 @@ let defaultOverrides = [ - # Override the version of some packages pinned in Home Assistant's setup.py + # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt + + # https://github.com/NixOS/nixpkgs/pull/125414 + (mkOverride "flask" "2.0.1" "0mcgwq7b4qd99mf5bsvs3wphchxarf8kgil4hwww3blj31xjak0w") + (mkOverride "itsdangerous" "2.0.1" "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly") + (mkOverride "jinja2" "3.0.1" "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh") + (mkOverride "markupsafe" "2.0.1" "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r") + (self: super: { + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.0.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; + }; + checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.pytest-xprocess ]; + pytestFlagsArray = [ "-m 'not filterwarnings'" ]; + }); + }) + (mkOverride "flask-restful" "0.3.9" "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c") + (self: super: { + debugpy = super.debugpy.overridePythonAttrs (oldAttrs: rec { + # tests fail with flask/werkezug>=2.0 + doCheck = false; + }); + }) # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged @@ -43,6 +68,7 @@ let pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { version = "1.7.1"; src = oldAttrs.src.override { + inherit version; sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; }; disabledTests = [ @@ -155,7 +181,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.5.5"; + hassVersion = "2021.6.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -174,7 +200,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1vdxygjik1ay58xgyr1rk12cgy63raqi4fldnd4mlhs4i21c7ff8"; + sha256 = "0x1yx8ysd08azk1wscn8v7zljj6k951d8z4z9znzqp129y91x59w"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -183,7 +209,8 @@ in with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "awesomeversion==21.2.3" "awesomeversion" \ + --replace "attrs==21.2.0" "attrs" \ + --replace "awesomeversion==21.4.0" "awesomeversion" \ --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ @@ -215,6 +242,8 @@ in with py.pkgs; buildPythonApplication rec { voluptuous voluptuous-serialize yarl + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ] ++ componentBuildInputs ++ extraBuildInputs; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -277,6 +306,7 @@ in with py.pkgs; buildPythonApplication rec { "blackbird" "blueprint" "bluetooth_le_tracker" + "bosch_shc" "braviatv" "broadlink" "brother" @@ -360,6 +390,7 @@ in with py.pkgs; buildPythonApplication rec { "geofency" "glances" "gios" + "gogogate2" "google" "google_assistant" "google_domains" @@ -684,6 +715,8 @@ in with py.pkgs; buildPythonApplication rec { "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_require_auth" # prometheus/test_init.py: Spurious AssertionError regarding humidifier_target_humidity_percent metric "--deselect tests/components/prometheus/test_init.py::test_view" + # smhi/test_init.py: Tries to fetch data from the network: socket.gaierror: [Errno -2] Name or service not known + "--deselect tests/components/smhi/test_init.py::test_remove_entry" # tests are located in tests/ "tests" # dynamically add packages required for component tests @@ -728,6 +761,9 @@ in with py.pkgs; buildPythonApplication rec { # put ping binary into PATH, e.g. for wake_on_lan tests export PATH=${inetutils}/bin:$PATH + # set up zoneinfo data for backports-zoneinfo in pvpc_hourly_pricing tests + export PYTHONTZPATH="${tzdata}/share/zoneinfo" + # error out when component test directory is missing, otherwise hidden by xdist execution :( for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do test -d "tests/components/$component" || { diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index bd490654420..a9b16487167 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210504.0"; + version = "20210601.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rNdqflWT8bmGHtAGGfq4xVxDcnK+EZU9qejRWQPJmUI="; + sha256 = "sha256-z2KvP/zMibhpDzBBuWVD0Qpb37NaX3kxyNW4bY9WJrE="; }; # there is nothing to strip in this package From 82ea022b008738af0fd9c6aad6e29ac4822a7b0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jun 2021 03:35:03 +0200 Subject: [PATCH 698/797] python3Packages.aiohomekit: 0.2.66 -> 0.2.67 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 731272d5bad..6d77598c863 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.2.66"; + version = "0.2.67"; format = "pyproject"; disabled = pythonAtLeast "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "186cc2ybpg0xd09vf35v7qcfn70k8f5l9vpf15wkbvksm58v4s0v"; + sha256 = "04421p0dq7xh7rhx8ip177g2b91lhlc2yziqxbs9yxd1qyzwiqj1"; }; nativeBuildInputs = [ From e6a895c79284ef199c3f71baa00f8b3892102f37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jun 2021 03:37:53 +0200 Subject: [PATCH 699/797] python3Packages.zwave-js-server-python: 0.26.0 -> 0.26.1 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 7b42905c75e..2976c5e24ba 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.26.0"; + version = "0.26.1"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "0rwd95y0kgbn3r9zcbqph053cjfipii3yg2sbpg9mr4hq5xynh9z"; + sha256 = "1rh6wim5hr9lygvgria7lr6x61sdyrv3drrrirgv9p9gl3rxcj6m"; }; propagatedBuildInputs = [ From 7ef89797af0b66dee63637f3b42ae4e4dd5df271 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jun 2021 04:10:21 +0200 Subject: [PATCH 700/797] home-assistant: 2021.6.0 -> 2021.6.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 488fed80fd5..9ceddb54bba 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.6.0"; + version = "2021.6.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 42e265d5944..3ab32fee91c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -181,7 +181,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.6.0"; + hassVersion = "2021.6.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -200,7 +200,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0x1yx8ysd08azk1wscn8v7zljj6k951d8z4z9znzqp129y91x59w"; + sha256 = "1bw0h3r9xaabjmsra4d3bq7gxr83mjdvyz6q0j57mfq2sawda6mf"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index a9b16487167..f59f3943cd0 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210601.1"; + version = "20210603.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-z2KvP/zMibhpDzBBuWVD0Qpb37NaX3kxyNW4bY9WJrE="; + sha256 = "sha256-2UhbtaxEcOkD9Z5g9gZs+QjuVLXZGCEcmKoxRtIEYxw="; }; # there is nothing to strip in this package From 4432b29e91c47f6511563e89bb3a8cb81ca2b812 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Jun 2021 14:18:43 +0200 Subject: [PATCH 701/797] python3Packages.xknx: 0.18.3 -> 0.18.4 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 2d565c0eac4..a7f5b1115c1 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.3"; + version = "0.18.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-IXzmVAxxFOfU8ptixZLeyM64Fm1xSIlEDbR09f77JKM="; + sha256 = "sha256-gKt3VDPsHjd3QNqD63MY0Pe+eLR3YmKidoAE5lbqCZQ="; }; propagatedBuildInputs = [ From 04015a0a41a289f7cbb74367c908884702da9cd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Jun 2021 14:47:55 +0200 Subject: [PATCH 702/797] python3Packages.aiolyric: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/aiolyric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index 0dc576fca49..4c20e38d8cf 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.6"; + version = "1.0.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "1lnzsdw6kvgk0762f3vyw4xfzn7qkvsff16q61gm0ryjqg9j8whx"; + sha256 = "sha256-3UyWUsamluJclwrQD+MuUPLhNJoNU4/8w1m92OLWyrg="; }; propagatedBuildInputs = [ aiohttp ]; From 38dd3a24f3286e034b1585f0cc503d9b636b3040 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Jun 2021 04:24:51 +0200 Subject: [PATCH 703/797] home-assistant: 2021.6.1 -> 2021.6.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9ceddb54bba..8046106a984 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.6.1"; + version = "2021.6.2"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3ab32fee91c..18460f9fd4e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -181,7 +181,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.6.1"; + hassVersion = "2021.6.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -200,7 +200,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1bw0h3r9xaabjmsra4d3bq7gxr83mjdvyz6q0j57mfq2sawda6mf"; + sha256 = "1bk28404yd7vf00w45n1lyswyd0iadaa8jrikv861zh9bk1xm27y"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 097499bfeb2a1d0434b0bb90b40616e1a176588d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Jun 2021 23:59:49 +0200 Subject: [PATCH 704/797] python3Packages.aiorecollect: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/aiorecollect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 1bce60ce6af..0d3fe5bbaed 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-A4qk7eo4maCRP4UmtWrRCPvG6YrLVSOiOcfN8pEj5Po="; + sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm"; }; nativeBuildInputs = [ From 85998d1b02f88cb529f7c07e5485c8e5bdf39265 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Jun 2021 01:49:27 +0200 Subject: [PATCH 705/797] home-assistant: 2021.6.2 -> 2021.6.3 --- pkgs/servers/home-assistant/component-packages.nix | 10 +++++----- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8046106a984..1c8227d7e3d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.6.2"; + version = "2021.6.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -295,13 +295,13 @@ "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect_aio "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 - "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs + "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ sqlalchemy ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client "geo_json_events" = ps: with ps; [ geojson-client ]; "geo_location" = ps: with ps; [ ]; - "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client + "geo_rss_events" = ps: with ps; [ georss-generic-client ]; "geofency" = ps: with ps; [ aiohttp-cors ]; "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano @@ -384,7 +384,7 @@ "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "iglo" = ps: with ps; [ ]; # missing inputs: iglo - "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client + "ign_sismologia" = ps: with ps; [ georss-ign-sismologia-client ]; "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors pillow ]; "image_processing" = ps: with ps; [ aiohttp-cors ]; @@ -668,7 +668,7 @@ "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent - "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client + "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client ]; "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 18460f9fd4e..6f06ec0a823 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -181,7 +181,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.6.2"; + hassVersion = "2021.6.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -200,7 +200,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1bk28404yd7vf00w45n1lyswyd0iadaa8jrikv861zh9bk1xm27y"; + sha256 = "0n0g5kgyc9vhncdfi66lr9i42631rsigv2hzmnfal5jxgblh5736"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 558cb984de748cdf86f08c8bf5d410390d2503ec Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Jun 2021 11:44:24 +0200 Subject: [PATCH 706/797] chromiumBeta: 92.0.4515.40 -> 92.0.4515.51 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5d888fc0649..a0d7024dde8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.40", - "sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p", - "sha256bin64": "0i3plysx51n2gsm5vbf9666rz73pqbbns7v09wznbbncvw9zngrf", + "version": "92.0.4515.51", + "sha256": "0x9c5fy95wnri9z0s8pbwyq1lw684n7d70l1s2rp5yxh0snannxg", + "sha256bin64": "036km5dp7asq5n86qx7c9119mdch7sl89lhq1ffss0f4mzcq42yd", "deps": { "gn": { "version": "2021-05-07", From f8a97bf9d8adf56204a57b945257873cf490e523 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Jun 2021 11:46:18 +0200 Subject: [PATCH 707/797] python3Packages.systembridge: add websockets dependency --- pkgs/development/python-modules/systembridge/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 6174e507d2a..2c7328c50d6 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -1,5 +1,6 @@ { lib , aiohttp +, websockets , buildPythonPackage , fetchFromGitHub }: @@ -17,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + websockets ]; # Project has no tests From feeffee08103edc1920a00273278eb1f70ea50d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Fri, 11 Jun 2021 17:37:49 +0700 Subject: [PATCH 708/797] urxvt-font-size: 2015-05-22 -> 1.3 --- .../rxvt-unicode-plugins/urxvt-font-size/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index beecb3e278d..88dae0a34ff 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }: -stdenv.mkDerivation { - name = "urxvt-font-size-2015-05-22"; - dontPatchShebangs = true; +stdenv.mkDerivation rec { + name = "urxvt-font-size"; + version = "1.3"; src = fetchFromGitHub { owner = "majutsushi"; repo = "urxvt-font-size"; - rev = "fd5b09c10798c6723bbf771d4d8881cf6563bc69"; - sha256 = "16m3kkypg3y00x597zx05zy167a0kaqpawz0l591wzb2bv1dz55z"; + rev = "v${version}"; + sha256 = "1526ap161cp3378f4ijd09nmsh71ld7bkxxhp8p6razdi2v8r16h"; }; installPhase = '' From fa4172e4161a2550ed652fc8ef5d826b06effc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Jun 2021 13:23:09 +0200 Subject: [PATCH 709/797] python3Packages.python-igraph: 0.9.4 -> 0.9.5 https://github.com/igraph/python-igraph/blob/0.9.5/CHANGELOG.md --- pkgs/development/python-modules/python-igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index d196cf6e747..b04a7ba9baf 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.9.4"; + version = "0.9.5"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "sha256-0iqYzeqVJwBqDL7AllrNaI5c7fmtrVwWpinCnO+ACzo="; + sha256 = "sha256-3zyJTOkzkqb04/MtfzSJa+w6llo+h6CvHb1d4Bw3YUA="; }; nativeBuildInputs = [ From c5a63ebf394ecc7c81c0c7e1a88508721958355a Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Fri, 11 Jun 2021 13:21:18 +0100 Subject: [PATCH 710/797] tectonic: 0.4.1 -> 0.5.2 --- pkgs/tools/typesetting/tectonic/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index ba722837026..dd92477d173 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.4.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "sha256-XQ3KRM12X80JPFMnQs//8ZJEv+AV1sr3BH0Nw/PH0HQ="; + fetchSubmodules = true; + sha256 = "sha256-JQ78N+cfk1D6xZixoUvYiLP6ZwovBn/ro1CZoutBwp8="; }; - cargoSha256 = "sha256-930tFAKMCmTFS9faIWLSVtWN/gAA9UAUMuRo61XISYA="; + cargoSha256 = "sha256-disJme0UM6U+yWjGsPya0xDvW6iQsipqMkEALeJ99xU="; nativeBuildInputs = [ pkg-config ]; From 706ce9e2308ac370088abb09cf63b20cce2b07cf Mon Sep 17 00:00:00 2001 From: Joshua Trees Date: Mon, 31 May 2021 00:15:56 +0200 Subject: [PATCH 711/797] nixos/synergy: add encryption support Make it possible to use the Synergy server with TLS encryption without resorting to the GUI. --- nixos/modules/services/misc/synergy.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index 7990a9f6f4c..d6cd5d7f0d6 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -70,6 +70,26 @@ in type = types.bool; description = "Whether the Synergy server should be started automatically."; }; + tls = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether TLS encryption should be used. + + Using this requires a TLS certificate that can be + generated by starting the Synergy GUI once and entering + a valid product key. + ''; + }; + + cert = mkOption { + type = types.nullOr types.str; + default = null; + example = "~/.synergy/SSL/Synergy.pem"; + description = "The TLS certificate to use for encryption."; + }; + }; }; }; @@ -95,7 +115,7 @@ in description = "Synergy server"; wantedBy = optional cfgS.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; - serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; + serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert=${cfgS.tls.cert}")}''; serviceConfig.Restart = "on-failure"; }; }) From 606bf6dc17b6cdc5217a27d9bc703bc0f43f8c58 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 6 Jun 2021 13:11:11 -0700 Subject: [PATCH 712/797] doc/functions/generators: convert to CommonMark --- doc/functions.xml | 2 +- doc/functions/generators.section.md | 56 ++++++++++++++++++++++ doc/functions/generators.xml | 74 ----------------------------- 3 files changed, 57 insertions(+), 75 deletions(-) create mode 100644 doc/functions/generators.section.md delete mode 100644 doc/functions/generators.xml diff --git a/doc/functions.xml b/doc/functions.xml index dd91d705aa9..8ef530d307c 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -7,7 +7,7 @@ The nixpkgs repository has several utility functions to manipulate Nix expressions. - + diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md new file mode 100644 index 00000000000..bb8426d8087 --- /dev/null +++ b/doc/functions/generators.section.md @@ -0,0 +1,56 @@ +# Generators {#sec-generators} +Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: `INI`, `JSON` and `YAML` + +All generators follow a similar call interface: `generatorName configFunctions data`, where `configFunctions` is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is `mkSectionName ? (name: libStr.escape [ "[" "]" ] name)` from the `INI` generator. It receives the name of a section and sanitizes it. The default `mkSectionName` escapes `[` and `]` with a backslash. + +Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses `: ` as separator, the strings `"yes"`/`"no"` as boolean values and requires all string values to be quoted: + +```nix +with lib; +let + customToINI = generators.toINI { + # specifies how to format a key/value pair + mkKeyValue = generators.mkKeyValueDefault { + # specifies the generated string for a subset of nix values + mkValueString = v: + if v == true then ''"yes"'' + else if v == false then ''"no"'' + else if isString v then ''"${v}"'' + # and delegats all other values to the default generator + else generators.mkValueStringDefault {} v; + } ":"; + }; + +# the INI file can now be given as plain old nix values +in customToINI { + main = { + pushinfo = true; + autopush = false; + host = "localhost"; + port = 42; + }; + mergetool = { + merge = "diff3"; + }; +} +``` + +This will produce the following INI file as nix string: + +```INI +[main] +autopush:"no" +host:"localhost" +port:42 +pushinfo:"yes" +str\:ange:"very::strange" + +[mergetool] +merge:"diff3" +``` + +::: note +Nix store paths can be converted to strings by enclosing a derivation attribute like so: `"${drv}"`. +::: + +Detailed documentation for each generator can be found in `lib/generators.nix`. diff --git a/doc/functions/generators.xml b/doc/functions/generators.xml deleted file mode 100644 index 9ce1f85eb17..00000000000 --- a/doc/functions/generators.xml +++ /dev/null @@ -1,74 +0,0 @@ -
- Generators - - - Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: INI, JSON and YAML - - - - All generators follow a similar call interface: generatorName configFunctions data, where configFunctions is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]" ] name) from the INI generator. It receives the name of a section and sanitizes it. The default mkSectionName escapes [ and ] with a backslash. - - - - Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses : as separator, the strings "yes"/"no" as boolean values and requires all string values to be quoted: - - - -with lib; -let - customToINI = generators.toINI { - # specifies how to format a key/value pair - mkKeyValue = generators.mkKeyValueDefault { - # specifies the generated string for a subset of nix values - mkValueString = v: - if v == true then ''"yes"'' - else if v == false then ''"no"'' - else if isString v then ''"${v}"'' - # and delegats all other values to the default generator - else generators.mkValueStringDefault {} v; - } ":"; - }; - -# the INI file can now be given as plain old nix values -in customToINI { - main = { - pushinfo = true; - autopush = false; - host = "localhost"; - port = 42; - }; - mergetool = { - merge = "diff3"; - }; -} - - - - This will produce the following INI file as nix string: - - - -[main] -autopush:"no" -host:"localhost" -port:42 -pushinfo:"yes" -str\:ange:"very::strange" - -[mergetool] -merge:"diff3" - - - - - Nix store paths can be converted to strings by enclosing a derivation attribute like so: "${drv}". - - - - - Detailed documentation for each generator can be found in lib/generators.nix. - -
From d555585281829ba4eb007d0b83bae6cb721c5886 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 11 Jun 2021 15:33:11 +0200 Subject: [PATCH 713/797] zsh-autosuggestions: 0.6.4 -> 0.7.0 --- pkgs/shells/zsh/zsh-autosuggestions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index f9502152277..e261cdedc74 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "zsh-autosuggestions"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-autosuggestions"; rev = "v${version}"; - sha256 = "0h52p2waggzfshvy1wvhj4hf06fmzd44bv6j18k3l9rcx6aixzn6"; + sha256 = "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98"; }; buildInputs = [ zsh ]; From 8f3bf74e1c1689e8c04f83a2c4cf58b38c17ab33 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 11 Jun 2021 14:15:20 +0100 Subject: [PATCH 714/797] bosh-cli: init at 6.4.3 --- .../networking/cluster/bosh-cli/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/cluster/bosh-cli/default.nix diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix new file mode 100644 index 00000000000..070af87f9c4 --- /dev/null +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, openssh +}: + +buildGoModule rec { + pname = "bosh-cli"; + + version = "6.4.3"; + + src = fetchFromGitHub { + owner = "cloudfoundry"; + repo = pname; + rev = "v${version}"; + sha256 = "1glxwk0fv52rjim7ihcxkjx19fsn9k7gzg9zmwxgx8wpsjrdcq3f"; + }; + vendorSha256 = null; + + postPatch = '' + substituteInPlace cmd/version.go --replace '[DEV BUILD]' '${version}' + ''; + + nativeBuildInputs = [ makeWrapper ]; + + subPackages = [ "." ]; + + doCheck = false; + + postInstall = '' + mv $out/bin/bosh-cli $out/bin/bosh + wrapProgram $out/bin/bosh --prefix PATH : '${lib.makeBinPath [ openssh ]}' + ''; + + meta = with lib; { + description = "A command line interface to CloudFoundry BOSH"; + homepage = "https://bosh.io"; + changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef91641dd58..68a9ff02a43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14446,6 +14446,8 @@ in boost_process = callPackage ../development/libraries/boost-process { }; + bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { }; + botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; inherit (darwin.apple_sdk.frameworks) CoreServices Security; From 07864c64aa106b6f9223973e1e6187828c684ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 11 Jun 2021 16:16:12 +0200 Subject: [PATCH 715/797] nginxQuic: 12f18e0bca09 -> 1fec68e322d0 --- pkgs/servers/http/nginx/quic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 38a4bd9cdf4..a8864864721 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "12f18e0bca09"; # branch=quic - sha256 = "1lr6zlny26kamczgk8ddscmy5fp5mzxqcppwhjhvq1a029a0r4b7"; + rev = "1fec68e322d0"; # branch=quic + sha256 = "0nr1mjic215yc6liyv1kfwhfdija3q2sw3qdwibds5vkg330vmw8"; }; preConfigure = '' From 44055b455747c850bc3d2bcf5d87d068349efa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 11 Jun 2021 16:18:20 +0200 Subject: [PATCH 716/797] nixos/manual: update documentation on Qt themes --- nixos/doc/manual/configuration/x-windows.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index e7219389706..315ed3acf97 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -191,9 +191,12 @@ GTK themes can be installed either to user profile or system-wide (via environment.systemPackages). To make Qt 5 applications - look similar to GTK2 ones, you can install qt5.qtbase.gtk - package into your system environment. It should work for all Qt 5 library - versions. + look similar to GTK ones, you can use the following configuration: + + = true; + = "gtk2"; + = "gtk2"; + From 99f12af681ebd3369a72580cccddc317841765c5 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 31 May 2021 21:24:17 +0200 Subject: [PATCH 717/797] imagemagick: 6.9.12-12 -> 6.9.12-14 --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index e8a88249368..5d9bc4fdd36 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-12"; + version = "6.9.12-14"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-yqMYuayQjPlTqi3+CtwP5CdsAGud/fHR0I2LwUPIq00="; + sha256 = "sha256-RK6N4koHVAqol16QXLFWUgI6N5Rph2QCIHxmDFs3Jfk="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From ad502ab5c59a49eaf0c92f90201dffd4255a005a Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 10 Jun 2021 23:19:08 +0300 Subject: [PATCH 718/797] nixos/sourcehut: automatically build and import qemu image for docker --- nixos/modules/services/misc/sourcehut/builds.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/sourcehut/builds.nix b/nixos/modules/services/misc/sourcehut/builds.nix index e228665784e..a17a1010dbf 100644 --- a/nixos/modules/services/misc/sourcehut/builds.nix +++ b/nixos/modules/services/misc/sourcehut/builds.nix @@ -48,7 +48,6 @@ in default = false; description = '' Run workers for builds.sr.ht. - Perform manually on machine: `cd ${scfg.statePath}/images; docker build -t qemu -f qemu/Dockerfile .` ''; }; @@ -161,6 +160,21 @@ in partOf = [ "buildsrht.service" ]; description = "builds.sr.ht worker service"; path = [ pkgs.openssh pkgs.docker ]; + preStart = let qemuPackage = pkgs.qemu_kvm; + in '' + if [[ "$(docker images -q qemu:latest 2> /dev/null)" == "" || "$(cat ${statePath}/docker-image-qemu 2> /dev/null || true)" != "${qemuPackage.version}" ]]; then + # Create and import qemu:latest image for docker + ${ + pkgs.dockerTools.streamLayeredImage { + name = "qemu"; + tag = "latest"; + contents = [ qemuPackage ]; + } + } | docker load + # Mark down current package version + printf "%s" "${qemuPackage.version}" > ${statePath}/docker-image-qemu + fi + ''; serviceConfig = { Type = "simple"; User = user; From ea5956a2ed03bcd34b6d269cbb6613db47d9a957 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 10 Jun 2021 15:08:34 -0700 Subject: [PATCH 719/797] nixos-rebuild: remove repair, never used --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 7441be07af3..c47a3b7c522 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -24,7 +24,6 @@ fast= rollback= upgrade= upgrade_all= -repair= profile=/nix/var/nix/profiles/system buildHost= targetHost= @@ -60,10 +59,6 @@ while [ "$#" -gt 0 ]; do upgrade=1 upgrade_all=1 ;; - --repair) - repair=1 - extraBuildFlags+=("$i") - ;; --max-jobs|-j|--cores|-I|--builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") From 0e8e7968d1528ed4df50d6b86e0079ba94ccaf63 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 10 Jun 2021 15:14:49 -0700 Subject: [PATCH 720/797] nixos-rebuild: prevent masking return value with declaration --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index c47a3b7c522..85df4ffb44b 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -171,6 +171,7 @@ nixBuild() { else local instArgs=() local buildArgs=() + local drv= while [ "$#" -gt 0 ]; do local i="$1"; shift 1 @@ -197,7 +198,7 @@ nixBuild() { esac done - local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" + drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" @@ -217,6 +218,8 @@ nixFlakeBuild() { shift 1 local evalArgs=() local buildArgs=() + local drv= + while [ "$#" -gt 0 ]; do local i="$1"; shift 1 case "$i" in @@ -238,7 +241,7 @@ nixFlakeBuild() { esac done - local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" + drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" if [ -a "$drv" ]; then NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" From 07da819bcff7dccac8407698b5144decba81b571 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 10 Jun 2021 15:20:12 -0700 Subject: [PATCH 721/797] nixos-rebuild: prevent wordsplitting --- .../linux/nixos-rebuild/nixos-rebuild.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 85df4ffb44b..d574758b87c 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -308,7 +308,7 @@ fi if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast && -z $flake ]]; then if p=$(nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then export _NIXOS_REBUILD_REEXEC=1 - exec $p/bin/nixos-rebuild "${origArgs[@]}" + exec "$p/bin/nixos-rebuild" "${origArgs[@]}" exit 1 fi fi @@ -396,9 +396,9 @@ remotePATH= if [[ -n $buildNix && -z $flake ]]; then echo "building Nix..." >&2 nixDrv= - if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then - if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then - if ! nixStorePath="$(nix-instantiate --eval '' -A $(nixSystem) | sed -e 's/^"//' -e 's/"$//')"; then + if ! nixDrv="$(nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then + if ! nixStorePath="$(nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then nixStorePath="$(prebuiltNix "$(uname -m)")" fi if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \ @@ -406,11 +406,11 @@ if [[ -n $buildNix && -z $flake ]]; then echo "warning: don't know how to get latest Nix" >&2 fi # Older version of nix-store -r don't support --add-root. - [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix + [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" if [ -n "$buildHost" ]; then remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")" remoteNix="$remoteNixStorePath/bin" - if ! buildHostCmd nix-store -r $remoteNixStorePath \ + if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then remoteNix= echo "warning: don't know how to get latest Nix" >&2 @@ -419,7 +419,7 @@ if [[ -n $buildNix && -z $flake ]]; then fi fi if [ -a "$nixDrv" ]; then - nix-store -r "$nixDrv"'!'"out" --add-root $tmpDir/nix --indirect >/dev/null + nix-store -r "$nixDrv"'!'"out" --add-root "$tmpDir/nix" --indirect >/dev/null if [ -n "$buildHost" ]; then nix-copy-closure --to "$buildHost" "$nixDrv" # The nix build produces multiple outputs, we add them all to the remote path @@ -436,7 +436,7 @@ fi # nixos-version shows something useful). if [[ -n $canRun && -z $flake ]]; then if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$($SHELL $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}" || true) + suffix=$($SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) if [ -n "$suffix" ]; then echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi @@ -509,7 +509,7 @@ fi # If we're not just building, then make the new configuration the boot # default and/or activate it now. if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then - if ! targetHostCmd $pathToConfig/bin/switch-to-configuration "$action"; then + if ! targetHostCmd "$pathToConfig/bin/switch-to-configuration" "$action"; then echo "warning: error(s) occurred while switching to the new configuration" >&2 exit 1 fi From d6a829e7b703cb0453685e6490edfaf9c3d84b67 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 10 Jun 2021 15:21:25 -0700 Subject: [PATCH 722/797] nixos-rebuild: remove unused variable: remotePATH --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index d574758b87c..c8db9520b6b 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -391,8 +391,6 @@ prebuiltNix() { fi } -remotePATH= - if [[ -n $buildNix && -z $flake ]]; then echo "building Nix..." >&2 nixDrv= From 971eb043411eef0d6d3010cf9673a6a88fe101eb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 10 Jun 2021 15:24:49 -0700 Subject: [PATCH 723/797] nixos-rebuild: fix extraBuildFlags usage with flakes --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index c8db9520b6b..5522fa6a456 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -241,7 +241,7 @@ nixFlakeBuild() { esac done - drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" + drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" From 389f628c08eea2c2301a7eaca22c4f0a90d15072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 11 Jun 2021 20:39:06 +0200 Subject: [PATCH 724/797] knot-resolver: skip tests on aarch64-darwin (for now) It used to build in a previous iteration https://hydra.nixos.org/job/nixpkgs/aarch64-darwin/knot-resolver.aarch64-darwin so I expect it will work without these tests (I have no access to a darwin machine). --- pkgs/servers/dns/knot-resolver/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 791de67e52d..b0f9dfd6c91 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -79,7 +79,8 @@ unwrapped = stdenv.mkDerivation rec { rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; - doInstallCheck = with stdenv; hostPlatform == buildPlatform; + doInstallCheck = with stdenv; hostPlatform == buildPlatform + && !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' meson test --print-errorlogs From 81e6e2fdd0eca1ba16dea353ca6dd543448d3500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 11 Jun 2021 16:27:28 -0300 Subject: [PATCH 725/797] xfce.thunar: depends on pcre - The library pcre is needed for regular expressions in the Search & Replace feature of the bulk renamer. --- pkgs/desktops/xfce/core/thunar/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 4e6072c7112..68027bf5018 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -10,6 +10,7 @@ , libxfce4ui , libxfce4util , libxslt +, pcre , xfconf , gobject-introspection , makeWrapper @@ -39,6 +40,7 @@ let unwrapped = mkXfceDerivation { libnotify libxfce4ui libxfce4util + pcre xfconf ]; From ff424e99361df3e88a953da0ca31c7e50378511b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jun 2021 22:35:46 +0200 Subject: [PATCH 726/797] python3Packages.boschshcpy: 0.2.18 -> 0.2.19 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 0ac1cbc83c7..4e480514bca 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.18"; + version = "0.2.19"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tschamm"; repo = pname; rev = version; - sha256 = "08bfg3g0hifjaa17d4zmws2ikbijdm0b98svgj8jdcl8v0nlqx69"; + sha256 = "sha256-HxLy3tGMn2KDfD37yKLoImpfXGoaoGB6VEanNu/WMnk="; }; propagatedBuildInputs = [ From e8f08487b15a473feced964150d3eabd8fdb2942 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jun 2021 22:42:50 +0200 Subject: [PATCH 727/797] metasploit: 6.0.47 -> 6.0.48 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 28 +++++++------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 42 ++++++++++----------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 3119eeabade..76541e922cf 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.47" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.48" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 760b9fe62c6..339f41ab81e 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 6416bc1a2867938dd39705a3daef25bc5dedfd16 - ref: refs/tags/6.0.47 + revision: 4ec1009a615521371dd98576c456f62f63190ad9 + ref: refs/tags/6.0.48 specs: - metasploit-framework (6.0.47) + metasploit-framework (6.0.48) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,9 +31,9 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.45) + metasploit-payloads (= 2.0.47) metasploit_data_models (~> 4.1.0) - metasploit_payloads-mettle (= 1.0.9) + metasploit_payloads-mettle (= 1.0.10) mqtt msgpack nessus_rest @@ -125,13 +125,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.465.0) - aws-sdk-core (3.114.1) + aws-partitions (1.467.0) + aws-sdk-core (3.114.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.240.0) + aws-sdk-ec2 (1.242.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.55.0) @@ -140,7 +140,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.0) + aws-sdk-s3 (1.96.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -192,7 +192,7 @@ GEM hashery (2.1.2) hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) http_parser.rb (0.6.0) i18n (1.8.10) @@ -204,7 +204,7 @@ GEM jsobfu (0.4.2) rkelly-remix json (2.5.1) - loofah (2.9.1) + loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) @@ -226,7 +226,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.45) + metasploit-payloads (2.0.47) metasploit_data_models (4.1.4) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -237,7 +237,7 @@ GEM railties (~> 5.2.2) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.9) + metasploit_payloads-mettle (1.0.10) method_source (1.0.0) mini_portile2 (2.5.3) minitest (5.14.4) @@ -265,7 +265,7 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.0) - pdf-reader (2.4.2) + pdf-reader (2.5.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index fe435a5be45..28ef25223ea 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.47"; + version = "6.0.48"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-lK8FtHc4VLvp6bEYAw7cqHgbjQP2RS5+XxtjaVMiVWg="; + sha256 = "sha256-E7vuuQ4vxm+pUi95d5rnz8Rgp0DmV08sgtswfzUaa0o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 0f6b54632e4..d94b5de86c3 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi"; + sha256 = "18j2m4i70zinxvwib53kclyvgl5j474nm230yy15bqsfhmhm5qqc"; type = "gem"; }; - version = "1.465.0"; + version = "1.467.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ksnsj7jqb339fy4nh6v8zn9gy77vbyjpsiv33r35q82ivi32z2"; + sha256 = "09ybqvdmxcw0jgyjy99c5nr0jirs1yyp0lqy95hl0wgvxhvck001"; type = "gem"; }; - version = "3.114.1"; + version = "3.114.2"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wqrvs49nzr2n9ilbjz61ac61d4d8wwpmzfaawhhq7l4hmwm4pdr"; + sha256 = "0zbhgfd4x70ikajximd4s4ni6rd9bvylxwqzh84iwmjngf2sa5fi"; type = "gem"; }; - version = "1.240.0"; + version = "1.242.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g46v19n6pxa60x7fih2y9zc18q23kdjkb1p2qr33zmi6cz76cc4"; + sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h"; type = "gem"; }; - version = "1.96.0"; + version = "1.96.1"; }; aws-sigv4 = { groups = ["default"]; @@ -454,10 +454,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; "http_parser.rb" = { groups = ["default"]; @@ -534,10 +534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; + sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.0"; }; metasm = { groups = ["default"]; @@ -574,12 +574,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "6416bc1a2867938dd39705a3daef25bc5dedfd16"; - sha256 = "0s2m499njqqvbxz2wign0f6iny58vh70665ix7lvnm1qfys0bbwl"; + rev = "4ec1009a615521371dd98576c456f62f63190ad9"; + sha256 = "0jkb38spyc6vh8n4ymz682kn1i6gwyd7fy9gaalnziig1swyxfqk"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.47"; + version = "6.0.48"; }; metasploit-model = { groups = ["default"]; @@ -596,10 +596,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09w5r7g19n845h9ii66h8cx9ikgv69d59ry67183h7c76mhzvm9c"; + sha256 = "0jxa9q8jzfy91i4khnzmd36p3g2sq7df34csgwbmv6caarzs7732"; type = "gem"; }; - version = "2.0.45"; + version = "2.0.47"; }; metasploit_data_models = { groups = ["default"]; @@ -616,10 +616,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07l2ahb4c5ay6s5vbcfmipmya2qdj8i29blxk9vdmvs27yzkc8jk"; + sha256 = "12mm3bqcirbzn7337zg96w79i6in49z2gmg41cwjywi1p2iawk61"; type = "gem"; }; - version = "1.0.9"; + version = "1.0.10"; }; method_source = { groups = ["default"]; @@ -836,10 +836,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cxladxy18dhk4a3b263crq8hyxb3q0c7ifxrb5nr1bs6y0pk8i6"; + sha256 = "14cxj3ra9nnn334qpm2vsx9s0zk3095s8ih6cwcp47h3hv03c73y"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; pg = { groups = ["default"]; From 529db88e931feb6dc2bda558e0568b1b48ab7599 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Sat, 12 Jun 2021 02:17:46 +0530 Subject: [PATCH 728/797] google-cloud-sdk: 343.0.0 -> 344.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b9567fcfcaa..e8bd99a13d5 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1f86pkjsp8lrmk8ap40wh9zbzb2ni49vc2cjsdjbj4pkkwivihpv"; + sha256 = "0xhy2sa04ir5ncjnnx25nyf66k21w3f649smhfpz9973s7vk5vhg"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1l47lq2wq8y0adrjij3w5ki1mm1f00503ks398flfmbzyav6bad3"; + sha256 = "1dkj4cpy891nd3l1xcqaj1mfphirs9fzbm081i8pyn36nwmdpg2j"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "343.0.0"; + version = "344.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); From 8cb2d7a0950a4b5ddc0e7581b74548d2cbe0d458 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Jun 2021 17:31:55 +0200 Subject: [PATCH 729/797] python3Packages.pyflic: init at 2.0.3 --- .../python-modules/pyflic/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pyflic/default.nix diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix new file mode 100644 index 00000000000..ead4b33929d --- /dev/null +++ b/pkgs/development/python-modules/pyflic/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyflic"; + version = "2.0.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "soldag"; + repo = pname; + rev = version; + sha256 = "0adf4k191138jmbsfhkhhbgaxcq97d1hr5w48ryxr1fig64sjqy2"; + }; + + # Projec thas no tests + doCheck = false; + + pythonImportsCheck = [ "pyflic" ]; + + meta = with lib; { + description = "Python module to interact with Flic buttons"; + homepage = "https://github.com/soldag/pyflic"; + license = with licenses; [ cc0 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8743eeed35..e1515bd323f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5742,6 +5742,8 @@ in { pyflakes = callPackage ../development/python-modules/pyflakes { }; + pyflic = callPackage ../development/python-modules/pyflic { }; + pyflume = callPackage ../development/python-modules/pyflume { }; pyflunearyou = callPackage ../development/python-modules/pyflunearyou { }; From 199a1453ed529f770c96f45a4b2b1a99d05c32a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Jun 2021 22:37:57 +0200 Subject: [PATCH 730/797] python3packages.meteoalertapi: init at 0.1.8 --- .../python-modules/meteoalertapi/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/meteoalertapi/default.nix diff --git a/pkgs/development/python-modules/meteoalertapi/default.nix b/pkgs/development/python-modules/meteoalertapi/default.nix new file mode 100644 index 00000000000..6ad2fae9868 --- /dev/null +++ b/pkgs/development/python-modules/meteoalertapi/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, xmltodict +}: + +buildPythonPackage rec { + pname = "meteoalertapi"; + version = "0.1.8"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rolfberkenbosch"; + repo = "meteoalert-api"; + rev = "v${version}"; + sha256 = "1l66vsd77g5hqkp2c3qrrxz4mr7liwq96apg8km80qyqsjmma9yy"; + }; + + propagatedBuildInputs = [ + requests + xmltodict + ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ "meteoalertapi" ]; + + meta = with lib; { + description = "Python wrapper for MeteoAlarm.org"; + homepage = "https://github.com/rolfberkenbosch/meteoalert-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1515bd323f..e4e072dce93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4301,6 +4301,8 @@ in { metar = callPackage ../development/python-modules/metar { }; + meteoalertapi = callPackage ../development/python-modules/meteoalertapi { }; + mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; From ccfde9b5412e45d29c18a043495ba5d87c93f08d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jun 2021 22:49:27 +0200 Subject: [PATCH 731/797] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1c8227d7e3d..06d4d195dd7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -499,7 +499,7 @@ "met" = ps: with ps; [ pymetno ]; "met_eireann" = ps: with ps; [ pymeteireann ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api - "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi + "meteoalarm" = ps: with ps; [ meteoalertapi ]; "meteoclimatic" = ps: with ps; [ ]; # missing inputs: pymeteoclimatic "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient From 84c97f7b27cf5a68f3e82f3fa602e6dcf95a37b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jun 2021 22:52:18 +0200 Subject: [PATCH 732/797] python3Packages.meteoalertapi: 0.1.8 -> 0.2.0 --- pkgs/development/python-modules/meteoalertapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meteoalertapi/default.nix b/pkgs/development/python-modules/meteoalertapi/default.nix index 6ad2fae9868..555059f5683 100644 --- a/pkgs/development/python-modules/meteoalertapi/default.nix +++ b/pkgs/development/python-modules/meteoalertapi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meteoalertapi"; - version = "0.1.8"; + version = "0.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rolfberkenbosch"; repo = "meteoalert-api"; rev = "v${version}"; - sha256 = "1l66vsd77g5hqkp2c3qrrxz4mr7liwq96apg8km80qyqsjmma9yy"; + sha256 = "sha256-EdHqWEkE/uUtz/xjV4k4NvNvtPPU4sJjHGwUM7J+HWs="; }; propagatedBuildInputs = [ From 21ed7a970c7d8da87acc6629c6c71cd40589cac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 11 Jun 2021 18:07:54 +0200 Subject: [PATCH 733/797] vimPlugins.vim-bracketed-paste: init at 2018-05-22 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a7fdb5fd919..bf8ad20cfcb 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5655,6 +5655,18 @@ final: prev: meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; + vim-bracketed-paste = buildVimPluginFrom2Nix { + pname = "vim-bracketed-paste"; + version = "2018-05-22"; + src = fetchFromGitHub { + owner = "ConradIrwin"; + repo = "vim-bracketed-paste"; + rev = "c4c639f3cacd1b874ed6f5f196fac772e089c932"; + sha256 = "1hhi7ab36iscv9l7i64qymckccnjs9pzv0ccnap9gj5xigwz6p9h"; + }; + meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/"; + }; + vim-bsv = buildVimPluginFrom2Nix { pname = "vim-bsv"; version = "2020-11-08"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 015504c5b45..9d6ffbb301b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -72,6 +72,7 @@ cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim cohama/lexima.vim +ConradIrwin/vim-bracketed-paste crusoexia/vim-monokai ctjhoa/spacevim ctrlpvim/ctrlp.vim From 4e5d5bfc323e7ccb39f57ab915c6c4c14650e070 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jun 2021 22:27:45 +0200 Subject: [PATCH 734/797] python3Packages.xknx: 0.18.4 -> 0.18.5 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index a7f5b1115c1..b5c5f437d28 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.4"; + version = "0.18.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-gKt3VDPsHjd3QNqD63MY0Pe+eLR3YmKidoAE5lbqCZQ="; + sha256 = "sha256-hvLfcrN1NFKM2YezvMLSTNZtwpThEnT7eRUnVzbrK0Q="; }; propagatedBuildInputs = [ From eeb255207df56b2b28745eb53b33e50bb87c3021 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 11 Jun 2021 07:55:50 +0000 Subject: [PATCH 735/797] zfsUnstable: 2.1.0-rc6 -> 2.1.0-rc7 https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc7 --- pkgs/os-specific/linux/zfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e41ae3bece2..303fe62adfd 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -179,6 +179,7 @@ let snapshotting, cloning, block devices, deduplication, and more. ''; homepage = "https://github.com/openzfs/zfs"; + changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; @@ -206,9 +207,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc6"; + version = "2.1.0-rc7"; - sha256 = "0q3vl9rid6a84pb85v38hnf17vws65jjb4slw8bhm8dq8fna2a86"; + sha256 = "11dvz8r5l7cbhbx2j02y6335i2vibh29dqrqk4kmw4lf87g1isni"; isUnstable = true; }; From 71ffc07f4e3f56301e6b7737667d4a9cc3202a4a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 12 Jun 2021 00:36:30 +0200 Subject: [PATCH 736/797] haskellPackages.cabal2nix-unstable: 2021-06-10 -> 2021-06-12 Adds support for GHC 9.0.x which we also test by compiling it with all available GHC versions on Hydra. --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- pkgs/top-level/release-haskell.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index a250a792679..bd88c5e5a0a 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-06-10"; + version = "unstable-2021-06-12"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/f63eb780e9c946a5037580e29d8b4effa09da905.tar.gz"; - sha256 = "1xjdghhbryqhm39z1p8z804mcraia33jvfl8v02yfk7q9xk0bpq2"; + url = "https://github.com/NixOS/cabal2nix/archive/5bb08e994aa17a46676007400794df703c53af58.tar.gz"; + sha256 = "1cwjmscy3rf64rd7pkkbmp1zri1f6bn46hjnmf6b33jg7wzw11g4"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 36a5835c9cd..87a08dddb60 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -222,6 +222,7 @@ let # working as expected. cabal-install = all; Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ]; + cabal2nix-unstable = all; funcmp = all; # Doesn't currently work on ghc-9.0: # https://github.com/haskell/haskell-language-server/issues/297 From c0d39d26a511ddeb794319d7cfa758c3d96f570f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 12 Jun 2021 00:43:21 +0200 Subject: [PATCH 737/797] haskell.packages.ghc901.retry: dont build test suite Test suite doesn't build with GHC 9.0.1 and since upstream is currently not invested in fixing it, we (temporarily) disable it. Upside: we can build hoogle again. https://github.com/Soostone/retry/issues/71 --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 5dea75bb218..640cdec1cea 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -111,4 +111,8 @@ self: super: { # https://github.com/snoyberg/mono-traversable/issues/192 mono-traversable = dontCheck super.mono-traversable; + # Disable tests pending resolution of + # https://github.com/Soostone/retry/issues/71 + retry = dontCheck super.retry; + } From c3173699c74b0f68ceb6afee77f258a7e98cbc01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 02:01:25 +0000 Subject: [PATCH 738/797] ammonite: 2.3.8 -> 2.4.0 --- pkgs/development/tools/ammonite/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index eb827882b75..680217acfbb 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git -, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: +{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts +, git, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: with lib; @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.3.8"; + version = "2.4.0"; src = fetchurl { url = @@ -75,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs"; + sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7"; + sha256 = "2F35qhWI6hNb+Eh9ZTDznqo116yN7MZIGVchaAIM36A="; }; } From 88fc8922a4908fab2752ea312b40123de8627a51 Mon Sep 17 00:00:00 2001 From: Zach Coyle Date: Fri, 11 Jun 2021 19:22:35 -0400 Subject: [PATCH 739/797] mas: 1.8.1 -> 1.8.2 --- pkgs/os-specific/darwin/mas/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/os-specific/darwin/mas/default.nix index 495d47df89f..15de553b76b 100644 --- a/pkgs/os-specific/darwin/mas/default.nix +++ b/pkgs/os-specific/darwin/mas/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mas"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas.pkg"; - sha256 = "W/wgg+ETeJPoZ7MoVGH2uJzQiZMLIy3n1JYKUloc3ZU="; + sha256 = "HlLQKBVIYKanS6kjkbYdabBi1T0irxE6fNd2H6mDKe4="; }; nativeBuildInputs = [ libarchive p7zip ]; @@ -25,13 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r ./bin $out - cp -r ./Frameworks $out - ''; - - postFixup = '' - install_name_tool -change @rpath/MasKit.framework/Versions/A/MasKit $out/Frameworks/MasKit.framework/Versions/A/MasKit $out/bin/mas - install_name_tool -change @rpath/Commandant.framework/Commandant $out/Frameworks/MasKit.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Commandant $out/bin/mas + cp -r ./usr/local/bin $out ''; meta = with lib; { From b06a0d409e8e7b4f56b9661b0cc5538180b80289 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 5 Jun 2021 21:53:12 +0800 Subject: [PATCH 740/797] linuxPackages.lttng-modules: 2.10.5 -> 2.12.6 --- pkgs/os-specific/linux/lttng-modules/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 8e20ffda346..7f4036c775f 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - pname = "lttng-modules-${version}"; - name = "${pname}-${kernel.version}"; - version = "2.10.5"; + pname = "lttng-modules-${kernel.version}"; + version = "2.12.6"; src = fetchurl { url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq"; + sha256 = "sha256-lawqLPkthdI/+9rKah7A18FnIR0eD7hQq5AASj9HXqo="; }; buildInputs = kernel.moduleBuildDependencies; @@ -28,11 +27,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux kernel modules for LTTng tracing"; homepage = "https://lttng.org/"; - license = with licenses; [ lgpl21 gpl2 mit ]; + license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = builtins.compareVersions kernel.version "3.18" == -1 - || builtins.compareVersions kernel.version "4.16" == 1; }; - } From 24f34c1b90aabda177e156f51242e2df543cf57a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 11 Jun 2021 23:58:57 -0400 Subject: [PATCH 741/797] box2d: enable on darwin --- pkgs/development/libraries/box2d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 1b6ede9b310..64349b1e3cf 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "2D physics engine"; homepage = "https://box2d.org/"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; }; } From 2c8871a7dbc9db0753fdea004ef264ed249d9791 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Fri, 11 Jun 2021 00:29:59 +0000 Subject: [PATCH 742/797] vscode: 1.56.2 -> 1.57.0 --- pkgs/applications/editors/vscode/vscode.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fd1cb7153eb..41f5f79de78 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,16 +13,16 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "08qrag9nzmngzzvs2cgbmc4zzxlb9kwn183v8caj6dvcrjvfqgbv"; - x86_64-darwin = "0rlyr08lla3xadlh373xqcks8a9akk3x2cmakgn17q2b16988fmq"; - aarch64-linux = "1m277940xsasqac4i88s05xrqsab99jhl3ka0zzfbixrgr2dj8q1"; - armv7l-linux = "1qm4cggjj50vdnrx848x810gz3ahh0hndra22lsvcjdbsw8g35rk"; + x86_64-linux = "1bj954kjwrk0nx8griy2y8gp7dys0wf610ki0jrby46mlvrmszs1"; + x86_64-darwin = "1dqpz7qpnycd4b7iqg639rab3ds4m06m15rmyp7r70053qaw1s61"; + aarch64-linux = "04ifmw39swdl6ybz6jpan2krsqli1kjyjnicjaisww8vhvhr2lzk"; + armv7l-linux = "0y1rzn2jy4wrn2yr95v7zzyl36pj9mbz4dgvazvy465wzk5ai7b4"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.2"; + version = "1.57.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From c9ddfed1707f3e830a8a1fe3bdec69057e464f61 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Jun 2021 04:20:00 +0000 Subject: [PATCH 743/797] tflint: 0.29.0 -> 0.29.1 https://github.com/terraform-linters/tflint/releases/tag/v0.29.1 --- pkgs/development/tools/analysis/tflint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 137b3c2c1a1..9666bf006d7 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1ciwr2bwbxnw8366wvgl5ga3y2qj46i0h3yp3av1x9n2r8rddrlh"; + sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82"; }; vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk"; From 74c602f2115904a9d3facfe6d84beda4926e7f30 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Sat, 12 Jun 2021 00:42:20 -0400 Subject: [PATCH 744/797] scheme-bytestructures: init at 1.0.7 --- .../scheme-bytestructures/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/scheme-modules/scheme-bytestructures/default.nix diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix new file mode 100644 index 00000000000..3f1fd2b68a3 --- /dev/null +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, guile +, autoreconfHook +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "scheme-bytestructures"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "TaylanUB"; + repo = pname; + rev = "v${version}"; + sha256 = "0q0habjiy3h9cigb7q1br9kz6z212dn2ab31f6dgd3rrmsfn5rvb"; + }; + + postConfigure = '' + sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; + sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; + ''; + + nativeBuildInputs = [ + autoreconfHook pkg-config + ]; + buildInputs = [ + guile + ]; + + meta = with lib; { + description = "Structured access to bytevector contents"; + homepage = "https://github.com/TaylanUB/scheme-bytestructures"; + license = licenses.gpl3; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68a9ff02a43..840400d369d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12577,6 +12577,8 @@ in scheme48 = callPackage ../development/interpreters/scheme48 { }; + scheme-bytestructures = callPackage ../development/scheme-modules/scheme-bytestructures { }; + self = pkgsi686Linux.callPackage ../development/interpreters/self { }; spark = callPackage ../applications/networking/cluster/spark { }; From 0dd23e26108575c48c46ba994b6a4aaa92904b60 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Sat, 12 Jun 2021 00:43:42 -0400 Subject: [PATCH 745/797] guile-git: init at 0.3.0 --- .../guile-modules/guile-git/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/guile-modules/guile-git/default.nix diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix new file mode 100644 index 00000000000..f337eefecb2 --- /dev/null +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitLab +, guile +, libgit2 +, scheme-bytestructures +, autoreconfHook +, pkg-config +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "guile-git"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "guile-git"; + repo = pname; + rev = "v${version}"; + sha256 = "1s77s70gzfj6h7bglq431kw8l4iknhsfpc0mnvcp4lkhwdcgyn1n"; + }; + + postConfigure = '' + sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; + sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; + ''; + + nativeBuildInputs = [ + autoreconfHook pkg-config texinfo + ]; + buildInputs = [ + guile + ]; + propagatedBuildInputs = [ + libgit2 scheme-bytestructures + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Bindings to Libgit2 for GNU Guile"; + homepage = "https://gitlab.com/guile-git/guile-git"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 840400d369d..30a4554ef55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12653,6 +12653,8 @@ in guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; + guile-git = callPackage ../development/guile-modules/guile-git { }; + guile-gnome = callPackage ../development/guile-modules/guile-gnome { gconf = gnome2.GConf; guile = guile_2_0; From 4f6518d8ff00ba2cff2947130194e639298250c7 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Sat, 12 Jun 2021 01:18:36 -0400 Subject: [PATCH 746/797] Fix GPLv3Plus license --- .../scheme-modules/scheme-bytestructures/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 3f1fd2b68a3..545c9e165a1 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Structured access to bytevector contents"; homepage = "https://github.com/TaylanUB/scheme-bytestructures"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; platforms = platforms.linux; }; From 720c66eb6189722c1fe80d6b49c2acceefb7f93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomek=20Ma=C5=84ko?= Date: Sat, 12 Jun 2021 05:59:16 +0000 Subject: [PATCH 747/797] plex-media-player: 2.58.0.1076 -> 2.58.1 --- pkgs/applications/video/plex-media-player/default.nix | 6 +++--- pkgs/applications/video/plex-media-player/deps.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index e7a735f167c..81b354fe1ff 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -11,14 +11,14 @@ let depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; - version = "2.58.0.1076"; - vsnHash = "38e019da"; + version = "2.58.1"; + vsnHash = "ae73e074"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; + sha256 = "1q20fdp5d0blb0q6p2357bwdc2g65cadkgdp4w533ij2nyaxydjd"; }; nativeBuildInputs = [ pkg-config cmake python3 ]; diff --git a/pkgs/applications/video/plex-media-player/deps.nix b/pkgs/applications/video/plex-media-player/deps.nix index fddbae9375c..cfb74c2d489 100644 --- a/pkgs/applications/video/plex-media-player/deps.nix +++ b/pkgs/applications/video/plex-media-player/deps.nix @@ -7,22 +7,22 @@ rec { webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc="; + sha256 = "1xsacy1xb8a9rfdrd7lvx7n3hd0cf2c3mgmg9wl18jvwnqxyac83"; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8="; + sha256 = "07spxyhrg45ppa2zjn3ri4qvi6qimlmq6wmh492r3jkrwd71rxgf"; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4="; + sha256 = "1zll79hpgx8fghx228li9qairfd637yf8rhvjzdgpq4dvn21fv65"; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8="; + sha256 = "1zzfw2g76wqrxrx9kck5q79if78z91wn3awj703kz9sgxi4bkjsk"; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g="; + sha256 = "1f1zvrr3c0w37gvl78blg9rgxxi64nc4iv5vd87qbysfh1vpsjz0"; }; } From c63d4270feed5eb6c578fe2d9398d3f6f2f96811 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 23 May 2021 19:15:37 +0800 Subject: [PATCH 748/797] linuxPackages.rtl8188eus-aircrack: init at unstable-2021-05-04 --- .../linux/rtl8188eus-aircrack/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix new file mode 100644 index 00000000000..93a91f0447a --- /dev/null +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, kernel, bc }: + +stdenv.mkDerivation { + pname = "rtl8188eus-aircrack"; + version = "${kernel.version}-unstable-2021-05-04"; + + src = fetchFromGitHub { + owner = "aircrack-ng"; + repo = "rtl8188eus"; + rev = "6146193406b62e942d13d4d43580ed94ac70c218"; + sha256 = "sha256-85STELbFB7QmTaM8GvJNlWvAg6KPAXeYRiMb4cGA6RY="; + }; + + nativeBuildInputs = [ bc ]; + + buildInputs = kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" ]; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with lib; { + description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support"; + homepage = "https://github.com/aircrack-ng/rtl8188eus"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fortuneteller2k ]; + broken = kernel.isHardened; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68a9ff02a43..34e5d3ab0ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20762,6 +20762,8 @@ in r8168 = callPackage ../os-specific/linux/r8168 { }; + rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { }; + rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; From 741277f5b8d85119dd9f4cc41cdf340b7e8f42c2 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 20 Apr 2021 19:50:04 +0800 Subject: [PATCH 749/797] vscode-extensions.vadimcn.vscode-lldb: 1.6.1 -> 1.6.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jörg Thalheim --- .../vscode-lldb/build-deps/package.json | 2 +- .../vscode-lldb/cmake-build-extension-only.patch | 12 +++++++----- .../misc/vscode-extensions/vscode-lldb/default.nix | 10 +++++----- pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix | 8 ++++---- .../vscode-lldb/reset-cargo-config.patch | 14 +++++++++++--- pkgs/misc/vscode-extensions/vscode-lldb/update.sh | 2 +- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index 188fa67ede5..e59ab78888c 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "vscode-lldb", - "version": "1.6.1", + "version": "1.6.3", "dependencies": { "string-argv": "^0.3.1", "yaml": "^1.10.0", diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch index 30ab3f9b21c..fb55816b942 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch +++ b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 890abd4..157a8a1 100644 +index 37745b5..cad11a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,13 +16,6 @@ endif() set(VERSION "${VERSION}${VERSION_SUFFIX}") message("Version ${VERSION}") - + -set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files") -if (LLDB_PACKAGE) - message("Using LLDB_PACKAGE=${LLDB_PACKAGE}") @@ -14,15 +14,15 @@ index 890abd4..157a8a1 100644 -endif() - set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]") - + # General OS-specific definitions @@ -87,16 +80,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - + -# Run 'npm install' -execute_process( -- COMMAND ${NPM} install +- COMMAND ${NPM} ci # like install, but actually respects package-lock file. - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Result -) @@ -32,3 +32,5 @@ index 890abd4..157a8a1 100644 - # Copy it back, so we can commit the lock file. file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) + + diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 3ebb30fac65..f0d6a8e8ee3 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, jq, callPackage +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, callPackage , nodePackages, cmake, nodejs, unzip, python3 }: assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-mi+AeHg9zO0vjF0OZCufPkliInqxTvDGV350wqAwe90="; + sha256 = "sha256-Lw9JX7x000pUd/1MnGPv+RcIKlCKFlVgEslwXgrdO4k="; fetchSubmodules = true; }; @@ -24,7 +24,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-vcL/nSGhyE0INQVWxEIpYwXmnOl1soBn+mymZr1FaSM="; + cargoSha256 = "sha256-6nN+qVb1AEAMUth7d8mfQfLul0CpHnq9F93lXlp4mS0="; nativeBuildInputs = [ makeWrapper ]; @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { ''; # `adapter` will find python binary and libraries at runtime. - fixupPhase = '' + postFixup = '' wrapProgram $out/$installPrefix/adapter/codelldb \ --prefix PATH : "${python3}/bin" \ --prefix LD_LIBRARY_PATH : "${python3}/lib" diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix b/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix index 2ec90b1931e..e04e9ad0b5b 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix @@ -1,13 +1,13 @@ # Patched lldb for Rust language support. -{ lldb_11, fetchFromGitHub }: +{ lldb_12, fetchFromGitHub }: let llvmSrc = fetchFromGitHub { owner = "vadimcn"; repo = "llvm-project"; - rev = "dd7efd9ea2d38e3227bc2e83a99772aceeb44242"; - sha256 = "sha256-XY8J8Ie1cWb6ok72Gju/KUxZ4fIFQVitYVnuCezGRKQ="; + rev = "f2e9ff34256cd8c6feaf14359f88ad3f538ed687"; + sha256 = "sha256-5UsCBu3rtt+l2HZiCswoQJPPh8T6y471TBF4AypdF9I="; }; -in lldb_11.overrideAttrs (oldAttrs: { +in lldb_12.overrideAttrs (oldAttrs: { src = "${llvmSrc}/lldb"; passthru = (oldAttrs.passthru or {}) // { diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch index 300f8cd96ef..e95df0a9cef 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch +++ b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch @@ -1,11 +1,19 @@ +diff --git a/.cargo/config b/.cargo/config +index c3c75e4..e69de29 100644 --- a/.cargo/config +++ b/.cargo/config -@@ -1,8 +0,0 @@ +@@ -1,14 +0,0 @@ -[build] -target-dir = "build/target" - -[target.armv7-unknown-linux-gnueabihf] --linker = "arm-linux-gnueabihf-gcc" +-rustflags = [ +- "-C", "link-arg=-fuse-ld=lld", +- "-C", "link-arg=--target=armv7-unknown-linux-gnueabihf", +-] - -[target.aarch64-unknown-linux-gnu] --linker = "aarch64-linux-gnu-gcc" +-rustflags = [ +- "-C", "link-arg=-fuse-ld=lld", +- "-C", "link-arg=--target=aarch64-unknown-linux-gnu", +-] diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh index 0f3e407ddde..34bb5dbc33d 100755 --- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -20,7 +20,7 @@ version="$1" sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules) -sed -E 's/\bsha256 = ".*?"/sha256 = "'$srcHash'"/' --in-place "$nixFile" +sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile" cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile" From a5f462e79169777a0706312214f473984f7b5648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Mon, 10 May 2021 18:54:55 +0100 Subject: [PATCH 750/797] mindforger: remove use of deprecated QtWebFrame Removed references to QtWebKit and migrated to QtWebEngine. Co-authored-by: Dmitry Kalinkin Co-authored-by: Sandro --- .../editors/mindforger/default.nix | 27 +++++++++++++++---- .../mindforger/{build.patch => paths.patch} | 0 2 files changed, 22 insertions(+), 5 deletions(-) rename pkgs/applications/editors/mindforger/{build.patch => paths.patch} (100%) diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 512e0f12441..781d8296d01 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,9 +1,10 @@ { mkDerivation , cmark-gfm , fetchurl +, fetchpatch , qmake , qtbase -, qtwebkit +, qtwebengine , lib , wrapGAppsHook }: @@ -17,19 +18,35 @@ mkDerivation rec { sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake wrapGAppsHook ] ; - buildInputs = [ qtbase qtwebkit cmark-gfm ] ; + nativeBuildInputs = [ qmake wrapGAppsHook ]; + buildInputs = [ qtbase qtwebengine cmark-gfm ]; doCheck = true; - patches = [ ./build.patch ] ; + patches = [ + # this makes the package relocatable - removes hardcoded references to /usr + ./paths.patch + # this fixes compilation with QtWebEngine - referencing a commit trying to upstream the change - see https://github.com/dvorka/mindforger/pull/1357 + (fetchpatch { + url = "https://github.com/dvorka/mindforger/commit/d28e2bade0278af1b5249953202810540969026a.diff"; + sha256 = "sha256-qHKQQNGSc3F9seaOHV0gzBQFFqcTXk91LpKrojjpAUw="; + }) + ]; postPatch = '' substituteInPlace lib/src/install/installer.cpp --replace /usr "$out" substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out" + for f in app/app.pro lib/lib.pro; do + substituteInPlace "$f" --replace "QMAKE_CXX = g++" "" + done ''; - qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ; + qmakeFlags = [ + "-r" + "mindforger.pro" + "CONFIG+=mfnoccache" + "CONFIG+=mfwebengine" + ]; meta = with lib; { description = "Thinking Notebook & Markdown IDE"; diff --git a/pkgs/applications/editors/mindforger/build.patch b/pkgs/applications/editors/mindforger/paths.patch similarity index 100% rename from pkgs/applications/editors/mindforger/build.patch rename to pkgs/applications/editors/mindforger/paths.patch From 0887d7a7476bef520d35ff6321303bfee7ea5965 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 4 Jun 2021 21:57:46 +0200 Subject: [PATCH 751/797] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F13.ocaml:?= =?UTF-8?q?=20init=20at=204.13.0-=CE=B11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.13.nix | 9 +++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/4.13.nix diff --git a/pkgs/development/compilers/ocaml/4.13.nix b/pkgs/development/compilers/ocaml/4.13.nix new file mode 100644 index 00000000000..dc805f7e61c --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.13.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "13"; + patch_version = "0-alpha1"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha1.tar.xz"; + sha256 = "071k12q8m2w9bcwvfclyc46pwd9r49v6av36fhjdlqq29niyq915"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8314014e937..4bc9a592b67 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1511,6 +1511,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { }); + ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { }); + ocamlPackages_latest = ocamlPackages_4_12; ocamlPackages = ocamlPackages_4_12; From b94e1977e0c89060d3ba63bbfa6372e0f0d231b3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Jun 2021 20:19:15 +0000 Subject: [PATCH 752/797] attr: only supported on Linux attr makes direct syscalls, so I don't think it's going to work on any other platforms any time soon outside of a Linux translation layer. --- pkgs/development/libraries/attr/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index b81afc24ee9..b7c9287b68b 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -31,15 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2Plus; - - # The build failure on Darwin will likely be solved after upgrading the - # macOS SDK in nixpkgs. Check the current SDK version in - # ../../../../os-specific/darwin/apple-sdk/default.nix to see if it has - # been updated to 10.13 or later. Once the requirements are met, building - # it should be straightforward as Homebrew was able to build it without - # patching. - broken = stdenv.isDarwin; }; } From d4652e5ac4a7da4aac86218f562de9db8fccc375 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 11:06:29 +0200 Subject: [PATCH 753/797] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 06d4d195dd7..da1095743b5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -265,7 +265,7 @@ "fixer" = ps: with ps; [ fixerio ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit - "flic" = ps: with ps; [ ]; # missing inputs: pyflic + "flic" = ps: with ps; [ pyflic ]; "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; From 61543790d3e2b33b8b936b5baa24b86e7a67fb6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Jun 2021 13:16:56 +0200 Subject: [PATCH 754/797] python3Packages.pymeteoclimatic: init at 0.0.6 --- .../pymeteoclimatic/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pymeteoclimatic/default.nix diff --git a/pkgs/development/python-modules/pymeteoclimatic/default.nix b/pkgs/development/python-modules/pymeteoclimatic/default.nix new file mode 100644 index 00000000000..db150342a2a --- /dev/null +++ b/pkgs/development/python-modules/pymeteoclimatic/default.nix @@ -0,0 +1,39 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, lxml +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pymeteoclimatic"; + version = "0.0.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adrianmo"; + repo = pname; + rev = version; + sha256 = "0ys0d6jy7416gbsd0pqgvm5ygzn36pjdaklqi4q56vsb13zn7y0h"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + lxml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "meteoclimatic" ]; + + meta = with lib; { + description = "Python wrapper around the Meteoclimatic service"; + homepage = "https://github.com/adrianmo/pymeteoclimatic"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4e072dce93..d686bc1725f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5996,6 +5996,8 @@ in { pymeteireann = callPackage ../development/python-modules/pymeteireann { }; + pymeteoclimatic = callPackage ../development/python-modules/pymeteoclimatic { }; + pymetno = callPackage ../development/python-modules/pymetno { }; pymitv = callPackage ../development/python-modules/pymitv { }; From 505f270294caedc9fa07ae76cf2a77b6bce6c769 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 11:36:48 +0200 Subject: [PATCH 755/797] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 06d4d195dd7..2cd0dd52d18 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -500,7 +500,7 @@ "met_eireann" = ps: with ps; [ pymeteireann ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ meteoalertapi ]; - "meteoclimatic" = ps: with ps; [ ]; # missing inputs: pymeteoclimatic + "meteoclimatic" = ps: with ps; [ pymeteoclimatic ]; "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor From 41fa85575784f84378bb996a6ecf8a29f28c34e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 11:38:05 +0200 Subject: [PATCH 756/797] home-assistant: enable meteoclimatic tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6f06ec0a823..94cc0ac449a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -471,6 +471,7 @@ in with py.pkgs; buildPythonApplication rec { "meraki" "met" "met_eireann" + "meteoclimatic" "microsoft_face" "microsoft_face_detect" "microsoft_face_identify" From 2d641a29abeee4ab098e404b25b359b6f00aada6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 5 Jun 2021 08:56:28 +0000 Subject: [PATCH 757/797] nixUnstable: fix cross by disabling documentation The documentation for Nix HEAD now requires running the generated Nix binary, so we can't cross-build it. :( https://github.com/NixOS/nix/issues/4622 --- pkgs/tools/package-management/nix/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a7b3d12f7a5..6ba5135fdd6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -24,6 +24,8 @@ common = , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic + , enableDocumentation ? lib.versionOlder version "2.4pre" || + stdenv.hostPlatform == stdenv.buildPlatform , pname, version, suffix ? "", src , patches ? [ ] }: @@ -36,16 +38,20 @@ common = VERSION_SUFFIX = suffix; - outputs = [ "out" "dev" "man" "doc" ]; + outputs = + [ "out" "dev" ] + ++ lib.optionals enableDocumentation [ "man" "doc" ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] + ++ lib.optionals (is24 && enableDocumentation) [ + (lib.getBin lowdown) mdbook + ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex - (lib.getBin lowdown) mdbook jq ]; @@ -118,6 +124,7 @@ common = "--sysconfdir=${confDir}" "--enable-gc" ] + ++ lib.optional (!enableDocumentation) "--disable-doc-gen" ++ lib.optionals (!is24) [ # option was removed in 2.4 "--disable-init-state" @@ -160,7 +167,7 @@ common = license = lib.licenses.lgpl2Plus; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.unix; - outputsToInstall = [ "out" "man" ]; + outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man"; }; passthru = { From be976cdda9fcb41402be7ba1d09166e094e5e0f5 Mon Sep 17 00:00:00 2001 From: Petros Angelatos Date: Fri, 11 Jun 2021 10:59:18 +0200 Subject: [PATCH 758/797] materialize: 0.7.1 -> 0.8.0 Signed-off-by: Petros Angelatos --- pkgs/servers/sql/materialize/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index e89cd9804ab..5a2a3ad8ebf 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -40,17 +40,17 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.7.1"; - rev = "f4bd159fa73d37d44f8ed3f1db13c0c2ff85566f"; + version = "0.8.0"; + rev = "b2fe225f1afcfec4912976bdaa4a44caf3ca0842"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; inherit rev; - hash = "sha256-8nonB/KRv4qOGvJhh0v3UwlBzAXfzb3afeCm/7/E0AU="; + hash = "sha256:09q1bfgsp6j8l8wv2abgibndwfkg2w3nm4dif4qgdkd52fdg0kc5"; }; - cargoSha256 = "sha256-5slgICqLZFqxPymgHvq98BtcD70hfJMr36pvAoQKEJ4="; + cargoSha256 = "sha256:0y2r4980dyajf2ql9vb2jxcsn0a2q0gd3f8v932fgjqw13ysmi0s"; nativeBuildInputs = [ cmake perl pkg-config ] # Provides the mig command used by the krb5-src build script @@ -65,6 +65,7 @@ rustPlatform.buildRustPackage rec { "--skip test_client" "--skip test_client_errors" "--skip test_no_block" + "--skip test_safe_mode" ]; postPatch = '' From 39bc7363820157000a389e078808a1d553b9bf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 12 Jun 2021 12:34:04 +0200 Subject: [PATCH 759/797] nixos/console: allow console.font to be a path As for console.keyMap, all uses of this option are compatible with paths. This allows doing things like `console.font = pkgs.runCommand ...`. --- nixos/modules/config/console.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index 5be7f06c05d..c5150305bd8 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -43,13 +43,14 @@ in options.console = { font = mkOption { - type = types.str; + type = with types; either str path; default = "Lat2-Terminus16"; example = "LatArCyrHeb-16"; description = '' The font used for the virtual consoles. Leave empty to use whatever the setfont program considers the default font. + Can be either a font name or a path to a PSF font file. ''; }; From 280afb7d4c03400771ca20f03abab75bc81ce796 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 11 Jun 2021 19:20:32 +0300 Subject: [PATCH 760/797] wineUnstable: 6.9 -> 6.10 Staging updated as well --- pkgs/misc/emulators/wine/sources.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6103472a7cc..425730f7704 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,16 +44,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.9"; + version = "6.10"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-GFVOYB3vhqmiAXKwhcZoMpFPwh511VX25U/4nn6uW/4="; + sha256 = "sha256-WO3hSEgtSRiCYtWi0MnXAKdMacUcyqEcWt9j0/MUQZ8="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "6.1.1"; + version = "6.2.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-rDsUvq/eNLhIIofllwABE9wGqRXzLJ/QbHfrgZB544s="; + sha256 = "sha256-zY1TUT2DV7KHama6sIllTvmUH0LvaQ+1VcZJP1OB28o="; }; patches = [ @@ -65,17 +65,12 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-g0NmiypafOAmKDRoRf4uz5NnhFo6uga0fKYNCF29jbE="; + sha256 = "sha256-nqXgJe2i1xDW1aCAmwFPshiUI2PtZ/S7p8Cq2ODMTQk="; owner = "wine-staging"; repo = "wine-staging"; - #rev = "v${version}"; - # FIXME: replace with line above with 6.10 release - # Fix https://bugs.winehq.org/show_bug.cgi?id=51172 - rev = "5bbe3e47a559b3c04bc8791e0b398a271c772af7"; + rev = "v${version}"; - # Actually only "d3d11-Deferred_Context" cause problems, two others only dependencies - # see FIXME above - disabledPatchsets = [ "d3d11-Deferred_Context" "wined3d-CSMT_Main" "nvapi-Stub_DLL" "nvcuvid-CUDA_Video_Support" "nvencodeapi-Video_Encoder" ]; + disabledPatchsets = [ ]; }; winetricks = fetchFromGitHub rec { From bbfe4e6a5ef92be765cd6dc4d6aabc54af935704 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 5 Jun 2021 22:07:07 -0300 Subject: [PATCH 761/797] ocamlPackages.arp: 2.3.1 -> 2.3.2 --- .../development/ocaml-modules/arp/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/arp/default.nix b/pkgs/development/ocaml-modules/arp/default.nix index 518f1c9f424..d900f2b772e 100644 --- a/pkgs/development/ocaml-modules/arp/default.nix +++ b/pkgs/development/ocaml-modules/arp/default.nix @@ -8,50 +8,48 @@ buildDunePackage rec { pname = "arp"; - version = "2.3.1"; - - minimumOCamlVersion = "4.06"; - - useDune2 = true; + version = "2.3.2"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "1nzm3fbkvz702g8f60fs49736lpffwchy64i1l1raxm9b4lmdk3p"; + sha256 = "1s09ibj9v6pp2ckn96wxmn3mjifcj97asls5xc4zg75pflk0grgz"; }; + minimumOCamlVersion = "4.06"; + useDune2 = true; + nativeBuildInputs = [ bisect_ppx ]; propagatedBuildInputs = [ cstruct - ipaddr - macaddr - logs - mirage-time - mirage-protocols - lwt duration + ipaddr + logs + lwt + macaddr mirage-profile + mirage-protocols + mirage-time ]; doCheck = true; checkInputs = [ alcotest + ethernet + mirage-clock-unix mirage-profile mirage-random mirage-random-test - mirage-vnetif - mirage-clock-unix - mirage-random mirage-time-unix - ethernet + mirage-vnetif ]; meta = with lib; { description = "Address Resolution Protocol purely in OCaml"; - license = licenses.isc; homepage = "https://github.com/mirage/arp"; - maintainers = [ maintainers.sternenseemann ]; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; }; } From dc5593c2986f2ea6f3babda46d4dfbbcc6686a68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 15:09:38 +0200 Subject: [PATCH 762/797] python3Packages.georss-client: 0.13 -> 0.14 --- pkgs/development/python-modules/georss-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index e142942f939..2e5fc5da9e8 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "georss-client"; - version = "0.13"; + version = "0.14"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; rev = "v${version}"; - sha256 = "1pvx2qb8gs2f7bb8xxq689ydxirsl3bcgsbi5qv5klc4c051dj8i"; + sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0="; }; propagatedBuildInputs = [ From 9e2b8f07adc6ef70125cdd26d8447a3cff3d7a59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Jun 2021 15:09:57 +0200 Subject: [PATCH 763/797] python3Packages.georss-generic-client: 0.4 -> 0.6 --- .../python-modules/georss-generic-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix index e01d7fa789f..4f2e317c52e 100644 --- a/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/pkgs/development/python-modules/georss-generic-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-generic-client"; - version = "0.4"; + version = "0.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-generic-client"; rev = "v${version}"; - sha256 = "0i4shx6fvwibx0hlfmd0dyq2n5lkrqwmlm0l476fdb9bw5lkaiy0"; + sha256 = "sha256-XVejBbVilq8zrmuyBUd0mNPZ4qysSg9lAe/lhbKT+qs="; }; propagatedBuildInputs = [ From 0f6a466b0cfc49bd312e358fa114d726fd11587e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 12 Jun 2021 00:17:09 +0000 Subject: [PATCH 764/797] python3Packages.typed-ast: 1.4.1 -> 1.4.3 --- .../python-modules/typed-ast/default.nix | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 608ce8b65fe..d5c190e1c41 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,20 +1,40 @@ -{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }: +{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder, pytest }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.4.1"; - src = fetchFromGitHub{ + version = "1.4.3"; + src = fetchFromGitHub { owner = "python"; repo = "typed_ast"; rev = version; - sha256 = "086r9qhls6mz1w72a6d1ld3m4fbkxklf6mgwbs8wpw0zlxjm7y40"; + sha256 = "16mn9snwik5n2ib65sw2xcaqdm02j8ps21zgjxf8kyy7qnx2mx4w"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; - # No tests in archive - doCheck = false; + + pythonImportsCheck = [ + "typed_ast" + "typed_ast.ast27" + "typed_ast.ast3" + "typed_ast.conversions" + ]; + + checkInputs = [ + pytest + ]; + checkPhase = '' + runHook preCheck + + # We can't use pytestCheckHook because that invokes pytest with python -m pytest + # which adds the current directory to sys.path at the beginning. + # _That_ version of the typed_ast module doesn't have the C extensions we need. + pytest + + runHook postCheck + ''; + meta = { - homepage = "https://pypi.python.org/pypi/typed-ast"; - description = "a fork of Python 2 and 3 ast modules with type comment support"; + homepage = "https://github.com/python/typed_ast"; + description = "Python 2 and 3 ast modules with type comment support"; license = lib.licenses.asl20; }; } From 9052ddec409723e297f5de93f9f83e0dee35ba1e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 12 Jun 2021 16:17:24 +0200 Subject: [PATCH 765/797] kitty: 0.20.3 -> 0.21.0 https://github.com/kovidgoyal/kitty/releases/tag/v0.21.0 The patch is no longer needed. --- .../terminal-emulators/kitty/default.nix | 8 ++------ .../terminal-emulators/kitty/fix-paths.patch | 16 ---------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/terminal-emulators/kitty/fix-paths.patch diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 3b0d3028041..428830d945e 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.20.3"; + version = "0.21.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-rORIrbUqtQZuU6TjjYP7IZHfCPeLnrNy6wInnAwhG48="; + sha256 = "sha256-n8ipIQAfKPVApJhuTrlSSsd6dlPeCUvk7rdiVmL9i+4="; }; buildInputs = [ @@ -63,10 +63,6 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" ]; - patches = [ - ./fix-paths.patch - ]; - # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; diff --git a/pkgs/applications/terminal-emulators/kitty/fix-paths.patch b/pkgs/applications/terminal-emulators/kitty/fix-paths.patch deleted file mode 100644 index 380f6d74914..00000000000 --- a/pkgs/applications/terminal-emulators/kitty/fix-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -3,7 +3,7 @@ -# Patching is needed here for the following reason: -# * importing the `constants` package from Kitty has a side effect that it -# creates the user configuration directory. This package gets imported -# while sphinx scans the code for documentation strings. -# - - # You can set these variables from the command line. - SPHINXOPTS = -j auto -T $(FAIL_WARN) --SPHINXBUILD = sphinx-build -+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build - SPHINXPROJ = kitty - SOURCEDIR = . - BUILDDIR = _build From af9015c2aa2795c95fa0dc1743aafeaf0ceafbbe Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 12 Jun 2021 09:35:57 -0400 Subject: [PATCH 766/797] mindforger: don't use qt5.mkDerivation --- pkgs/applications/editors/mindforger/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 781d8296d01..e63c7ba3d90 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,15 +1,16 @@ -{ mkDerivation +{ lib +, stdenv , cmark-gfm , fetchurl , fetchpatch , qmake , qtbase , qtwebengine -, lib , wrapGAppsHook +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mindforger"; version = "1.52.0"; @@ -18,7 +19,7 @@ mkDerivation rec { sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake wrapGAppsHook ]; + nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ]; buildInputs = [ qtbase qtwebengine cmark-gfm ]; doCheck = true; From 48f22f432d5c7b328ba6cea01a1b5d640563c4da Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 12 Jun 2021 09:36:51 -0400 Subject: [PATCH 767/797] mindforger: install app on darwin --- pkgs/applications/editors/mindforger/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index e63c7ba3d90..6b93153ec04 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -49,6 +49,12 @@ stdenv.mkDerivation rec { "CONFIG+=mfwebengine" ]; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir "$out"/Applications + mv app/mindforger.app "$out"/Applications/ + wrapQtApp "$out"/Applications/mindforger.app/Contents/MacOS/mindforger + ''; + meta = with lib; { description = "Thinking Notebook & Markdown IDE"; longDescription = '' From 061b83317da2dcbb937fe9fb76076731b4bc1563 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 06:03:42 -0300 Subject: [PATCH 768/797] ocamlPackages.index: 1.3.0 -> 1.3.1 --- .../ocaml-modules/index/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index a24d72a3445..61ecb65510c 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -6,29 +6,41 @@ buildDunePackage rec { pname = "index"; - version = "1.3.0"; - - minimumOCamlVersion = "4.08"; - - useDune2 = true; + version = "1.3.1"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "00qwhwg79scs5bgp8nbppv06qs9yhicf686q7lh64ngh0642iz6n"; + sha256 = "sha256-ycZi/TFLoGRloSpjYqH5FCHWP3eyiTCIDLESEn5inuI="; }; - buildInputs = [ stdlib-shims ]; + minimumOCamlVersion = "4.08"; + useDune2 = true; + + buildInputs = [ + stdlib-shims + ]; propagatedBuildInputs = [ - fmt logs mtime repr ppx_repr cmdliner progress semaphore-compat + cmdliner + fmt + logs + mtime + ppx_repr + progress + repr + semaphore-compat ]; + checkInputs = [ + alcotest + crowbar + re + ]; doCheck = true; - checkInputs = [ alcotest crowbar re ]; - meta = { - homepage = "https://github.com/mirage/index"; + meta = with lib; { description = "A platform-agnostic multi-level index"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/index"; + license = licenses.mit; + maintainers = with maintainers; [ vbgl ]; }; } From 36a4ae8c05f4c8cd6b83bea0374d9bf98f301c11 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 12 Jun 2021 00:02:12 -0400 Subject: [PATCH 769/797] liblangtag: enable on darwin --- .../libraries/liblangtag/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 5c31197ebff..5ba2ecc5d6b 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext +{ lib, stdenv, fetchurl, autoreconfHook, gtk-doc, gettext , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: @@ -6,11 +6,10 @@ stdenv.mkDerivation rec { pname = "liblangtag"; version = "0.6.3"; - src = fetchFromBitbucket { - owner = "tagoh"; - repo = pname; - rev = version; - sha256 = "10rycs8xrxzf9frzalv3qx8cs1jcildhrr4imzxdmr9f4l585z96"; + # Artifact tarball contains lt-localealias.h needed for darwin + src = fetchurl { + url = "https://bitbucket.org/tagoh/liblangtag/downloads/${pname}-${version}.tar.bz2"; + sha256 = "sha256-HxKiCgLsOo0i5U3tuLaDpDycFgvaG6M3vxBgYHrnM70="; }; core_zip = fetchurl { @@ -31,19 +30,19 @@ stdenv.mkDerivation rec { cp "${language_subtag_registry}" data/language-subtag-registry ''; - configureFlags = [ - "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias" - ]; + configureFlags = + lib.optional + (stdenv.hostPlatform.libc == "glibc") + "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ]; nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ]; - meta = { - inherit version; + meta = with lib; { description = "An interface library to access tags for identifying languages"; - license = lib.licenses.mpl20; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.mpl20; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; # There are links to a homepage that are broken by a BitBucket change homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; }; From 401e5cf6fca7fe461d88af581e707f5300f020d5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 12 Jun 2021 17:49:29 +0200 Subject: [PATCH 770/797] bombadillo: Remove empty vendor dependency --- pkgs/applications/networking/browsers/bombadillo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index 5794bce31f0..b07c526c0d5 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; outputs = [ "out" "man" ]; From fa88e96379ea461253fe91dc5b009f9910469a92 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 12 Jun 2021 17:49:41 +0200 Subject: [PATCH 771/797] kubectl-example: Remove empty vendor dependency --- .../applications/networking/cluster/kubectl-example/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubectl-example/default.nix b/pkgs/applications/networking/cluster/kubectl-example/default.nix index 04677cb4277..228f12075c4 100644 --- a/pkgs/applications/networking/cluster/kubectl-example/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-example/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; meta = with lib; { description = "kubectl plugin for retrieving resource example YAMLs"; From 4acb93c132d1aa767a378927a34f3dd7b0501e88 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 12 Jun 2021 17:49:54 +0200 Subject: [PATCH 772/797] gjo: Remove empty vendor dependency --- pkgs/tools/text/gjo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index 0ab9a54c47b..da8fa212940 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; meta = with lib; { description = "Small utility to create JSON objects"; From c5a98fd73cb3d1bcd59b47e2e4799f870fa9c78f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 12 Jun 2021 18:27:07 +0200 Subject: [PATCH 773/797] wineStable: 6.0 -> 6.0.1 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6103472a7cc..e40561c5aff 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "6.0"; + version = "6.0.1"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY="; + sha256 = "sha256-Ogmh7Jyh6h1PcpWY14JxeXP09kRYZn+7dX0SLzoB2ko="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { From 327ac769dd734f51c774c99d9a26b8c13e6aefb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Jun 2021 18:32:23 +0200 Subject: [PATCH 774/797] python3Packages.python-igraph: 0.9.5 -> 0.9.6 https://github.com/igraph/python-igraph/releases/tag/0.9.6 --- pkgs/development/python-modules/python-igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index b04a7ba9baf..ce5073ed087 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.9.5"; + version = "0.9.6"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "sha256-3zyJTOkzkqb04/MtfzSJa+w6llo+h6CvHb1d4Bw3YUA="; + sha256 = "sha256-x/BUlMmSgjY2v6bVKPxmz86OCz6xgRUcfSqI3vV9MPs="; }; nativeBuildInputs = [ From 38c4256a9635d37ed297e43ade8e6f5ef42893d1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 12 Jun 2021 18:37:49 +0200 Subject: [PATCH 775/797] haskellPackages.gtk2hs-buildtools: attempt to fix build on aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linker failure outputs look like they are related to the GClosure stuff, so lets try disabling that flag on arm — originally the upstream cabal file disabled that flag by default if arch != x86_64-linux || != sparc64, so this seems to be actually correct. --- pkgs/development/haskell-modules/configuration-arm.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index b9f868b04ca..a8054c5861e 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -37,6 +37,10 @@ self: super: { # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 happy = dontCheck super.happy; + # Disable GClosure based signals implementation on aarch64 as it causes linker issues + # https://github.com/gtk2hs/gtk2hs/issues/305 + gtk2hs-buildtools = appendConfigureFlag super.gtk2hs-buildtools "-f-ClosureSignals"; + } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # AARCH64-SPECIFIC OVERRIDES From 1dc8d8f0c443df7c477dd44c3c914085d8c40347 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 1 Jun 2021 15:25:13 +0800 Subject: [PATCH 776/797] vscode-extensions.vadimcn.vscode-lldb: 1.6.3 -> 1.6.4 `vsce` need to be locked to 1.88.0, or build will fail. Since currently liblldb.so and lldb-server are in different outputs of lldb need to set `LLDB_DEBUGSERVER_PATH` to let liblldb.so find the server. --- .../node-packages/node-packages.nix | 7820 ++++++++--------- .../vscode-lldb/build-deps/package.json | 19 +- .../vscode-extensions/vscode-lldb/default.nix | 11 +- 3 files changed, 3540 insertions(+), 4310 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d5381c9c288..35e3c091aa3 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1200.2" = { + "@angular-devkit/architect-0.1200.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1200.2"; + version = "0.1200.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.2.tgz"; - sha512 = "Vy/dE1iwEiV63cxcU+SC+Lf5SUnY64vg9J3YA3jxFlJnELbxxN+T7xDfjMEMPoLzTY02K9XNb8ZGLStZxVmZLg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.4.tgz"; + sha512 = "/BKaVlpbZYb65elZ+xHoKB2J2DuTstMU++dqE9T/7E0CevuMoOdkLQFQm71Kjl3eFI4i6T5d8mlLVPNE/ZWm7w=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -76,13 +76,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/core-12.0.2" = { + "@angular-devkit/core-12.0.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.2.tgz"; - sha512 = "n7BmZAW0nx4pEigdAsibvtIm4Vjk1IwY3Bbc8fqD+AQpdYCo+Ake1Eu6fL2XoW8Yco7U4JYYdn/uodWEgBdroQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.4.tgz"; + sha512 = "gtQkLXuQK7NPkurw49//MFZWoRa9aVCIbxE2uxbDAzzQengx9nLUoezS2xVdM7m/SqVK72YL+ZFfSTXzfiSdnA=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -103,13 +103,13 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; - "@angular-devkit/schematics-12.0.2" = { + "@angular-devkit/schematics-12.0.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.0.2.tgz"; - sha512 = "PS+SrRhAc/lyRfuBsi6Rt2yV7IA34B7T6J0K8/Av0GABZ83x+0vLiZC39eSPS1X8qcM/U09pCfDT8Q6ZQPCICA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.0.4.tgz"; + sha512 = "MEAAcOh1Y4R6O7HWo7mMXgRK9BSbCZ3rlx+aHmtWpNXohw0TRhNY5WmRnQTRvMA3qjR9nh0Uo7BkRpgwRfqmBw=="; }; }; "@angular-devkit/schematics-cli-0.1102.6" = { @@ -229,13 +229,13 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apidevtools/json-schema-ref-parser-9.0.7" = { + "@apidevtools/json-schema-ref-parser-9.0.9" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.0.7"; + version = "9.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz"; - sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg=="; + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; + sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.14.3" = { + "@babel/cli-7.14.5" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.3.tgz"; - sha512 = "zU4JLvwk32ay1lhhyGfqiRUSPoltVDjhYkA3aQq8+Yby9z30s/EsFw1EPOHxWG9YZo2pAGfgdRNeHZQAYU5m9A=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz"; + sha512 = "poegjhRvXHWO0EAsnYajwYZuqcz7gyfxwfaecUESxDujrqOivf3zrjFbub8IJkrqEaz3fvJWh001EzxBub54fg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -337,22 +337,22 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.12.13" = { + "@babel/code-frame-7.14.5" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.14.4" = { + "@babel/compat-data-7.14.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz"; - sha512 = "i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz"; + sha512 = "kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w=="; }; }; "@babel/core-7.10.5" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.3" = { + "@babel/core-7.14.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz"; - sha512 = "jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.5.tgz"; + sha512 = "RN/AwP2DJmQTZSfiDaD+JQQ/J99KsIpOCfBE5pL+5jJSt7nI3nYGoAXZu+ffYSQ029NLs2DstZb+eR81uuARgg=="; }; }; "@babel/core-7.9.0" = { @@ -382,58 +382,58 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.3" = { + "@babel/generator-7.14.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz"; - sha512 = "bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz"; + sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA=="; }; }; - "@babel/helper-annotate-as-pure-7.12.13" = { + "@babel/helper-annotate-as-pure-7.14.5" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz"; + sha512 = "EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz"; + sha512 = "YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w=="; }; }; - "@babel/helper-compilation-targets-7.14.4" = { + "@babel/helper-compilation-targets-7.14.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; - sha512 = "JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; + sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.4" = { + "@babel/helper-create-class-features-plugin-7.14.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz"; - sha512 = "idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz"; + sha512 = "Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.14.3" = { + "@babel/helper-create-regexp-features-plugin-7.14.5" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz"; - sha512 = "JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; + sha512 = "TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="; }; }; "@babel/helper-define-polyfill-provider-0.2.3" = { @@ -445,76 +445,76 @@ let sha512 = "RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew=="; }; }; - "@babel/helper-explode-assignable-expression-7.13.0" = { + "@babel/helper-explode-assignable-expression-7.14.5" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; - sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz"; + sha512 = "Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ=="; }; }; - "@babel/helper-function-name-7.14.2" = { + "@babel/helper-function-name-7.14.5" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; - sha512 = "NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha512 = "Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ=="; }; }; - "@babel/helper-get-function-arity-7.12.13" = { + "@babel/helper-get-function-arity-7.14.5" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha512 = "I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg=="; }; }; - "@babel/helper-hoist-variables-7.13.16" = { + "@babel/helper-hoist-variables-7.14.5" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.13.16"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; - sha512 = "1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.13.12" = { + "@babel/helper-member-expression-to-functions-7.14.5" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; + sha512 = "UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ=="; }; }; - "@babel/helper-module-imports-7.13.12" = { + "@babel/helper-module-imports-7.14.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; + sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.2" = { + "@babel/helper-module-transforms-7.14.5" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; - sha512 = "OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; + sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA=="; }; }; - "@babel/helper-optimise-call-expression-7.12.13" = { + "@babel/helper-optimise-call-expression-7.14.5" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; + sha512 = "IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA=="; }; }; "@babel/helper-plugin-utils-7.10.4" = { @@ -526,121 +526,121 @@ let sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-plugin-utils-7.13.0" = { + "@babel/helper-plugin-utils-7.14.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.13.0" = { + "@babel/helper-remap-async-to-generator-7.14.5" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz"; + sha512 = "rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A=="; }; }; - "@babel/helper-replace-supers-7.14.4" = { + "@babel/helper-replace-supers-7.14.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; - sha512 = "zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; + sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; }; }; - "@babel/helper-simple-access-7.13.12" = { + "@babel/helper-simple-access-7.14.5" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; + sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { + "@babel/helper-skip-transparent-expression-wrappers-7.14.5" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.12.1"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz"; + sha512 = "dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ=="; }; }; - "@babel/helper-split-export-declaration-7.12.13" = { + "@babel/helper-split-export-declaration-7.14.5" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.0" = { + "@babel/helper-validator-identifier-7.14.5" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha512 = "V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; + sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="; }; }; - "@babel/helper-validator-option-7.12.17" = { + "@babel/helper-validator-option-7.14.5" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.13.0" = { + "@babel/helper-wrap-function-7.14.5" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz"; + sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.0" = { + "@babel/helpers-7.14.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz"; - sha512 = "+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.5.tgz"; + sha512 = "xtcWOuN9VL6nApgVHtq3PPcQv5qFBJzoSZzJ/2c0QK/IP/gxVcoWSNQwFEGvmbQsuS9rhYqjILDGGXcTkA705Q=="; }; }; - "@babel/highlight-7.14.0" = { + "@babel/highlight-7.14.5" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz"; - sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; + sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@babel/parser-7.14.4" = { + "@babel/parser-7.14.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz"; - sha512 = "ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz"; + sha512 = "TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; - sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz"; + sha512 = "ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -652,13 +652,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.14.2" = { + "@babel/plugin-proposal-async-generator-functions-7.14.5" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz"; - sha512 = "b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.5.tgz"; + sha512 = "tbD/CG3l43FIXxmu4a7RBe4zH7MLJ+S/lFowPFO7HetS2hyOZ/0nnnznegDuzFzfkyQYTxqdTH/hKmuBngaDAA=="; }; }; "@babel/plugin-proposal-class-properties-7.12.13" = { @@ -670,85 +670,85 @@ let sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; - "@babel/plugin-proposal-class-properties-7.13.0" = { + "@babel/plugin-proposal-class-properties-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; + sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; }; }; - "@babel/plugin-proposal-class-static-block-7.14.3" = { + "@babel/plugin-proposal-class-static-block-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz"; - sha512 = "HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz"; + sha512 = "KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.14.2" = { + "@babel/plugin-proposal-dynamic-import-7.14.5" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz"; - sha512 = "oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; + sha512 = "ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="; }; }; - "@babel/plugin-proposal-export-default-from-7.12.13" = { + "@babel/plugin-proposal-export-default-from-7.14.5" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz"; - sha512 = "idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.14.5.tgz"; + sha512 = "T8KZ5abXvKMjF6JcoXjgac3ElmXf0AWzJwi2O/42Jk+HmCky3D9+i1B7NPP1FblyceqTevKeV/9szeikFoaMDg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.14.2" = { + "@babel/plugin-proposal-export-namespace-from-7.14.5" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; - sha512 = "sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; + sha512 = "g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="; }; }; - "@babel/plugin-proposal-json-strings-7.14.2" = { + "@babel/plugin-proposal-json-strings-7.14.5" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz"; - sha512 = "w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; + sha512 = "NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.14.2" = { + "@babel/plugin-proposal-logical-assignment-operators-7.14.5" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz"; - sha512 = "1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; + sha512 = "YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz"; - sha512 = "ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; + sha512 = "gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.14.2" = { + "@babel/plugin-proposal-numeric-separator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; - sha512 = "DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; + sha512 = "yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.10.4" = { @@ -760,58 +760,58 @@ let sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.14.4" = { + "@babel/plugin-proposal-object-rest-spread-7.14.5" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz"; - sha512 = "AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.5.tgz"; + sha512 = "VzMyY6PWNPPT3pxc5hi9LloKNr4SSrVCg7Yr6aZpW4Ym07r7KqSU/QXYwjXLVxqwSv0t/XSXkFoKBPUkZ8vb2A=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.14.2" = { + "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz"; - sha512 = "XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; + sha512 = "3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.14.2" = { + "@babel/plugin-proposal-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz"; - sha512 = "qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; + sha512 = "ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.13.0" = { + "@babel/plugin-proposal-private-methods-7.14.5" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; + sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.14.0" = { + "@babel/plugin-proposal-private-property-in-object-7.14.5" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; - sha512 = "59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz"; + sha512 = "62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { + "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; + sha512 = "6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -841,13 +841,13 @@ let sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; - "@babel/plugin-syntax-class-static-block-7.12.13" = { + "@babel/plugin-syntax-class-static-block-7.14.5" = { name = "_at_babel_slash_plugin-syntax-class-static-block"; packageName = "@babel/plugin-syntax-class-static-block"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; - sha512 = "ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; + sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -859,13 +859,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.12.13" = { + "@babel/plugin-syntax-export-default-from-7.14.5" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz"; - sha512 = "gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.14.5.tgz"; + sha512 = "snWDxjuaPEobRBnhpqEfZ8RMxDbHt8+87fiEioGuE+Uc0xAKgSD8QiuL3lF93hPVQfZFAcYwrrf+H5qUhike3Q=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -877,13 +877,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.12.13" = { + "@babel/plugin-syntax-flow-7.14.5" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; - sha512 = "J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.14.5.tgz"; + sha512 = "9WK5ZwKCdWHxVuU13XNT6X73FGmutAXeor5lGFq6qhOFtMFUF4jkbijuyUdZZlpYq6E2hZeZf/u3959X9wsv0Q=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -913,13 +913,13 @@ let sha512 = "KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g=="; }; }; - "@babel/plugin-syntax-jsx-7.12.13" = { + "@babel/plugin-syntax-jsx-7.14.5" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; - sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz"; + sha512 = "ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -976,409 +976,409 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-private-property-in-object-7.14.0" = { + "@babel/plugin-syntax-private-property-in-object-7.14.5" = { name = "_at_babel_slash_plugin-syntax-private-property-in-object"; packageName = "@babel/plugin-syntax-private-property-in-object"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; - sha512 = "bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; + sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.13" = { + "@babel/plugin-syntax-top-level-await-7.14.5" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.12.13" = { + "@babel/plugin-syntax-typescript-7.14.5" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; - sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"; + sha512 = "u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q=="; }; }; - "@babel/plugin-transform-arrow-functions-7.13.0" = { + "@babel/plugin-transform-arrow-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; + sha512 = "KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.13.0" = { + "@babel/plugin-transform-async-to-generator-7.14.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; + sha512 = "szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.13" = { + "@babel/plugin-transform-block-scoped-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; + sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.14.4" = { + "@babel/plugin-transform-block-scoping-7.14.5" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz"; - sha512 = "5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz"; + sha512 = "LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw=="; }; }; - "@babel/plugin-transform-classes-7.14.4" = { + "@babel/plugin-transform-classes-7.14.5" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz"; - sha512 = "p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz"; + sha512 = "J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA=="; }; }; - "@babel/plugin-transform-computed-properties-7.13.0" = { + "@babel/plugin-transform-computed-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; + sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; }; }; - "@babel/plugin-transform-destructuring-7.14.4" = { + "@babel/plugin-transform-destructuring-7.14.5" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz"; - sha512 = "JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.5.tgz"; + sha512 = "wU9tYisEbRMxqDezKUqC9GleLycCRoUsai9ddlsq54r8QRLaeEhc+d+9DqCG+kV9W2GgQjTZESPTpn5bAFMDww=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.13" = { + "@babel/plugin-transform-dotall-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; + sha512 = "loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.13" = { + "@babel/plugin-transform-duplicate-keys-7.14.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; + sha512 = "iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.13" = { + "@babel/plugin-transform-exponentiation-operator-7.14.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; + sha512 = "jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.13.0" = { + "@babel/plugin-transform-flow-strip-types-7.14.5" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz"; - sha512 = "EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.14.5.tgz"; + sha512 = "KhcolBKfXbvjwI3TV7r7TkYm8oNXHNBqGOy6JDVwtecFaRoKYsUUqJdS10q0YDKW1c6aZQgO+Ys3LfGkox8pXA=="; }; }; - "@babel/plugin-transform-for-of-7.13.0" = { + "@babel/plugin-transform-for-of-7.14.5" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz"; + sha512 = "CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA=="; }; }; - "@babel/plugin-transform-function-name-7.12.13" = { + "@babel/plugin-transform-function-name-7.14.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; + sha512 = "vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="; }; }; - "@babel/plugin-transform-literals-7.12.13" = { + "@babel/plugin-transform-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; + sha512 = "ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.13" = { + "@babel/plugin-transform-member-expression-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; + sha512 = "WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="; }; }; - "@babel/plugin-transform-modules-amd-7.14.2" = { + "@babel/plugin-transform-modules-amd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz"; - sha512 = "hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; + sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.14.0" = { + "@babel/plugin-transform-modules-commonjs-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; - sha512 = "EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz"; + sha512 = "en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.13.8" = { + "@babel/plugin-transform-modules-systemjs-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz"; + sha512 = "mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA=="; }; }; - "@babel/plugin-transform-modules-umd-7.14.0" = { + "@babel/plugin-transform-modules-umd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; - sha512 = "nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; + sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.5.tgz"; + sha512 = "+Xe5+6MWFo311U8SchgeX5c1+lJM+eZDBZgD+tvXu9VVQPXwwVzeManMMjYX6xw2HczngfOSZjoFYKwdeB/Jvw=="; }; }; - "@babel/plugin-transform-new-target-7.12.13" = { + "@babel/plugin-transform-new-target-7.14.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; + sha512 = "Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="; }; }; - "@babel/plugin-transform-object-assign-7.12.13" = { + "@babel/plugin-transform-object-assign-7.14.5" = { name = "_at_babel_slash_plugin-transform-object-assign"; packageName = "@babel/plugin-transform-object-assign"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz"; - sha512 = "4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.14.5.tgz"; + sha512 = "lvhjk4UN9xJJYB1mI5KC0/o1D5EcJXdbhVe+4fSk08D6ZN+iuAIs7LJC+71h8av9Ew4+uRq9452v9R93SFmQlQ=="; }; }; - "@babel/plugin-transform-object-super-7.12.13" = { + "@babel/plugin-transform-object-super-7.14.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; + sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; }; }; - "@babel/plugin-transform-parameters-7.14.2" = { + "@babel/plugin-transform-parameters-7.14.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz"; - sha512 = "NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz"; + sha512 = "Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA=="; }; }; - "@babel/plugin-transform-property-literals-7.12.13" = { + "@babel/plugin-transform-property-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; + sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; }; }; - "@babel/plugin-transform-react-display-name-7.14.2" = { + "@babel/plugin-transform-react-display-name-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz"; - sha512 = "zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz"; + sha512 = "07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ=="; }; }; - "@babel/plugin-transform-react-jsx-7.14.3" = { + "@babel/plugin-transform-react-jsx-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz"; - sha512 = "uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz"; + sha512 = "7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q=="; }; }; - "@babel/plugin-transform-react-jsx-development-7.12.17" = { + "@babel/plugin-transform-react-jsx-development-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx-development"; packageName = "@babel/plugin-transform-react-jsx-development"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; - sha512 = "BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz"; + sha512 = "rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.12.13" = { + "@babel/plugin-transform-react-jsx-self-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz"; - sha512 = "FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.5.tgz"; + sha512 = "M/fmDX6n0cfHK/NLTcPmrfVAORKDhK8tyjDhyxlUjYyPYYO8FRWwuxBA3WBx8kWN/uBUuwGa3s/0+hQ9JIN3Tg=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.14.2" = { + "@babel/plugin-transform-react-jsx-source-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.2.tgz"; - sha512 = "OMorspVyjxghAjzgeAWc6O7W7vHbJhV69NeTGdl9Mxgz6PaweAuo7ffB9T5A1OQ9dGcw0As4SYMUhyNC4u7mVg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.5.tgz"; + sha512 = "1TpSDnD9XR/rQ2tzunBVPThF5poaYT9GqP+of8fAtguYuI/dm2RkrMBDemsxtY0XBzvW7nXjYM0hRyKX9QYj7Q=="; }; }; - "@babel/plugin-transform-react-pure-annotations-7.12.1" = { + "@babel/plugin-transform-react-pure-annotations-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-pure-annotations"; packageName = "@babel/plugin-transform-react-pure-annotations"; - version = "7.12.1"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; - sha512 = "RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz"; + sha512 = "3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g=="; }; }; - "@babel/plugin-transform-regenerator-7.13.15" = { + "@babel/plugin-transform-regenerator-7.14.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.13.15"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; - sha512 = "Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; + sha512 = "NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.13" = { + "@babel/plugin-transform-reserved-words-7.14.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; + sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; - "@babel/plugin-transform-runtime-7.14.3" = { + "@babel/plugin-transform-runtime-7.14.5" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz"; - sha512 = "t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz"; + sha512 = "fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.13" = { + "@babel/plugin-transform-shorthand-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; + sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; }; }; - "@babel/plugin-transform-spread-7.13.0" = { + "@babel/plugin-transform-spread-7.14.5" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.5.tgz"; + sha512 = "/3iqoQdiWergnShZYl0xACb4ADeYCJ7X/RgmwtXshn6cIvautRPAFzhd58frQlokLO6Jb4/3JXvmm6WNTPtiTw=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.13" = { + "@babel/plugin-transform-sticky-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; + sha512 = "Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="; }; }; - "@babel/plugin-transform-template-literals-7.13.0" = { + "@babel/plugin-transform-template-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; + sha512 = "22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.13" = { + "@babel/plugin-transform-typeof-symbol-7.14.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; + sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-typescript-7.14.4" = { + "@babel/plugin-transform-typescript-7.14.5" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.4.tgz"; - sha512 = "WYdcGNEO7mCCZ2XzRlxwGj3PgeAr50ifkofOUC/+IN/GzKLB+biDPVBUAQN2C/dVZTvEXCp80kfQ1FFZPrwykQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.5.tgz"; + sha512 = "cFD5PKp4b8/KkwQ7h71FdPXFvz1RgwTFF9akRZwFldb9G0AHf7CgoPx96c4Q/ZVjh6V81tqQwW5YiHws16OzPg=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.13" = { + "@babel/plugin-transform-unicode-escapes-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; + sha512 = "crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.13" = { + "@babel/plugin-transform-unicode-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; + sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; "@babel/preset-env-7.12.17" = { @@ -1390,22 +1390,22 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.14.4" = { + "@babel/preset-env-7.14.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.4.tgz"; - sha512 = "GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.5.tgz"; + sha512 = "ci6TsS0bjrdPpWGnQ+m4f+JSSzDKlckqKIJJt9UZ/+g7Zz9k0N8lYU8IeLg/01o2h8LyNZDMLGgRLDTxpudLsA=="; }; }; - "@babel/preset-flow-7.13.13" = { + "@babel/preset-flow-7.14.5" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.13.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.13.13.tgz"; - sha512 = "MDtwtamMifqq3R2mC7l3A3uFalUb3NH5TIBQWjN/epEPlZktcLq4se3J+ivckKrLMGsR7H9LW8+pYuIUN9tsKg=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.14.5.tgz"; + sha512 = "pP5QEb4qRUSVGzzKx9xqRuHUrM/jEzMqdrZpdMA+oUCRgd5zM1qGr5y5+ZgAL/1tVv1H0dyk5t4SKJntqyiVtg=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -1417,13 +1417,13 @@ let sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; - "@babel/preset-react-7.13.13" = { + "@babel/preset-react-7.14.5" = { name = "_at_babel_slash_preset-react"; packageName = "@babel/preset-react"; - version = "7.13.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.13.13.tgz"; - sha512 = "gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA=="; + url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz"; + sha512 = "XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ=="; }; }; "@babel/preset-stage-0-7.8.3" = { @@ -1453,22 +1453,22 @@ let sha512 = "T513uT4VSThRcmWeqcLkITKJ1oGQho9wfWuhQm10paClQkp1qyd0Wf8mvC8Se7UYssMyRSj4tZYpVTkCmAK/mA=="; }; }; - "@babel/preset-typescript-7.13.0" = { + "@babel/preset-typescript-7.14.5" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz"; - sha512 = "LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz"; + sha512 = "u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw=="; }; }; - "@babel/register-7.13.16" = { + "@babel/register-7.14.5" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.13.16"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.13.16.tgz"; - sha512 = "dh2t11ysujTwByQjXNgJ48QZ2zcXKQVdV8s0TbeMI0flmtGWCdTwK9tJiACHXPLmncm5+ktNn/diojA45JE4jg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.14.5.tgz"; + sha512 = "TjJpGz/aDjFGWsItRBQMOFTrmTI9tr79CHOK+KIvLeCkbxuOAk2M5QHjvruIMGoo9OuccMh5euplPzc5FjAKGg=="; }; }; "@babel/runtime-7.13.9" = { @@ -1480,13 +1480,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.0" = { + "@babel/runtime-7.14.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz"; - sha512 = "JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.5.tgz"; + sha512 = "121rumjddw9c3NCQ55KGkyE1h/nzWhU/owjhw0l4mQrkzz4x9SGS1X8gFLraHwX7td3Yo4QTL+qj0NcIzN87BA=="; }; }; "@babel/runtime-7.9.0" = { @@ -1498,49 +1498,49 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.0" = { + "@babel/runtime-corejs3-7.14.5" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz"; - sha512 = "0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.5.tgz"; + sha512 = "cBbwXj3F2xjnQJ0ERaFRLjxhUSBYsQPXJ7CERz/ecx6q6hzQ99eTflAPFC3ks4q/IG4CWupNVdflc4jlFBJVsg=="; }; }; - "@babel/standalone-7.14.4" = { + "@babel/standalone-7.14.5" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.4.tgz"; - sha512 = "oBvBtSdACtNeH2YAg2kyZhfbqfKQK7lgudfHo8IC03JiBrfuvvMlfkBaSrqxrpf9DmUCZJnDZH3uLNVN5QoXog=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.5.tgz"; + sha512 = "cildg3/P3jk0j+dB+9fJ8Gthrvc9TxhlqvEQXHOn48VpHxGiKZBgBKMJWV5rPJZK5KASSaDYbvdNJOeqYaKf/A=="; }; }; - "@babel/template-7.12.13" = { + "@babel/template-7.14.5" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; - sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz"; + sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.2" = { + "@babel/traverse-7.14.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz"; - sha512 = "TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.5.tgz"; + sha512 = "G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg=="; }; }; - "@babel/types-7.14.4" = { + "@babel/types-7.14.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz"; - sha512 = "lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz"; + sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1606,13 +1606,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2json-0.4.0" = { + "@cdktf/hcl2json-0.4.1" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.4.0.tgz"; - sha512 = "etFW1+DoAwQ7ENtdvpuKxmosJDDJ2rnQUDkJPZnNIqLUAXcGG3MdU6PWTnLQX/xwDMQq7xfCZlDK/hrV7g2rhA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.4.1.tgz"; + sha512 = "yabxBeKkCJvj3gFQmHfsS/P6JaQMBqbyEZ1G67gTCtfkbOSEGib8KWsl3ZA+u5Fs2z5q9M4emLcCBHHPrmSG3g=="; }; }; "@chemzqm/neovim-5.2.13" = { @@ -2011,13 +2011,13 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@eslint/eslintrc-0.4.1" = { + "@eslint/eslintrc-0.4.2" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg=="; }; }; "@exodus/schemasafe-1.0.0-rc.3" = { @@ -2218,13 +2218,13 @@ let sha512 = "8Q4sH+KBgM9jsH7Dp0A5lEmGiKvBXNcax2H6k8i54vfptaUh8gBZqohGuLshzeTJYT43I3LDulheOGr83yNB3g=="; }; }; - "@expo/xcpretty-2.0.1" = { + "@expo/xcpretty-2.0.2" = { name = "_at_expo_slash_xcpretty"; packageName = "@expo/xcpretty"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-2.0.1.tgz"; - sha512 = "fyQbzvZpLiKpx68QDzeLlL1AtFhhEW35dqxIqb4QQ6e3iofu57NdWBQTmIAQzDOPcNNXUR9SFncu3M4iyWwQ7Q=="; + url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-2.0.2.tgz"; + sha512 = "c5e+tj8XG7xHE4ohQhgVx3b6cq0ePTOfbZ5a2bLrF4QGLeCJ92bBBZ+LkcHFHbwngQBe20w9pqMqJGD/C5ZAEg=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2272,13 +2272,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.170.1" = { + "@fluentui/react-7.170.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.170.1"; + version = "7.170.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.170.1.tgz"; - sha512 = "v43+TQ+zcjzW3vPOebIIUQpj4j1p4McDVwrVGplUmIVgxXPg9wBvXGB0CcBvpaFRZq6tKG95uUdanRsEStBMxQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.170.3.tgz"; + sha512 = "PTXyeYuBCLhdT8SzlBKNOeejuJST5G7IxNgAXgdHayipJRa3gNYoE8kbWbGr64sQatQPDDYastVl8iSLe6B9Hw=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -2326,13 +2326,13 @@ let sha512 = "+SDJ3ZvGkF7hzo6BGa8ZqeK3F6Z4+S+KviC9oOK+XCs3tfMyJCh/4j93XIWINgMMDIh9BgEvlw4306VxlXIlYA=="; }; }; - "@google-cloud/projectify-2.0.1" = { + "@google-cloud/projectify-2.1.0" = { name = "_at_google-cloud_slash_projectify"; packageName = "@google-cloud/projectify"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz"; - sha512 = "ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ=="; + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.0.tgz"; + sha512 = "qbpidP/fOvQNz3nyabaVnZqcED1NNzf7qfeOlgtAZd9knTwY+KtsGRkYpiQzcATABy4gnGP2lousM3S0nuWVzA=="; }; }; "@google-cloud/promisify-2.0.3" = { @@ -2344,13 +2344,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.12.0" = { + "@google-cloud/pubsub-2.13.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.12.0.tgz"; - sha512 = "SF+y7sKX9Jo2ZoVqzwEuSReUyb6O4mwxzxP1B+dP3j0ArUk0XXSC/tFLQhYM7lC2ViLxGWoIbEZbRIw8SrIQnw=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.13.0.tgz"; + sha512 = "DXR/mYbGDUxCoLOT9FhOUrnYcsEEL2am6GMc5GWQf6nqCEH25OxTZJccZ/7xg5UMkDhSWmDcbmtDyAjcPwEN1g=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2488,24 +2488,6 @@ let sha512 = "DZqx3nHBm2OGY7NKq4sppDEfx4nBAsQH/d/H/yxo/+BwpVLWLGs+OorpwQ+Fqd6EgpDEoi4MhqndjGUeLl/5GA=="; }; }; - "@grpc/grpc-js-1.2.12" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.12.tgz"; - sha512 = "+gPCklP1eqIgrNPyzddYQdt9+GvZqPlLpIjIo+TveE+gbtp74VV1A2ju8ExeO8ma8f7MbpaGZx/KJPYVWL9eDw=="; - }; - }; - "@grpc/grpc-js-1.3.1" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.1.tgz"; - sha512 = "zyFq9eW0U4vGyhJS/oeW3mIeKTzB13we9rBclcisfRHxGQbC9FCOKQ5BBA2129yZwRVMt4hQia1igGzECeuY9g=="; - }; - }; "@grpc/grpc-js-1.3.2" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -2524,24 +2506,6 @@ let sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; }; }; - "@grpc/proto-loader-0.6.0" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0.tgz"; - sha512 = "JwWZwGuN1nQuPdeL1d94hNGtnRtiOuy+SkdVUU8IwwQzksvdWvgKHyGDCesvAD0tndQTm1YUZHJw+JDTIDALyQ=="; - }; - }; - "@grpc/proto-loader-0.6.1" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz"; - sha512 = "4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw=="; - }; - }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -3820,13 +3784,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.174" = { + "@microsoft/load-themed-styles-1.10.181" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.174"; + version = "1.10.181"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.174.tgz"; - sha512 = "O0ERVgeTrpzCzCLHOTZZDSg0K3FKdWRdBpFjs+X5wS21Jg21QqrA4T9FhCheilEcrF4Qmf41gBtgZ/16JNSWIA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.181.tgz"; + sha512 = "HkABSVIAL+ulsDMy7s28rwhvl0ODq4QF/KvFwRngZJRPBKNjpcf1uFLCluBcEngnl4LSArCCuM7ozND7t8CMDA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3892,13 +3856,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-11.29.2" = { + "@netlify/build-12.1.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "11.29.2"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-11.29.2.tgz"; - sha512 = "fxVBpKjsTdcRkfj9RdMBVxy/TABQJhkf5/vFwzNZqnnBwes/Em6YFutNpML6zm5Ub9hpvE0HaceyOU4HkvjSFg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-12.1.0.tgz"; + sha512 = "DvKkNgfwzrQc3lFHJjHfoX7/l2qNd5F6i8urIEthYCH98SLMKrwuCcw3MSkgcmVKI4e+YE0H2PF2MiWWgQ+WLw=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3910,31 +3874,40 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-6.7.1" = { + "@netlify/config-7.2.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "6.7.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-6.7.1.tgz"; - sha512 = "4DyiSauSFaorJ46l4tBu+nbvPKY9i1gOQvw9L4yql7gd7qqJsHJi2zivdJ50+MPedQn0cgcs5lk303UBEfFsBQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-7.2.0.tgz"; + sha512 = "bxjAO6EvROkDtHZtaJg6phiZnR+cXYDTrlsrws9uOV5fuwT2hN0+82ICxUw5dSv+PHnz36nKqJCaC2F2J459Vw=="; }; }; - "@netlify/framework-info-5.1.2" = { + "@netlify/esbuild-0.13.5" = { + name = "_at_netlify_slash_esbuild"; + packageName = "@netlify/esbuild"; + version = "0.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild/-/esbuild-0.13.5.tgz"; + sha512 = "412V+fUhQagmQ6gw/SqvFU1Gi06n+7M9Rug6+Fr4Qzpiq7To2iMS0myYOyyFs1UfmVM6a3erXKfhPQsBzo4CQQ=="; + }; + }; + "@netlify/framework-info-5.1.4" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.1.2.tgz"; - sha512 = "v3Fs9REofVNMgye8j1c0NBfVRA+P+2cS50Y1RRwrlVz344UUwZd7b0LKhZl0EkQadsdyxG2a3XgjxF5Zb3jJ0Q=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.1.4.tgz"; + sha512 = "u995zzabQ+L6MKSNw4oVsN4wXiPfgN2Cb20yxC+7lmsRJWXdaEVHh9CASc7UmTrXELGXIAROS16+vlHv63fZ7A=="; }; }; - "@netlify/functions-utils-1.3.37" = { + "@netlify/functions-utils-1.3.40" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.37"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.37.tgz"; - sha512 = "Lq1Aj3N2vWB3nNFRbEHgVjB+MpwCsZz+rUOCki3h5PwEUwnGFyFi2VcdHQ2FJtzF7vrcm5NoMfg4pG8iY91YGA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.40.tgz"; + sha512 = "H7+rB6VJOzzFSniUSv98ZSSydd5SfZlbEcxNPbVpXrl8WAcK7GlmIBfXCpyVzVjbflecxSdVhZC2i6isHDN4zA=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -3946,31 +3919,40 @@ let sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ=="; }; }; - "@netlify/open-api-2.4.0" = { + "@netlify/open-api-2.5.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.4.0.tgz"; - sha512 = "ffNpGiJulY4is1pWkrs1dn3/ytNoqJxyAD/N70cnkIVNpOWMnPGSPKGBk/TBpaZhispgSBBQ+JZXEMJAGMDZ6Q=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.5.0.tgz"; + sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.13" = { + "@netlify/plugin-edge-handlers-1.11.16" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.13"; + version = "1.11.16"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.13.tgz"; - sha512 = "GPSg5bYlU2hgmt1MGx22+ZoXbPdnEiqkdj40hWxJjHuDIGqfvFa3nGup7BvHBNfd1uI+OVSlLXzabWl6aVjQIg=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.16.tgz"; + sha512 = "f9a2G4z9PY5nh2UClLuY8+j+kNa38CuDFPDdf63vEfy1Dt/ICrWpbfTOhwknd6BrPgZ3lu477joRankm19dPMQ=="; }; }; - "@netlify/plugins-list-2.14.2" = { + "@netlify/plugins-list-2.15.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.14.2"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.14.2.tgz"; - sha512 = "WbLQ0X1cnryXzWeV03dA3BHw0CEPDTrj3IvjbeOB45A5/dxvTgQVjAeFbmqgRj6A8GPHgSLoNN0kteoXBojHhw=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.15.0.tgz"; + sha512 = "UOkQGvLjy5XDQsVpaaur/QOTPCXS6xCIbMWRYgboEH/BtMNh7ATv7fkF1kQgrJ1+hdguWzRYhww8/4A+G/kcxw=="; + }; + }; + "@netlify/routing-local-proxy-0.30.0" = { + name = "_at_netlify_slash_routing-local-proxy"; + packageName = "@netlify/routing-local-proxy"; + version = "0.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.0.tgz"; + sha512 = "603JAYirKZOse+wzAdHwudvWUCGe7nqu5pOVVIa562AV3YhNgZU4sPPKFUcRSXn3QFgyhUSxnNHOabs62IWhrg=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -3982,49 +3964,22 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/traffic-mesh-agent-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent"; - packageName = "@netlify/traffic-mesh-agent"; - version = "0.27.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.10.tgz"; - sha512 = "HZXEdIXzg8CpysYRDVXkBpmjOj/C8Zb8Q/qkkt9x+npJ56HeX6sXAE4vK4SMCRLkkbQ2VyYTaDKg++GefeB2Gg=="; - }; - }; - "@netlify/traffic-mesh-agent-darwin-x64-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; - packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.27.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.10.tgz"; - sha512 = "j2blCh3TKNV35VPF9Zf/LM3v6pH/gz/Y7uu/78RLbgNvCW0vGN7b1GgFnXQKwrvbL6tRGumJS2P5PWUfEsKOBA=="; - }; - }; - "@netlify/traffic-mesh-agent-linux-x64-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; - packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.27.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.10.tgz"; - sha512 = "JdeGT356TtqbxY6IjsS+wik68V0iNGdRsGV4cYOx/aAfclAyZ9DL29A4nzobyq5J+s5binrbKpix26/WKi+sqA=="; - }; - }; - "@netlify/traffic-mesh-agent-win32-x64-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; - packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.27.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.10.tgz"; - sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; - }; - }; - "@netlify/zip-it-and-ship-it-4.2.5" = { + "@netlify/zip-it-and-ship-it-4.2.7" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.2.5"; + version = "4.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.5.tgz"; - sha512 = "2ncCQEs49I8Ir30w2T3E1yogJp9cw+X8vfvL9a8i1AA0VE51F2rfhNsLbceWrEWn2T3TgogOMQP/0Qsxw2v0Tg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.7.tgz"; + sha512 = "7RDPHByyberzRWpQ5PTQZOWWXGH4mqggPDCgj58vDsgIffF+GeG+pZBPv4ZOGCPPb2INZbG0iTiJFvAHictKew=="; + }; + }; + "@netlify/zip-it-and-ship-it-4.3.0" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.3.0.tgz"; + sha512 = "SrI3AFL57IhhQiBgllCj2PMgRlY/b7iA1h0mym9EItduV98+3wmmyXDKTxJtxu2dE0QNUG2J8uiXmCncVAqv6g=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4081,13 +4036,13 @@ let sha512 = "1TTvTwvGMSe9SQMEKN5zGdyGMv8Kth49eiUcdPnUWigtafk1BE9iP7gVSyLVYgijzCwh40GUkSYey0TUaSbRBw=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -4099,31 +4054,31 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.7" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz"; + sha512 = "BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA=="; }; }; - "@npmcli/arborist-2.6.1" = { + "@npmcli/arborist-2.6.2" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.1.tgz"; - sha512 = "OOlntFIOAo7RplEQaYXlA5U5NXE+EwZtnTCsit4Wtme5+llGiea6GBytuV8dOzdPMPlNx3fQQjBUE9E8k76yjQ=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.2.tgz"; + sha512 = "CAo0HSziRdlpGUUheERmOrADnKHfBYpLAl/HmWGwGCtWKB3BCxfgb0rJ7MsFg38wy7YF3+fDs7R9dMVCH89K/A=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4342,40 +4297,40 @@ let sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA=="; }; }; - "@octokit/core-3.4.0" = { + "@octokit/core-3.5.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz"; - sha512 = "6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-3.5.0.tgz"; + sha512 = "IKcyllVQe6KPwPPFIaKdbhNNQhmmHIj69PXOseBF6/NglXoKHVe79syEfZj0bz7sP87MOl5jLZadV3slgdZ1vQ=="; }; }; - "@octokit/endpoint-6.0.11" = { + "@octokit/endpoint-6.0.12" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.11"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz"; - sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"; + sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; }; }; - "@octokit/graphql-4.6.2" = { + "@octokit/graphql-4.6.4" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "4.6.2"; + version = "4.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz"; - sha512 = "WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.4.tgz"; + sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-7.2.3" = { + "@octokit/openapi-types-7.3.2" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "7.2.3"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.2.3.tgz"; - sha512 = "V1ycxkR19jqbIl3evf2RQiMRBvTNRi+Iy9h20G5OP5dPfEF6GJ1DPlUeiZRxo2HJxRr+UA4i0H1nn4btBDPFrw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.3.2.tgz"; + sha512 = "oJhK/yhl9Gt430OrZOzAl2wJqR0No9445vmZ9Ey8GjUZUpwuu/vmEFP0TDhDXdpGDoxD6/EIFHJEcY8nHXpDTA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4387,22 +4342,22 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.13.3" = { + "@octokit/plugin-paginate-rest-2.13.5" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.13.3"; + version = "2.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz"; - sha512 = "46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.5.tgz"; + sha512 = "3WSAKBLa1RaR/7GG+LQR/tAZ9fp9H9waE9aPXallidyci9oZsfgsLn5M836d3LuDC6Fcym+2idRTBpssHZePVg=="; }; }; - "@octokit/plugin-request-log-1.0.3" = { + "@octokit/plugin-request-log-1.0.4" = { name = "_at_octokit_slash_plugin-request-log"; packageName = "@octokit/plugin-request-log"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz"; - sha512 = "4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"; + sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; "@octokit/plugin-rest-endpoint-methods-5.3.1" = { @@ -4414,40 +4369,40 @@ let sha512 = "3B2iguGmkh6bQQaVOtCsS0gixrz8Lg0v4JuXPqBcFqLKuJtxAUf3K88RxMEf/naDOI73spD+goJ/o7Ie7Cvdjg=="; }; }; - "@octokit/request-5.4.15" = { + "@octokit/request-5.6.0" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.15"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz"; - sha512 = "6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.0.tgz"; + sha512 = "4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA=="; }; }; - "@octokit/request-error-2.0.5" = { + "@octokit/request-error-2.1.0" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz"; - sha512 = "T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"; + sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.5.5" = { + "@octokit/rest-18.6.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.5.5"; + version = "18.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.5.tgz"; - sha512 = "Py9sWvxBGeAwNY8UnhxP6jnq7aflvQ0uQ6gmZObyJLR9hmd5NEz9piu/A77cxV6+0l9UNACJVXX6FOnl5LIcPw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.0.tgz"; + sha512 = "MdHuXHDJM7e5sUBe3K9tt7th0cs4csKU5Bb52LRi2oHAeIMrMZ4XqaTrEv660HoUPoM1iDlnj27Ab/Nh3MtwlA=="; }; }; - "@octokit/types-6.16.2" = { + "@octokit/types-6.16.4" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.16.2"; + version = "6.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.2.tgz"; - sha512 = "wWPSynU4oLy3i4KGyk+J1BLwRKyoeW2TwRHgwbDz17WtVFzSK2GOErGliruIx8c+MaYtHSYTx36DSmLNoNbtgA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.4.tgz"; + sha512 = "UxhWCdSzloULfUyamfOg4dJxV9B+XjgrIZscI0VCbp4eNrjmorGEw+4qdwcpTsu6DIrm9tQsFQS2pK5QkqQ04A=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4504,310 +4459,310 @@ let sha512 = "+0P+PrP9qSFVaayNdek4P1OAGE+PEl2SsufuHDRmUpOY25Wzjo7Atyar56Trjc32jkNy4lID6ZFT6BahsR9P9A=="; }; }; - "@ot-builder/bin-composite-types-1.0.8" = { + "@ot-builder/bin-composite-types-1.0.9" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.8.tgz"; - sha512 = "YVSC2OhhBYx4nTELZrS/DKbdseDhCIlyMiey4Zgc6VKQgC33ZXaGB9gUnAT/CHuGJINQJoKtsgyRA3nkd+2QJw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.9.tgz"; + sha512 = "ErKiMoPa3CdguITg/k/k5rm/Or+O1MwzadX3knibqu4QGbOmPco1/uS4BOShKriC9frJnnN9AYOT9w9quvKZQg=="; }; }; - "@ot-builder/bin-util-1.0.8" = { + "@ot-builder/bin-util-1.0.9" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.8.tgz"; - sha512 = "GkyOMuUD3AQGCguvyaAgraEc7DMsKAHoujFPSUN76h6C9LUYGmayCDsbHjZoInkb90+m2OXcZ9hqSCIThZ6dcA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.9.tgz"; + sha512 = "NAf0soBY4KkejHFuq5Q9R5cebzbD5e22cPlZGS+gXF1a5zRfuLdXbmMv6XXlca8z7zHF8jfaCbZtqqP1xrWLZg=="; }; }; - "@ot-builder/cli-help-shower-1.0.8" = { + "@ot-builder/cli-help-shower-1.0.9" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.8.tgz"; - sha512 = "MXbzoFtpSbU9eQozzynlEPRjUBDbtDq187SylpYIeV7FARfkaKd7f8M6FDH+gqeNMeAUcivnMYifAC+nz8bWOA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.9.tgz"; + sha512 = "NoYTfWa1OhhRn2qluLbh/3IbWXuXqclBrXBp5lbkp5Wz4yf25m8KHJgqMwIm2wnhKP2v4xj8lzKCp/Jn1+QL5A=="; }; }; - "@ot-builder/cli-proc-1.0.8" = { + "@ot-builder/cli-proc-1.0.9" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.8.tgz"; - sha512 = "kOGCHlc7cSI8J24gCRHXNbl4IvsjdorRUX9L3HtDDH9pVpHqVrlb3X2opcNVtPo0kYbKidANEGf76c/WRi0ERQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.9.tgz"; + sha512 = "g8xX/y6Z0LtvLvLAx5rZY8P3dfmhSm/EiWlKOnf2Cz36IqGgYwaihicPc0ONSNki81bseRgC6j/uXTd0+UxZTw=="; }; }; - "@ot-builder/cli-shared-1.0.8" = { + "@ot-builder/cli-shared-1.0.9" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.8.tgz"; - sha512 = "B5c0RqrRkB8gb7h0+mX+JQAP6I8TtnLD8JiYRGMo+JszI2anh7ecD3XbVgMF0oJi8e5r5+p0xq8sDrJi4qy9SQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.9.tgz"; + sha512 = "rf9ebY8WJqyafdOKjmdWOBfSofiDl9PxhahlgJk+k+IK37sjd/QXOSqB6UEGlx2dJhlVnoJAg5lmRxS/5ent0w=="; }; }; - "@ot-builder/common-impl-1.0.8" = { + "@ot-builder/common-impl-1.0.9" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.8.tgz"; - sha512 = "ho7WtOf+MiMq6jjF6LbepqTTnyzEv6OeNTT1erkdWb52QETZnINYtbMks/HVPYHnGMZqy62dmN8f1PSe74yD0A=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.9.tgz"; + sha512 = "QuR3zXvgxLbNqoQuyX1rBqG3bcSsAVfV2JuXwKyuLY5MlNELq8luUJPjZRtLdmtAuWUU7waVrAUUlSjyf7A+lg=="; }; }; - "@ot-builder/errors-1.0.8" = { + "@ot-builder/errors-1.0.9" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.8.tgz"; - sha512 = "I8XzcO4tg8rWKFTS3nHKvPOE27uGH8fZLy9HsqU4yw8rGMYUo1EDxabReQ8v53DhrIlpbObW3/nSrGF4LT6m8Q=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.9.tgz"; + sha512 = "r9e+NfOipls5xztugHKtLEq/lsrBtKp+xWa9+7T3foP2u4mjn+/PubghbH7AxOVQH66Dj08MaGUqyKEH2N2KwQ=="; }; }; - "@ot-builder/io-bin-cff-1.0.8" = { + "@ot-builder/io-bin-cff-1.0.9" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.8.tgz"; - sha512 = "rHp9PFGeoblPwuCZd/i5l/CgNGv9hWEDQHZP11uQcO45H83iZugVxaT65ChBHoKDFp5x/+oxLSxp6kMu/7diZg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.9.tgz"; + sha512 = "Y3cWdNk/wX1SMdn+BaNsayrGN/DopufEdgGCPZACEdpZLhiNlDliPA41mqO5+SemOdH59QbNtvAQgNXZqDHo2Q=="; }; }; - "@ot-builder/io-bin-encoding-1.0.8" = { + "@ot-builder/io-bin-encoding-1.0.9" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.8.tgz"; - sha512 = "bP7U7cr3fkdM3jYtW6fSgBfqjIcVKJu3iZfAOtcP0o+aID6FbETWGpxYrfGcJuvjcQLDPhc0pda1Ag/ypeTnvg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.9.tgz"; + sha512 = "GtL4q9cR39b2ngkSy/2HGpge6Q1om2BOuXTtdrJT0KpCbESjuZ09Sr1/NnqBIQ0QjKGXnR/o5kUg62q71CVbmQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.8" = { + "@ot-builder/io-bin-ext-private-1.0.9" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.8.tgz"; - sha512 = "RTCaiGvbO340gLHh2omj62v0ysOE+rEdcVuISiIb08fo0azLsi+MvzQdwprCOc1+8s5wY/peDCQ38HN/gYC7dA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.9.tgz"; + sha512 = "AU2HvH9okIkLX6OLt6kOlpjDR3z2lW2LxQ05+pQSxGwcVuLCeene6f8tWQ+/FWmhevJQgoDKeEy/KfFyoAlxIg=="; }; }; - "@ot-builder/io-bin-font-1.0.8" = { + "@ot-builder/io-bin-font-1.0.9" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.8.tgz"; - sha512 = "6cL1cn7Qmzu1bsx4hr2aqKCMVu1+Si2xA8uGEVOryD94odjX76HJMta4bjH9P///PcQdIeJDczpk1s21LPg6Cw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.9.tgz"; + sha512 = "iem4LxkEVQ/HvhuRNrv2ORDnvsPNZPCuJSmGtK3S4D258GPdcDj0Kohn5bpyrFPiL5QybGQUAzo4qYkbMEvInQ=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.8" = { + "@ot-builder/io-bin-glyph-store-1.0.9" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.8.tgz"; - sha512 = "vqr4pyK1oa3ADPUydKQgWZHKk1WAjO7hmMYARbqKzUCPHrqrr2dXJHMW8RNg+JhQykhG0ibHf6NdjHklBzTWIQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.9.tgz"; + sha512 = "QHlF2vcOHGmgTnpBWVP3wKCfVemXE9NeUpAcLLkolQMKpR0lXyrundJll/ujPSPImFp4AknPL6UCa6eKrHBwoQ=="; }; }; - "@ot-builder/io-bin-layout-1.0.8" = { + "@ot-builder/io-bin-layout-1.0.9" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.8.tgz"; - sha512 = "0xrUl6WPQLpRwsVQXh1aBF28f7gJ0OR7N9xK5CZLsEku6R/uEGPSR0K9xlw8L+74J/ZWCX/WkbNgvvNUfyQLcw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.9.tgz"; + sha512 = "ePDm9bKLiS6mhkYxlCv29bYXAlqmQsDR09KKXcFqSj1GSdKFUB/zvfca7PS7xyuLq/XKA9jwdHHLIAfSqdeAxg=="; }; }; - "@ot-builder/io-bin-metadata-1.0.8" = { + "@ot-builder/io-bin-metadata-1.0.9" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.8.tgz"; - sha512 = "hgkeZy8JI5pgr3B0ayLDHxOxuIDRSnK/PRxZBydOCsArcW61N8cEPv/DzMKS3iNY0hpTUghZ7INLWC5+0KL63g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.9.tgz"; + sha512 = "qjB11/bumujZI1MewgCqTZe5a3PA219t62Im4ZOgTiOIJ+A55Mryy7W711GrRdcdSOpV0WgSVP1BdwORHvz6wg=="; }; }; - "@ot-builder/io-bin-metric-1.0.8" = { + "@ot-builder/io-bin-metric-1.0.9" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.8.tgz"; - sha512 = "dKtTJ8AB1VWj/WYv9i+qhm6uKcwdC++MqQiaTLA7/eCnG9O2QjfTbOptYr6KI3+BKwe6/tbyzrqj7G5ZaVmtKA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.9.tgz"; + sha512 = "f1ALFM5iiVLqQyFZKRYV92fy3/epePMZD2PWYzedHLMzgymm/K2oY0VaRyt010TrVugtaBI4FGN9EpKJFYM9Tw=="; }; }; - "@ot-builder/io-bin-name-1.0.8" = { + "@ot-builder/io-bin-name-1.0.9" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.8.tgz"; - sha512 = "p93QSIEoBXtRyBEWI4KLuTTh3EtJTsoSeM7Ifopga7sCPDWFky5GeRqTq+Mvlk0cPiJtV24qdPdaIem5r5PBmg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.9.tgz"; + sha512 = "tf6X+VursEmLEPDJTfNynkf8O3a3X4670KVnx2RVigyWdXmwj/U52zTU7Vs3NN+xQfUNbhUMgnd7rEHgilvJcA=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.8" = { + "@ot-builder/io-bin-sfnt-1.0.9" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.8.tgz"; - sha512 = "2yogXf3cdd6dI022HPU6lnzL10KU4DOOALkeg84qQCmse0WZdhZAKhdn08sqHIJ+EDjkfpRjHld0F96sKH8e0g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.9.tgz"; + sha512 = "yg7qKhmN2zFXfBSi64SXFzji3axvXLfJLGTx0rSWGtVQRX3gQBfwQ98vzrX1Z5O4rSGaCkALXy9wIELeAqy//g=="; }; }; - "@ot-builder/io-bin-ttf-1.0.8" = { + "@ot-builder/io-bin-ttf-1.0.9" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.8.tgz"; - sha512 = "TaX7s9UFyoyajgig7944DgWFmEzzcGjVGz3qz3olgAZcHhrgLoqIlmaxt1jEHgb7LZx3wG4G9WwcSl6arqMdAQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.9.tgz"; + sha512 = "McbFe5dx314NhxkTZOzGdTTanJrJvQy6OGuM1+ACrYfCr2CnVONUiuOtN/1nUyIm/N5yiFXLyIcI/pAjOgbl2w=="; }; }; - "@ot-builder/ot-1.0.8" = { + "@ot-builder/ot-1.0.9" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.8.tgz"; - sha512 = "X2/4GcLGA1dTaR2+iHdhGn64cCLQJ9gZdoAVS3DZjMJIyyScFDVLAGhYHPLYk97EDQ5Pm7RnQNoY11U5igm28g=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.9.tgz"; + sha512 = "sJCDeFoAc9PlbOAJDXI32VXcaSV4swBMiFyy1VcNxo9SWT624hwHAe/ZfOrevrSNLzSO93QB3j5l/OjHMGLE9Q=="; }; }; - "@ot-builder/ot-encoding-1.0.8" = { + "@ot-builder/ot-encoding-1.0.9" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.8.tgz"; - sha512 = "dRmxL8WUfjZAjd8RcSmd3wI442Gzy9i4X7Ock2rj0ZwVxlfQB7F3dx71IVgvSRbrkz2Ny+7htW3eq+V0be+cmw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.9.tgz"; + sha512 = "3unI4fHkV45e1p92Z3yifHrtQPMmkBz7B5nFkVrTMSNvSCZKvk6bRcdyvlFEkvQW2zgllQf2GfggV5u/PnikjA=="; }; }; - "@ot-builder/ot-ext-private-1.0.8" = { + "@ot-builder/ot-ext-private-1.0.9" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.8.tgz"; - sha512 = "uloryF2vSRkIGHPqLN6FkAb1oZ6xkTR2w407PCgVYO9Pkq/j5d8ZHGM80VOYukfHFUdqskFyYcmojF/0WUA06A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.9.tgz"; + sha512 = "KUnMgeNSWTm7NupsM+WNA8+JM6dGdEsxKRMq7s5O67jfan/SKO+ICf5xpcFeWqFHbto5wKkzERmnCMZLTV3aDA=="; }; }; - "@ot-builder/ot-glyphs-1.0.8" = { + "@ot-builder/ot-glyphs-1.0.9" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.8.tgz"; - sha512 = "XP7pRUJPq/2dbDqzEAHWIFvwIdVK+BkZ/xPV75hGECEIquh7MpFKAXtLjRyFpVU+RRD0Xplmj/1P4W0047A4JQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.9.tgz"; + sha512 = "vDoCjthLji9fGyXRTabU8ltEn+qhYSH+IaAbGu3JuL9EKElw5r9w6DpzzjBmFjoVCh/o8MVxMW7VwNKgOkXT5g=="; }; }; - "@ot-builder/ot-layout-1.0.8" = { + "@ot-builder/ot-layout-1.0.9" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.8.tgz"; - sha512 = "fRazZF4bTzyeYjFivbWim6/+dsWeGI6ZW6mCES5GmgidHzcFw2OrvDO1VYIKg5KSafjEZxe4QcMrF86bFkSDTg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.9.tgz"; + sha512 = "Od/olVg7QWFSaxHRcA7uzM0jNEoM3nqy5vge1eghapwkRFN0k/PKINYNi0h95S/1A5sDmT9FZ3PRZ8v6kT6BqQ=="; }; }; - "@ot-builder/ot-metadata-1.0.8" = { + "@ot-builder/ot-metadata-1.0.9" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.8.tgz"; - sha512 = "p0z1ywytkvDVUivKV9m8dE7jFztnBFvn/WIqXgpxaqhzXcDIc5mDl1hca/1DJU1ZAwdR03fifEsniCz+3Vaynw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.9.tgz"; + sha512 = "4tyYUnm2tBVSBned3FHBClyWilA4AXAgR0P+Fw8Nd4NWcYCkIsHezlR+8Sl54YX8LnxO5XVTHpZvFob+QdyCSQ=="; }; }; - "@ot-builder/ot-name-1.0.8" = { + "@ot-builder/ot-name-1.0.9" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.8.tgz"; - sha512 = "P9X7Fwg7s27n4eTXJqh68Cfrg2K5x28JaIINdgIo4wnRNVfmc/JjH/Z5Rz5U3ahytUdY6+pS+YJAW9BYJ2DJOw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.9.tgz"; + sha512 = "zl7qxyS5VjhB67//jJCwcjdT16ds98Zz4mnU4jcLwDkv0RHQFCFDiHqlefHwegIeMR2S54F27pxHsXDSG5MKLQ=="; }; }; - "@ot-builder/ot-sfnt-1.0.8" = { + "@ot-builder/ot-sfnt-1.0.9" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.8.tgz"; - sha512 = "tfKv7EuSVKWgKFKOcdCMqWA6tCTf+bye3kWyYYJaG149w1YpzFqMMYk1uB95rL6cjJWvkphZdN2BSbEaUcD+sg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.9.tgz"; + sha512 = "o6o3IyKbAHUla37PxRxwAq5EqNgF7AfjtSzvhDnWQC+qofFDebpnRiGksEOah7LMAeSAsMi04KhK6cQJ/b1cYw=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.8" = { + "@ot-builder/ot-standard-glyph-namer-1.0.9" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.8.tgz"; - sha512 = "sNEu9Ye5IdISzSaLnyNl/0ZwQY8DLUfvGuQs45JPT84WTpkB7c1BpndlSfcCDZaqdtTXN/tNS2fAN7TJm1g9Ig=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.9.tgz"; + sha512 = "4TuinXcXE36b0UyezCveHzf/GC57sfDM6FB8Oavy/6TiRjyurLJ/03INkTqlgaPihiH1aU7NF2jFkJqym/W5Xw=="; }; }; - "@ot-builder/prelude-1.0.8" = { + "@ot-builder/prelude-1.0.9" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.8.tgz"; - sha512 = "wknxzHrwwcN4m32P1FmYScTD03Vtj5mQWCx21NCzcsUyEfGasUvTzoPhOw5qUdklN3azFSjByfjpMUAjCRfnJg=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.9.tgz"; + sha512 = "9nCcbwXQaLnwDkayFadEUiEd5CiHhSHsvFw2EXkZuEWUceu4qN0TACVy0EjiCWGD3FE9LM3NljejUmIxc4Hf8A=="; }; }; - "@ot-builder/primitive-1.0.8" = { + "@ot-builder/primitive-1.0.9" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.8.tgz"; - sha512 = "jJydJoA67wop43AVcH+E+5Q2DU7epll1J6krs6Oz3Rrs7x2RB5fc79nWJMm8bHpKPB0xnA3zsLiJjERB7Ud9dw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.9.tgz"; + sha512 = "ut0tqNGB7wtk6AQ5QZEt+A6XyIHeizxYkx9L6YluBaoq4E8PUk2gk4Vmvf8mf5nQkpmoTJFAqgMrp9KrSAjzFA=="; }; }; - "@ot-builder/rectify-1.0.8" = { + "@ot-builder/rectify-1.0.9" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.8.tgz"; - sha512 = "RFD/oA3kTviuj7WHRynyMT4zBFNB8tSifrMjQxyY28BEWckieX27RM9+QynfuHg07s1pZ/mZC5g3wLwjdeE5+w=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.9.tgz"; + sha512 = "Ku1nPOiK+Ex2JaV5IvXKHDxWflKOhzgpDFqvh+GNrcRgfi0Ybkuhi1/hlMpQ2ZD2z7wTjIeVYa3vaCIdy7rheA=="; }; }; - "@ot-builder/stat-glyphs-1.0.8" = { + "@ot-builder/stat-glyphs-1.0.9" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.8.tgz"; - sha512 = "rSQPs0laN2H+jBTKFA/q9+rcOJO9bJVHvCxHu74hfwjvlpysWbaN/+9PwMb5mFIP/GzToYfYhgZ6e7qBNRSM+g=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.9.tgz"; + sha512 = "Y2EcyqdanTtRCBfADGEvYgKP5d+WK+UyYMIY5ILcQEGW2L1osVe8QROUfpo7kWqrKjxV2Tzrz5/SvlP5BzYTfg=="; }; }; - "@ot-builder/trace-1.0.8" = { + "@ot-builder/trace-1.0.9" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.8.tgz"; - sha512 = "VGPt+1UT+yDzouUDugMW2z7tFED+sHJKT5mOwl6N2t/+Er6gaxrRlfYKvdHqdgFKIg8oKytoZS3wOauWiVF02w=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.9.tgz"; + sha512 = "c8002SN64oldhDz4NN9VdoyJOdPHAU4UkB7EQFsPRZX/a8pVx20SMWXcNokrTGTHhEpaXBY0i/zshUp0kLbjVQ=="; }; }; - "@ot-builder/var-store-1.0.8" = { + "@ot-builder/var-store-1.0.9" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.8.tgz"; - sha512 = "Wo3xfMDzmlqSNEn5YOO8hxW7X9YTw6fCUmfUmfaOAmNYRWsVHnLwTSnu92M6p0shMqVHzgqhCHDxG7KZAuSNwQ=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.9.tgz"; + sha512 = "gaNm+kdi1vQgEiul2flVn6OC/FDHmV1Nb+nuQWO7uwQCkxnb22qv/d5o/QAM5KeLQ/xvnPjjlF8ZAA34NylA4A=="; }; }; - "@ot-builder/variance-1.0.8" = { + "@ot-builder/variance-1.0.9" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.8.tgz"; - sha512 = "GaWs/PMrzkAJJmf5Wm0qr09AHYP9ydNk6J9KEs7GXH7gBm6X5pl/V6D105u+6Tx+QSGotRvc8einQm/vazug7A=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.9.tgz"; + sha512 = "dYmtxdHBlkwJRU6Fu6vl/kaaF1DdJiWUuDBLJrGY865J/yGrtIKFAE18UD1XtNaYRQ3Je87Suheb85HHvcXzZA=="; }; }; "@parcel/fs-1.11.0" = { @@ -4855,13 +4810,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@pm2/agent-1.0.8" = { + "@pm2/agent-2.0.0" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; - version = "1.0.8"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@pm2/agent/-/agent-1.0.8.tgz"; - sha512 = "r8mud8BhBz+a2yjlgtk+PBXUR5EQ9UKSJCs232OxfCmuBr1MZw0Mo+Kfog6WJ8OmVk99r1so9yTUK4IyrgGcMQ=="; + url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.0.tgz"; + sha512 = "W1LvdyF1tGaVU5f/hV8DjpI5joI7MEgXiQMLZnTwZlFwDVP00O9s86571Q8xSiweTcFZFyye0F4wORN/PjSgGA=="; }; }; "@pm2/io-5.0.0" = { @@ -5053,22 +5008,22 @@ let sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A=="; }; }; - "@redocly/openapi-core-1.0.0-beta.49" = { + "@redocly/openapi-core-1.0.0-beta.50" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.49"; + version = "1.0.0-beta.50"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.49.tgz"; - sha512 = "SwCtQeyovcV7cS6YQoe5GWX3hWXAZrnrZQtQv0YW91CtrZMBdk5qA5eQ9Mkkbk6YOKKCWkc8yD+KdkRATlyPNw=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.50.tgz"; + sha512 = "GuXn4IETxpbRd8dlAQDQPtvqOpbMvPMeC/e5mv5MOXkLIznNk4vjiQVe6QSCbZbCHzzpb2+89B6S7asebPm4Rg=="; }; }; - "@redocly/react-dropdown-aria-2.0.11" = { + "@redocly/react-dropdown-aria-2.0.12" = { name = "_at_redocly_slash_react-dropdown-aria"; packageName = "@redocly/react-dropdown-aria"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.11.tgz"; - sha512 = "rmuSC2JFFl4DkPDdGVrmffT9KcbG2AB5jvhxPIrOc1dO9mHRMUUftQY35KZlvWqqSSqVn+AM+J9dhiTo1ZqR8A=="; + url = "https://registry.npmjs.org/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.12.tgz"; + sha512 = "feQEZlyBvQsbT/fvpJ4jJ5OLGaUPpnskHYDsY8DGpPymN+HUeDQrqkBEbbKRwMKidFTI2cxk2kJNNTnvdS9jyw=="; }; }; "@rollup/plugin-babel-5.3.0" = { @@ -5161,13 +5116,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.0.2" = { + "@schematics/angular-12.0.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.0.2.tgz"; - sha512 = "DMUfp7226QY2FkJeBm1xAUUKRX9umVCRhqEcku4Zaig6PylVd9LZFLjZvGKA4Vq2DkYRtClll3z5FIhAOSY3SQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.0.4.tgz"; + sha512 = "rC4/+c6p3S/ezDeJzAstrwzdpYgcYzHumtzVSDDM+3Kx0QBUTq/Nj6sk1e2C/fgtV5Jb2INEkTvrih+HP7I0wA=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5206,13 +5161,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.10.1" = { + "@serverless/components-3.12.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.10.1"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.10.1.tgz"; - sha512 = "Kgs9sBcsgxW4l0j8H5Bh8ROV4MmeFEiEwcj8OjFI4MyGj/nNw8dQA5ArpF2COJCgVDLwYVqnRGOCR+tEF0TlnA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.12.0.tgz"; + sha512 = "USK6QCREd/SjsDDhumrsORkyQYew9WvXGjSbh5GvoGNKbqZlMiNWnua/DXmpz1uf2qaXzJO0LZEtpsiDBPX59w=="; }; }; "@serverless/core-1.1.2" = { @@ -5224,13 +5179,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/dashboard-plugin-5.1.4" = { + "@serverless/dashboard-plugin-5.3.0" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.1.4.tgz"; - sha512 = "f6uSdUSfZmUhVxLjqwYMNUYi3EShakPQwzipCpVEChcB0AKZG6mhu2NBfTFeSBASvR2l1Mq8tqVgHoTXp9yq4Q=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.3.0.tgz"; + sha512 = "JOtFIVLHyeTAtdoK2gFEAAMNsGemszQr6rwhTOg0bV6pgeLmfufL4nz9rAtSj5m2oZnVnH46+P1aVZlwUXNThQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5242,22 +5197,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.2" = { + "@serverless/platform-client-4.2.3" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.2.tgz"; - sha512 = "8jP72e0POFGEW7HKtDzK0qt1amYtvlB7bYSal8JUCXbeY2qk3xRJZuLWCZBBKRGz4ha4eBNjlz7iniACb9biLg=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.3.tgz"; + sha512 = "dyELLbrf/9+O+sjuIL7ymlH8zwCOsG+tf2TjeEjXooVSvNqUoZ4ZadENjxInUV841l0ddwkihwzH/54Yw+/qkg=="; }; }; - "@serverless/platform-client-china-2.1.13" = { + "@serverless/platform-client-china-2.1.14" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.13.tgz"; - sha512 = "kQuWjHiBeslZ1SkIFzXRoEi+CCunUEBOyJRU7Zeg5l4vV4U63G8Ax1waMXxoBILgYK5cDG0F/y+UoSAvEhJmZw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.14.tgz"; + sha512 = "ciXVcYcdLlSB9ph94sX/8jmDuY85Yq0fJvwKGzndKPngjVkXs6Gw2tqj91act9nqW541Ycqb/HFh1BhgcDWP7Q=="; }; }; "@serverless/template-1.1.4" = { @@ -5296,13 +5251,13 @@ let sha512 = "QXBZO0W2da0AtROpg8H1c4YWMSl56+nef0Kukd+40Q4jEaY3a0dtpVzvGps3aLFDXer3kWZ3LtlhS5HGXLficw=="; }; }; - "@serverless/utils-china-1.1.0" = { + "@serverless/utils-china-1.1.1" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.0.tgz"; - sha512 = "4iul4BaS6wi8c4fhRahkxt8IDSGB9swVyK3SpVqP4LJNGJ5UtKvStxa6pMC4OMVWs0LDCaLGlfFqOgBUo3VxRQ=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.1.tgz"; + sha512 = "iGICjLlhU8lrMuknd4i63bYgZi3PZ1EZlf6fW7YsP3l8TY2xtqGcvVzfsj75SAuShBYA3GpKnil6foxCeKok6w=="; }; }; "@sideway/address-4.1.2" = { @@ -5467,13 +5422,13 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; - "@snyk/code-client-3.7.0" = { + "@snyk/code-client-3.8.1" = { name = "_at_snyk_slash_code-client"; packageName = "@snyk/code-client"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.7.0.tgz"; - sha512 = "a1uGkSpO4Pr9UucZUVfUR5PVcl1fEA4sXbdZPyzs1AABE7JhMY6FnBYKgQFz2qIkPAPy4M0m18bnGpHq5ZdWNg=="; + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.8.1.tgz"; + sha512 = "7HrkscxEXC5eVehZ6nip2uIFDbuvCuux0lrj78twaAnVn9uUx/4G7AKZl8JcrESQEN6py80tJzjvPlBybHJ1+g=="; }; }; "@snyk/composer-lockfile-parser-1.4.1" = { @@ -5494,13 +5449,13 @@ let sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg=="; }; }; - "@snyk/docker-registry-v2-client-2.1.3" = { + "@snyk/docker-registry-v2-client-2.2.1" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "2.1.3"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.1.3.tgz"; - sha512 = "nbWgOhHFc2GXQsweDxhulhYtLptsBxoXMSI3Py7BOt8ITgXK0HUors2+mzGbwpbvnwMAYjwhv8PLOVVVsa8PXQ=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.1.tgz"; + sha512 = "3pn0UBs0JskTTmZdBRSblxta3xNAnoFaUmh2s6v3LtpqA/RwXFvlHVUDc72cbJSeKiQJzfESFv9OxfgZ3NmL/Q=="; }; }; "@snyk/fast-glob-3.2.6-patch" = { @@ -5512,22 +5467,22 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.601.0" = { + "@snyk/fix-1.620.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.601.0"; + version = "1.620.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.601.0.tgz"; - sha512 = "0Fz0nC547Qkg0FGpmvzDIPrrXvisQN6c07JM0RReM8Xb47p1o51O/MPsWdHIFJasIT5HkshyOaV5rjGQmfwHtQ=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.620.0.tgz"; + sha512 = "o0dISy2mjmZ63/O/Y+yivBtqT6BR88JAa8QbMQ29/TzwysOoKjTaQXbfgT338Q1vm3J91iEptVn3Ut0UsC5LEQ=="; }; }; - "@snyk/fix-pipenv-pipfile-0.3.5" = { + "@snyk/fix-pipenv-pipfile-0.4.3" = { name = "_at_snyk_slash_fix-pipenv-pipfile"; packageName = "@snyk/fix-pipenv-pipfile"; - version = "0.3.5"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.3.5.tgz"; - sha512 = "Kqe9wqUrSSGB0+QFrJjCy5ub7bNg10F5I/avJK95RY/2g9cXpQnkdkTexRmVdOl+IF5z3JBXRjBnIQb6buvp6w=="; + url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.4.3.tgz"; + sha512 = "dBQaoPmmvc8Dzq/D1z5HKJRI6BgjS5SBSBJs4+NoCpOVTqeoDwP8hG3fC++480kbqlugEaEnHZu4uvA3H9oF7A=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -6268,13 +6223,13 @@ let sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg=="; }; }; - "@types/eslint-7.2.12" = { + "@types/eslint-7.2.13" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.12"; + version = "7.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.12.tgz"; - sha512 = "HjikV/jX6e0Pg4DcB+rtOBKSrG6w5IaxWpmi3efL/eLxMz5lZTK+W1DKERrX5a+mNzL78axfsDNXu7JHFP4uLg=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz"; + sha512 = "LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg=="; }; }; "@types/eslint-scope-3.7.0" = { @@ -6322,6 +6277,15 @@ let sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; }; }; + "@types/estree-0.0.48" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.48"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; + sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; + }; + }; "@types/expect-1.20.4" = { name = "_at_types_slash_expect"; packageName = "@types/expect"; @@ -6340,6 +6304,15 @@ let sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; }; }; + "@types/express-4.17.12" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.12.tgz"; + sha512 = "pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q=="; + }; + }; "@types/express-4.17.8" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -6358,13 +6331,13 @@ let sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; }; }; - "@types/express-serve-static-core-4.17.20" = { + "@types/express-serve-static-core-4.17.21" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.20.tgz"; - sha512 = "8qqFN4W53IEWa9bdmuVrUcVkFemQWnt5DKPQ/oa8xKDYgtjCr2OO6NX5TIK49NLFr3mPYU2cLh92DQquC3oWWQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz"; + sha512 = "gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA=="; }; }; "@types/fancy-log-1.3.0" = { @@ -6601,15 +6574,6 @@ let sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; }; - "@types/json5-0.0.30" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz"; - sha512 = "sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="; - }; - }; "@types/keygrip-1.0.2" = { name = "_at_types_slash_keygrip"; packageName = "@types/keygrip"; @@ -6808,15 +6772,6 @@ let sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; }; }; - "@types/multimatch-4.0.0" = { - name = "_at_types_slash_multimatch"; - packageName = "@types/multimatch"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/multimatch/-/multimatch-4.0.0.tgz"; - sha512 = "xS26gtqY5QASmfU/6jb5vj7F0D0SctgRGtwXsKSNng1knk/OewjISlkMwGonkMCbZCqSoW3s6nL0sAtTlzbL/g=="; - }; - }; "@types/mysql-2.15.15" = { name = "_at_types_slash_mysql"; packageName = "@types/mysql"; @@ -6880,31 +6835,22 @@ let sha512 = "Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag=="; }; }; - "@types/node-14.14.37" = { + "@types/node-14.17.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.37"; + version = "14.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz"; - sha512 = "XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz"; + sha512 = "e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw=="; }; }; - "@types/node-14.17.1" = { + "@types/node-15.12.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.1"; + version = "15.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz"; - sha512 = "/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="; - }; - }; - "@types/node-15.0.3" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "15.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.0.3.tgz"; - sha512 = "/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz"; + sha512 = "zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="; }; }; "@types/node-15.6.1" = { @@ -7312,13 +7258,13 @@ let sha512 = "2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ=="; }; }; - "@types/vscode-1.56.0" = { + "@types/vscode-1.57.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.56.0"; + version = "1.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.56.0.tgz"; - sha512 = "Q5VmQxOx+L1Y6lIJiGcJzwcyV3pQo/eiW8P+7sNLhFI16tJCwtua2DLjHRcpjbCLNVYpQM73kzfFo1Z0HyP9eQ=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.57.0.tgz"; + sha512 = "FeznBFtIDCWRluojTsi9c3LLcCHOXP5etQfBK42+ixo1CoEAchkw39tuui9zomjZuKfUVL33KZUDIwHZ/xvOkQ=="; }; }; "@types/webpack-4.41.29" = { @@ -7357,15 +7303,6 @@ let sha512 = "Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw=="; }; }; - "@types/ws-7.4.1" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.1.tgz"; - sha512 = "ISCK1iFnR+jYv7+jLNX0wDqesZ/5RAeY3wUx6QaphmocphU61h+b+PHjS18TF4WIPTu/MMzxIq2PHr32o2TS5Q=="; - }; - }; "@types/ws-7.4.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -7420,13 +7357,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.26.0" = { + "@typescript-eslint/eslint-plugin-4.26.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz"; - sha512 = "yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz"; + sha512 = "aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7438,13 +7375,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.26.0" = { + "@typescript-eslint/experimental-utils-4.26.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz"; - sha512 = "TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz"; + sha512 = "sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7456,22 +7393,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.26.0" = { + "@typescript-eslint/parser-4.26.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz"; - sha512 = "b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz"; + sha512 = "q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ=="; }; }; - "@typescript-eslint/scope-manager-4.26.0" = { + "@typescript-eslint/scope-manager-4.26.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz"; - sha512 = "G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz"; + sha512 = "TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7483,13 +7420,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.26.0" = { + "@typescript-eslint/types-4.26.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz"; - sha512 = "rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz"; + sha512 = "STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7501,13 +7438,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.26.0" = { + "@typescript-eslint/typescript-estree-4.26.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz"; - sha512 = "GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz"; + sha512 = "l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7519,13 +7456,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.26.0" = { + "@typescript-eslint/visitor-keys-4.26.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz"; - sha512 = "cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz"; + sha512 = "IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -7663,31 +7600,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.0.11" = { + "@vue/compiler-core-3.1.1" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.11"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.11.tgz"; - sha512 = "6sFj6TBac1y2cWCvYCA8YzHJEbsVkX7zdRs/3yK/n1ilvRqcn983XvpBbnN3v4mZ1UiQycTvOiajJmOgN9EVgw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.1.tgz"; + sha512 = "Z1RO3T6AEtAUFf2EqqovFm3ohAeTvFzRtB0qUENW2nEerJfdlk13/LS1a0EgsqlzxmYfR/S/S/gW9PLbFZZxkA=="; }; }; - "@vue/compiler-dom-3.0.11" = { + "@vue/compiler-dom-3.1.1" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.11"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz"; - sha512 = "+3xB50uGeY5Fv9eMKVJs2WSRULfgwaTJsy23OIltKgMrynnIj8hTYY2UL97HCoz78aDw1VDXdrBQ4qepWjnQcw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.1.tgz"; + sha512 = "nobRIo0t5ibzg+q8nC31m+aJhbq8FbWUoKvk6h3Vs1EqTDJaj6lBTcVTq5or8AYht7FbSpdAJ81isbJ1rWNX7A=="; }; }; - "@vue/shared-3.0.11" = { + "@vue/shared-3.1.1" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.11"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz"; - sha512 = "b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.1.tgz"; + sha512 = "g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -8185,31 +8122,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.0.3" = { + "@webpack-cli/configtest-1.0.4" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz"; - sha512 = "WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; + sha512 = "cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ=="; }; }; - "@webpack-cli/info-1.2.4" = { + "@webpack-cli/info-1.3.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.2.4"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz"; - sha512 = "ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz"; + sha512 = "ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w=="; }; }; - "@webpack-cli/serve-1.4.0" = { + "@webpack-cli/serve-1.5.1" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz"; - sha512 = "xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz"; + sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw=="; }; }; "@wry/equality-0.1.11" = { @@ -8545,13 +8482,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.3.0" = { + "acorn-8.4.0" = { name = "acorn"; packageName = "acorn"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz"; - sha512 = "tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.4.0.tgz"; + sha512 = "ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w=="; }; }; "acorn-globals-1.0.9" = { @@ -8743,15 +8680,6 @@ let sha512 = "IWwXKnCbirdbyXSfUDvCCrmYrOHANRZcc8NcRrvTlIApdl7PwE9oGcsYvNeJPAVY1M+70b4PxXGKIf8AEuiQ6w=="; }; }; - "adverb-where-0.0.9" = { - name = "adverb-where"; - packageName = "adverb-where"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/adverb-where/-/adverb-where-0.0.9.tgz"; - sha1 = "09c5cddd8d503b9fe5f76e0b8dc5c70a8f193e34"; - }; - }; "adverb-where-0.2.5" = { name = "adverb-where"; packageName = "adverb-where"; @@ -8914,13 +8842,13 @@ let sha512 = "WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA=="; }; }; - "ajv-8.5.0" = { + "ajv-8.6.0" = { name = "ajv"; packageName = "ajv"; - version = "8.5.0"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz"; - sha512 = "Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz"; + sha512 = "cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ=="; }; }; "ajv-errors-1.0.1" = { @@ -9112,15 +9040,6 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; - "ansi-colors-3.2.3" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; - sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; - }; - }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -9526,13 +9445,13 @@ let sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; - "apollo-server-core-2.25.0" = { + "apollo-server-core-2.25.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.25.0"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.0.tgz"; - sha512 = "LqDmY+R5dcb6zj/RgM7P8NnURV2XdQFIF4rY7g80hD9mc2WSCKHF6eH+lHG0sFPW7f8iBr+lJ4LyETuWEVF0hg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.1.tgz"; + sha512 = "10gVjvGv3uPfy7gUFQhgNhb66RorD1qX6yF4bTawm4S6JstkGrWYFJN5/48o7Mte+tATpXzAGiWu0l4wsYA/mA=="; }; }; "apollo-server-env-3.1.0" = { @@ -9553,13 +9472,13 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; - "apollo-server-express-2.25.0" = { + "apollo-server-express-2.25.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.25.0"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.0.tgz"; - sha512 = "FCTisD+VB1LCcTjjhKvQZ/dkly83KVlioFMgcPjW1X/kzCznRT3aQoVn9bQHlzQr7NnpwFseb4Rhd2KKD4wKEA=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.1.tgz"; + sha512 = "9idHkV3umcIDdq/NIQEC2D6zZ0QtaMRVCbeRcDgm9uWWiX3ulK5ICdHbNBu5UHXkDmKjfZiGaCWBZti0MsRQAg=="; }; }; "apollo-server-plugin-base-0.13.0" = { @@ -10714,13 +10633,13 @@ let sha512 = "hIsyIeDv5LPDh+/Yv9+NDcV0z+WtHo7937abePpW9ikx9WNB75BRn/AuP2jkk3YpfxIp4mGaY6zgUm014VU7Hw=="; }; }; - "asyncjs-util-1.2.5" = { + "asyncjs-util-1.2.6" = { name = "asyncjs-util"; packageName = "asyncjs-util"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.5.tgz"; - sha512 = "P0BY77ZZvaF+rka9mx12r9ys+U+DDz9yhIz6vbSSNhyKzFJce+jrYSRufvg7RLOH/M8XnhIDOBpagbRtRJiuGA=="; + url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.6.tgz"; + sha512 = "PxQ2drzeOUe20HsjIXOlfw76Ci8RQkF2B95arcQap02jJ3lByNKkC3MtVFhIWF+FYl738tD/tZHOlUuYfamFvw=="; }; }; "asynckit-0.4.0" = { @@ -10894,22 +10813,22 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.784.0" = { + "aws-sdk-2.920.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.784.0"; + version = "2.920.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz"; - sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.920.0.tgz"; + sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.918.0" = { + "aws-sdk-2.927.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.918.0"; + version = "2.927.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.918.0.tgz"; - sha512 = "ZjWanOA1Zo664EyWLCnbUlkwCjoRPmSIMx529W4gk1418qo3oCEcvUy1HeibGGIClYnZZ7J4FMQvVDm2+JtHLQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.927.0.tgz"; + sha512 = "S1dbpq26bQNYBQPHAsZBt0/L/e0FAWFdjjQoU3zdaVIXa08eA9d/oRI3kEs568ErJgBjwWU1CUUlr1byBxKjUQ=="; }; }; "aws-sign2-0.6.0" = { @@ -11947,13 +11866,13 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "before-after-hook-2.2.1" = { + "before-after-hook-2.2.2" = { name = "before-after-hook"; packageName = "before-after-hook"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz"; - sha512 = "/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="; + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz"; + sha512 = "3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="; }; }; "bencode-0.7.0" = { @@ -12010,15 +11929,6 @@ let sha512 = "Al3nHGQGqDYqqinXhQzmwmcRToe/3WyBv4N8aZc5Pef8xw2neZlR9VPi84Sa23JtgWcucu18HxVZrnI0fn2etw=="; }; }; - "better-ajv-errors-0.6.7" = { - name = "better-ajv-errors"; - packageName = "better-ajv-errors"; - version = "0.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-0.6.7.tgz"; - sha512 = "PYgt/sCzR4aGpyNy5+ViSQ77ognMnWq7745zM+/flYO4/Yisdtp9wDQW2IKCyVYPUxQt3E/b5GBSwfhd1LPdlg=="; - }; - }; "better-assert-1.0.2" = { name = "better-assert"; packageName = "better-assert"; @@ -12361,13 +12271,13 @@ let sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; - "bit-field-1.3.6" = { + "bit-field-1.4.0" = { name = "bit-field"; packageName = "bit-field"; - version = "1.3.6"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bit-field/-/bit-field-1.3.6.tgz"; - sha512 = "gu+wXJ+saekzja7tSRygoR+M+C88U0IoVTdp0SmZj5tyDwSkWmZNhSUkBmHx2NNZcSAB0gu9g8yBd1Kn7ECVmw=="; + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.4.0.tgz"; + sha512 = "HmJvg3BWUuZKw6Q/WV30FprzHtDcZaZHIW03T4kWVlZ0vVR2jVn2h3gFCL5R/8/43pCrNzW+IKQ7KDCI8SsFYw=="; }; }; "bitcoin-core-2.3.0" = { @@ -12829,22 +12739,22 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "bolt01-1.2.1" = { + "bolt01-1.2.2" = { name = "bolt01"; packageName = "bolt01"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/bolt01/-/bolt01-1.2.1.tgz"; - sha512 = "Mpk1QZofLqrJ1Sjm1vA1HKov6+ffOhCUTP5ae8UTK+U7IwbGSQTfQWu1m6waoSmUN7esQDAS2gBE6PiVaHK0ww=="; + url = "https://registry.npmjs.org/bolt01/-/bolt01-1.2.2.tgz"; + sha512 = "IH3j1UF+XewQ8ngHW4HVPF9E1GS8R0fGtnvfCVkTTcLYBQOQrP9kvSxS8Wz4HFfjCR34Ep0fIibF69LVnHbbxQ=="; }; }; - "bolt03-1.2.9" = { + "bolt03-1.2.10" = { name = "bolt03"; packageName = "bolt03"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.9.tgz"; - sha512 = "2WVVcn+pQXIbDkVixZ6c6Hu0E+LiCyUnj14xQs6qEgU3Sq4NFEguAzDwuvr2B9IxwVGD+5/rH5H9RbY0+d5KlQ=="; + url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.10.tgz"; + sha512 = "1t2jGC59hIiiSudf3OK6Z2E1wdnfSXBuEfbawpS33y3XHgkPFwt+IzEI8Xvqk/MqgXNRBVPhG8A5+SdYoeLT7A=="; }; }; "bolt07-1.7.1" = { @@ -12856,13 +12766,13 @@ let sha512 = "vZCX56PB0274YW8BuCE91xWgqCPkfndBkknYYZFajX6Zr/KByMDXKQ2t1KKSYVkzzTL0rqeLWyQKdL6gJU1zHA=="; }; }; - "bolt07-1.7.2" = { + "bolt07-1.7.3" = { name = "bolt07"; packageName = "bolt07"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.2.tgz"; - sha512 = "b1ZmcU1ucTjRL/FvYUDbLqCmc1I0PRLWB+yvlI6w8l9be5JJgzaf1AmU6+yoa1eL3cqX8leWzyaVjWTjRKGfMg=="; + url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.3.tgz"; + sha512 = "zXhf60qEpFXwRTeoaJ+0SyPw/jzBtIHZLCJBvaa0rFGiiQKdWXdaiIWeyIkxl74p/UGUv4BQsbkAgB0Em/1QOQ=="; }; }; "bolt09-0.1.3" = { @@ -12874,13 +12784,13 @@ let sha512 = "xFfW/ix6qSzBVGGt3jgpG/SX1LgVvGUYxA/0yC6uaPAjgqbdqmbDZzNEqMRps7Z8Vp1H3yfO5JXQuX54n/GzZg=="; }; }; - "bolt09-0.1.4" = { + "bolt09-0.1.5" = { name = "bolt09"; packageName = "bolt09"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/bolt09/-/bolt09-0.1.4.tgz"; - sha512 = "I8GZoVvQDF7w/93XNbUD29hBoN+kiPomPb8X/D6510pjRI5/KgZ0nITH4BAymS89GTGPjI5ZavkFw3vxxRhjQQ=="; + url = "https://registry.npmjs.org/bolt09/-/bolt09-0.1.5.tgz"; + sha512 = "oT1+erg21vat55oXNd7nNEkCO0FQnmaraFZuyXFyeVk7dZCm/3vgic0qK1VuUSV+ksYXJfRKYC4AqfYrtHNPZg=="; }; }; "bonjour-3.5.0" = { @@ -12901,13 +12811,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.1.0" = { + "boolean-3.1.2" = { name = "boolean"; packageName = "boolean"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.1.0.tgz"; - sha512 = "K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.1.2.tgz"; + sha512 = "YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw=="; }; }; "boom-2.10.1" = { @@ -14062,13 +13972,13 @@ let sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; - "cacheable-request-7.0.1" = { + "cacheable-request-7.0.2" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz"; - sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz"; + sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; }; }; "cached-path-relative-1.0.2" = { @@ -14314,13 +14224,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001232" = { + "caniuse-lite-1.0.30001237" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001232"; + version = "1.0.30001237"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz"; - sha512 = "e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz"; + sha512 = "pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw=="; }; }; "canvas-2.8.0" = { @@ -14485,13 +14395,22 @@ let sha512 = "NU5mZbOE3RgRX7a9zHf4AgiNcI/clqQ9vw/YixSgVe2AOiAsUXuSH2BCc3eFAZSlPSQYLxWG6mSCGY/06cy5Hw=="; }; }; - "cdktf-0.4.0" = { + "cdk8s-plus-17-1.0.0-beta.18" = { + name = "cdk8s-plus-17"; + packageName = "cdk8s-plus-17"; + version = "1.0.0-beta.18"; + src = fetchurl { + url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.18.tgz"; + sha512 = "7TIYXo9fIdj8kawpiIaGNlhxewE2KbundrZDMMLSchsb9QtJBYQEj8a00kUBonPMpftwZCQY36RANEThq16BRQ=="; + }; + }; + "cdktf-0.4.1" = { name = "cdktf"; packageName = "cdktf"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.4.0.tgz"; - sha512 = "P6KRqGokkAVRZdT2+fXfEdQszpOXrJa/EuNZr0WPcIrfTVfjL6HNrHyuP1HWUvJRzlcbG5ZZ3+8Uk4oFS9IXvA=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.4.1.tgz"; + sha512 = "U5aap+QH+w/0ibeFRYm8T/JtaA8AkjCkQ6c60eL/5hY0K0qi8rjEBpQcEho9KljqZvWap6mD2yD+JqunbLzRGA=="; }; }; "center-align-0.1.3" = { @@ -14827,6 +14746,15 @@ let sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; + "cheerio-1.0.0-rc.10" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz"; + sha512 = "g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw=="; + }; + }; "cheerio-1.0.0-rc.3" = { name = "cheerio"; packageName = "cheerio"; @@ -14854,22 +14782,13 @@ let sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw=="; }; }; - "cheerio-1.0.0-rc.9" = { - name = "cheerio"; - packageName = "cheerio"; - version = "1.0.0-rc.9"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.9.tgz"; - sha512 = "QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng=="; - }; - }; - "cheerio-select-1.4.0" = { + "cheerio-select-1.5.0" = { name = "cheerio-select"; packageName = "cheerio-select"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.4.0.tgz"; - sha512 = "sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew=="; + url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz"; + sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg=="; }; }; "cheerio-select-tmp-0.1.1" = { @@ -14899,15 +14818,6 @@ let sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; - "child_process-1.0.2" = { - name = "child_process"; - packageName = "child_process"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz"; - sha1 = "b1f7e7fc73d25e7fd1d455adc94e143830182b5a"; - }; - }; "chloride-2.4.1" = { name = "chloride"; packageName = "chloride"; @@ -14953,15 +14863,6 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "chokidar-3.3.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; - }; - }; "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; @@ -15943,15 +15844,6 @@ let sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; - "code-error-fragment-0.0.230" = { - name = "code-error-fragment"; - packageName = "code-error-fragment"; - version = "0.0.230"; - src = fetchurl { - url = "https://registry.npmjs.org/code-error-fragment/-/code-error-fragment-0.0.230.tgz"; - sha512 = "cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw=="; - }; - }; "code-excerpt-3.0.0" = { name = "code-excerpt"; packageName = "code-excerpt"; @@ -16555,13 +16447,13 @@ let sha512 = "L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="; }; }; - "common-path-prefix-2.0.0" = { + "common-path-prefix-3.0.0" = { name = "common-path-prefix"; packageName = "common-path-prefix"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-2.0.0.tgz"; - sha512 = "Lb9qbwwyQdRDmyib0qur7BC9/GHIbviTaQebayFsGC/n77AwFhZINCcJkQx2qVv9LJsA8F5ex65F2qrOfWGUyw=="; + url = "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz"; + sha512 = "QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="; }; }; "common-tags-1.8.0" = { @@ -16843,13 +16735,13 @@ let sha512 = "Ep/l9Rd1J9IPueztJfpbOqVzuKHQh4ZODMNt9xqTYdBBNRXbV4oTu34kCkkfdRVcDq0ohtpaeXGgb+c0LQxFRA=="; }; }; - "config-chain-1.1.12" = { + "config-chain-1.1.13" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; - sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; }; "configstore-1.4.0" = { @@ -17041,13 +16933,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.75" = { + "constructs-3.3.77" = { name = "constructs"; packageName = "constructs"; - version = "3.3.75"; + version = "3.3.77"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.75.tgz"; - sha512 = "q10foASSSfDWmS99OQLfnWDXCzqLvoORISAVWPFg0AmIGlBv2ZdDOtXxLqrJARPxVlOldmW2JzWzdRI+4+0/ZA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.77.tgz"; + sha512 = "A9xWepIkiED0baaEWxokUvRnPrxcAwoCsyIPDAJ3VqQ90juiIHQ0gkW9GX0nG6c+Go5l1dL5FZIFZBeayx+xIg=="; }; }; "consume-http-header-1.0.0" = { @@ -17123,13 +17015,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.22.4" = { + "contentful-management-7.24.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.22.4"; + version = "7.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.22.4.tgz"; - sha512 = "nwFWfaaIQGveN9bAEZ6IpQjWeZlDgse1SXvgdR/D3mxTUYqDlyQv1sIqst+tcgd09zF4TuEKgF0e6Xmc0X1XhQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.24.0.tgz"; + sha512 = "Uo6SZ2q5PqrOSwFWX609/Dy1xfpwTJ0uOw4GuohIeo+MgJJqEwJcZ+K4H7/ie3QievZ1V7dm/f5AyyCalTCtgA=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17546,13 +17438,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.13.1" = { + "core-js-3.14.0" = { name = "core-js"; packageName = "core-js"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz"; - sha512 = "JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz"; + sha512 = "3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="; }; }; "core-js-3.8.3" = { @@ -17564,22 +17456,22 @@ let sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; }; }; - "core-js-compat-3.13.1" = { + "core-js-compat-3.14.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.1.tgz"; - sha512 = "mdrcxc0WznfRd8ZicEZh1qVeJ2mu6bwQFh8YVUK48friy/FOwFV5EJj9/dlh+nMQ74YusdVfBFDuomKgUspxWQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.14.0.tgz"; + sha512 = "R4NS2eupxtiJU+VwgkF9WTpnSfZW4pogwKHd8bclWU2sp93Pr5S1uYJI84cMOubJRou7bcfL0vmwtLslWN5p3A=="; }; }; - "core-js-pure-3.13.1" = { + "core-js-pure-3.14.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.1.tgz"; - sha512 = "wVlh0IAi2t1iOEh16y4u1TRk6ubd4KvLE8dlMi+3QUI6SfKphQUh7tAwihGGSQ8affxEXpVIPpOdf9kjR4v4Pw=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz"; + sha512 = "YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g=="; }; }; "core-util-is-1.0.2" = { @@ -17807,13 +17699,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.6.0" = { + "create-gatsby-1.7.1" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.6.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.6.0.tgz"; - sha512 = "mNPBiTZ9aH24I2YInaiBoXDjPgibsystLsXXWpM5miIJpA6rZrJSRtHVGfXUxZXsKHLc/at2vNrFQbsVue3Nyg=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.7.1.tgz"; + sha512 = "X330+JLFhnYDVTEs7nd5nQiaqWc9aq/gAY6V/jXo2ZwySZRW2XMAaL1ROLpkd5MwywTfykW0oJWRhLBwC17a7A=="; }; }; "create-graphback-1.0.1" = { @@ -18194,13 +18086,13 @@ let sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA=="; }; }; - "css-select-4.1.2" = { + "css-select-4.1.3" = { name = "css-select"; packageName = "css-select"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.1.2.tgz"; - sha512 = "nu5ye2Hg/4ISq4XqdLY2bEatAcLIdt3OYGFc9Tm9n7VSlFBcfRv0gBNksHRgSdUDQGtN3XrZ94ztW+NfzkFSUw=="; + url = "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz"; + sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; }; }; "css-select-base-adapter-0.1.1" = { @@ -18473,13 +18365,13 @@ let sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; - "csv-parse-4.15.4" = { + "csv-parse-4.16.0" = { name = "csv-parse"; packageName = "csv-parse"; - version = "4.15.4"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.15.4.tgz"; - sha512 = "OdBbFc0yZhOm17lSxqkirrHlFFVpKRT0wp4DAGoJelsP3LbGzV9LNr7XmM/lrr0uGkCtaqac9UhP8PDHXOAbMg=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.0.tgz"; + sha512 = "Zb4tGPANH4SW0LgC9+s9Mnequs9aqn7N3/pCqNbVjs2XhEF6yWNU2Vm4OGl1v2Go9nw8rXt87Cm2QN/o6Vpqgg=="; }; }; "csv-parser-1.12.1" = { @@ -18824,13 +18716,13 @@ let sha512 = "XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg=="; }; }; - "d3-geo-2.0.1" = { + "d3-geo-2.0.2" = { name = "d3-geo"; packageName = "d3-geo"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz"; - sha512 = "M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A=="; + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.2.tgz"; + sha512 = "8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA=="; }; }; "d3-geo-projection-3.0.0" = { @@ -20480,13 +20372,13 @@ let sha512 = "xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg=="; }; }; - "devtools-protocol-0.0.869402" = { + "devtools-protocol-0.0.883894" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.869402"; + version = "0.0.883894"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz"; - sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.883894.tgz"; + sha512 = "33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg=="; }; }; "dezalgo-1.0.3" = { @@ -20597,13 +20489,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.4" = { + "diff2html-3.4.5" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.4.tgz"; - sha512 = "yAvhx2GbzzWCAWTepQJrdIPyrjL/29A5UepSAPwnHvwVB41N9oAMshonZmulrFFAFkDN8u9OHKKf/p3R06xuvQ=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.5.tgz"; + sha512 = "EvLFeEq4ZAG3URzajoNr2T1C2oQSRYpG+wlPj6d7xKua1+GY6XjZglTobERZUkMm4LyETTmzqHf19kpQljAcgA=="; }; }; "diff3-0.0.3" = { @@ -21191,13 +21083,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.6.0" = { + "domutils-2.7.0" = { name = "domutils"; packageName = "domutils"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz"; - sha512 = "y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"; + sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; }; }; "dot-case-3.0.4" = { @@ -21281,15 +21173,6 @@ let sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; }; }; - "dotenv-9.0.2" = { - name = "dotenv"; - packageName = "dotenv"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz"; - sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; - }; - }; "dotenv-expand-5.1.0" = { name = "dotenv-expand"; packageName = "dotenv-expand"; @@ -21677,13 +21560,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.743" = { + "electron-to-chromium-1.3.752" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.743"; + version = "1.3.752"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz"; - sha512 = "K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; + sha512 = "2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22723,13 +22606,13 @@ let sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; }; }; - "eslint-7.27.0" = { + "eslint-7.28.0" = { name = "eslint"; packageName = "eslint"; - version = "7.27.0"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz"; - sha512 = "JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz"; + sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; }; "eslint-config-prettier-8.3.0" = { @@ -22768,13 +22651,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.10.0" = { + "eslint-plugin-vue-7.11.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz"; - sha512 = "xdr6e4t/L2moRAeEQ9HKgge/hFq+w9v5Dj+BA54nTAzSFdUyKLiSOdZaRQjCHMY0Pk2WaQBFH9QiWG60xiC+6A=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.0.tgz"; + sha512 = "Qwo8wilqnOXnG9B5auEiTstyaHefyhHd5lEhhxemwXoWsAxIW2yppzuVudowC5n+qn1nMLNV9TANkTthBK7Waw=="; }; }; "eslint-scope-3.7.3" = { @@ -23506,13 +23389,13 @@ let sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; - "execa-5.0.1" = { + "execa-5.1.1" = { name = "execa"; packageName = "execa"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz"; - sha512 = "4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw=="; + url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; "execall-1.0.0" = { @@ -24226,6 +24109,15 @@ let sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; }; }; + "fast-json-patch-3.0.0-1" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "3.0.0-1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz"; + sha512 = "6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw=="; + }; + }; "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; @@ -24262,6 +24154,15 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; + "fast-printf-1.6.5" = { + name = "fast-printf"; + packageName = "fast-printf"; + version = "1.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.5.tgz"; + sha512 = "0+bBTCT4SOmHg3NFsPO39s+EwUdQiKig4MMye7fM0ea24YprUW35AZuWVQdE0SMBRI/GIQldj8ydQGuVRE95UQ=="; + }; + }; "fast-redact-3.0.1" = { name = "fast-redact"; packageName = "fast-redact"; @@ -25072,15 +24973,6 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; - "flat-4.1.1" = { - name = "flat"; - packageName = "flat"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz"; - sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA=="; - }; - }; "flat-5.0.2" = { name = "flat"; packageName = "flat"; @@ -26035,15 +25927,6 @@ let sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; - "fsevents-2.1.3" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; - }; - }; "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; @@ -26179,31 +26062,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.6.0" = { + "gatsby-core-utils-2.7.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.6.0.tgz"; - sha512 = "d8a/iblc3wIrLEOWTUcoK5uYE2DrvlQmeulx6DK3NY49KD8jet8ozB6T5GA1CftsvowWeO6aaDnoWDbTxIxTRA=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.7.1.tgz"; + sha512 = "ofiAzLMeLjkS9huo0JQRbNzOfwCCxzPg7mSXeEhZhHGfbXoqZ9ZufmlTTgSYLc5v6agoM4yi4rHqdMOXu4qXAw=="; }; }; - "gatsby-recipes-0.17.0" = { + "gatsby-recipes-0.18.1" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.17.0"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.17.0.tgz"; - sha512 = "tC2xUa05zrUp77DTyQE11ILhFiqv9JYxBHhh47b7tJGiLAU1XhjxZH0uFZ109r9wEeZjxTYOYkyoiTu+0Ps4pw=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.18.1.tgz"; + sha512 = "gjtCDu1qMtQkjmA5mrHw4orFxkoUPW9VnyVcLc8kcGAjJLR3MTKeECQL6p0SrKHgsbJTkOJ2BTvzU3R5jENBbg=="; }; }; - "gatsby-telemetry-2.6.0" = { + "gatsby-telemetry-2.7.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.6.0.tgz"; - sha512 = "ENrhT4tkETj9Gq48d+ziiyNTX8Q8/5EyqqWvDUTCSefeHV5xpBclJ+CEnxZkmkEa/QSoBCpjws2VbxnTmRwjWA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.7.1.tgz"; + sha512 = "nZgM5SYkS7AWE4NJ/HGrQkUBn7B1k8d6KuRVgv1HanHQxnKUBaWL/6ej/ZBYcvfRBWMCi2mX0QJYlSKVx45XOw=="; }; }; "gauge-1.2.7" = { @@ -26251,13 +26134,13 @@ let sha512 = "4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA=="; }; }; - "gcp-metadata-4.2.1" = { + "gcp-metadata-4.3.0" = { name = "gcp-metadata"; packageName = "gcp-metadata"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz"; - sha512 = "tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw=="; + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.0.tgz"; + sha512 = "L9XQUpvKJCM76YRSmcxrR4mFPzPGsgZUH+GgHMxAET8qc6+BhRJq63RLhWakgEO2KKVgeSDVfyiNjkGSADwNTA=="; }; }; "gelf-stream-1.1.1" = { @@ -26854,15 +26737,6 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; - "glob-7.1.3" = { - name = "glob"; - packageName = "glob"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; - }; - }; "glob-7.1.6" = { name = "glob"; packageName = "glob"; @@ -27134,15 +27008,6 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-12.4.0" = { - name = "globals"; - packageName = "globals"; - version = "12.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; - }; - }; "globals-13.9.0" = { name = "globals"; packageName = "globals"; @@ -27296,22 +27161,22 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "goldengate-10.0.3" = { + "goldengate-10.0.6" = { name = "goldengate"; packageName = "goldengate"; - version = "10.0.3"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.3.tgz"; - sha512 = "zNvkjnJQWbFWtK7or4CtX0WMy2n5AfMVnob5ipf+AznwLxKX8KyqY9W4bzYpVh6Xjm9N21ZUbubsPheV3mA4qQ=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.6.tgz"; + sha512 = "6nwFndjr71Od5XL53oVtlwf3gk8EI/zkKrcjeRAS/G6XLFzPsrOe4npeuom+mgkfgE0rRJFtoOY0wrYgDGuYSg=="; }; }; - "goldengate-10.0.4" = { + "goldengate-10.1.0" = { name = "goldengate"; packageName = "goldengate"; - version = "10.0.4"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.4.tgz"; - sha512 = "WuLSD4trXP8fN8jCpWlNMpobrf1DBYCEy/0+SVrzen6znQepM4rRCByuna1Iy1G/XsbbdFiwYBd9iSxJiwqjDQ=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.1.0.tgz"; + sha512 = "xeMOmvY6a7MBUjU1YPmREgDr7qiM5wZWXzdAZsnJxd0/fd5T0gYNi4saJ2eGvDGSmI+TehDn1bYF1Tvlo2GiBQ=="; }; }; "gonzales-pe-4.3.0" = { @@ -27341,13 +27206,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.1.0" = { + "google-auth-library-7.1.2" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.1.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.0.tgz"; - sha512 = "X+gbkGjnLN3HUZP2W3KBREuA603BXd80ITvL0PeS0QpyDNYz/u0pIZ7aRuGnrSuUc0grk/qxEgtVTFt1ogbP+A=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.2.tgz"; + sha512 = "FMipHgfe2u1LzWsf2n9zEB9KsJ8M3n8OYTHbHtlkzPCyo7IknXQR5X99nfvwUHGuX+iEpihUZxDuPm7+qBYeXg=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -27359,22 +27224,22 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.14.1" = { + "google-gax-2.15.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.14.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.14.1.tgz"; - sha512 = "I5RDEN7MEptrCxeHX3ht7nKFGfyjgYX4hQKI9eVMBohMzVbFSwWUndo0CcKXu8es7NhB4gt2XYLm1AHkXhtHpA=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.15.0.tgz"; + sha512 = "jfShUgX1DVu+DiOeAcsT5JbWlLdUnb2FsdWRb+Q/pNz6kNAUbmq8sFLB2uaWjlTxoSGHZLfrt3vJ9lpArzzQPA=="; }; }; - "google-p12-pem-3.0.3" = { + "google-p12-pem-3.1.0" = { name = "google-p12-pem"; packageName = "google-p12-pem"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz"; - sha512 = "wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA=="; + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.0.tgz"; + sha512 = "JUtEHXL4DY/N+xhlm7TC3qL797RPAtk0ZGXNs3/gWyiDHYoA/8Rjes0pztkda+sZv4ej1EoO2KhWgW5V9KTrSQ=="; }; }; "goosig-0.10.0" = { @@ -27665,13 +27530,13 @@ let sha512 = "J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg=="; }; }; - "graphql-ws-4.7.0" = { + "graphql-ws-4.9.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "4.7.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.7.0.tgz"; - sha512 = "Md8SsmC9ZlsogFPd3Ot8HbIAAqsHh8Xoq7j4AmcIat1Bh6k91tjVyQvA0Au1/BolXSYq+RDvib6rATU2Hcf1Xw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz"; + sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; "gray-matter-2.1.1" = { @@ -27737,13 +27602,13 @@ let sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA=="; }; }; - "gtoken-5.2.1" = { + "gtoken-5.3.0" = { name = "gtoken"; packageName = "gtoken"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz"; - sha512 = "OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw=="; + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.0.tgz"; + sha512 = "mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w=="; }; }; "gud-1.0.0" = { @@ -28556,13 +28421,13 @@ let sha512 = "om8L9O5XwqeSdwl5NtHgrzK3wcF4fT9T4gb/NktoH8EyoZipas/tvUZLV48xT7fQfMYr9qvb0WEutqdf0LWSqA=="; }; }; - "highlight.js-10.7.2" = { + "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.7.2"; + version = "10.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz"; - sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; + sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; }; }; "highlight.js-8.2.0" = { @@ -30429,22 +30294,13 @@ let sha512 = "/rNd9R/qcq+4QakROCQGnOJbiQ9BKwtOVF+OWu+3pYVYgPydnAMA++VCcKxZYFCGDC70Ee+9oUvIlXI8UQoiqQ=="; }; }; - "invoices-1.1.7" = { + "invoices-1.2.1" = { name = "invoices"; packageName = "invoices"; - version = "1.1.7"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-1.1.7.tgz"; - sha512 = "AMCHpf/7sJOjeRbTgCLLvhH41ZnUv0D809ZFJRhR2dGOfp8GxJHzfnNqtgYGxQiW0+dVK2ooBVyR+dqoEQs6mw=="; - }; - }; - "invoices-1.2.0" = { - name = "invoices"; - packageName = "invoices"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-1.2.0.tgz"; - sha512 = "x9jMmN/afPZkeL7qwMj15r+RSV7ztPsfxKgByD3bXR/WhmjrlfU+zwfliohScW/UV1b0FUSq6A7DgTME4tdMSQ=="; + url = "https://registry.npmjs.org/invoices/-/invoices-1.2.1.tgz"; + sha512 = "b1yeWevW04/jMmkzJ3Fk91d8cAd+pYYg/w0S7XCGAI4yo8jSnAD+S4oAWjfFkwNa+GV8WwCOTDuotWcI5md87A=="; }; }; "iota-array-1.0.0" = { @@ -30537,13 +30393,13 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; - "ipaddr.js-2.0.0" = { + "ipaddr.js-2.0.1" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.0.tgz"; - sha512 = "S54H9mIj0rbxRIyrDMEuuER86LdlgUg9FSeZ8duQb6CUG2iRrA36MYVQBSprTF/ZeAwvyQ5mDGuNvIPM0BIl3w=="; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"; + sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; }; }; "irc-framework-4.9.0" = { @@ -31842,13 +31698,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-domain-0.0.19" = { + "is-valid-domain-0.0.20" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.0.19"; + version = "0.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.19.tgz"; - sha512 = "NxuZbJABXdGlFNEVphG9bT0YOQE0B75Bv+emGsEjmRnAs9aMUVbdKUafj//yTxApThjqQqRKBd9MJDlnqx8Pmg=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.20.tgz"; + sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; "is-valid-glob-1.0.0" = { @@ -32643,15 +32499,6 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; - }; - }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -32868,13 +32715,13 @@ let sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; }; }; - "jsii-srcmak-0.1.273" = { + "jsii-srcmak-0.1.280" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.273"; + version = "0.1.280"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.273.tgz"; - sha512 = "koWwHIq+LdKPoclPjRvZp2cNwk8Tck/wW1iUqgRDpjIO6+Puq26ovr/XF7etf9sXZEpCRHOT7/qTOVMJo0F+vg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.280.tgz"; + sha512 = "FKU0HcL+OceiXRpUbdR5XX/7ivUnCpGOVtgRvPJeXjQDdz3Px09sYHKSHGmAgipcoBPtKQ8Vrv+5rGckuQZ+mQ=="; }; }; "json-bigint-0.2.3" = { @@ -33165,15 +33012,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json-to-ast-2.1.0" = { - name = "json-to-ast"; - packageName = "json-to-ast"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-to-ast/-/json-to-ast-2.1.0.tgz"; - sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ=="; - }; - }; "json2csv-5.0.6" = { name = "json2csv"; packageName = "json2csv"; @@ -33183,13 +33021,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.236" = { + "json2jsii-0.1.248" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.236"; + version = "0.1.248"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.236.tgz"; - sha512 = "f2UN6Fum7vNQmeonz3HvP7GJxlathMSFYNzYCHdLjFKDpX3KDD9+xi7Qrk0JOMqrGMG6Ev1ye4rXlnUBlWKLvA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.248.tgz"; + sha512 = "aMpcyCpezSOElnI+9fSychrq4wYDCpb3MJOizYkVEVkEeNYiV0ND2qFzYOG+k+cIEzzsQh2EAisCftI5q6vsrQ=="; }; }; "json3-3.2.6" = { @@ -34435,13 +34273,13 @@ let sha512 = "IR5ASkAU4NHTN1JFeP9bYvhARhaBg8VD8yUcmvNIvFWg6L3dsM2yK1A9EM6MpPvWYKH9SEiljB59ZUa5s2pYnA=="; }; }; - "libnpmaccess-4.0.2" = { + "libnpmaccess-4.0.3" = { name = "libnpmaccess"; packageName = "libnpmaccess"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.2.tgz"; - sha512 = "avXtJibZuGap0/qADDYqb9zdpgzVu/yG5+tl2sTRa7MCkDNv2ZlGwCYI0r6/+tmqXPj0iB9fKexHz426vB326w=="; + url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.3.tgz"; + sha512 = "sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ=="; }; }; "libnpmconfig-1.2.1" = { @@ -34453,13 +34291,13 @@ let sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; }; }; - "libnpmpublish-4.0.1" = { + "libnpmpublish-4.0.2" = { name = "libnpmpublish"; packageName = "libnpmpublish"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.1.tgz"; - sha512 = "hZCrZ8v4G9YH3DxpIyBdob25ijD5v5LNzRbwsej4pPDopjdcLLj1Widl+BUeFa7D0ble1JYL4F3owjLJqiA8yA=="; + url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.2.tgz"; + sha512 = "+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw=="; }; }; "libsodium-0.7.9" = { @@ -34534,22 +34372,13 @@ let sha512 = "lzj7oODpX7XS/4qHGBG/VAMirBDK/rbWS8S9pTCSUV9ZknuXg2loCkDyPQuB3vC2MMt1QOsXn4oQUtxpPtSa1g=="; }; }; - "lightning-3.3.4" = { + "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; - version = "3.3.4"; + version = "3.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.4.tgz"; - sha512 = "VpkNbaWlsmTgaWWJPGyYb2dm2v5b+wPQWmfZBJ7V5znL17Q+ef7Csj8PTTgnIccAWE429QL9/OyOzn/JVnZ/PA=="; - }; - }; - "lightning-3.3.7" = { - name = "lightning"; - packageName = "lightning"; - version = "3.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.7.tgz"; - sha512 = "fjzFCwXafGUeCwUSiEKToS/A8GO4oxDiDG+XNuL984mgYyJdXLHoTEMdaYZD48yowtfjYCdLks0iypIdg6kn1Q=="; + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.9.tgz"; + sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; "limit-spawn-0.0.3" = { @@ -34678,40 +34507,22 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-4.2.7" = { + "ln-accounting-4.3.0" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "4.2.7"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.2.7.tgz"; - sha512 = "joCN96uuTS53sfJQ5XBFUsKetXk6GOc7NsXqmPmjn/78swpqkxWLar30BvbweGTIveSvDb9xfCT7v1PfSxgiJg=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.0.tgz"; + sha512 = "JfnHWP6hNmA5DCx0OHq7WKwiwPKyD1lb7GPmRqg0NFr8jj9p/PNnxayfjRD2PsmA5C3OxXO53wCy1XymG4I8+Q=="; }; }; - "ln-service-51.5.0" = { + "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; - version = "51.5.0"; + version = "51.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.5.0.tgz"; - sha512 = "Q22CcKJ+52mExGNvOmeEVBza82LGdbLkFVzfMjC9oPlP5DikS+sdlK5GZM/Dc5HFN5pwK7y9Ke7gRue/UxHwbw=="; - }; - }; - "ln-service-51.7.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.7.0.tgz"; - sha512 = "n0Ib9fjVL8x3ymdOax6gjmR0Nq59vIhQ89en1XpgxIWbowWhiJUXPolTEgiA8vpeoG72CZN3nYaPXgil9uNVLg=="; - }; - }; - "ln-service-51.8.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.1.tgz"; - sha512 = "YjRsNwAez1RfA63YDoLf5Ojg3Ma+aLmvfMqasqU3r+/pDR+mgGFyjVODsw6qujerIEM2FaxegddJeOz7R7/Ijw=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.2.tgz"; + sha512 = "X+AFuuw54NEr8UqbkJlEtqkmlpIpmji7BX+bYmYrEOZOtJca7PbaqspVWq+YB9qWw/OiuI76ly67KGTYM0QbCw=="; }; }; "ln-sync-0.4.5" = { @@ -34723,13 +34534,13 @@ let sha512 = "ETaASkbv5v2gcrob/xonsjy0deKSxIHfKOTfOXQicxhZed02plQ2oAUx/K3yxIhRnm7YS45Z/gYQLxUqHkI4ow=="; }; }; - "ln-telegram-3.2.3" = { + "ln-telegram-3.2.5" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.3"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.3.tgz"; - sha512 = "pNYz/xz/VCn8EApERCR+2nB0hmBM25dAmKUs0FZnMlQGozNaSqb26ttN0XLA/Q/JVOeovacjlAOJ0tl6zqcS8w=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.5.tgz"; + sha512 = "odHaSJDF1asxW74D4JaoLIGkVqX5KMBDk310sPoM0LJ5Fqljjc2K/Mo+zW+NQtIyaEcFrQTH207jZy2sb4niUQ=="; }; }; "load-bmfont-1.4.1" = { @@ -35047,13 +34858,13 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; - "lodash-id-0.14.0" = { + "lodash-id-0.14.1" = { name = "lodash-id"; packageName = "lodash-id"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.0.tgz"; - sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896"; + url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.1.tgz"; + sha512 = "ikQPBTiq/d5m6dfKQlFdIXFzvThPi2Be9/AHxktOnDSfSxE1j9ICbBT5Elk1ke7HSTgM38LHTpmJovo9/klnLg=="; }; }; "lodash._arrayeach-3.0.0" = { @@ -36325,15 +36136,6 @@ let sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; - "log-symbols-3.0.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; - }; - }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -36766,13 +36568,13 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "lunr-2.3.8" = { + "lunr-2.3.9" = { name = "lunr"; packageName = "lunr"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz"; - sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz"; + sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; "lzma-native-6.0.1" = { @@ -36829,13 +36631,13 @@ let sha1 = "d25e32e97c3c2cb89568ba8c98d229d5c305e391"; }; }; - "macos-release-2.4.1" = { + "macos-release-2.5.0" = { name = "macos-release"; packageName = "macos-release"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz"; - sha512 = "H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz"; + sha512 = "EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="; }; }; "magic-string-0.22.5" = { @@ -36946,6 +36748,15 @@ let sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; + "make-fetch-happen-9.0.2" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.2.tgz"; + sha512 = "UkAWAuXPXSSlVviTjH2We20mtj1NnZW2Qq/oTY2dyMbRQ5CR3Xed3akCDMnM7j6axrMY80lhgM7loNE132PfAw=="; + }; + }; "make-iterator-1.0.1" = { name = "make-iterator"; packageName = "make-iterator"; @@ -37351,13 +37162,13 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; - "marked-2.0.6" = { + "marked-2.0.7" = { name = "marked"; packageName = "marked"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-2.0.6.tgz"; - sha512 = "S2mYj0FzTQa0dLddssqwRVW4EOJOVJ355Xm2Vcbm+LU7GQRGWvwbO5K87OaPSOux2AwTSgtPPaXmc8sDPrhn2A=="; + url = "https://registry.npmjs.org/marked/-/marked-2.0.7.tgz"; + sha512 = "BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ=="; }; }; "marked-terminal-3.3.0" = { @@ -37918,15 +37729,6 @@ let sha512 = "RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q=="; }; }; - "memoize-one-5.1.1" = { - name = "memoize-one"; - packageName = "memoize-one"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz"; - sha512 = "HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="; - }; - }; "memoize-one-5.2.1" = { name = "memoize-one"; packageName = "memoize-one"; @@ -38179,13 +37981,13 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "mermaid-8.10.1" = { + "mermaid-8.10.2" = { name = "mermaid"; packageName = "mermaid"; - version = "8.10.1"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.10.1.tgz"; - sha512 = "KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.10.2.tgz"; + sha512 = "Za5MrbAOMbEsyY4ONgGjfYz06sbwF1iNGRzp1sQqpOtvXxjxGu/J1jRJ8QyE9kD/D9zj1/KlRrYegWEvA7eZ5Q=="; }; }; "meros-1.1.4" = { @@ -38647,15 +38449,6 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-db-1.47.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.47.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz"; - sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="; - }; - }; "mime-db-1.48.0" = { name = "mime-db"; packageName = "mime-db"; @@ -38692,13 +38485,13 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; - "mime-types-2.1.30" = { + "mime-types-2.1.31" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.30"; + version = "2.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz"; - sha512 = "crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz"; + sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg=="; }; }; "mimic-fn-1.2.0" = { @@ -39205,15 +38998,6 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-7.2.0" = { - name = "mocha"; - packageName = "mocha"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; - sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; - }; - }; "mocha-8.4.0" = { name = "mocha"; packageName = "mocha"; @@ -40439,22 +40223,22 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-7.0.0" = { + "netlify-7.0.1" = { name = "netlify"; packageName = "netlify"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-7.0.0.tgz"; - sha512 = "s454O7JRqrIo90c6rX+um1Xp7B0dGZBAYaIXYtA3em8DXJ0uWoglDeQSul8qGT1goAAF/9oMPo0T9KTM/XrjqA=="; + url = "https://registry.npmjs.org/netlify/-/netlify-7.0.1.tgz"; + sha512 = "Gd1aexpJ3RrOzkssdE8ipS67PuppOAkJNhRqQPp2in2XnJKPm5kvYonYMNVadasSFlNdmVCk9nELV3TnbAfklw=="; }; }; - "netlify-redirect-parser-3.0.29" = { + "netlify-redirect-parser-5.1.1" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "3.0.29"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.29.tgz"; - sha512 = "+lP4IG30CEpjlUaJM7hs/AW84gxkP0svvE80WJOcgB20lilPDkS6K3qeLlybjH/YznzomHZ0EF5Ydr/9d5I99A=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-5.1.1.tgz"; + sha512 = "TDJShXyaMwQaVtzWjK6U1UAWzWHnFzTVULAduaGroVlQha5Hi6WaRCZLg64FvQx4MUMOH8qOgSyByCqIMXqZWA=="; }; }; "netlify-redirector-0.2.1" = { @@ -40565,13 +40349,13 @@ let sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; }; }; - "nextgen-events-1.4.0" = { + "nextgen-events-1.5.2" = { name = "nextgen-events"; packageName = "nextgen-events"; - version = "1.4.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.4.0.tgz"; - sha512 = "bwSpShfuLg/lcRFokZvtUcrn5kumy6uRI6Jc+QWzH+bW6ZRdog7LfwAwhqeTzVfsprZgDGrctr6rO5aJhcdAfg=="; + url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.5.2.tgz"; + sha512 = "0ZEIRQywH5Oxt2IYYufRltQg/KjXhKM7f7MHve+ZIRaKnIR1PPYEXAl2WBmej5Sf0Qh2GgE/21sMRZVuOyxLzw=="; }; }; "nice-try-1.0.5" = { @@ -40646,15 +40430,6 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "no-cliches-0.1.1" = { - name = "no-cliches"; - packageName = "no-cliches"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/no-cliches/-/no-cliches-0.1.1.tgz"; - sha512 = "mYihjs47X5+N71CN3P+QBrEIBuclIfMMpgWEpkmLqFPvrOXdzokvDlhbLfjdBNZOqYgniaeZC6J1ZCgxFdyvXw=="; - }; - }; "no-cliches-0.3.4" = { name = "no-cliches"; packageName = "no-cliches"; @@ -40791,15 +40566,6 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; - "node-environment-flags-1.0.6" = { - name = "node-environment-flags"; - packageName = "node-environment-flags"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; - sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; - }; - }; "node-eta-0.9.0" = { name = "node-eta"; packageName = "node-eta"; @@ -41124,13 +40890,13 @@ let sha512 = "d/CbPGJMSNekJHOQu4WMNwjXRFnZ4c2+D3nlSdRH6wdUVVc++4nat8TuhcXKUe9W9+nqMrmVhReGnf8UwKsfBw=="; }; }; - "node-releases-1.1.72" = { + "node-releases-1.1.73" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.72"; + version = "1.1.73"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz"; - sha512 = "LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz"; + sha512 = "uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="; }; }; "node-source-walk-4.2.0" = { @@ -41457,6 +41223,15 @@ let sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; + "normalize-url-6.0.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.1.tgz"; + sha512 = "VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ=="; + }; + }; "now-and-later-2.0.1" = { name = "now-and-later"; packageName = "now-and-later"; @@ -41574,6 +41349,15 @@ let sha512 = "6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA=="; }; }; + "npm-package-arg-8.1.4" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.4.tgz"; + sha512 = "xLokoCFqj/rPdr3LvcdDL6Kj6ipXGEDHD/QGpzwU6/pibYUOXmp5DBmg76yukFyx4ZDbrXNOTn+BPyd8TD4Jlw=="; + }; + }; "npm-packlist-1.4.8" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -41637,6 +41421,15 @@ let sha512 = "KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA=="; }; }; + "npm-registry-fetch-11.0.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz"; + sha512 = "jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="; + }; + }; "npm-registry-fetch-9.0.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -41880,15 +41673,6 @@ let sha512 = "2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ=="; }; }; - "oas-validator-4.0.8" = { - name = "oas-validator"; - packageName = "oas-validator"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-4.0.8.tgz"; - sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw=="; - }; - }; "oas-validator-5.0.6" = { name = "oas-validator"; packageName = "oas-validator"; @@ -42115,15 +41899,6 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.assign-4.1.0" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; - }; - }; "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; @@ -42277,13 +42052,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.170.1" = { + "office-ui-fabric-react-7.170.3" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.170.1"; + version = "7.170.3"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.170.1.tgz"; - sha512 = "NZULXfe9I9W1THYUOFOPr7vLStRbdYNJi3+sJSRrNQHSeeGlUaFbAIOiT8g8h+3Seypk4Ybtm7vZXc6mUHx+Gw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.170.3.tgz"; + sha512 = "jpgvc2OQAf8vB35v0LeO0m23HDHBUkd5uQP03YAULXEyb8usBjyPN0R8O+PEEBsmtn/UIcPlB14xUof9S0MsuQ=="; }; }; "omggif-1.0.10" = { @@ -42448,15 +42223,6 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "onml-1.3.0" = { - name = "onml"; - packageName = "onml"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/onml/-/onml-1.3.0.tgz"; - sha512 = "RhGUsC6Im2A5vAdIvxE3auRKTqrqUZQl/AYLn8+9lM3SO4da5bwhcI5TcM+hfQxNCSLLOVErsl9p0ZPjKKmz+g=="; - }; - }; "onml-2.1.0" = { name = "onml"; packageName = "onml"; @@ -43024,6 +42790,15 @@ let sha512 = "1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg=="; }; }; + "ora-5.4.1" = { + name = "ora"; + packageName = "ora"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -43150,22 +42925,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.8" = { + "ot-builder-1.0.9" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.8.tgz"; - sha512 = "e9PkE4wr4mskFMNuV5IvCujBVp9Nc+yl5ltu7qad/BNcHIFh4nn9iWFE+Klva6h8prDefgE2FOuG+sYLU0IOrQ=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.9.tgz"; + sha512 = "y3TBkZdnqoLtHsyPDni+NA43nlN3hGeEfw+5FvrtNplnwMqFtYTTZ0aUa9TCmjyih5dtMOGay8HhOSFGZ5ONhw=="; }; }; - "otb-ttc-bundle-1.0.8" = { + "otb-ttc-bundle-1.0.9" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.8.tgz"; - sha512 = "VqlzOefegjHk0OTM7XIay7M+v0PSKYznKTmBPCds6X+NfaumDInoBrF7OTrhq5IN1LXlu4TwW29u0wzDCgc2+A=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.9.tgz"; + sha512 = "q1PtQMsMMcZluIkNh5Nk469vzM0j8yNzIqab5/xhM0dstnIC/+8ax0yR1uf6MvcKuZSv6Pict/knFs6n/k065w=="; }; }; "ow-0.21.0" = { @@ -43690,13 +43465,13 @@ let sha512 = "lMO7V9aMhyE5gfaSFxKfW3OTdXuFBNQJfuNuet3NPzWWhOYIW90t85vHcHLDjdhgmfAdAHyh9q1HAap96ea0XA=="; }; }; - "pacote-11.3.3" = { + "pacote-11.3.4" = { name = "pacote"; packageName = "pacote"; - version = "11.3.3"; + version = "11.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.3.tgz"; - sha512 = "GQxBX+UcVZrrJRYMK2HoG+gPeSUX/rQhnbPkkGrCYa4n2F/bgClFPaMm0nsdnYrxnmUy85uMHoFXZ0jTD0drew=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.3.4.tgz"; + sha512 = "RfahPCunM9GI7ryJV/zY0bWQiokZyLqaSNHXtbNSoLb7bwTvBbJBEyCJ01KWs4j1Gj7GmX8crYXQ1sNX6P2VKA=="; }; }; "pad-0.0.5" = { @@ -43717,6 +43492,15 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; + "paid-services-1.1.0" = { + name = "paid-services"; + packageName = "paid-services"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/paid-services/-/paid-services-1.1.0.tgz"; + sha512 = "+fpRfH9z0kzUzj+Gt4F/avFxyUMH486HZRlVHal48wJRbQO5yQoc8ABGkg9PFxeRFTgsSCJfN7kFwP9TQSsfXw=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -44104,13 +43888,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-url-5.0.2" = { + "parse-url-5.0.3" = { name = "parse-url"; packageName = "parse-url"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.2.tgz"; - sha512 = "Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.3.tgz"; + sha512 = "nrLCVMJpqo12X8uUJT4GJPd5AFaTOrGx/QpJy3HNcVtq0AZSstVIsnxS5fqNPuoqMUs3MyfBoOP6Zvu2Arok5A=="; }; }; "parse5-1.5.1" = { @@ -45292,6 +45076,15 @@ let sha1 = "1a1e55153d41a05534cea23cfe860abaa0eb4ace"; }; }; + "pm2-sysmonit-1.2.8" = { + name = "pm2-sysmonit"; + packageName = "pm2-sysmonit"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz"; + sha512 = "ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA=="; + }; + }; "pn-1.1.0" = { name = "pn"; packageName = "pn"; @@ -45337,13 +45130,13 @@ let sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; }; }; - "polished-3.7.2" = { + "polished-4.1.3" = { name = "polished"; packageName = "polished"; - version = "3.7.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.7.2.tgz"; - sha512 = "pQKtpZGmsZrW8UUpQMAnR7s3ppHeMQVNyMDKtUyKwuvDmklzcEyM5Kllb3JyE/sE/x7arDmyd35i+4vp99H6sQ=="; + url = "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz"; + sha512 = "ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA=="; }; }; "polyraf-1.1.0" = { @@ -45428,13 +45221,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-7.0.35" = { + "postcss-7.0.36" = { name = "postcss"; packageName = "postcss"; - version = "7.0.35"; + version = "7.0.36"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz"; + sha512 = "BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw=="; }; }; "postcss-8.2.10" = { @@ -45446,13 +45239,13 @@ let sha512 = "b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw=="; }; }; - "postcss-8.3.0" = { + "postcss-8.3.2" = { name = "postcss"; packageName = "postcss"; - version = "8.3.0"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz"; - sha512 = "+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.2.tgz"; + sha512 = "y1FK/AWdZlBF5lusS5j5l4/vF67+vQZt1SXPVJ32y1kRGDQyrs1zk32hG1cInRTu14P0V+orPz+ifwW/7rR4bg=="; }; }; "postcss-calc-7.0.5" = { @@ -46112,13 +45905,13 @@ let sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; - "prebuild-install-6.1.2" = { + "prebuild-install-6.1.3" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz"; - sha512 = "PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz"; + sha512 = "iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q=="; }; }; "precinct-8.1.0" = { @@ -46229,6 +46022,15 @@ let sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; }; }; + "prettier-2.3.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz"; + sha512 = "p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -46499,13 +46301,13 @@ let sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA=="; }; }; - "probing-1.3.5" = { + "probing-1.3.6" = { name = "probing"; packageName = "probing"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/probing/-/probing-1.3.5.tgz"; - sha512 = "Pn7gjrWqgsCyTIlSgTvhni17I3BsLXXL/QLDcDhEPI84xsyUWpSqiUw7Vr15kKvtPABrwtFb6k81v4kWGLo1ZQ=="; + url = "https://registry.npmjs.org/probing/-/probing-1.3.6.tgz"; + sha512 = "BO8oZu/KY6Z3ZquoEOJSvsUWFTNbGb5K8M+oZCMqT2VFaqceJ33TZJLF+qEAHIFIALagd4jHaKMg2V043ltotQ=="; }; }; "process-0.10.1" = { @@ -46580,6 +46382,15 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; + "progress-2.0.1" = { + name = "progress"; + packageName = "progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz"; + sha512 = "OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg=="; + }; + }; "progress-2.0.3" = { name = "progress"; packageName = "progress"; @@ -47021,6 +46832,15 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; + "psbt-1.1.10" = { + name = "psbt"; + packageName = "psbt"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/psbt/-/psbt-1.1.10.tgz"; + sha512 = "LLyJcNVKRK8AUXKcpCrZA21+mlrjzlzTLQZp/Yu279hqqQrakAu9IusT7zEddhhkQrzm6UQ9cER3nhrIZqh0hw=="; + }; + }; "psbt-1.1.8" = { name = "psbt"; packageName = "psbt"; @@ -47030,15 +46850,6 @@ let sha512 = "gnGq1ikGhvcsJij9BU2DZWBfXp09yRi/72+790hNwPaMPobgWrdlQ6sg6rNyDNYf+lwzYV8WIyHOLk2zH/7fGg=="; }; }; - "psbt-1.1.9" = { - name = "psbt"; - packageName = "psbt"; - version = "1.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/psbt/-/psbt-1.1.9.tgz"; - sha512 = "lL4unvP9nZFCWlqpKvWUEfTKVpkVyGKeBsYH/f76NNlgn1PF87Glw7opoAJQ5m0xfUTeUqy8J6ukIt4tFCqi1Q=="; - }; - }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -47930,6 +47741,15 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; + "puppeteer-10.0.0" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.0.0.tgz"; + sha512 = "AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A=="; + }; + }; "puppeteer-8.0.0" = { name = "puppeteer"; packageName = "puppeteer"; @@ -47939,15 +47759,6 @@ let sha512 = "D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ=="; }; }; - "puppeteer-9.1.1" = { - name = "puppeteer"; - packageName = "puppeteer"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz"; - sha512 = "W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw=="; - }; - }; "purgecss-2.3.0" = { name = "purgecss"; packageName = "purgecss"; @@ -47993,13 +47804,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.145" = { + "pyright-1.1.148" = { name = "pyright"; packageName = "pyright"; - version = "1.1.145"; + version = "1.1.148"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz"; - sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.148.tgz"; + sha512 = "cM1Bs/5XSqqfaTfl+zSvXvrq1YMUYOmo2QGBqZ4Cczq0hDo4oJAihzszJONO9H5riTgmEduid5aU3Rpkx+Y/xw=="; }; }; "q-0.9.7" = { @@ -48506,15 +48317,6 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "random-item-3.1.0" = { - name = "random-item"; - packageName = "random-item"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-item/-/random-item-3.1.0.tgz"; - sha512 = "0DyAT8LYBNQKSkqcPjia/HNoWCZ5JWBdAQWjBQVh5DMVv3Fv7V90I8/AuUf8NW4zdFn27i9qj8Kp6wI5JsiiOA=="; - }; - }; "random-iterate-1.0.1" = { name = "random-iterate"; packageName = "random-iterate"; @@ -48740,6 +48542,15 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; + "react-17.0.2" = { + name = "react"; + packageName = "react"; + version = "17.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react/-/react-17.0.2.tgz"; + sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; + }; + }; "react-dev-utils-11.0.4" = { name = "react-dev-utils"; packageName = "react-dev-utils"; @@ -48767,6 +48578,15 @@ let sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; }; + "react-dom-17.0.2" = { + name = "react-dom"; + packageName = "react-dom"; + version = "17.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz"; + sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; + }; + }; "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -49190,15 +49010,6 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.2.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; - }; - }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -49415,13 +49226,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.53" = { + "redoc-2.0.0-rc.54" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.53"; + version = "2.0.0-rc.54"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.53.tgz"; - sha512 = "nyHIEIVo+kxsMfAy7nkYSlU7qjXZAARcj0INaRwCoy/DG9BMMi3xLcpo0CmarL9XeI891+VN2tpyTJ8jhZUtPw=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.54.tgz"; + sha512 = "xwukaWdoktkDAoQuhajekdC54+/lSLwIUqJCNSTVEjeYEuZPq2tFUj9H5SBt8/YSq5UF/zOmDQrXPWMgildQpQ=="; }; }; "reduce-component-1.0.1" = { @@ -49982,13 +49793,13 @@ let sha512 = "F5BMWDmgATEoyPCtKjmGNTGN1ghoZlfRQ3MJh8dS/MrvIUIxupiof/Y9uahChipXcqQ57twVbgMmyQmuO1vokw=="; }; }; - "renderkid-2.0.5" = { + "renderkid-2.0.7" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz"; - sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz"; + sha512 = "oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ=="; }; }; "repeat-element-1.1.4" = { @@ -50837,13 +50648,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.50.5" = { + "rollup-2.51.2" = { name = "rollup"; packageName = "rollup"; - version = "2.50.5"; + version = "2.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz"; - sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.51.2.tgz"; + sha512 = "ReV2eGEadA7hmXSzjxdDKs10neqH2QURf2RxJ6ayAlq93ugy6qIvXMmbc5cWMGCDh1h5T4thuWO1e2VNbMq8FA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51080,13 +50891,13 @@ let sha512 = "Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g=="; }; }; - "rusha-0.8.13" = { + "rusha-0.8.14" = { name = "rusha"; packageName = "rusha"; - version = "0.8.13"; + version = "0.8.14"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; - sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.14.tgz"; + sha512 = "cLgakCUf6PedEu15t8kbsjnwIFFR2D4RfL+W3iWFJ4iac7z4B0ZI8fxy4R3J956kAI68HclCFGL8MPoUVC3qVA=="; }; }; "rw-1.3.3" = { @@ -51332,13 +51143,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.34.0" = { + "sass-1.34.1" = { name = "sass"; packageName = "sass"; - version = "1.34.0"; + version = "1.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz"; - sha512 = "rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz"; + sha512 = "scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ=="; }; }; "sax-0.5.8" = { @@ -51413,6 +51224,15 @@ let sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; }; }; + "scheduler-0.20.2" = { + name = "scheduler"; + packageName = "scheduler"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz"; + sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; + }; + }; "schema-utils-0.4.7" = { name = "schema-utils"; packageName = "schema-utils"; @@ -52430,13 +52250,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.39.0" = { + "simple-git-2.39.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.39.0"; + version = "2.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.39.0.tgz"; - sha512 = "VOsrmc3fpp1lGVIpo+1SKNqJzrdVJeSGZCeenPKnJPNo5UouAlSkWFc037pfm9wRYtfxBdwp2deVJGCG8J6C8A=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.39.1.tgz"; + sha512 = "+kEAkyQHsWejYxQNCzTrjvCxJOcijpB49RSs7HV+TK9B9prUq7YBNpFstQvjfGBn4Hecywp4tm+breGGGHlHwA=="; }; }; "simple-markdown-0.4.4" = { @@ -52718,6 +52538,15 @@ let sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; }; }; + "slugify-1.4.7" = { + name = "slugify"; + packageName = "slugify"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/slugify/-/slugify-1.4.7.tgz"; + sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg=="; + }; + }; "slugify-1.5.3" = { name = "slugify"; packageName = "slugify"; @@ -52907,13 +52736,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.26.0" = { + "snyk-mvn-plugin-2.26.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.26.0"; + version = "2.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.0.tgz"; - sha512 = "LxYNWXPJxcwbkCK+vE7t437RttEDcbsS2KJJYzFtrr6u7g26c51u9aMHYPCDAEmwjI1A28zSrh7Wp45JW4YOqg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.1.tgz"; + sha512 = "DCs53aRT/uK2e1jXzeVG2d+Ll0bmY/YHL+jEYaWJko8XwGoVwqCrVOkRyzXd2KOZUk3gpD6MaxIrBWsc8RJzRA=="; }; }; "snyk-nodejs-lockfile-parser-1.34.0" = { @@ -54068,13 +53897,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.4.5" = { + "ssb-friends-4.4.7" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.4.5"; + version = "4.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.5.tgz"; - sha512 = "XTGmXoqSm/U+A4WxNTTr3+yLdQk2sZUtvqdAFUPqzIVHmF3loji7IgyFRdEAk7wC2pY4N29YsYE2/qpRvu576Q=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.7.tgz"; + sha512 = "WPdHEWsAl9zMjbqQoFP++7UBi/lCKxiR0c8Qe2HHHoWIw58iVLSpepbNlZFwiZP4mPK5v2XaoYLOj7s3/UKj2w=="; }; }; "ssb-git-0.5.0" = { @@ -54590,13 +54419,13 @@ let sha512 = "/Kz55rgUIv2KP2MKphwYT/NCuSfAlbbMRv2ZWw7wyXayu230zdtzhxxuXXcvsc6EmmhS8bSJl3uS1wmMHFumbA=="; }; }; - "statsd-client-0.4.6" = { + "statsd-client-0.4.7" = { name = "statsd-client"; packageName = "statsd-client"; - version = "0.4.6"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.6.tgz"; - sha512 = "OL3PAf0LhlFP8ZpxFm3Ue7dL3cV5o7PAsWDsQnx/iKXGVr8huYF/ui+OZEORerEDVRps7BCPAq5bWppMj1oMoA=="; + url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.7.tgz"; + sha512 = "+sGCE6FednJ/vI7vywErOg/mhVqmf6Zlktz7cdGRnF/cQWXD9ifMgtqU1CIIXmhSwm11SCk4zDN+bwNCvIR/Kg=="; }; }; "statuses-1.4.0" = { @@ -55724,13 +55553,13 @@ let sha512 = "cm7TQq9I8dA5LKUr+r8W7RzQlLsmTdCr6wXmjYueOoh/bQu55ODEw7GFhT42pUyoaLtO2rgmx1+8cSIjY9lR9g=="; }; }; - "subscriptions-transport-ws-0.9.18" = { + "subscriptions-transport-ws-0.9.19" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; - version = "0.9.18"; + version = "0.9.19"; src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz"; - sha512 = "tztzcBTNoEbuErsVQpTN2xUNN/efAZXyCyL5m3x4t6SKrEiTL2N8SaKWBFWM4u56pL79ULif3zjyeq+oV+nOaA=="; + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz"; + sha512 = "dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw=="; }; }; "subscriptions-transport-ws-0.9.8" = { @@ -55904,15 +55733,6 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-6.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; - sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; - }; - }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -55976,13 +55796,13 @@ let sha512 = "Zx1/xLeGOIBlZMGPRCaXtlMe4ZA0faato5Dc3CosEqwu75MIEPuOstdkH6cy+RYTUYynoxzNaDxkPX4DbrPwRA=="; }; }; - "svelte2tsx-0.2.0" = { + "svelte2tsx-0.2.1" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.2.0.tgz"; - sha512 = "gag/5eqXOMfeHkPWbioEz2kk01KJpG2ZVxYMV35EWMGpxR4m6jzgNPkl7bYp5fEOuHQ99muyVQFIedu4wjgmZw=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.2.1.tgz"; + sha512 = "3JNUm+rRz0BYwO53NDEqpswW3wU2uvKtpIBjrFbizso8HJpjHM1NCFyXvVfdeM9vG7xH6oh3n0G0tE9noAomKA=="; }; }; "sver-compat-1.5.0" = { @@ -56012,13 +55832,13 @@ let sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; }; }; - "svg2img-0.9.2" = { + "svg2img-0.9.3" = { name = "svg2img"; packageName = "svg2img"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.2.tgz"; - sha512 = "sjyUgQhfEPJpBRTGxqI9bRzE+3k41Nzc7OtcHSSko96i/EQJZAisdxyhk12Ho/mDVCsb1QsVHLbevbxrFC6onQ=="; + url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.3.tgz"; + sha512 = "xuBToDg/iFg0T8dhMTpu8CGfnsinswF2zgBa22HbcK6fSAKkl/bsX84qbic50kA4McKTLK5QZ+fzavy8quEIVA=="; }; }; "svgo-0.6.6" = { @@ -56129,22 +55949,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.49.0" = { + "swagger-ui-dist-3.50.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.49.0"; + version = "3.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.49.0.tgz"; - sha512 = "R1+eT16XNP1bBLfacISifZAkFJlpwvWsS2vVurF5pbIFZnmCasD/hj+9r/q7urYdQyb0B6v11mDnuYU7rUpfQg=="; - }; - }; - "swagger2openapi-6.2.3" = { - name = "swagger2openapi"; - packageName = "swagger2openapi"; - version = "6.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-6.2.3.tgz"; - sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.50.0.tgz"; + sha512 = "BklniOBPlvZ6M9oGkhUwOf5HvxhkHBIycXN3ndju8WlLmi1xfMSdOA2AR6pNswlwURzsZUe1rh80aUyjnpD+Zw=="; }; }; "swagger2openapi-7.0.6" = { @@ -56282,6 +56093,15 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; + "systeminformation-5.7.6" = { + name = "systeminformation"; + packageName = "systeminformation"; + version = "5.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.6.tgz"; + sha512 = "sT7GeHq32DHaYBsQFogiLuHx51u+DO5flOlhIcmckTP0T9hQhAvvrbOR8jglNMaZgCvp5jACxeepERKGl7Bn/g=="; + }; + }; "table-3.8.3" = { name = "table"; packageName = "table"; @@ -56318,15 +56138,6 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.7.0" = { - name = "table"; - packageName = "table"; - version = "6.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.7.0.tgz"; - sha512 = "SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw=="; - }; - }; "table-6.7.1" = { name = "table"; packageName = "table"; @@ -56526,6 +56337,15 @@ let sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw=="; }; }; + "tar-fs-2.0.0" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz"; + sha512 = "vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA=="; + }; + }; "tar-fs-2.1.1" = { name = "tar-fs"; packageName = "tar-fs"; @@ -56706,15 +56526,6 @@ let sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw=="; }; }; - "tempfile-2.0.0" = { - name = "tempfile"; - packageName = "tempfile"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz"; - sha1 = "6b0446856a9b1114d1856ffcbe509cccb0977265"; - }; - }; "tempy-0.2.1" = { name = "tempy"; packageName = "tempy"; @@ -57732,15 +57543,6 @@ let sha512 = "RqtHvVffaf+ORMlpFjEWh3czDy6Q5wFfdGq9JXVBXu2L8/ssjDTnong8f1+I2xWGlKslXUkHU7m1HBj6MyoLqw=="; }; }; - "too-wordy-0.1.6" = { - name = "too-wordy"; - packageName = "too-wordy"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.1.6.tgz"; - sha512 = "MV5F74YF9+UYsvwXGXTh+5YP3EqH/ivwWfyFE2/YHWQQxm9jDPmkIC23nkN133Ye4nO3HTXmiMcfGqJ5xRPfOA=="; - }; - }; "too-wordy-0.3.4" = { name = "too-wordy"; packageName = "too-wordy"; @@ -58164,15 +57966,6 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-loader-6.2.2" = { - name = "ts-loader"; - packageName = "ts-loader"; - version = "6.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; - sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; - }; - }; "ts-loader-8.0.4" = { name = "ts-loader"; packageName = "ts-loader"; @@ -58182,6 +57975,15 @@ let sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ=="; }; }; + "ts-loader-8.3.0" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.3.0.tgz"; + sha512 = "MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag=="; + }; + }; "ts-log-2.2.3" = { name = "ts-log"; packageName = "ts-log"; @@ -58281,6 +58083,15 @@ let sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; }; }; + "tslib-2.3.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"; + sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -58488,6 +58299,15 @@ let sha1 = "0762378f1dc1c050e48f666aca904e24b1a962f4"; }; }; + "tx2-1.0.4" = { + name = "tx2"; + packageName = "tx2"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tx2/-/tx2-1.0.4.tgz"; + sha512 = "rU+y30nUY3PyIi+znvv74HzxlpULKwMPAyRK+YiCjvGkk3rY3fic3D6Z+avLpun3V5A6HFwPQ9JrBTMNEV/dxg=="; + }; + }; "txt-to-ast-3.0.3" = { name = "txt-to-ast"; packageName = "txt-to-ast"; @@ -58911,13 +58731,13 @@ let sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="; }; }; - "uglify-js-3.13.8" = { + "uglify-js-3.13.9" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.8"; + version = "3.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.8.tgz"; - sha512 = "PvFLMFIQHfIjFFlvAch69U2IvIxK9TNzNWt1SxZGp9JZ/v70yvqIQuiJeVPPtUMOzoNt+aNRDk4wgxb34wvEqA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz"; + sha512 = "wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="; }; }; "uglify-js-3.4.10" = { @@ -59064,6 +58884,15 @@ let sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; }; }; + "unbzip2-stream-1.3.3" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; + sha512 = "fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg=="; + }; + }; "unbzip2-stream-1.4.3" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; @@ -61360,13 +61189,13 @@ let sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="; }; }; - "vls-0.7.2" = { + "vls-0.7.4" = { name = "vls"; packageName = "vls"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.7.2.tgz"; - sha512 = "9nKgSPtNxQlc32K5GgZV++MdsCpNuac/SfxnEmVI0DCF4E0Uekj+RUo7Zk6NnA4veiNMN+AEjAIlbXYWPHgX6Q=="; + url = "https://registry.npmjs.org/vls/-/vls-0.7.4.tgz"; + sha512 = "uU5HCIK5vX096eMA5fBwyR7tv36m1Ssy910w5ILT5OvCUTXgBR58gZRJWrL2HxCyG8oYXC+oFWjhJc7+ExBUgQ=="; }; }; "vm-browserify-1.1.2" = { @@ -61405,13 +61234,22 @@ let sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"; }; }; - "vsce-1.91.0" = { + "vsce-1.88.0" = { name = "vsce"; packageName = "vsce"; - version = "1.91.0"; + version = "1.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.91.0.tgz"; - sha512 = "y75QryWKzAw5KIR4NFEXc6XAy/Er1BHXdNwAESgKKFw8Yc8cA/+dP4Gj7VYhNPOJlV0v5j1in/cPkLFZAqC7cQ=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz"; + sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; + }; + }; + "vsce-1.93.0" = { + name = "vsce"; + packageName = "vsce"; + version = "1.93.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vsce/-/vsce-1.93.0.tgz"; + sha512 = "RgmxwybXenP6tTF0PLh97b/RRLp1RkzjAHNya3QAfv1EZVg+lfoBiAaXogpmOGjYr8OskkqP5tIa3D/Q6X9lrw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -61918,13 +61756,13 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-2.6.12" = { + "vue-2.6.14" = { name = "vue"; packageName = "vue"; - version = "2.6.12"; + version = "2.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz"; - sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; "vue-codemod-0.0.5" = { @@ -62125,13 +61963,13 @@ let sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; - "wavedrom-2.6.9" = { + "wavedrom-2.7.0" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.6.9"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.6.9.tgz"; - sha512 = "EXBubejy7GrzibGLJ6OXH5HAP7KbA62gXMm8FvqJH0W5S05D6pgqdnRG20KP1w/WSY+zqdVIkiHNxwgquPbs2w=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.7.0.tgz"; + sha512 = "ae13n2/yEpmJt9VabwawsK7eHva7Mk+ghI+TQXCUbC1YEW8ChdrYgI/4TJyaYblzDlADZ0iCSaifZKNbjpR4Tw=="; }; }; "wawoff2-1.0.2" = { @@ -62287,6 +62125,15 @@ let sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg=="; }; }; + "webpack-5.38.1" = { + name = "webpack"; + packageName = "webpack"; + version = "5.38.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.38.1.tgz"; + sha512 = "OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g=="; + }; + }; "webpack-bundle-analyzer-3.9.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; @@ -62305,6 +62152,15 @@ let sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; + "webpack-cli-4.7.2" = { + name = "webpack-cli"; + packageName = "webpack-cli"; + version = "4.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; + sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; + }; + }; "webpack-core-0.6.9" = { name = "webpack-core"; packageName = "webpack-core"; @@ -62377,13 +62233,13 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; - "webpack-merge-5.7.3" = { + "webpack-merge-5.8.0" = { name = "webpack-merge"; packageName = "webpack-merge"; - version = "5.7.3"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz"; - sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; }; }; "webpack-node-externals-1.7.2" = { @@ -62530,13 +62386,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.5.0" = { + "whatwg-url-8.6.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.5.0"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz"; - sha512 = "fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.6.0.tgz"; + sha512 = "os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -63160,6 +63016,15 @@ let sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; + "workerpool-6.1.4" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.4.tgz"; + sha512 = "jGWPzsUqzkow8HoAvqaPWTUPCrlPJaJ5tY8Iz7n1uCz3tTp6s3CDG0FF1NsX42WNlkRSW6Mr+CDZGnNoSsKa7g=="; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -63277,13 +63142,13 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; - "write-good-0.11.3" = { + "write-good-1.0.8" = { name = "write-good"; packageName = "write-good"; - version = "0.11.3"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-0.11.3.tgz"; - sha512 = "fDKIHO5wCzTLCOGNJl1rzzJrZlTIzfZl8msOoJQZzRhYo0X/tFTm4+2B1zTibFYK01Nnd1kLZBjj4xjcFLePNQ=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.8.tgz"; + sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; }; "write-json-file-3.2.0" = { @@ -63349,13 +63214,13 @@ let sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; - "ws-5.2.2" = { + "ws-5.2.3" = { name = "ws"; packageName = "ws"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; + sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; }; }; "ws-6.1.4" = { @@ -63376,13 +63241,13 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.2.5" = { + "ws-6.2.2" = { name = "ws"; packageName = "ws"; - version = "7.2.5"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz"; - sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"; + sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; }; }; "ws-7.4.3" = { @@ -63394,15 +63259,6 @@ let sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; }; }; - "ws-7.4.4" = { - name = "ws"; - packageName = "ws"; - version = "7.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz"; - sha512 = "Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="; - }; - }; "ws-7.4.5" = { name = "ws"; packageName = "ws"; @@ -64331,15 +64187,6 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; - "yargs-unparser-1.6.0" = { - name = "yargs-unparser"; - packageName = "yargs-unparser"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; - sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; - }; - }; "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -64589,22 +64436,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.0.2.tgz"; - sha512 = "hXxnOxPl6+v/O+OnkJxPPupCeQJNmI08EdtnER5z/UCSpmlJibbTAqLF9rFaOi/7dPLS0RCNWmCRA6grgTlP9g=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.0.4.tgz"; + sha512 = "kZaJ55udB/AjQ+q8CrQfk6JGWdnJpH3c2VtbvSuR/ihiG6zMSxwpXqt1rImQN0RfffG3bsHD2SpM+T7/LKPemw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1200.2" - sources."@angular-devkit/core-12.0.2" - sources."@angular-devkit/schematics-12.0.2" + sources."@angular-devkit/architect-0.1200.4" + sources."@angular-devkit/core-12.0.4" + sources."@angular-devkit/schematics-12.0.4" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.0.2" + sources."@schematics/angular-12.0.4" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -64744,8 +64591,8 @@ in sources."lru-cache-6.0.0" sources."magic-string-0.25.7" sources."make-fetch-happen-8.0.14" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minipass-3.1.3" @@ -65083,8 +64930,8 @@ in sources."map-obj-4.2.1" sources."marky-1.2.2" sources."matcher-2.1.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -65173,7 +65020,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -65299,8 +65146,8 @@ in sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -65362,7 +65209,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" sources."word-wrap-1.2.3" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."zxcvbn-4.4.2" @@ -65394,9 +65241,9 @@ in ]; }) sources."@angular-devkit/schematics-cli-0.1102.6" - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -65415,12 +65262,12 @@ in ]; }) sources."@schematics/schematics-0.1102.6" - sources."@types/eslint-7.2.12" + sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" @@ -65439,7 +65286,7 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -65458,7 +65305,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65478,7 +65325,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65568,19 +65415,19 @@ in ]; }) sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."magic-string-0.25.7" sources."memfs-3.2.2" sources."merge-stream-2.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -65720,58 +65567,58 @@ in sources."@apollographql/apollo-tools-0.5.1" sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.13" + sources."@babel/plugin-syntax-flow-7.14.5" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -65779,58 +65626,58 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-syntax-typescript-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.13.0" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.14.4" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.14.4" - sources."@babel/preset-flow-7.13.13" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-typescript-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + sources."@babel/preset-env-7.14.5" + sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.13.0" - (sources."@babel/register-7.13.16" // { + sources."@babel/preset-typescript-7.14.5" + (sources."@babel/register-7.14.5" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -65838,13 +65685,13 @@ in sources."@hapi/topo-3.1.6" sources."@josephg/resolvable-1.0.1" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@nodelib/fs.scandir-2.1.4" // { + (sources."@nodelib/fs.scandir-2.1.5" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" ]; }) sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.walk-1.2.7" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -65883,7 +65730,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" @@ -65898,13 +65745,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.0.11" // { + (sources."@vue/compiler-core-3.1.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.11" - sources."@vue/shared-3.0.11" + sources."@vue/compiler-dom-3.1.1" + sources."@vue/shared-3.1.1" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -65932,7 +65779,7 @@ in sources."lru-cache-6.0.0" ]; }) - (sources."apollo-server-core-2.25.0" // { + (sources."apollo-server-core-2.25.1" // { dependencies = [ sources."lru-cache-6.0.0" sources."uuid-8.3.2" @@ -65940,7 +65787,7 @@ in }) sources."apollo-server-env-3.1.0" sources."apollo-server-errors-2.5.0" - sources."apollo-server-express-2.25.0" + sources."apollo-server-express-2.25.1" sources."apollo-server-plugin-base-0.13.0" sources."apollo-server-types-0.9.0" sources."apollo-tracing-0.15.0" @@ -65964,7 +65811,6 @@ in sources."assign-symbols-1.0.0" sources."ast-types-0.13.3" sources."async-2.6.3" - sources."async-limiter-1.0.1" sources."async-retry-1.3.1" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -66027,7 +65873,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -66070,7 +65916,7 @@ in sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -66085,12 +65931,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.13.1" + sources."core-js-pure-3.14.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -66157,7 +66003,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66295,7 +66141,7 @@ in sources."graphql-subscriptions-1.2.1" (sources."graphql-tag-2.12.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."graphql-tools-4.0.8" @@ -66400,7 +66246,7 @@ in sources."ast-types-0.14.2" sources."recast-0.20.4" sources."source-map-0.6.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."jsesc-2.5.2" @@ -66449,8 +66295,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -66492,7 +66338,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -66774,11 +66620,7 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-outer-1.0.1" - (sources."subscriptions-transport-ws-0.9.18" // { - dependencies = [ - sources."ws-5.2.2" - ]; - }) + sources."subscriptions-transport-ws-0.9.19" sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" sources."tar-stream-1.6.2" @@ -66870,10 +66712,10 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vue-2.6.12" + sources."vue-2.6.14" (sources."vue-codemod-0.0.5" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -66904,7 +66746,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-6.2.1" + sources."ws-7.4.6" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -67056,13 +66898,13 @@ in sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.14.3" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/types-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/types-7.14.5" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -67130,42 +66972,43 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.16.0.tgz"; - sha512 = "TR3y3sHEmRSAt7ikc9rWtWrpJ/2MpvgM5knMhbDJWxvqcvyTPagASAA5gktPJRhxnS2+RScVFEd0I6G/XGTuoQ=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.16.1.tgz"; + sha512 = "y43IQKivEMsR/ZiQ2GCmzx3ZWoFy+1vDjHuWOJcrCzkZClS8HFkI8/kZE+29g2n25DDzQJIeILEjGXretny6vQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.3" // { + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -67173,18 +67016,18 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."colors-1.4.0" - sources."commander-2.20.3" + sources."commander-7.2.0" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67230,7 +67073,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -67255,7 +67098,7 @@ in sources."which-1.3.1" sources."xml2js-0.2.8" sources."xml2tss-0.0.5" - sources."xmldom-0.4.0" + sources."xmldom-0.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -67278,7 +67121,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67313,7 +67156,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -67321,10 +67164,10 @@ in sources."ansi-styles-4.3.0" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67367,7 +67210,7 @@ in sources."dom-serializer-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.1.0" @@ -67513,10 +67356,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "8.0.14"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.14.tgz"; - sha512 = "z9/oACcuCHyWSg2c5J1G/HNcTAknUc4YS2SIqsbjw27YmAL2x6T9Uo1OSSemWnOqGtlHfS6xf7X3DJNsfIYPfQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-9.4.1.tgz"; + sha512 = "bvs2ySATrJXq9DOIYBGY41DIaE0AqSOEp5DlpXB9Kgf9rtbf3moiRwBGNtWpc1ZchSezDUBBRG8gmciT2q+S4w=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67527,12 +67370,12 @@ in }) sources."@alexbosworth/saxophone-0.6.2" sources."@cto.af/textdecoder-0.0.0" - (sources."@grpc/grpc-js-1.2.12" // { + (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" ]; }) - sources."@grpc/proto-loader-0.6.1" + sources."@grpc/proto-loader-0.6.2" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" @@ -67551,8 +67394,8 @@ in sources."@types/body-parser-1.19.0" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.34" - sources."@types/express-4.17.11" - sources."@types/express-serve-static-core-4.17.20" + sources."@types/express-4.17.12" + sources."@types/express-serve-static-core-4.17.21" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/node-10.12.18" @@ -67565,7 +67408,7 @@ in }) sources."@types/serve-static-1.13.9" sources."@types/tough-cookie-4.0.0" - sources."@types/ws-7.4.1" + sources."@types/ws-7.4.4" sources."abort-controller-3.0.0" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -67601,7 +67444,7 @@ in sources."assert-plus-1.0.0" sources."astral-regex-2.0.0" sources."async-3.2.0" - sources."asyncjs-util-1.2.5" + sources."asyncjs-util-1.2.6" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" @@ -67624,6 +67467,7 @@ in sources."bip68-1.0.4" sources."bitcoin-ops-1.4.1" sources."bitcoinjs-lib-5.2.0" + sources."bl-4.1.0" sources."bluebird-3.7.2" sources."bn.js-4.12.0" (sources."body-parser-1.19.0" // { @@ -67631,18 +67475,18 @@ in sources."qs-6.7.0" ]; }) - (sources."bolt01-1.2.1" // { + (sources."bolt01-1.2.2" // { dependencies = [ sources."bn.js-5.2.0" ]; }) - sources."bolt03-1.2.9" - (sources."bolt07-1.7.2" // { + sources."bolt03-1.2.10" + (sources."bolt07-1.7.3" // { dependencies = [ sources."bn.js-5.2.0" ]; }) - sources."bolt09-0.1.4" + sources."bolt09-0.1.5" (sources."boxen-5.0.1" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -67658,6 +67502,7 @@ in sources."brorand-1.1.0" sources."bs58-4.0.1" sources."bs58check-2.1.2" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equal-constant-time-1.0.1" @@ -67686,6 +67531,7 @@ in sources."cipher-base-1.0.4" sources."cli-boxes-2.2.1" sources."cli-cursor-1.0.2" + sources."cli-spinners-2.6.0" sources."cli-table3-0.5.1" sources."cli-width-2.2.1" (sources."cliui-7.0.4" // { @@ -67696,6 +67542,7 @@ in sources."strip-ansi-6.0.0" ]; }) + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" @@ -67726,12 +67573,13 @@ in sources."create-hmac-1.1.7" sources."crypto-js-4.0.0" sources."crypto-random-string-2.0.0" - sources."csv-parse-4.15.4" + sources."csv-parse-4.16.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-property-1.0.0" sources."delayed-stream-1.0.0" @@ -67777,24 +67625,21 @@ in sources."fresh-0.5.2" sources."gauge-1.2.7" sources."gaxios-4.3.0" - sources."gcp-metadata-4.2.1" + sources."gcp-metadata-4.3.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."global-dirs-3.0.0" - (sources."goldengate-10.0.4" // { + (sources."goldengate-10.1.0" // { dependencies = [ - sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."invoices-1.1.7" - sources."ln-service-51.7.0" ]; }) sources."google-auth-library-6.1.6" - sources."google-p12-pem-3.0.3" + sources."google-p12-pem-3.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.6" - sources."gtoken-5.2.1" + sources."gtoken-5.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -67823,11 +67668,12 @@ in ]; }) sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.0.0" // { + (sources."inquirer-8.1.0" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -67847,7 +67693,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."invoices-1.2.0" // { + (sources."invoices-1.2.1" // { dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" @@ -67862,6 +67708,7 @@ in sources."is-descriptor-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.4.0" + sources."is-interactive-1.0.0" sources."is-npm-5.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -67872,6 +67719,7 @@ in sources."is-path-inside-3.0.3" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isnumber-1.0.0" @@ -67891,53 +67739,24 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lightning-3.3.4" // { + (sources."lightning-3.3.9" // { dependencies = [ - sources."@grpc/proto-loader-0.6.0" - sources."@types/node-14.14.37" - sources."bech32-2.0.0" + sources."@types/node-15.6.1" sources."bn.js-5.2.0" - sources."invoices-1.1.7" ]; }) - (sources."ln-accounting-4.2.7" // { + (sources."ln-accounting-4.3.0" // { dependencies = [ - sources."@grpc/grpc-js-1.2.11" - sources."@grpc/proto-loader-0.5.6" - sources."@types/node-14.14.35" - sources."@types/ws-7.4.0" - sources."asyncjs-util-1.2.4" - sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."bolt07-1.7.1" - sources."bolt09-0.1.3" - sources."cbor-7.0.4" - sources."goldengate-10.0.3" - sources."invoices-1.1.6" - (sources."lightning-3.3.1" // { - dependencies = [ - sources."asyncjs-util-1.2.3" - ]; - }) - sources."ln-service-51.5.0" - sources."psbt-1.1.8" - ]; - }) - (sources."ln-service-51.8.1" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.1" - sources."@grpc/proto-loader-0.6.2" - sources."@types/node-15.0.3" - sources."@types/ws-7.4.4" - sources."bn.js-5.2.0" - sources."lightning-3.3.7" - sources."ws-7.4.5" + sources."goldengate-10.0.6" ]; }) + sources."ln-service-51.8.2" (sources."ln-sync-0.4.5" // { dependencies = [ sources."@grpc/grpc-js-1.2.11" sources."@grpc/proto-loader-0.5.6" + sources."@types/express-4.17.11" sources."@types/node-14.14.35" sources."@types/ws-7.4.0" sources."asyncjs-util-1.2.4" @@ -67955,22 +67774,10 @@ in sources."psbt-1.1.8" ]; }) - (sources."ln-telegram-3.2.3" // { + (sources."ln-telegram-3.2.5" // { dependencies = [ - sources."ajv-8.5.0" - sources."ansi-regex-5.0.0" - sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."is-fullwidth-code-point-3.0.0" - sources."json-schema-traverse-1.0.0" - (sources."ln-service-51.7.0" // { - dependencies = [ - sources."invoices-1.1.7" - ]; - }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - sources."table-6.7.0" + sources."goldengate-10.0.6" ]; }) sources."lodash-4.17.21" @@ -67983,6 +67790,13 @@ in sources."lodash.padstart-4.6.1" sources."lodash.truncate-4.4.2" sources."lodash.uniq-4.5.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."supports-color-7.2.0" + ]; + }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -68032,11 +67846,24 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-1.1.0" + (sources."ora-5.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."cli-cursor-3.1.0" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-timeout-4.1.0" sources."package-json-6.5.0" + sources."paid-services-1.1.0" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" @@ -68044,42 +67871,15 @@ in sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" sources."prettyjson-1.2.1" - (sources."probing-1.3.5" // { - dependencies = [ - sources."@grpc/grpc-js-1.2.11" - sources."@grpc/proto-loader-0.5.6" - sources."@types/node-14.14.35" - sources."@types/ws-7.4.0" - sources."asyncjs-util-1.2.4" - sources."bech32-2.0.0" - sources."bn.js-5.2.0" - sources."bolt09-0.1.3" - sources."cbor-7.0.4" - sources."invoices-1.1.7" - (sources."lightning-3.3.1" // { - dependencies = [ - sources."asyncjs-util-1.2.3" - sources."bolt07-1.7.1" - sources."invoices-1.1.6" - ]; - }) - (sources."ln-service-51.5.0" // { - dependencies = [ - sources."bolt07-1.7.1" - sources."invoices-1.1.6" - ]; - }) - sources."psbt-1.1.8" - ]; - }) + sources."probing-1.3.6" sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" ]; }) sources."proxy-addr-2.0.7" - (sources."psbt-1.1.9" // { + (sources."psbt-1.1.10" // { dependencies = [ sources."bn.js-5.2.0" ]; @@ -68146,7 +67946,7 @@ in sources."supports-color-2.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" sources."json-schema-traverse-1.0.0" @@ -68207,6 +68007,7 @@ in sources."varuint-bitcoin-1.1.2" sources."vary-1.1.2" sources."verror-1.10.0" + sources."wcwidth-1.0.1" (sources."widest-line-3.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -68234,7 +68035,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.4" + sources."ws-7.4.6" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -68337,8 +68138,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -68385,7 +68186,7 @@ in sources."whatwg-url-6.5.0" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-5.2.2" + sources."ws-5.2.3" sources."xml-name-validator-3.0.0" ]; buildInputs = globalBuildInputs; @@ -68788,11 +68589,11 @@ in sha512 = "QHoiW1H2P6Sx7L5IEvbZnnQsfy7eaibY/KS2UAX9VINXNdGS9RxqEdLOe9yTdcy5pzIFpQKIBspOnHcBOjVa8A=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/types-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/types-7.14.5" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.1" @@ -69039,8 +68840,8 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -69161,7 +68962,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.39.0" + sources."simple-git-2.39.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -69251,7 +69052,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69391,7 +69192,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-2.0.0" + sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" sources."is-core-module-2.4.0" sources."is-finite-1.1.0" @@ -69432,8 +69233,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -69542,7 +69343,7 @@ in sources."router-0.6.2" sources."run-parallel-1.2.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."rx-2.5.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -69657,10 +69458,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.18"; + version = "1.0.0-beta.22"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.18.tgz"; - sha512 = "eT0Z2u8yB8gMAIOMJ76TjeCQZ8nzxSbN/Y87cbzhT9I6vyLjgCw/w+48XXudOfW63kY2/TugWtZE+mwQlu3QXw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.22.tgz"; + sha512 = "hQrssZlC0Cy/PruMVi9N9oU0UuEUCEc0a99l4CgBa63RnVFxU/nEUTStKVKKjpTUl+NOO87cdiHkw6Q81gBIrg=="; }; dependencies = [ sources."@jsii/spec-1.30.0" @@ -69673,6 +69474,7 @@ in sources."camelcase-6.2.0" sources."case-1.6.3" sources."cdk8s-1.0.0-beta.14" + sources."cdk8s-plus-17-1.0.0-beta.18" sources."cliui-7.0.4" sources."clone-2.1.2" (sources."codemaker-1.30.0" // { @@ -69684,7 +69486,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.75" + sources."constructs-3.3.77" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -69757,13 +69559,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.273" // { + (sources."jsii-srcmak-0.1.280" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.236" + sources."json2jsii-0.1.248" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69810,7 +69612,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-6.0.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."typescript-3.9.9" sources."unbox-primitive-1.0.1" sources."universalify-2.0.0" @@ -69848,17 +69650,17 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.4.0.tgz"; - sha512 = "2mJA2Kq8mCcTzfHbNnogPWj/OVtPFEtzgL00hxPyLIKaQz7gX0Sagej18qp7kPh0pVA5Qenm5jVST3GdkjoX6A=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.4.1.tgz"; + sha512 = "bDK7F4MQFFgzkZBoxMimSu297IJ4duhG1ZpOGG/YcQ9MF/IuIKqlxV6WhWUEfPupnSuZuDQMNCRf/PhKsWcy9Q=="; }; dependencies = [ - sources."@cdktf/hcl2json-0.4.0" + sources."@cdktf/hcl2json-0.4.1" sources."@jsii/spec-1.30.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" sources."@types/node-fetch-2.5.10" sources."@types/yauzl-2.9.1" sources."@types/yoga-layout-1.9.2" @@ -69892,7 +69694,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."cdktf-0.4.0" + sources."cdktf-0.4.1" sources."chalk-4.1.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -69914,7 +69716,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.75" + sources."constructs-3.3.77" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -70033,7 +69835,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.273" // { + (sources."jsii-srcmak-0.1.280" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70059,8 +69861,8 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.2.1" sources."mdurl-1.0.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -70305,10 +70107,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.9.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.9.0.tgz"; - sha512 = "QmYLkObs561ld4vqvivzgVpGGpjsx+d0+x2slqKPvB80juKfaZbfcBxttkcAa6giB6qKFU4njhyz4pP54JebZg=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.11.0.tgz"; + sha512 = "RxYUkfb1HO+ZI62tB0JhqmxYgTrtlS8f3a6+gbFDkEkOCdoCG3GiQBlbV6JjQwdoK7LwNWPxeocJjqoA53ZLnQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70417,10 +70219,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.17.5"; + version = "0.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.17.5.tgz"; - sha512 = "a5GHhsPEFcby7CkhnpkWyLei/SCcon3Z/Li1Jvxr/h6bewDHFNXA5DZSDJWvhLnktGcwZNBOWGBBZhPWFGYAaA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.3.tgz"; + sha512 = "0bYcyZiiH+XlWjtBXGPUNAizDmdz8LFGvazTlOiurij06s1KKzE5gw9waUlbPdnlVwbNpoUkdTZ1mIEPn0bgLg=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -70534,7 +70336,7 @@ in dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" sources."which-2.0.2" @@ -70642,10 +70444,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.4.tgz"; - sha512 = "IK3JYMiJALMMhUlFgl4HxW2dvJdmUr86Hve+ngVATLpT2vWHG5V3sXjuHq7c7RlE7+oWS2CNoxIPf8oiuZesPQ=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.5.tgz"; + sha512 = "Rydv3YbCs2zGNzHfng47QVrnmWSgDdfWS1j1ropjW2R7HZndHIc/ArFv920MXIstDW5TO1LGBy+zhD8hhBYTGg=="; }; buildInputs = globalBuildInputs; meta = { @@ -70851,7 +70653,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-6.1.0" sources."traverse-0.3.9" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."unbox-primitive-1.0.1" sources."universalify-0.1.2" sources."unzipper-0.10.11" @@ -70908,18 +70710,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" @@ -70989,7 +70787,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -71051,7 +70849,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -71087,14 +70885,14 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.27.0" // { + (sources."eslint-7.28.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; @@ -71228,11 +71026,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -71547,7 +71341,7 @@ in sources."prelude-ls-1.2.1" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."prettier-eslint-12.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -71758,7 +71552,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -71790,7 +71584,7 @@ in }) sources."tsutils-3.21.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typescript-3.9.9" sources."unherit-1.1.3" sources."unified-6.2.0" @@ -71890,13 +71684,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.144"; + version = "1.1.148"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.144.tgz"; - sha512 = "bUb/GuY0QjlDAws60UNDL8ZiRzp6sLmSqRkMyAAUEb9arsSphvok80P3i/NEsJhG2lgx2LaEz1mKUCnR+UjTlA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.148.tgz"; + sha512 = "AudslTXxhUIiBsitc6bQcUUS+P7J1q1fU2XYDFp3CxBN+MJLDjT0LdARklN4N01W9mvT9hCW9cwfJKuk4dsCNg=="; }; dependencies = [ - sources."pyright-1.1.145" + sources."pyright-1.1.148" ]; buildInputs = globalBuildInputs; meta = { @@ -71970,10 +71764,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.46.0"; + version = "0.46.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.0.tgz"; - sha512 = "KwkFaDNBwZtqdahUPKYKoCb0nvLZ1wu5L2/8kpK94IMDgNPy3TUTxujtwDjLwjYo/z+W5reRfwIYNJZ3FZ2Onw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.1.tgz"; + sha512 = "FnHbToRGz0isjp4C/Fp5K+gX5vuuYmT8jlUdExWlhhTh7X+4pTz2xYlgaBX2/UTZQqOgn/wM4lxKlZtOpKVVCA=="; }; buildInputs = globalBuildInputs; meta = { @@ -72046,35 +71840,36 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.3" @@ -72082,7 +71877,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -72101,7 +71896,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72139,7 +71934,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72236,7 +72031,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -72258,7 +72053,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ (sources."chalk-2.4.2" // { dependencies = [ @@ -72401,10 +72196,10 @@ in coc-texlab = nodeEnv.buildNodePackage { name = "coc-texlab"; packageName = "coc-texlab"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.0.2.tgz"; - sha512 = "YiPB0gasof89HqAGz55BICHtt9gDyTjsNY1mwdKkJP0ZmgSxub5q+hOYYbay56X4+348Raxx0fp75JI8ax1nAw=="; + url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.1.0.tgz"; + sha512 = "wO2krr6/HKQuEONvSg6t+qwDrF68OvYpPjAz/AHcynXNpYX3M+LZaenzavultjsxQ/K0TU1ZiRI3VnI4YeTP/g=="; }; buildInputs = globalBuildInputs; meta = { @@ -72425,9 +72220,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.2" @@ -72513,10 +72308,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.7.0.tgz"; - sha512 = "Kye0Bn4ifhNhKFcenXg0z8iNzkBGOCXCb552sY/L55+4+08WU02impRnuYkEwFo2QAjDrRQNYjUfUabRR4LC+A=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.1.tgz"; + sha512 = "qkVsa46XLmOCmohpQhhz1SG9vUQN/54b/zZsDI5fnuBM49GX9f+Aya8m9ZidAzuwFKV+ostgvdWaB+GeQPPNPQ=="; }; dependencies = [ sources."typescript-4.3.2" @@ -72534,25 +72329,21 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.4.tgz"; - sha512 = "9ZEPHykSx2J/OwLFocXSK1Bg4p35AegacFb0ZaWV9s0IEtdNSkYi25Y9CscqV6fQheMfyEl0f4rlI4yh6DbcPg=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.5.tgz"; + sha512 = "pBh7Jrn+L4hj6E6JxAwGdjVB/9v2TuJEMYUhDFR41s/zBJG2cXxzgUVmGz8RWYd70HdEz2ula1FcRA4rjkjPXg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -72586,8 +72377,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.27.0" - sources."eslint-plugin-vue-7.10.0" + sources."eslint-7.28.0" + sources."eslint-plugin-vue-7.11.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -72624,11 +72415,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -72663,7 +72450,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -72688,7 +72475,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -72703,11 +72490,11 @@ in }) sources."tsutils-2.29.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typescript-4.3.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - sources."vls-0.7.2" + sources."vls-0.7.4" (sources."vue-eslint-parser-7.6.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -72996,9 +72783,9 @@ in }; dependencies = [ sources."@netflix/nerror-1.1.3" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -73329,13 +73116,13 @@ in sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.14" + sources."make-fetch-happen-9.0.2" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -73344,8 +73131,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -73379,10 +73166,10 @@ in sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -73413,7 +73200,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.3" + sources."pacote-11.3.4" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."path-exists-3.0.0" @@ -73601,15 +73388,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73980,7 +73767,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74061,8 +73848,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.3" @@ -74615,8 +74402,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -74728,7 +74515,7 @@ in sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -74961,9 +74748,9 @@ in sha512 = "4kjsgc/rV+qtH3dTqEnR/ug36yKNjyo5z674ySkD6k08DwlLs10fsP/I+d8BAsbtjpL36bqZxLa9iNgTDqioXQ=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."aggregate-error-3.1.0" sources."array-union-2.1.0" sources."balanced-match-1.0.2" @@ -75090,22 +74877,22 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.71.0"; + version = "6.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.71.0.tgz"; - sha512 = "bx902tD9qzZFnM7YbL9KOqdcE8iW1KKEyxdvE5rEJVdzny7FMHpLRF/YpP+bjKdXvnCcZMNsePqNum+i2qp8Ng=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.72.0.tgz"; + sha512 = "sOsFzBwwUkJkP6EZ8cOwz1eFva5sTf6ojhOgl2gplRs7+PkuqGyng/4TnKL3KIFqwE5lFsA66sIh8UQU4Dkecw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.784.0" + sources."aws-sdk-2.920.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -75165,8 +74952,8 @@ in sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.4" sources."method-missing-1.2.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" @@ -75279,6 +75066,7 @@ in sources."jsonfile-4.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" @@ -75293,7 +75081,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -75331,7 +75119,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."boolean-3.1.0" + sources."boolean-3.1.2" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -75340,7 +75128,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" @@ -75367,9 +75155,9 @@ in sources."commander-4.1.1" sources."compare-version-0.1.2" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75594,8 +75382,8 @@ in sources."strip-bom-2.0.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -75637,7 +75425,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" (sources."npm-conf-1.1.3" // { dependencies = [ @@ -75664,7 +75452,7 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.2.0" - sources."ora-5.4.0" + sources."ora-5.4.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -75880,51 +75668,52 @@ in sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75945,7 +75734,7 @@ in sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.1" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" ]; @@ -75959,7 +75748,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -75996,7 +75785,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76093,9 +75882,9 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -76245,9 +76034,9 @@ in version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -76257,7 +76046,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.170.1" + sources."@fluentui/react-7.170.3" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -76271,10 +76060,10 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.174" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@microsoft/load-themed-styles-1.10.181" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."rimraf-3.0.2" @@ -76289,7 +76078,7 @@ in sources."@types/connect-3.4.34" sources."@types/engine.io-3.1.5" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.20" + sources."@types/express-serve-static-core-4.17.21" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" @@ -77132,8 +76921,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -77298,7 +77087,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.170.1" + sources."office-ui-fabric-react-7.170.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -77525,7 +77314,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.34.0" // { + (sources."sass-1.34.1" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -77941,25 +77730,21 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.27.0"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz"; - sha512 = "JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz"; + sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -78025,11 +77810,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -78081,13 +77862,13 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."which-2.0.2" @@ -78115,8 +77896,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" @@ -78124,11 +77905,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -78159,7 +77936,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.27.0" + sources."eslint-7.28.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -78195,11 +77972,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -78252,13 +78025,13 @@ in sources."supports-color-8.1.1" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."which-2.0.2" @@ -78302,126 +78075,126 @@ in sha512 = "r6SeIMk2ZP1/rSKGcXquiQp/A7MGAmJvG0otmJhlO5ypdYXfAJ1fhEJIqt7ufSngc5RRJ0cjnKZ1WBSyJlJTNA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-default-from-7.12.13" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-default-from-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.12.13" + sources."@babel/plugin-syntax-export-default-from-7.14.5" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.13" + sources."@babel/plugin-syntax-flow-7.14.5" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-syntax-typescript-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.13.0" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-assign-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-display-name-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/plugin-transform-react-jsx-self-7.12.13" - sources."@babel/plugin-transform-react-jsx-source-7.14.2" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.14.3" // { + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-assign-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-self-7.14.5" + sources."@babel/plugin-transform-react-jsx-source-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + (sources."@babel/plugin-transform-runtime-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.14.4" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-typescript-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" (sources."@babel/preset-env-7.12.17" // { dependencies = [ sources."semver-5.7.1" @@ -78429,10 +78202,10 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-4.0.2" @@ -78512,7 +78285,7 @@ in sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xcpretty-2.0.1" // { + (sources."@expo/xcpretty-2.0.2" // { dependencies = [ sources."@babel/code-frame-7.10.4" ]; @@ -78564,9 +78337,9 @@ in sources."@jimp/tiff-0.12.1" sources."@jimp/types-0.12.1" sources."@jimp/utils-0.12.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@npmcli/git-2.0.9" // { dependencies = [ sources."mkdirp-1.0.4" @@ -78836,7 +78609,7 @@ in }) sources."cache-base-1.0.1" sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -78844,12 +78617,12 @@ in sources."callsites-2.0.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -78983,7 +78756,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -79014,15 +78787,9 @@ in sources."semver-6.3.0" ]; }) - (sources."css-select-2.1.0" // { + (sources."css-select-4.1.3" // { dependencies = [ - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domutils-1.7.0" + sources."domhandler-4.2.0" ]; }) sources."css-select-base-adapter-0.1.1" @@ -79031,7 +78798,7 @@ in sources."source-map-0.6.1" ]; }) - sources."css-what-3.4.2" + sources."css-what-5.0.1" sources."cssesc-3.0.0" sources."cssnano-4.1.11" sources."cssnano-preset-default-4.0.8" @@ -79107,14 +78874,14 @@ in sources."domelementtype-2.2.0" sources."domhandler-3.3.0" sources."domino-2.1.6" - (sources."domutils-2.6.0" // { + (sources."domutils-2.7.0" // { dependencies = [ sources."domhandler-4.2.0" ]; }) (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."dot-prop-5.3.0" @@ -79123,7 +78890,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79487,6 +79254,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."p-timeout-3.2.0" sources."responselike-1.0.2" @@ -79578,7 +79346,7 @@ in sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."lowercase-keys-2.0.0" @@ -79588,7 +79356,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-8.0.14" // { + (sources."make-fetch-happen-9.0.2" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -79620,8 +79388,8 @@ in ]; }) sources."mime-1.4.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -79708,7 +79476,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."node-fetch-2.6.1" @@ -79726,10 +79494,10 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" @@ -79743,21 +79511,21 @@ in (sources."npm-pick-manifest-6.1.1" // { dependencies = [ sources."hosted-git-info-4.0.2" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."semver-7.3.5" ]; }) - (sources."npm-registry-fetch-10.1.2" // { + (sources."npm-registry-fetch-11.0.0" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."semver-7.3.5" ]; }) sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."nullthrows-1.1.1" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -79838,6 +79606,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."registry-auth-token-3.4.0" sources."registry-url-5.1.0" @@ -79845,12 +79614,12 @@ in sources."semver-6.3.0" ]; }) - (sources."pacote-11.3.3" // { + (sources."pacote-11.3.4" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" sources."mkdirp-1.0.4" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."rimraf-3.0.2" sources."semver-7.3.5" ]; @@ -79859,7 +79628,7 @@ in sources."parallel-transform-1.2.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."parse-asn1-5.1.6" @@ -79873,7 +79642,7 @@ in sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."pascalcase-0.1.1" @@ -79927,7 +79696,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ (sources."chalk-2.4.2" // { dependencies = [ @@ -80149,21 +79918,11 @@ in sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.2.0" - sources."entities-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" - sources."entities-1.1.2" - sources."htmlparser2-3.10.1" - sources."readable-stream-3.6.0" + sources."domhandler-4.2.0" + sources."htmlparser2-6.1.0" sources."strip-ansi-3.0.1" ]; }) @@ -80393,6 +80152,16 @@ in (sources."svgo-1.3.2" // { dependencies = [ sources."chalk-2.4.2" + sources."css-select-2.1.0" + sources."css-what-3.4.2" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domelementtype-1.3.1" + sources."domutils-1.7.0" + sources."nth-check-1.0.2" ]; }) sources."symbol-observable-1.2.0" @@ -80662,7 +80431,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) (sources."webpack-log-2.0.0" // { @@ -80900,8 +80669,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -80997,17 +80766,18 @@ in sha512 = "KqaoGSmcIBLY6Vr1wWRMu0acuLUpxpKEtjekdwYs+JxMk74vRa8Mwxd96SmEoBat28cPCoLAPfvDyEtzUzkjEg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.14.3" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -81018,9 +80788,9 @@ in ]; }) sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.2" @@ -81040,7 +80810,7 @@ in (sources."@oclif/config-1.17.0" // { dependencies = [ sources."globby-11.0.3" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@oclif/errors-1.3.4" @@ -81387,8 +81157,8 @@ in sources."map-visit-1.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -81445,7 +81215,7 @@ in sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."prettier-linter-helpers-1.0.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" @@ -81609,21 +81379,25 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.12.0"; + version = "9.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.12.0.tgz"; - sha512 = "rPk4JyzPaSHyHQDGCh0/U63MW2nXgnZ4h0IRE2EjFHRz+KyNl/hakGX7EQKVej5HpMKFhWRjGOvDHn1PXooQgw=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.12.1.tgz"; + sha512 = "izgpgUiG36UwIV12oBu3X8ndACGsxh2cuREnGgTAoTs6P5OC2nEV3riwAak9eQpkuqHfZ6vEuw5ogSbMNqRIgA=="; }; dependencies = [ - sources."@apidevtools/json-schema-ref-parser-9.0.7" + (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { + dependencies = [ + sources."js-yaml-4.1.0" + ]; + }) sources."@dabh/diagnostics-2.0.2" sources."@google-cloud/paginator-3.0.5" sources."@google-cloud/precise-date-2.0.3" - sources."@google-cloud/projectify-2.0.1" + sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.12.0" // { + (sources."@google-cloud/pubsub-2.13.0" // { dependencies = [ - sources."google-auth-library-7.1.0" + sources."google-auth-library-7.1.2" ]; }) sources."@grpc/grpc-js-1.3.2" @@ -81652,9 +81426,10 @@ in sources."@types/archiver-5.1.0" sources."@types/duplexify-3.6.0" sources."@types/glob-7.1.3" + sources."@types/json-schema-7.0.7" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81697,7 +81472,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."arrify-2.0.1" sources."as-array-2.0.0" @@ -81991,7 +81766,7 @@ in ]; }) sources."gaxios-4.3.0" - sources."gcp-metadata-4.2.1" + sources."gcp-metadata-4.3.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" (sources."get-uri-3.0.2" // { @@ -82006,15 +81781,15 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.14.1" // { + (sources."google-gax-2.15.0" // { dependencies = [ - sources."google-auth-library-7.1.0" + sources."google-auth-library-7.1.2" ]; }) - sources."google-p12-pem-3.0.3" + sources."google-p12-pem-3.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.6" - sources."gtoken-5.2.1" + sources."gtoken-5.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-ansi-2.0.0" // { @@ -82090,7 +81865,11 @@ in sources."isstream-0.1.2" sources."jju-1.4.0" sources."join-path-1.1.1" - sources."js-yaml-3.14.1" + (sources."js-yaml-3.14.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) sources."jsbn-0.1.1" sources."json-bigint-1.0.0" sources."json-buffer-3.0.0" @@ -82172,8 +81951,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -82426,7 +82205,7 @@ in sources."toxic-1.0.1" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."tweetsodium-0.0.5" // { @@ -82578,9 +82357,9 @@ in sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -82620,7 +82399,7 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" @@ -82759,7 +82538,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -82857,8 +82636,8 @@ in sources."localforage-1.9.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -83446,10 +83225,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.6.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.6.0.tgz"; - sha512 = "GJ0BviJw3qnONdoNpCvqgRA8jxYk7rpqi+7MrvT0U+YMcT2HGhZbhY0RxlZqYRL8qOCJTtLB/N4Z7cCUwi8g1w=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.7.1.tgz"; + sha512 = "IWs7eU3tOad4qiglvokrZEL2yJPQsXjuzKW5slfXbhuj5pIc+o65f389HeOq20wHPh7ACHfZPMftvhtaPsO91g=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -83457,57 +83236,58 @@ in sources."tslib-2.0.3" ]; }) - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.3" // { + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" + sources."@babel/parser-7.14.5" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/runtime-7.14.0" - sources."@babel/standalone-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/runtime-7.14.5" + sources."@babel/standalone-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -83544,7 +83324,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/node-fetch-2.5.10" sources."@types/readable-stream-2.3.10" sources."@types/unist-2.0.3" @@ -83552,7 +83332,7 @@ in sources."@types/yargs-parser-20.2.0" sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."acorn-jsx-5.3.1" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { @@ -83612,7 +83392,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83662,7 +83442,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.22.4" + sources."contentful-management-7.24.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.7.0" // { @@ -83673,15 +83453,15 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.6.0" + sources."create-gatsby-1.7.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."crypto-random-string-2.0.0" - sources."css-select-2.1.0" - sources."css-what-3.4.2" + sources."css-select-4.1.3" + sources."css-what-5.0.1" sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -83700,19 +83480,15 @@ in }) sources."diff-sequences-25.2.6" sources."dom-converter-0.2.0" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.2.0" + sources."domutils-2.7.0" sources."dot-prop-5.3.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83784,8 +83560,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.6.0" - (sources."gatsby-recipes-0.17.0" // { + sources."gatsby-core-utils-2.7.1" + (sources."gatsby-recipes-0.18.1" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-4.1.0" @@ -83799,7 +83575,7 @@ in sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.6.0" + sources."gatsby-telemetry-2.7.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -83821,13 +83597,9 @@ in sources."has-symbols-1.0.2" sources."has-yarn-2.1.0" sources."hicat-0.8.0" - sources."highlight.js-10.7.2" + sources."highlight.js-10.7.3" sources."hosted-git-info-3.0.8" - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."entities-1.1.2" - ]; - }) + sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ @@ -83946,8 +83718,8 @@ in sources."micromark-extension-mdxjs-0.3.0" sources."micromark-extension-mdxjs-esm-0.3.1" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" @@ -83963,11 +83735,11 @@ in sources."node-eta-0.9.0" sources."node-fetch-2.6.1" sources."node-object-hash-2.3.3" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" - sources."normalize-url-3.3.0" + sources."normalize-url-6.0.1" sources."npm-run-path-2.0.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."object-assign-4.1.1" sources."object-inspect-1.10.3" sources."object-path-0.11.5" @@ -83989,7 +83761,7 @@ in }) sources."parse-entities-2.0.0" sources."parse-path-4.0.3" - sources."parse-url-5.0.2" + sources."parse-url-5.0.3" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" sources."path-exists-4.0.0" @@ -84001,7 +83773,7 @@ in sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -84054,7 +83826,7 @@ in ]; }) sources."remark-stringify-8.1.1" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" sources."strip-ansi-3.0.1" @@ -84315,7 +84087,7 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" - sources."is-valid-domain-0.0.19" + sources."is-valid-domain-0.0.20" sources."json-buffer-2.0.11" sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" @@ -84325,8 +84097,8 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -84491,9 +84263,9 @@ in sha512 = "xf6lKP7Ptas6bIdn/KvOn7UqkPS9/BBKcGCDVrsak/e0dWYeDZIOCMNwWxLp/zEjwBMSiPZtJdOdsIdmWap3bQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84509,7 +84281,7 @@ in sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" sources."agent-base-6.0.2" - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ajv-formats-2.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -84526,7 +84298,7 @@ in sources."arrify-1.0.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."atomically-1.7.0" @@ -84596,7 +84368,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" @@ -84708,7 +84480,7 @@ in ]; }) sources."optionator-0.8.3" - sources."ora-5.4.0" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -84848,9 +84620,9 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84938,12 +84710,12 @@ in sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@microsoft/fetch-event-source-2.0.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -84960,7 +84732,6 @@ in sources."array-union-2.1.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.4" @@ -84984,7 +84755,7 @@ in sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."caseless-0.12.0" @@ -85095,7 +84866,7 @@ in }) sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" - sources."graphql-ws-4.7.0" + sources."graphql-ws-4.9.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -85193,7 +84964,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."lowercase-keys-1.0.1" @@ -85206,8 +84977,8 @@ in sources."merge2-1.4.1" sources."meros-1.1.4" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -85220,7 +84991,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."node-emoji-1.10.0" @@ -85278,7 +85049,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."passwd-user-3.0.0" @@ -85343,11 +85114,7 @@ in sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."subscriptions-transport-ws-0.9.18" // { - dependencies = [ - sources."ws-5.2.2" - ]; - }) + sources."subscriptions-transport-ws-0.9.19" sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.6" // { dependencies = [ @@ -85536,8 +85303,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -86589,7 +86356,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -86605,10 +86372,10 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.14.2"; + version = "0.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.2.tgz"; - sha512 = "lUCgGVZ/oyCkpgDkIa5IfClwX8Ppy11Dk7XdeVboAGSmKjIuOKx6yy86WS0W08KFtCRuxftzNy+KdQjM4UjqCA=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.15.1.tgz"; + sha512 = "uNbgqqBiD2ko4QQOYAHTPwDMluc9X81NwzlrJN7yExCoM6dHNgRFjVI+4TEdRrF/EqUzl1dpMUn7GYbu/qCKmA=="; }; dependencies = [ sources."ajv-6.12.6" @@ -86660,8 +86427,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -87065,8 +86832,8 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -87228,7 +86995,7 @@ in sources."node-fetch-2.6.1" sources."semver-5.7.1" sources."source-map-0.7.3" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -87342,7 +87109,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."astral-regex-2.0.0" @@ -87483,11 +87250,11 @@ in ]; }) sources."lru-cache-5.1.1" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -87635,9 +87402,9 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-1.0.8" - sources."@ot-builder/bin-util-1.0.8" - (sources."@ot-builder/cli-help-shower-1.0.8" // { + sources."@ot-builder/bin-composite-types-1.0.9" + sources."@ot-builder/bin-util-1.0.9" + (sources."@ot-builder/cli-help-shower-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87647,7 +87414,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-1.0.8" // { + (sources."@ot-builder/cli-proc-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87657,7 +87424,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-1.0.8" // { + (sources."@ot-builder/cli-shared-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87667,35 +87434,35 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-1.0.8" - sources."@ot-builder/errors-1.0.8" - sources."@ot-builder/io-bin-cff-1.0.8" - sources."@ot-builder/io-bin-encoding-1.0.8" - sources."@ot-builder/io-bin-ext-private-1.0.8" - sources."@ot-builder/io-bin-font-1.0.8" - sources."@ot-builder/io-bin-glyph-store-1.0.8" - sources."@ot-builder/io-bin-layout-1.0.8" - sources."@ot-builder/io-bin-metadata-1.0.8" - sources."@ot-builder/io-bin-metric-1.0.8" - sources."@ot-builder/io-bin-name-1.0.8" - sources."@ot-builder/io-bin-sfnt-1.0.8" - sources."@ot-builder/io-bin-ttf-1.0.8" - sources."@ot-builder/ot-1.0.8" - sources."@ot-builder/ot-encoding-1.0.8" - sources."@ot-builder/ot-ext-private-1.0.8" - sources."@ot-builder/ot-glyphs-1.0.8" - sources."@ot-builder/ot-layout-1.0.8" - sources."@ot-builder/ot-metadata-1.0.8" - sources."@ot-builder/ot-name-1.0.8" - sources."@ot-builder/ot-sfnt-1.0.8" - sources."@ot-builder/ot-standard-glyph-namer-1.0.8" - sources."@ot-builder/prelude-1.0.8" - sources."@ot-builder/primitive-1.0.8" - sources."@ot-builder/rectify-1.0.8" - sources."@ot-builder/stat-glyphs-1.0.8" - sources."@ot-builder/trace-1.0.8" - sources."@ot-builder/var-store-1.0.8" - sources."@ot-builder/variance-1.0.8" + sources."@ot-builder/common-impl-1.0.9" + sources."@ot-builder/errors-1.0.9" + sources."@ot-builder/io-bin-cff-1.0.9" + sources."@ot-builder/io-bin-encoding-1.0.9" + sources."@ot-builder/io-bin-ext-private-1.0.9" + sources."@ot-builder/io-bin-font-1.0.9" + sources."@ot-builder/io-bin-glyph-store-1.0.9" + sources."@ot-builder/io-bin-layout-1.0.9" + sources."@ot-builder/io-bin-metadata-1.0.9" + sources."@ot-builder/io-bin-metric-1.0.9" + sources."@ot-builder/io-bin-name-1.0.9" + sources."@ot-builder/io-bin-sfnt-1.0.9" + sources."@ot-builder/io-bin-ttf-1.0.9" + sources."@ot-builder/ot-1.0.9" + sources."@ot-builder/ot-encoding-1.0.9" + sources."@ot-builder/ot-ext-private-1.0.9" + sources."@ot-builder/ot-glyphs-1.0.9" + sources."@ot-builder/ot-layout-1.0.9" + sources."@ot-builder/ot-metadata-1.0.9" + sources."@ot-builder/ot-name-1.0.9" + sources."@ot-builder/ot-sfnt-1.0.9" + sources."@ot-builder/ot-standard-glyph-namer-1.0.9" + sources."@ot-builder/prelude-1.0.9" + sources."@ot-builder/primitive-1.0.9" + sources."@ot-builder/rectify-1.0.9" + sources."@ot-builder/stat-glyphs-1.0.9" + sources."@ot-builder/trace-1.0.9" + sources."@ot-builder/var-store-1.0.9" + sources."@ot-builder/variance-1.0.9" sources."@unicode/unicode-13.0.0-1.0.6" sources."aglfn-1.0.2" sources."amdefine-1.0.1" @@ -87782,8 +87549,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.8" - (sources."otb-ttc-bundle-1.0.8" // { + sources."ot-builder-1.0.9" + (sources."otb-ttc-bundle-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87841,7 +87608,7 @@ in sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."type-check-0.3.2" sources."typo-geom-0.11.2" sources."unicoderegexp-0.4.1" @@ -88074,7 +87841,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88198,7 +87965,7 @@ in sources."domelementtype-2.2.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" - (sources."domutils-2.6.0" // { + (sources."domutils-2.7.0" // { dependencies = [ sources."domhandler-4.2.0" ]; @@ -88276,7 +88043,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-10.7.2" + sources."highlight.js-10.7.3" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" @@ -88426,9 +88193,9 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.10.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mermaid-8.10.2" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" (sources."minify-4.1.3" // { dependencies = [ @@ -88436,7 +88203,7 @@ in sources."debug-4.3.2" sources."html-minifier-4.0.0" sources."ms-2.1.2" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" ]; }) sources."minimatch-3.0.4" @@ -88459,7 +88226,7 @@ in sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" sources."needle-2.6.0" - sources."nextgen-events-1.4.0" + sources."nextgen-events-1.5.2" sources."no-case-2.3.2" (sources."node-abi-2.30.0" // { dependencies = [ @@ -88489,7 +88256,6 @@ in sources."semver-5.7.1" ]; }) - sources."noop-logger-0.1.1" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -88527,7 +88293,7 @@ in sources."pipe-functions-1.3.0" sources."pn-1.1.0" sources."pngjs-5.0.0" - sources."prebuild-install-6.1.2" + sources."prebuild-install-6.1.3" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -88763,7 +88529,7 @@ in sources."brace-expansion-1.1.11" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" sources."glob-7.1.7" @@ -88823,7 +88589,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.4" + sources."@babel/parser-7.14.5" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -88836,7 +88602,7 @@ in sources."lodash-4.17.21" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" - sources."marked-2.0.6" + sources."marked-2.0.7" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -88986,8 +88752,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.10.3" @@ -89129,7 +88895,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lodash-4.17.21" - sources."lodash-id-0.14.0" + sources."lodash-id-0.14.1" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -89147,8 +88913,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -89293,13 +89059,13 @@ in sha512 = "JbF3PiO1wNawJnOQlb4nJZ2rvDfDWnD7ROCdzqgFXhqi3XTNXBqjpoC7PT3ylfNR6BGibjchndH27VieqyMA0A=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@oclif/errors-1.3.4" @@ -89356,7 +89122,7 @@ in dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."cli-width-3.0.0" @@ -89456,8 +89222,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."moment-2.29.1" sources."ms-2.1.2" @@ -89559,16 +89325,16 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.2.tgz"; - sha512 = "fo4Wt0S99/8vylZMxNj4cBFyOBBnC1bewZ0QOlePij/2SZVWxqbyLeIddY13q6URa2EpLRW8ixvFRUMjkmo1bw=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.3.tgz"; + sha512 = "JRAujkKWaOtO2LmyPH7K2XXRhrxuFAn9loIL9+iiah6vjz+ZLkqdKsySV9clRITGhj10t9baIfbCl6CJ5hu9gQ=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89645,8 +89411,8 @@ in }) sources."media-typer-0.3.0" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -89712,7 +89478,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = "http://karma-runner.github.io/"; + homepage = "https://karma-runner.github.io/"; license = "MIT"; }; production = true; @@ -89933,8 +89699,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -90179,8 +89945,8 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."log-symbols-2.2.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -90319,9 +90085,9 @@ in sha512 = "DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -90378,6 +90144,7 @@ in }) (sources."@lerna/npm-dist-tag-4.0.0" // { dependencies = [ + sources."make-fetch-happen-8.0.14" sources."npm-registry-fetch-9.0.0" ]; }) @@ -90401,6 +90168,7 @@ in sources."@lerna/prompt-4.0.0" (sources."@lerna/publish-4.0.0" // { dependencies = [ + sources."make-fetch-happen-8.0.14" sources."npm-registry-fetch-9.0.0" ]; }) @@ -90421,9 +90189,9 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@npmcli/ci-detect-1.3.0" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" @@ -90432,26 +90200,26 @@ in sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" sources."@octokit/auth-token-2.4.5" - sources."@octokit/core-3.4.0" - (sources."@octokit/endpoint-6.0.11" // { + sources."@octokit/core-3.5.0" + (sources."@octokit/endpoint-6.0.12" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.6.2" - sources."@octokit/openapi-types-7.2.3" + sources."@octokit/graphql-4.6.4" + sources."@octokit/openapi-types-7.3.2" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.13.3" - sources."@octokit/plugin-request-log-1.0.3" + sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.3.1" - (sources."@octokit/request-5.4.15" // { + (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-2.0.5" - sources."@octokit/rest-18.5.5" - sources."@octokit/types-6.16.2" + sources."@octokit/request-error-2.1.0" + sources."@octokit/rest-18.6.0" + sources."@octokit/types-6.16.4" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" @@ -90493,7 +90261,7 @@ in sources."aws4-1.11.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" - sources."before-after-hook-2.2.1" + sources."before-after-hook-2.2.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.1" @@ -90534,7 +90302,7 @@ in }) sources."concat-map-0.0.1" sources."concat-stream-2.0.0" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."conventional-changelog-angular-5.0.12" (sources."conventional-changelog-core-4.2.2" // { @@ -90591,7 +90359,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."eventemitter3-4.0.7" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ @@ -90756,8 +90524,8 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."kind-of-6.0.3" - sources."libnpmaccess-4.0.2" - (sources."libnpmpublish-4.0.1" // { + sources."libnpmaccess-4.0.3" + (sources."libnpmpublish-4.0.2" // { dependencies = [ sources."normalize-package-data-3.0.2" ]; @@ -90781,7 +90549,7 @@ in sources."semver-5.7.1" ]; }) - sources."make-fetch-happen-8.0.14" + sources."make-fetch-happen-9.0.2" sources."map-obj-4.2.1" (sources."meow-8.1.2" // { dependencies = [ @@ -90805,8 +90573,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -90830,6 +90598,7 @@ in sources."ms-2.1.2" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" + sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."node-fetch-2.6.1" sources."node-gyp-7.1.2" @@ -90840,7 +90609,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-3.3.0" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" (sources."npm-lifecycle-3.1.5" // { @@ -90861,10 +90630,10 @@ in ]; }) sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -90890,7 +90659,7 @@ in sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."p-waterfall-2.1.1" - sources."pacote-11.3.3" + sources."pacote-11.3.4" sources."parent-module-1.0.1" sources."parse-github-repo-url-1.4.1" sources."parse-json-5.2.0" @@ -90899,7 +90668,7 @@ in sources."qs-6.10.1" ]; }) - sources."parse-url-5.0.2" + sources."parse-url-5.0.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -91030,7 +90799,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -91048,7 +90817,7 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.5.0" + sources."whatwg-url-8.6.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" (sources."wide-align-1.1.3" // { @@ -91326,8 +91095,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -91723,8 +91492,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -91997,61 +91766,61 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -92062,48 +91831,48 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-runtime-7.14.3" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.14.4" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-runtime-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + sources."@babel/preset-env-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -92118,13 +91887,13 @@ in sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.11.1" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -92297,7 +92066,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92369,7 +92138,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -92421,7 +92190,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92683,8 +92452,8 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -92724,7 +92493,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -93276,9 +93045,9 @@ in sources."link-check-4.5.4" sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.0" - sources."marked-2.0.6" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."marked-2.0.7" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.3" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -93497,8 +93266,8 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -93661,14 +93430,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.10.1"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.10.1.tgz"; - sha512 = "X2wIJwN22Hwh5zkpGteKg31K+wYCO8W5NUsQYlnSWyv8RpHoZfK7+kDVRzvHvVqnizTM3D+KgSnONvh+Z0EB6g=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.10.2.tgz"; + sha512 = "aoGVAZC/goUc6iWYef5aRjCwITojjWvlEj+qPHCEbAGisR4md3fi3+3iDD3ra+zhagfXJZ1Qyo5+3lVkJPaC6Q=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93685,7 +93454,7 @@ in sources."clean-css-4.2.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.2.1" + sources."commander-7.2.0" sources."concat-map-0.0.1" sources."css-b64-images-0.2.5" sources."d3-5.16.0" @@ -93726,8 +93495,8 @@ in sources."d3-zoom-1.8.3" sources."dagre-0.8.5" sources."dagre-d3-0.6.4" - sources."debug-4.3.2" - sources."devtools-protocol-0.0.869402" + sources."debug-4.3.1" + sources."devtools-protocol-0.0.883894" sources."end-of-stream-1.4.4" sources."entity-decode-2.0.2" sources."extract-zip-2.0.1" @@ -93754,10 +93523,11 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lower-case-1.1.4" - sources."mermaid-8.10.1" + sources."mermaid-8.10.2" sources."minify-4.1.3" sources."minimatch-3.0.4" - sources."mkdirp-classic-0.5.3" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" sources."moment-mini-2.24.0" sources."ms-2.1.2" sources."no-case-2.3.2" @@ -93771,10 +93541,10 @@ in sources."path-is-absolute-1.0.1" sources."pend-1.2.0" sources."pkg-dir-4.2.0" - sources."progress-2.0.3" + sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-9.1.1" + sources."puppeteer-10.0.0" sources."readable-stream-3.6.0" sources."relateurl-0.2.7" sources."rimraf-3.0.2" @@ -93786,7 +93556,7 @@ in sources."string_decoder-1.3.0" sources."stylis-3.5.4" sources."supports-color-7.2.0" - sources."tar-fs-2.1.1" + sources."tar-fs-2.0.0" sources."tar-stream-2.2.0" (sources."terser-4.8.0" // { dependencies = [ @@ -93796,8 +93566,8 @@ in sources."through-2.3.8" sources."try-catch-2.0.1" sources."try-to-catch-1.1.1" - sources."uglify-js-3.13.8" - sources."unbzip2-stream-1.4.3" + sources."uglify-js-3.13.9" + sources."unbzip2-stream-1.3.3" sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -93826,11 +93596,11 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.170.1" + sources."@fluentui/react-7.170.3" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.174" + sources."@microsoft/load-themed-styles-1.10.181" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.26" @@ -93948,8 +93718,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -93966,7 +93736,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.170.1" + sources."office-ui-fabric-react-7.170.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -94057,7 +93827,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.49.0" + sources."swagger-ui-dist-3.50.0" sources."tail-2.2.2" sources."through-2.3.8" sources."tmp-0.0.33" @@ -94089,10 +93859,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.4.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz"; - sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.0.0.tgz"; + sha512 = "GRGG/q9bIaUkHJB9NL+KZNjDhMBHB30zW3bZW9qOiYr+QChyLjPzswaxFWkI1q6lGlSL28EQYzAi2vKWNkPx+g=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -94140,7 +93910,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" @@ -94153,13 +93923,14 @@ in sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" + sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."js-yaml-4.0.0" + sources."js-yaml-4.1.0" sources."locate-path-6.0.0" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."minimatch-3.0.4" sources."ms-2.1.3" - sources."nanoid-3.1.20" + sources."nanoid-3.1.23" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" @@ -94179,7 +93950,7 @@ in sources."to-regex-range-5.0.1" sources."which-2.0.2" sources."wide-align-1.1.3" - sources."workerpool-6.1.0" + sources."workerpool-6.1.4" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -94251,8 +94022,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.10.3" @@ -94342,53 +94113,53 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.32.6"; + version = "3.37.16"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.32.6.tgz"; - sha512 = "VG2b3SJHbAIVErZvaeD0cU496GnuHpBqUYJiMrtEJ3eaPSQGc6HHZz9/P0Zbl7S67jaOk/wANOfcSxtbmPEORQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.37.16.tgz"; + sha512 = "xbLV6yOhclcDmpf09mGo0jR4LOtRcOc4j+3mwk9wUYT3cav4VFIDVvKo1EuNxcINvN3CBQ+8d1Ui1+alS9nMrg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -94397,26 +94168,26 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -94426,50 +94197,50 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.14.4" // { + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + (sources."@babel/preset-env-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@bugsnag/browser-7.10.1" sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" @@ -94479,7 +94250,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-11.29.2" // { + (sources."@netlify/build-12.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94493,10 +94264,13 @@ in }) (sources."@netlify/cache-utils-1.0.7" // { dependencies = [ + sources."del-5.1.0" sources."locate-path-5.0.0" + sources."p-map-3.0.0" + sources."slash-3.0.0" ]; }) - (sources."@netlify/config-6.7.1" // { + (sources."@netlify/config-7.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94506,13 +94280,22 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/framework-info-5.1.2" // { + sources."@netlify/esbuild-0.13.5" + (sources."@netlify/framework-info-5.1.4" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.37" + (sources."@netlify/functions-utils-1.3.40" // { + dependencies = [ + sources."@netlify/zip-it-and-ship-it-4.3.0" + sources."cp-file-9.0.0" + sources."pkg-dir-5.0.0" + sources."resolve-2.0.0-next.3" + sources."yargs-16.2.0" + ]; + }) (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94523,68 +94306,35 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-2.4.0" - (sources."@netlify/plugin-edge-handlers-1.11.13" // { + sources."@netlify/open-api-2.5.0" + (sources."@netlify/plugin-edge-handlers-1.11.16" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" - sources."@types/node-14.17.1" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."del-6.0.0" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-11.0.3" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.4" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" + sources."@types/node-14.17.3" + sources."typescript-4.3.2" ]; }) - sources."@netlify/plugins-list-2.14.2" + sources."@netlify/plugins-list-2.15.0" + sources."@netlify/routing-local-proxy-0.30.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - sources."@netlify/traffic-mesh-agent-0.27.10" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" - sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" - sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-4.2.5" // { + (sources."@netlify/zip-it-and-ship-it-4.2.7" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."cliui-7.0.4" sources."cp-file-9.0.0" - sources."del-6.0.0" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-11.0.3" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.4" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" - sources."y18n-5.0.8" sources."yargs-16.2.0" - sources."yargs-parser-20.2.7" ]; }) - (sources."@nodelib/fs.scandir-2.1.4" // { + (sources."@nodelib/fs.scandir-2.1.5" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" ]; }) sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.walk-1.2.7" (sources."@oclif/color-0.1.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -94610,7 +94360,7 @@ in sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -94623,7 +94373,7 @@ in sources."micromatch-4.0.4" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."@oclif/errors-1.3.4" // { @@ -94677,31 +94427,31 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."universalify-2.0.0" ]; }) sources."@oclif/screen-1.0.4" sources."@octokit/auth-token-2.4.5" - sources."@octokit/core-3.4.0" - (sources."@octokit/endpoint-6.0.11" // { + sources."@octokit/core-3.5.0" + (sources."@octokit/endpoint-6.0.12" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.6.2" - sources."@octokit/openapi-types-7.2.3" - sources."@octokit/plugin-paginate-rest-2.13.3" - sources."@octokit/plugin-request-log-1.0.3" + sources."@octokit/graphql-4.6.4" + sources."@octokit/openapi-types-7.3.2" + sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.3.1" - (sources."@octokit/request-5.4.15" // { + (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-2.0.5" - sources."@octokit/rest-18.5.5" - sources."@octokit/types-6.16.2" + sources."@octokit/request-error-2.1.0" + sources."@octokit/rest-18.6.0" + sources."@octokit/types-6.16.4" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -94739,7 +94489,7 @@ in sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" sources."@types/mkdirp-0.5.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/node-fetch-2.5.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -94747,10 +94497,10 @@ in sources."@types/semver-5.5.0" sources."@types/yargs-13.0.11" sources."@types/yargs-parser-20.2.0" - sources."@typescript-eslint/types-4.26.0" - (sources."@typescript-eslint/typescript-estree-4.26.0" // { + sources."@typescript-eslint/types-4.26.1" + (sources."@typescript-eslint/typescript-estree-4.26.1" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -94765,12 +94515,12 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.26.0" + sources."@typescript-eslint/visitor-keys-4.26.1" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-8.5.0" + sources."ajv-8.6.0" (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" @@ -94827,7 +94577,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -94850,7 +94600,7 @@ in ]; }) sources."base64-js-1.5.1" - sources."before-after-hook-2.2.1" + sources."before-after-hook-2.2.2" sources."better-opn-2.1.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" @@ -94902,7 +94652,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-4.1.1" // { @@ -94963,16 +94713,11 @@ in sources."has-flag-4.0.0" sources."js-yaml-3.14.1" sources."supports-hyperlinks-2.2.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."cli-width-2.2.1" - (sources."cliui-6.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."wrap-ansi-6.2.0" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -94991,13 +94736,13 @@ in sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."commander-2.20.3" - sources."common-path-prefix-2.0.0" + sources."common-path-prefix-3.0.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" sources."concordance-5.0.4" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."configstore-5.0.1" (sources."content-disposition-0.5.3" // { dependencies = [ @@ -95021,7 +94766,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95095,10 +94840,21 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" - (sources."del-5.1.0" // { + (sources."del-6.0.0" // { dependencies = [ - sources."p-map-3.0.0" + sources."@nodelib/fs.stat-2.0.5" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.4" sources."slash-3.0.0" + sources."to-regex-range-5.0.1" ]; }) sources."delayed-stream-1.0.0" @@ -95113,11 +94869,7 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - (sources."detective-typescript-7.0.0" // { - dependencies = [ - sources."typescript-3.9.9" - ]; - }) + sources."detective-typescript-7.0.0" (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -95146,7 +94898,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95175,7 +94927,7 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-1.1.1" - (sources."execa-5.0.1" // { + (sources."execa-5.1.1" // { dependencies = [ sources."get-stream-6.0.1" sources."human-signals-2.1.0" @@ -95250,7 +95002,7 @@ in sources."@types/yargs-15.0.13" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" sources."got-10.7.0" @@ -95264,6 +95016,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-2.1.0" + sources."normalize-url-6.0.1" sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" sources."responselike-2.0.0" @@ -95337,7 +95090,7 @@ in sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -95631,7 +95384,7 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { dependencies = [ @@ -95663,8 +95416,8 @@ in sources."micro-memoize-4.0.9" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -95701,16 +95454,20 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-7.0.0" // { + (sources."netlify-7.0.1" // { dependencies = [ sources."qs-6.10.1" ]; }) - sources."netlify-redirect-parser-3.0.29" + (sources."netlify-redirect-parser-5.1.1" // { + dependencies = [ + sources."is-plain-obj-2.1.0" + ]; + }) sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ @@ -95774,7 +95531,7 @@ in sources."object.pick-1.3.0" (sources."oclif-plugin-completion-0.6.0" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."omit.js-2.0.2" @@ -95790,7 +95547,7 @@ in ]; }) sources."optionator-0.8.3" - (sources."ora-5.4.0" // { + (sources."ora-5.4.1" // { dependencies = [ sources."cli-cursor-3.1.0" sources."restore-cursor-3.1.0" @@ -95885,7 +95642,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.3.0" + sources."postcss-8.3.2" sources."postcss-values-parser-2.0.1" sources."precinct-8.1.0" sources."precond-0.2.3" @@ -95914,7 +95671,6 @@ in sources."querystring-0.2.0" sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" - sources."random-item-3.1.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.1" // { @@ -95975,7 +95731,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.50.5" + sources."rollup-2.51.2" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96116,7 +95872,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."statsd-client-0.4.6" + sources."statsd-client-0.4.7" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.2" @@ -96157,20 +95913,6 @@ in sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."del-6.0.0" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-11.0.3" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.4" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" sources."type-fest-0.16.0" ]; }) @@ -96217,7 +95959,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.2" + sources."typescript-3.9.9" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -96321,15 +96063,20 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.7" sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -96635,8 +96382,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -96887,7 +96634,7 @@ in sha512 = "P/EmWwzuY/0mQFlrklSUrVANdv9xQsbrpKrpfA8tuhhxu1OEiSgzYdo87Zj13Hi38K4f1rNPQj4rw2vEBcYS/g=="; }; dependencies = [ - sources."@babel/runtime-7.14.0" + sources."@babel/runtime-7.14.5" sources."@node-red/editor-api-1.3.5" sources."@node-red/editor-client-1.3.5" (sources."@node-red/nodes-1.3.5" // { @@ -97149,8 +96896,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-3.1.3" // { @@ -97327,7 +97074,7 @@ in sources."punycode-1.4.1" ]; }) - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -97394,7 +97141,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -97448,8 +97195,8 @@ in sources."jsonfile-1.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -97729,9 +97476,9 @@ in sha512 = "CdpgqtO6JpDKJjQ2gueY0jnbz6APWA9wFXSwPv5bXg4seSBibHqQ8JyWxYlS8YRfVbpeDtj582wcAWTlfy5qNA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -97742,9 +97489,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@samverschueren/stream-to-observable-0.3.1" // { dependencies = [ sources."any-observable-0.3.0" @@ -97756,7 +97503,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -97789,7 +97536,7 @@ in sources."braces-3.0.2" sources."builtins-1.0.3" sources."cacheable-lookup-2.0.1" - (sources."cacheable-request-7.0.1" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" ]; @@ -97849,7 +97596,7 @@ in sources."error-ex-1.3.2" sources."escape-goat-3.0.0" sources."escape-string-regexp-4.0.0" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-glob-3.2.5" sources."fastq-1.11.0" @@ -98059,7 +97806,7 @@ in sources."hosted-git-info-4.0.2" ]; }) - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" (sources."npm-name-6.0.1" // { dependencies = [ sources."p-map-3.0.0" @@ -98119,6 +97866,7 @@ in sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" sources."mimic-response-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" @@ -98259,10 +98007,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.15.1"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.15.1.tgz"; - sha512 = "sPk+GrqawshbG3T81r2QvvSxSQXBFWyn5NGLacf87l+/odi2ZRHkWdLrg304Lw0DrwwIIaGxUjp0FJXaMtIErQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.17.0.tgz"; + sha512 = "yNzj4vQellvUGiBM/SzhfT89EV0vb7iILjTehSydTY/IgK2Vjk7/7J8WNJ2ysqcgfLY21ptI/j7uknt15IbbKQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -98283,9 +98031,9 @@ in sha512 = "/l4S7Gh+8+Rg5itWsqFya5RRSHtPzw5neyAlbWNJfBfEeRX6lYVxKgs85QFBOKrZj3eL5MGBaUW8228TmjMhrw=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -98478,13 +98226,13 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.14" + sources."make-fetch-happen-9.0.2" sources."map-age-cleaner-0.1.3" sources."mem-8.1.1" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -98499,16 +98247,17 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" + sources."negotiator-0.6.2" sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -98525,7 +98274,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.3" + sources."pacote-11.3.4" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -98667,7 +98416,7 @@ in sources."coffee-script-1.12.7" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - (sources."config-chain-1.1.12" // { + (sources."config-chain-1.1.13" // { dependencies = [ sources."ini-1.3.8" ]; @@ -98721,8 +98470,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -98860,130 +98609,130 @@ in sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.3" // { + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.13" + sources."@babel/plugin-syntax-flow-7.14.5" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.13.0" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.14.4" // { + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + (sources."@babel/preset-env-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -99105,7 +98854,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -99132,7 +98881,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -99243,7 +98992,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99358,7 +99107,7 @@ in dependencies = [ sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" ]; }) sources."http-errors-1.7.3" @@ -99430,7 +99179,7 @@ in sources."acorn-6.4.2" sources."escodegen-1.14.3" sources."esprima-4.0.1" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) sources."jsesc-2.5.2" @@ -99474,8 +99223,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -99505,7 +99254,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -99543,7 +99292,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -99849,7 +99598,7 @@ in sources."which-boxed-primitive-1.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-5.2.2" + sources."ws-5.2.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -100019,8 +99768,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -100114,7 +99863,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -100348,7 +100097,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-2.0.0" + sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-core-module-2.4.0" @@ -100453,7 +100202,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -100727,8 +100476,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -100800,7 +100549,7 @@ in sources."rimraf-2.7.1" sources."run-parallel-1.2.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."send-0.17.1" // { @@ -100902,10 +100651,10 @@ in pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; - version = "4.5.6"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-4.5.6.tgz"; - sha512 = "4J5q704Xl6VmpmQhXFGMJL4kXyyQw3AZM1FE9vRxhS3LiDI/+WVBtOM6pqJ4g/RKW+AUjEkc23i/DCC4BVenDA=="; + url = "https://registry.npmjs.org/pm2/-/pm2-5.1.0.tgz"; + sha512 = "reJ35NOxM4+g7H0enW47HJsp32CszKkseCojAuUMUkffyXsGDKBMnDqhxAZMZKtHUUjl0cWFEqKehqB0ODH8Kw=="; }; dependencies = [ (sources."@opencensus/core-0.0.9" // { @@ -100919,7 +100668,7 @@ in sources."semver-5.7.1" ]; }) - (sources."@pm2/agent-1.0.8" // { + (sources."@pm2/agent-2.0.0" // { dependencies = [ sources."semver-7.2.3" ]; @@ -100946,11 +100695,7 @@ in sources."ansi-colors-4.1.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) + sources."argparse-1.0.10" sources."ast-types-0.13.4" sources."async-3.2.0" (sources."async-listener-0.6.10" // { @@ -100963,6 +100708,7 @@ in sources."binary-extensions-2.2.0" sources."blessed-0.1.81" sources."bodec-0.1.0" + sources."boolean-3.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.1" @@ -100993,7 +100739,9 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."eventemitter2-5.0.1" + sources."fast-json-patch-3.0.0-1" sources."fast-levenshtein-2.0.6" + sources."fast-printf-1.6.5" sources."fclone-1.0.11" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" @@ -101026,6 +100774,7 @@ in sources."is-number-7.0.0" sources."isarray-0.0.1" sources."js-git-0.7.8" + sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."lazy-1.0.11" sources."levn-0.3.0" @@ -101064,11 +100813,11 @@ in sources."pm2-axon-rpc-0.7.1" sources."pm2-deploy-1.0.2" sources."pm2-multimeter-0.1.2" + sources."pm2-sysmonit-1.2.8" sources."prelude-ls-1.1.2" sources."promptly-2.2.0" sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" - sources."ps-list-6.3.0" sources."raw-body-2.4.1" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -101093,14 +100842,16 @@ in sources."socks-proxy-agent-5.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.19" - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.0.3" sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" + sources."systeminformation-5.7.6" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."tv4-1.3.0" + sources."tx2-1.0.4" sources."type-check-0.3.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -101112,7 +100863,7 @@ in }) sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-7.2.5" + sources."ws-7.4.6" sources."xregexp-2.0.0" sources."yallist-3.1.1" sources."yamljs-0.3.0" @@ -101130,10 +100881,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.6.2"; + version = "6.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.6.2.tgz"; - sha512 = "w1YEyx+xiTbrxVt5OP6JG0LqwkK/hq2OkCYj7RZhK9oyv7cCEkgkX5Z5MPVC1wTCv2kQDJRoXzBeedPiIhzN8Q=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.7.6.tgz"; + sha512 = "VhO6zVIuhVkKXP3kWMZs9W5b3rhcztq524WoAc9OEwjmj7SiKyp0UNltaaLR0VRjFGJPuQOcqDbNkWwzao6dUw=="; }; buildInputs = globalBuildInputs; meta = { @@ -101182,9 +100933,9 @@ in sha512 = "leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -101194,9 +100945,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -101296,10 +101047,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz"; - sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz"; + sha512 = "p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA=="; }; buildInputs = globalBuildInputs; meta = { @@ -101682,10 +101433,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.145"; + version = "1.1.148"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz"; - sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.148.tgz"; + sha512 = "cM1Bs/5XSqqfaTfl+zSvXvrq1YMUYOmo2QGBqZ4Cczq0hDo4oJAihzszJONO9H5riTgmEduid5aU3Rpkx+Y/xw=="; }; buildInputs = globalBuildInputs; meta = { @@ -102033,142 +101784,142 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.14.3" - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/cli-7.14.5" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-default-from-7.12.13" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-default-from-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.12.13" + sources."@babel/plugin-syntax-export-default-from-7.14.5" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-display-name-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/plugin-transform-react-jsx-development-7.12.17" - sources."@babel/plugin-transform-react-pure-annotations-7.12.1" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.14.3" // { + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-development-7.14.5" + sources."@babel/plugin-transform-react-pure-annotations-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + (sources."@babel/plugin-transform-runtime-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.14.4" // { + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + (sources."@babel/preset-env-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-react-7.13.13" + sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.13.16" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/register-7.14.5" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@webassemblyjs/ast-1.9.0" @@ -102356,7 +102107,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102429,7 +102180,7 @@ in }) sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."connect-history-api-fallback-1.6.0" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" @@ -102441,7 +102192,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102566,7 +102317,11 @@ in }) sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" + (sources."domhandler-4.2.0" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) sources."domutils-1.7.0" sources."dot-prop-5.3.0" (sources."download-7.1.0" // { @@ -102581,7 +102336,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102806,10 +102561,11 @@ in sources."loader-utils-0.2.17" ]; }) - (sources."htmlparser2-3.10.1" // { + (sources."htmlparser2-6.1.0" // { dependencies = [ - sources."entities-1.1.2" - sources."readable-stream-3.6.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.7.0" ]; }) sources."http-cache-semantics-3.8.1" @@ -102979,11 +102735,7 @@ in }) sources."mime-2.5.2" sources."mime-db-1.48.0" - (sources."mime-types-2.1.30" // { - dependencies = [ - sources."mime-db-1.47.0" - ]; - }) + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -103024,7 +102776,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -103118,7 +102870,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -103312,9 +103064,15 @@ in }) sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" + sources."css-select-4.1.3" + sources."css-what-5.0.1" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.7.0" + sources."nth-check-2.0.0" sources."strip-ansi-3.0.1" ]; }) @@ -103684,7 +103442,7 @@ in dependencies = [ sources."acorn-7.4.1" sources."commander-2.20.3" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) (sources."webpack-dev-middleware-3.7.3" // { @@ -103720,7 +103478,7 @@ in sources."semver-6.3.0" sources."strip-ansi-3.0.1" sources."to-regex-range-2.1.1" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) sources."webpack-flush-chunks-2.0.3" @@ -103835,7 +103593,7 @@ in sources."@mozilla/readability-0.4.1" sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" - sources."acorn-8.3.0" + sources."acorn-8.4.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -103886,8 +103644,8 @@ in sources."jsdom-16.6.0" sources."levn-0.3.0" sources."lodash-4.17.21" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.2" sources."nwsapi-2.2.0" sources."optionator-0.8.3" @@ -103911,7 +103669,7 @@ in sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.5.0" + sources."whatwg-url-8.6.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."ws-7.4.6" @@ -103934,50 +103692,45 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.11.4"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.11.4.tgz"; - sha512 = "Ke/Lvy9fwLuZGpeILZfJOyBtwGhgOFLQdptAf0LdGt9l44DfwGVw7ppaqXoJEr1rXyu2eO0UtH2UnG5/CCigVw=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.1.tgz"; + sha512 = "Ew8ByEayRBZgG9iLv2ZO+h3ZMz55naz1jA1CPt6Vm0xcSbVNYb7ubnbHhSvUGshc2bGu8Je74k1veFZZqXjBeQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - (sources."@babel/generator-7.14.3" // { + sources."@babel/code-frame-7.14.5" + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/ajv-6.12.4" - (sources."@redocly/openapi-core-1.0.0-beta.49" // { + (sources."@redocly/openapi-core-1.0.0-beta.50" // { dependencies = [ - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" ]; }) - sources."@redocly/react-dropdown-aria-2.0.11" + sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.7" - sources."@types/node-13.13.52" - (sources."ajv-5.5.2" // { - dependencies = [ - sources."fast-deep-equal-1.1.0" - sources."json-schema-traverse-0.3.1" - ]; - }) + sources."@types/node-15.12.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -103996,7 +103749,6 @@ in sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."better-ajv-errors-0.6.7" sources."binary-extensions-2.2.0" sources."bn.js-5.2.0" sources."brace-expansion-1.1.11" @@ -104021,7 +103773,6 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."call-me-maybe-1.0.1" - sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" sources."chokidar-3.5.1" @@ -104030,15 +103781,12 @@ in sources."clipboard-2.0.8" sources."cliui-7.0.4" sources."clsx-1.1.1" - sources."co-4.6.0" - sources."code-error-fragment-0.0.230" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.13.1" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -104051,7 +103799,6 @@ in sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" sources."debug-4.3.2" - sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" sources."des.js-1.0.1" @@ -104080,14 +103827,12 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" - sources."find-up-4.1.0" sources."foreach-2.0.5" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."good-listener-1.2.2" - sources."grapheme-splitter-1.0.4" sources."handlebars-4.7.7" sources."has-flag-3.0.0" (sources."hash-base-3.1.0" // { @@ -104119,18 +103864,14 @@ in sources."jsesc-2.5.2" sources."json-pointer-0.6.1" sources."json-schema-traverse-0.4.1" - sources."json-to-ast-2.1.0" - sources."jsonpointer-4.1.0" - sources."leven-3.1.0" - sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."loose-envify-1.4.0" - sources."lunr-2.3.8" + sources."lunr-2.3.9" sources."mark.js-8.11.1" sources."marked-0.7.0" sources."md5.js-1.3.5" - sources."memoize-one-5.1.1" + sources."memoize-one-5.2.1" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -104153,27 +103894,19 @@ in sources."normalize-path-3.0.0" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.2" - (sources."oas-resolver-2.5.5" // { - dependencies = [ - sources."yargs-17.0.1" - ]; - }) + sources."oas-resolver-2.5.5" sources."oas-schema-walker-1.1.5" - sources."oas-validator-4.0.8" + sources."oas-validator-5.0.6" sources."object-assign-4.1.1" sources."openapi-sampler-1.0.1" sources."os-browserify-0.3.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" - sources."path-exists-4.0.0" sources."pbkdf2-3.1.2" sources."perfect-scrollbar-1.5.1" sources."picomatch-2.3.0" - sources."polished-3.7.2" + sources."polished-4.1.3" sources."postcss-value-parser-4.1.0" sources."prismjs-1.23.0" sources."process-0.11.10" @@ -104189,8 +103922,8 @@ in sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" - sources."react-16.14.0" - sources."react-dom-16.14.0" + sources."react-17.0.2" + sources."react-dom-17.0.2" sources."react-is-16.13.1" sources."react-tabs-3.2.2" (sources."readable-stream-2.3.7" // { @@ -104202,17 +103935,19 @@ in ]; }) sources."readdirp-3.5.0" - sources."redoc-2.0.0-rc.53" + (sources."redoc-2.0.0-rc.54" // { + dependencies = [ + sources."path-browserify-1.0.1" + ]; + }) sources."reftools-1.1.8" sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."scheduler-0.19.1" + sources."scheduler-0.20.2" sources."select-1.1.2" - sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallowequal-1.1.0" @@ -104222,7 +103957,7 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."slugify-1.5.3" + sources."slugify-1.4.7" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" @@ -104233,15 +103968,14 @@ in sources."strip-ansi-6.0.0" sources."styled-components-5.3.0" sources."supports-color-5.5.0" - sources."swagger2openapi-6.2.3" + sources."swagger2openapi-7.0.6" sources."timers-browserify-2.0.12" sources."tiny-emitter-2.1.0" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.2.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -104260,7 +103994,6 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-module-2.0.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -104273,17 +104006,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" - ]; - }) + sources."yargs-17.0.1" sources."yargs-parser-20.2.7" ]; buildInputs = globalBuildInputs; @@ -104439,10 +104162,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.1.1"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.1.tgz"; - sha512 = "Ol+/3LF4sZKQQOaG7/Jsa7t5Kix1I+dx9UEYL8mOOn2sWROtLcbI3AGHZbNQPWeuvnQ/y1R3MJ0vN9ZI5nBPUg=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.3.tgz"; + sha512 = "5VbL4nVDUedVKnOIIM3UQAIUlp+CvR/SrUkrN5GDoVfcWJAxH2oIh7PWyShy7+pE7tgkH2q+3e5EikGRpgE+oA=="; }; buildInputs = globalBuildInputs; meta = { @@ -104488,10 +104211,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.50.5"; + version = "2.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz"; - sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.51.2.tgz"; + sha512 = "ReV2eGEadA7hmXSzjxdDKs10neqH2QURf2RxJ6ayAlq93ugy6qIvXMmbc5cWMGCDh1h5T4thuWO1e2VNbMq8FA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104513,22 +104236,21 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { + (sources."@eslint/eslintrc-0.4.2" // { dependencies = [ - sources."globals-12.4.0" sources."ignore-4.0.6" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@rollup/plugin-commonjs-17.1.0" sources."@rollup/plugin-node-resolve-11.2.1" (sources."@rollup/pluginutils-3.1.0" // { @@ -104545,14 +104267,14 @@ in sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.10" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.56.0" - sources."@typescript-eslint/eslint-plugin-4.26.0" - sources."@typescript-eslint/experimental-utils-4.26.0" - sources."@typescript-eslint/parser-4.26.0" - sources."@typescript-eslint/scope-manager-4.26.0" - sources."@typescript-eslint/types-4.26.0" - sources."@typescript-eslint/typescript-estree-4.26.0" - sources."@typescript-eslint/visitor-keys-4.26.0" + sources."@types/vscode-1.57.0" + sources."@typescript-eslint/eslint-plugin-4.26.1" + sources."@typescript-eslint/experimental-utils-4.26.1" + sources."@typescript-eslint/parser-4.26.1" + sources."@typescript-eslint/scope-manager-4.26.1" + sources."@typescript-eslint/types-4.26.1" + sources."@typescript-eslint/typescript-estree-4.26.1" + sources."@typescript-eslint/visitor-keys-4.26.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -104593,8 +104315,8 @@ in sources."supports-color-7.2.0" ]; }) - sources."cheerio-1.0.0-rc.9" - sources."cheerio-select-1.4.0" + sources."cheerio-1.0.0-rc.10" + sources."cheerio-select-1.5.0" sources."chokidar-3.5.1" sources."cliui-7.0.4" sources."color-convert-1.9.3" @@ -104606,7 +104328,7 @@ in sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - sources."css-select-4.1.2" + sources."css-select-4.1.3" sources."css-what-5.0.1" sources."debug-4.3.2" sources."decamelize-4.0.0" @@ -104620,7 +104342,7 @@ in sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { dependencies = [ @@ -104634,7 +104356,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.27.0" // { + (sources."eslint-7.28.0" // { dependencies = [ (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -104692,11 +104414,7 @@ in sources."get-intrinsic-1.1.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."globby-11.0.3" sources."graceful-fs-4.2.6" sources."growl-1.10.5" @@ -104748,8 +104466,8 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -104820,7 +104538,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.50.5" + sources."rollup-2.51.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -104851,15 +104569,15 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" - sources."tmp-0.0.29" + sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" - sources."tslib-2.2.0" + sources."tslib-2.3.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -104867,7 +104585,7 @@ in }) sources."tunnel-0.0.6" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typed-rest-client-1.8.4" sources."typescript-4.3.2" sources."typescript-formatter-7.2.2" @@ -104878,7 +104596,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.91.0" // { + (sources."vsce-1.93.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -105006,8 +104724,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -105061,10 +104779,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.34.0"; + version = "1.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz"; - sha512 = "rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz"; + sha512 = "scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -105118,15 +104836,15 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "11.3.2"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-11.3.2.tgz"; - sha512 = "yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w=="; + url = "https://registry.npmjs.org/serve/-/serve-12.0.0.tgz"; + sha512 = "BkTsETQYynAZ7rXX414kg4X6EvuZQS3UVs1NY0VQYdRHSTYWPYcH38nnDh48D0x6ONuislgjag8uKlU2gTBImA=="; }; dependencies = [ sources."@zeit/schemas-2.6.0" sources."accepts-1.3.7" - sources."ajv-6.5.3" + sources."ajv-6.12.6" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -105139,9 +104857,11 @@ in sources."camelcase-4.1.0" sources."chalk-2.4.1" sources."cli-boxes-1.0.0" - (sources."clipboardy-1.2.3" // { + (sources."clipboardy-2.3.0" // { dependencies = [ - sources."execa-0.8.0" + sources."cross-spawn-6.0.5" + sources."execa-1.0.0" + sources."get-stream-4.1.0" ]; }) sources."color-convert-1.9.3" @@ -105153,9 +104873,10 @@ in sources."cross-spawn-5.1.0" sources."debug-2.6.9" sources."deep-extend-0.6.0" + sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - sources."fast-deep-equal-2.0.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -105165,30 +104886,36 @@ in sources."get-stream-3.0.0" sources."has-flag-3.0.0" sources."ini-1.3.8" + sources."is-docker-2.2.1" sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" + sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" + sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."on-headers-1.0.2" + sources."once-1.4.0" sources."p-finally-1.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-to-regexp-2.2.1" sources."pseudomap-1.0.2" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" + sources."semver-5.7.1" (sources."serve-handler-6.1.3" // { dependencies = [ sources."mime-db-1.33.0" @@ -105209,12 +104936,13 @@ in sources."vary-1.1.2" sources."which-1.3.1" sources."widest-line-2.0.1" + sources."wrappy-1.0.2" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Static file serving and directory listing"; - homepage = "https://github.com/zeit/serve#readme"; + homepage = "https://github.com/vercel/serve#readme"; license = "MIT"; }; production = true; @@ -105224,10 +104952,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.43.1"; + version = "2.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.43.1.tgz"; - sha512 = "KasMG0u78+QBMecuT1Cit3PdHA1Wl6xyjrWgFEdtJnI5mBcMA9FZVMvdqRk1VjaQtnvNJfpbzfJa6Aj2rrqXWQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.46.0.tgz"; + sha512 = "InHN7TTMezGrxejFKCtTKaUGbpbWoXVltLITgXoKdCkqUg66DkAwvf3kkTTy8/wKnTxYIdBbqNS5n1NHvzo4wg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -105238,9 +104966,9 @@ in ]; }) sources."@kwsites/promise-deferred-1.1.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -105260,7 +104988,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.10.1" // { + (sources."@serverless/components-3.12.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -105288,15 +105016,15 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/dashboard-plugin-5.1.4" + sources."@serverless/dashboard-plugin-5.3.0" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.2" // { + (sources."@serverless/platform-client-4.2.3" // { dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/platform-client-china-2.1.13" // { + (sources."@serverless/platform-client-china-2.1.14" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -105310,7 +105038,7 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.1.0" + sources."@serverless/utils-china-1.1.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -105329,7 +105057,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.170" sources."@types/long-4.0.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/readable-stream-2.3.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -105391,7 +105119,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105563,7 +105291,7 @@ in sources."dijkstrajs-1.0.2" sources."dir-glob-3.0.1" sources."dot-qs-0.2.0" - sources."dotenv-9.0.2" + sources."dotenv-10.0.0" sources."duplexer3-0.1.4" sources."duplexify-4.1.1" sources."duration-0.2.2" @@ -105651,7 +105379,7 @@ in dependencies = [ sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."decompress-response-6.0.0" sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" @@ -105659,6 +105387,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-3.1.0" + sources."normalize-url-6.0.1" sources."p-cancelable-2.1.1" sources."responselike-2.0.0" ]; @@ -105797,8 +105526,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -105925,7 +105654,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.39.0" // { + (sources."simple-git-2.39.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -106233,8 +105962,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -106735,43 +106464,39 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.619.0"; + version = "1.630.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.619.0.tgz"; - sha512 = "ZQFDU+WniTjD6Z1vqKQcBq50jJ9DWSBBCg0PNW54MZbK5oO+L2rHtbpaD3NI3lQI+AFCe64kdzkWMgsEemkFHQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.630.0.tgz"; + sha512 = "66JBqGFciNAE7ZcxAhvsKCCYDYgkATlH2u9Ro34cGYsj2ak7rawylYyzowdT8cBe390kK7H4eyxHwwYAKXHpqQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" sources."@deepcode/dcignore-1.0.2" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@octetstream/promisify-2.0.2" sources."@open-policy-agent/opa-wasm-1.2.0" sources."@sindresorhus/is-4.0.1" sources."@snyk/cli-interface-2.11.0" sources."@snyk/cloud-config-parser-1.9.2" sources."@snyk/cocoapods-lockfile-parser-3.6.2" - (sources."@snyk/code-client-3.7.0" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) + sources."@snyk/code-client-3.8.1" sources."@snyk/composer-lockfile-parser-1.4.1" (sources."@snyk/dep-graph-1.28.0" // { dependencies = [ sources."semver-7.3.5" ]; }) - sources."@snyk/docker-registry-v2-client-2.1.3" + sources."@snyk/docker-registry-v2-client-2.2.1" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.601.0" // { + (sources."@snyk/fix-1.620.0" // { dependencies = [ sources."chalk-4.1.0" sources."strip-ansi-6.0.0" ]; }) - (sources."@snyk/fix-pipenv-pipfile-0.3.5" // { + (sources."@snyk/fix-pipenv-pipfile-0.4.3" // { dependencies = [ sources."debug-4.3.1" ]; @@ -106794,13 +106519,13 @@ in }) (sources."@snyk/mix-parser-1.3.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."@snyk/snyk-docker-pull-3.2.5" // { @@ -106810,7 +106535,7 @@ in }) (sources."@snyk/snyk-hex-plugin-1.1.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@szmarczak/http-timer-4.0.5" @@ -106827,7 +106552,6 @@ in sources."@types/lodash.omit-4.5.6" sources."@types/lodash.union-4.6.6" sources."@types/minimatch-3.0.4" - sources."@types/multimatch-4.0.0" sources."@types/node-13.13.52" sources."@types/responselike-1.0.0" sources."@types/sarif-2.1.3" @@ -106893,7 +106617,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binjumper-0.1.4" sources."bl-4.1.0" - sources."boolean-3.1.0" + sources."boolean-3.1.2" sources."bottleneck-2.19.5" (sources."boxen-5.0.1" // { dependencies = [ @@ -106910,7 +106634,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.1" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" ]; @@ -106928,7 +106652,6 @@ in }) sources."chardet-0.7.0" sources."child-process-1.0.2" - sources."child_process-1.0.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" @@ -106944,7 +106667,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -106962,6 +106685,11 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" + (sources."del-6.0.0" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."detect-node-2.1.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" @@ -106988,7 +106716,7 @@ in sources."esprima-4.0.1" (sources."event-loop-spinner-2.1.0" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."execa-1.0.0" @@ -107049,6 +106777,7 @@ in sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.3" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -107126,7 +106855,7 @@ in }) sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."make-dir-3.1.0" (sources."matcher-3.0.0" // { dependencies = [ @@ -107152,7 +106881,7 @@ in }) sources."nice-try-1.0.5" sources."node.extend-2.0.2" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-run-path-2.0.2" sources."object-hash-2.2.0" sources."object-keys-1.1.1" @@ -107189,6 +106918,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" ]; @@ -107202,6 +106932,7 @@ in sources."picomatch-2.3.0" sources."pluralize-7.0.0" sources."prepend-http-2.0.0" + sources."prettier-2.3.1" sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -107259,7 +106990,7 @@ in (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ sources."chalk-4.1.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."snyk-docker-plugin-4.20.8" // { @@ -107269,7 +107000,6 @@ in sources."semver-7.3.5" sources."snyk-nodejs-lockfile-parser-1.34.0" sources."tmp-0.2.1" - sources."uuid-8.3.2" ]; }) sources."snyk-go-parser-1.4.1" @@ -107284,11 +107014,11 @@ in sources."chalk-3.0.0" sources."rimraf-3.0.2" sources."tmp-0.2.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.26.0" // { + (sources."snyk-mvn-plugin-2.26.1" // { dependencies = [ (sources."@snyk/java-call-graph-builder-1.21.0" // { dependencies = [ @@ -107309,7 +107039,6 @@ in sources."argparse-2.0.1" sources."js-yaml-4.1.0" sources."p-map-2.1.0" - sources."uuid-8.3.2" ]; }) (sources."snyk-nuget-plugin-1.21.1" // { @@ -107329,7 +107058,7 @@ in }) (sources."snyk-poetry-lockfile-parser-1.1.6" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."snyk-policy-1.19.0" // { @@ -107394,9 +107123,10 @@ in sources."tar-6.1.0" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" - (sources."tempfile-2.0.0" // { + (sources."tempy-1.0.1" // { dependencies = [ - sources."temp-dir-1.0.0" + sources."is-stream-2.0.0" + sources."type-fest-0.16.0" ]; }) sources."then-fs-2.0.0" @@ -107430,7 +107160,7 @@ in sources."url-parse-lax-3.0.0" sources."utf8-3.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" + sources."uuid-8.3.2" sources."vscode-languageserver-types-3.16.0" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -107479,7 +107209,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -107489,8 +107219,8 @@ in sources."debug-4.3.2" sources."engine.io-5.1.1" sources."engine.io-parser-4.0.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" @@ -108034,7 +107764,7 @@ in sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."is-typedarray-1.0.0" - sources."is-valid-domain-0.0.19" + sources."is-valid-domain-0.0.20" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -108216,7 +107946,7 @@ in sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" (sources."pretty-quick-3.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -108501,7 +108231,7 @@ in ]; }) sources."ssb-ebt-5.6.7" - (sources."ssb-friends-4.4.5" // { + (sources."ssb-friends-4.4.7" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -108745,7 +108475,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109101,8 +108831,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -109522,35 +109252,36 @@ in sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.3" @@ -109558,7 +109289,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -109577,7 +109308,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109615,7 +109346,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109711,7 +109442,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -109732,7 +109463,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ (sources."chalk-2.4.2" // { dependencies = [ @@ -109848,16 +109579,16 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.0.tgz"; - sha512 = "P9QsonwMBUvwQxJbnNKggvJf1K24xaUhRrzoqkJabHtUT37JyYrt9anMIZ7WmjuKUEI/Ejf+Gu/8A0VvyUBaUQ=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.1.tgz"; + sha512 = "E9gpfM+G6dC+hq5gIytJ3phvdir/k1TcG3XYW0Bixs4xZNhf/z9trtZR/Rxs6BwVGAS64lCprSO4a+yUZKHQ/Q=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" sources."anymatch-3.1.2" @@ -109900,9 +109631,9 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.2" sources."svelte-preprocess-4.7.3" - sources."svelte2tsx-0.2.0" + sources."svelte2tsx-0.2.1" sources."to-regex-range-5.0.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."typescript-4.3.2" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" @@ -109953,7 +109684,7 @@ in sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."entities-2.2.0" sources."has-flag-4.0.0" sources."mdn-data-2.0.14" @@ -110305,8 +110036,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -110551,7 +110282,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -110672,8 +110403,8 @@ in sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."module-alias-2.2.2" sources."moment-2.29.1" @@ -110717,7 +110448,7 @@ in sources."verror-1.10.0" sources."which-module-2.0.0" sources."wrap-ansi-5.1.0" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."y18n-4.0.3" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" @@ -111169,9 +110900,9 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.4.3" @@ -111181,7 +110912,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."acorn-jsx-5.3.1" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { @@ -111932,35 +111663,28 @@ in textlint-rule-write-good = nodeEnv.buildNodePackage { name = "textlint-rule-write-good"; packageName = "textlint-rule-write-good"; - version = "1.6.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-write-good/-/textlint-rule-write-good-1.6.2.tgz"; - sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; + url = "https://registry.npmjs.org/textlint-rule-write-good/-/textlint-rule-write-good-2.0.0.tgz"; + sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" sources."@textlint/types-1.5.5" - sources."adverb-where-0.0.9" + sources."adverb-where-0.2.5" sources."boundary-1.0.1" - sources."call-bind-1.0.2" - sources."define-properties-1.1.3" + sources."commander-2.20.3" sources."e-prime-0.10.4" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.1" - sources."has-1.0.3" - sources."has-symbols-1.0.2" - sources."no-cliches-0.1.1" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" + sources."no-cliches-0.3.4" sources."passive-voice-0.1.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.2.0" - sources."too-wordy-0.1.6" + sources."too-wordy-0.3.4" sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" sources."unist-util-visit-parents-2.1.2" sources."weasel-words-0.1.1" - sources."write-good-0.11.3" + sources."write-good-1.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -111988,7 +111712,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -112039,7 +111763,7 @@ in sources."busboy-0.3.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-4.1.0" @@ -112064,7 +111788,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -112241,7 +111965,7 @@ in ]; }) sources."nopt-4.0.3" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" @@ -112276,6 +112000,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" @@ -112523,8 +112248,8 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lru-cache-6.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -112906,10 +112631,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.8"; + version = "3.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.8.tgz"; - sha512 = "PvFLMFIQHfIjFFlvAch69U2IvIxK9TNzNWt1SxZGp9JZ/v70yvqIQuiJeVPPtUMOzoNt+aNRDk4wgxb34wvEqA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz"; + sha512 = "wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -112955,7 +112680,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -113008,7 +112733,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.4" + sources."diff2html-3.4.5" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -113095,8 +112820,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -113269,7 +112994,7 @@ in sources."d3-dsv-2.0.0" sources."d3-force-2.1.1" sources."d3-format-2.0.0" - sources."d3-geo-2.0.1" + sources."d3-geo-2.0.2" sources."d3-geo-projection-3.0.0" sources."d3-hierarchy-2.0.0" sources."d3-interpolate-2.0.1" @@ -113473,25 +113198,21 @@ in vls = nodeEnv.buildNodePackage { name = "vls"; packageName = "vls"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.7.2.tgz"; - sha512 = "9nKgSPtNxQlc32K5GgZV++MdsCpNuac/SfxnEmVI0DCF4E0Uekj+RUo7Zk6NnA4veiNMN+AEjAIlbXYWPHgX6Q=="; + url = "https://registry.npmjs.org/vls/-/vls-0.7.4.tgz"; + sha512 = "uU5HCIK5vX096eMA5fBwyR7tv36m1Ssy910w5ILT5OvCUTXgBR58gZRJWrL2HxCyG8oYXC+oFWjhJc7+ExBUgQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -113525,8 +113246,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.27.0" - sources."eslint-plugin-vue-7.10.0" + sources."eslint-7.28.0" + sources."eslint-plugin-vue-7.11.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -113563,11 +113284,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -113602,7 +113319,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -113627,7 +113344,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -113642,7 +113359,7 @@ in }) sources."tsutils-2.29.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typescript-4.3.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" @@ -113831,229 +113548,111 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.6.1"; + version = "1.6.4"; src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ - sources."@types/json5-0.0.30" + sources."@discoveryjs/json-ext-0.5.3" + sources."@types/eslint-7.2.13" + sources."@types/eslint-scope-3.7.0" + sources."@types/estree-0.0.47" + sources."@types/json-schema-7.0.7" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.56.0" + sources."@types/vscode-1.57.0" sources."@types/yauzl-2.9.1" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" + sources."@ungap/promise-all-settled-1.1.2" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-buffer-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/helper-wasm-section-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/wasm-edit-1.11.0" + sources."@webassemblyjs/wasm-gen-1.11.0" + sources."@webassemblyjs/wasm-opt-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" + sources."@webpack-cli/configtest-1.0.4" + sources."@webpack-cli/info-1.3.0" + sources."@webpack-cli/serve-1.5.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.4.2" + sources."acorn-8.4.0" sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" - sources."ansi-colors-3.2.3" + sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."aproba-1.2.0" - sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" - sources."atob-2.1.2" + sources."argparse-2.0.1" sources."azure-devops-node-api-10.2.2" sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-js-1.5.1" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" - sources."bn.js-5.2.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" sources."browser-stdout-1.3.1" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."browserify-zlib-0.2.0" - (sources."buffer-4.9.2" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) + sources."browserslist-4.16.6" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" - (sources."cacache-12.0.4" // { - dependencies = [ - sources."glob-7.1.7" - ]; - }) - sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."camelcase-5.3.1" - (sources."chalk-2.4.2" // { + sources."camelcase-6.2.0" + sources."caniuse-lite-1.0.30001237" + (sources."chalk-4.1.1" // { dependencies = [ - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" ]; }) - sources."cheerio-1.0.0-rc.9" - sources."cheerio-select-1.4.0" - sources."chokidar-3.3.0" - sources."chownr-1.1.4" + sources."cheerio-1.0.0-rc.10" + sources."cheerio-select-1.5.0" + sources."chokidar-3.5.1" sources."chrome-trace-event-1.0.3" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { + (sources."cliui-7.0.4" // { dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."clone-deep-4.0.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colorette-1.2.2" sources."commander-6.2.1" - sources."commondir-1.0.1" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."copy-concurrently-1.0.5" - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" - sources."crypto-browserify-3.12.0" - sources."css-select-4.1.2" + sources."cross-spawn-7.0.3" + sources."css-select-4.1.3" sources."css-what-5.0.1" - sources."cyclist-1.0.1" - sources."debug-3.2.6" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" - sources."define-properties-1.1.3" - sources."define-property-2.0.2" - sources."denodeify-1.2.1" - sources."des.js-1.0.1" - sources."detect-file-1.0.0" - sources."diff-3.5.0" - (sources."diffie-hellman-5.0.3" // { + (sources."debug-4.3.1" // { dependencies = [ - sources."bn.js-4.12.0" + sources."ms-2.1.2" ]; }) + sources."decamelize-4.0.0" + sources."denodeify-1.2.1" + sources."diff-5.0.0" sources."dom-serializer-1.3.2" - sources."domain-browser-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."emoji-regex-7.0.3" + sources."domutils-2.7.0" + sources."electron-to-chromium-1.3.752" + sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.5.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."memory-fs-0.5.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."enhanced-resolve-5.8.2" sources."entities-2.2.0" + sources."envinfo-7.8.1" sources."errno-0.1.8" - (sources."es-abstract-1.18.3" // { - dependencies = [ - sources."object.assign-4.1.2" - ]; - }) - sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" - sources."esprima-4.0.1" + sources."es-module-lexer-0.4.1" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.2.0" @@ -114061,575 +113660,231 @@ in }) sources."estraverse-4.3.0" sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - sources."expand-tilde-2.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) + sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fastest-levenshtein-1.0.12" sources."fd-slicer-1.1.0" - sources."figgy-pudding-3.5.2" - sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."findup-sync-3.0.0" - sources."flat-4.1.1" - (sources."flush-write-stream-1.1.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - (sources."from2-2.3.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."fs-write-stream-atomic-1.0.10" + sources."find-up-5.0.0" + sources."flat-5.0.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."get-stream-6.0.1" + sources."glob-7.1.6" sources."glob-parent-5.1.2" - (sources."global-modules-2.0.0" // { - dependencies = [ - sources."global-prefix-3.0.0" - ]; - }) - sources."global-prefix-1.0.2" + sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" sources."growl-1.10.5" sources."has-1.0.3" - sources."has-bigints-1.0.1" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.2" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."hash.js-1.1.7" sources."he-1.2.0" - sources."hmac-drbg-1.0.1" - sources."homedir-polyfill-1.0.3" sources."htmlparser2-6.1.0" - sources."https-browserify-1.0.0" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" - sources."import-local-2.0.0" - sources."imurmurhash-0.1.4" - sources."infer-owner-1.0.4" + sources."human-signals-2.1.0" + sources."import-local-3.0.2" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."interpret-1.4.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-bigint-1.0.2" + sources."interpret-2.2.0" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" - sources."is-buffer-2.0.5" - sources."is-callable-1.2.3" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" - sources."is-symbol-1.0.4" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-stream-2.0.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-yaml-3.13.1" + sources."jest-worker-27.0.2" + sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json5-1.0.1" + sources."json5-2.2.0" sources."kind-of-6.0.3" sources."leven-3.1.0" sources."linkify-it-2.2.0" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-3.0.0" + sources."loader-runner-4.2.0" + sources."loader-utils-2.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."log-symbols-3.0.0" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" + sources."log-symbols-4.0.0" + sources."lru-cache-6.0.0" (sources."markdown-it-10.0.0" // { dependencies = [ + sources."argparse-1.0.10" sources."entities-2.0.3" ]; }) - sources."md5.js-1.3.5" sources."mdurl-1.0.1" - (sources."memory-fs-0.4.1" // { + (sources."memory-fs-0.5.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."memory-streams-0.1.3" - (sources."micromatch-3.1.10" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-range-2.1.1" - ]; - }) - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) + sources."merge-stream-2.0.0" + sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - sources."mocha-7.2.0" - sources."move-concurrently-1.0.1" - sources."ms-2.1.1" + sources."mocha-8.4.0" + sources."ms-2.1.3" sources."mute-stream-0.0.8" - sources."nan-2.14.2" - sources."nanomatch-1.2.13" + sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - sources."node-environment-flags-1.0.6" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."punycode-1.4.1" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."string_decoder-1.1.1" - ]; - }) - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" + sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) sources."object-inspect-1.10.3" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.2" - sources."object.pick-1.3.0" sources."once-1.4.0" - sources."os-browserify-0.3.0" + sources."onetime-5.1.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-try-2.2.0" - sources."pako-1.0.11" - (sources."parallel-transform-1.2.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."parse-asn1-5.1.6" - sources."parse-passwd-1.0.0" sources."parse-semver-1.1.1" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."pbkdf2-3.1.2" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" sources."pend-1.2.0" sources."picomatch-2.3.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" - sources."posix-character-classes-0.1.1" - sources."process-0.11.10" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + ]; + }) sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) sources."punycode-2.1.1" sources."qs-6.10.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."read-1.0.7" sources."readable-stream-1.0.34" - sources."readdirp-3.2.0" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" + sources."readdirp-3.5.0" + sources."rechoir-0.7.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-cwd-2.0.0" - (sources."resolve-dir-1.0.1" // { - dependencies = [ - sources."global-modules-1.0.0" - ]; - }) - sources."resolve-from-3.0.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" - sources."run-queue-1.0.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."schema-utils-1.0.0" + sources."resolve-1.20.0" + sources."resolve-cwd-3.0.0" + sources."resolve-from-5.0.0" + sources."safe-buffer-5.2.1" + sources."schema-utils-3.0.0" sources."semver-5.7.1" - sources."serialize-javascript-4.0.0" - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."serialize-javascript-5.0.1" + sources."shallow-clone-3.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) + sources."signal-exit-3.0.3" sources."source-list-map-2.0.1" sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" - sources."source-map-url-0.4.1" - sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."ssri-6.0.2" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."stream-browserify-2.0.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-each-1.2.3" - (sources."stream-http-2.8.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-shift-1.0.1" sources."string-argv-0.3.1" sources."string-width-2.1.1" - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-6.0.0" - sources."tapable-1.1.3" - (sources."terser-4.8.0" // { + sources."strip-final-newline-2.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-8.1.1" + sources."tapable-2.2.0" + (sources."terser-5.7.0" // { dependencies = [ sources."commander-2.20.3" + sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-1.4.5" - (sources."through2-2.0.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."timers-browserify-2.0.12" + sources."terser-webpack-plugin-5.1.3" sources."tmp-0.0.29" - sources."to-arraybuffer-1.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" - (sources."ts-loader-6.2.2" // { + (sources."ts-loader-8.3.0" // { dependencies = [ - sources."micromatch-4.0.4" - sources."semver-6.3.0" + sources."enhanced-resolve-4.5.0" + sources."semver-7.3.5" + sources."tapable-1.1.3" ]; }) - sources."tslib-2.2.0" - sources."tty-browserify-0.0.0" + sources."tslib-2.3.0" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.4" - sources."typedarray-0.0.6" - sources."typescript-3.9.9" + sources."typescript-4.3.2" sources."uc.micro-1.0.6" - sources."unbox-primitive-1.0.1" sources."underscore-1.13.1" - sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - sources."isarray-1.0.0" - ]; - }) - sources."upath-1.2.0" sources."uri-js-4.4.1" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-1.1.0" - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - sources."vm-browserify-1.1.2" - sources."vsce-1.91.0" + (sources."vsce-1.88.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" - (sources."watchpack-1.7.5" // { + sources."watchpack-2.2.0" + sources."webpack-5.38.1" + (sources."webpack-cli-4.7.2" // { dependencies = [ - sources."chokidar-3.5.1" - sources."fsevents-2.3.2" - sources."readdirp-3.5.0" + sources."commander-7.2.0" ]; }) - (sources."watchpack-chokidar2-2.0.1" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."isarray-1.0.0" - sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" - sources."readable-stream-2.3.7" - sources."readdirp-2.2.1" - sources."string_decoder-1.1.1" - sources."to-regex-range-2.1.1" - ]; - }) - sources."webpack-4.46.0" - (sources."webpack-cli-3.3.12" // { - dependencies = [ - sources."supports-color-6.1.0" - ]; - }) - sources."webpack-sources-1.4.3" - sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-module-2.0.0" + sources."webpack-merge-5.8.0" + sources."webpack-sources-2.3.0" + sources."which-2.0.2" sources."wide-align-1.1.3" - sources."worker-farm-1.7.0" - (sources."wrap-ansi-5.1.0" // { + sources."wildcard-2.0.0" + sources."workerpool-6.1.0" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.3" - sources."yallist-3.1.1" + sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yaml-1.10.2" - (sources."yargs-13.3.2" // { + (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-13.1.2" - sources."yargs-unparser-1.6.0" + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -114696,7 +113951,7 @@ in sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."consolidate-0.14.5" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" @@ -114805,8 +114060,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -114891,7 +114146,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -114932,9 +114187,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -114950,7 +114205,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -115095,7 +114350,7 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" @@ -115873,13 +115128,13 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.0" + sources."@babel/runtime-corejs3-7.14.5" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" sources."abab-2.0.5" sources."abbrev-1.1.1" - sources."acorn-8.3.0" + sources."acorn-8.4.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -115895,27 +115150,23 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" - (sources."bit-field-1.3.6" // { + (sources."bit-field-1.4.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."fs-extra-8.1.0" + sources."fs-extra-10.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."jsonfile-4.0.0" - sources."onml-1.3.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."universalify-0.1.2" - sources."yargs-15.4.1" + sources."yargs-17.0.1" ]; }) sources."brace-expansion-1.1.11" sources."browser-process-hrtime-1.0.0" sources."btoa-1.2.1" - sources."camelcase-5.3.1" sources."canvas-2.8.0" sources."canvg-3.0.7" sources."chownr-2.0.0" - (sources."cliui-6.0.0" // { + (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -115929,7 +115180,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.13.1" + sources."core-js-pure-3.14.0" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -115939,7 +115190,6 @@ in }) sources."data-urls-2.0.0" sources."debug-4.3.2" - sources."decamelize-1.2.0" sources."decimal.js-10.2.1" sources."decompress-response-4.2.1" sources."deep-is-0.1.3" @@ -115958,7 +115208,6 @@ in sources."estraverse-5.2.0" sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" - sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" @@ -115981,7 +115230,6 @@ in sources."json5-2.2.0" sources."jsonfile-6.1.0" sources."levn-0.3.0" - sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."logidrom-0.3.1" sources."lru-cache-6.0.0" @@ -115990,8 +115238,8 @@ in sources."semver-6.3.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -116009,11 +115257,7 @@ in sources."once-1.4.0" sources."onml-2.1.0" sources."optionator-0.8.3" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."parse5-6.0.1" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" @@ -116024,7 +115268,6 @@ in sources."readable-stream-2.3.7" sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."rgbcolor-1.0.1" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" @@ -116042,7 +115285,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."svg-pathdata-5.0.5" - sources."svg2img-0.9.2" + sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" sources."tar-6.1.0" (sources."tough-cookie-4.0.0" // { @@ -116057,15 +115300,14 @@ in sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" - sources."wavedrom-2.6.9" + sources."wavedrom-2.7.0" sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.5.0" - sources."which-module-2.0.0" + sources."whatwg-url-8.6.0" sources."wide-align-1.1.3" sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -116077,21 +115319,17 @@ in sources."ws-7.4.6" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."cliui-7.0.4" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-parser-20.2.7" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.7" ]; buildInputs = globalBuildInputs; meta = { @@ -116113,8 +115351,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -116128,10 +115366,9 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-0.4.1" // { + (sources."@eslint/eslintrc-0.4.2" // { dependencies = [ sources."debug-4.3.2" - sources."globals-12.4.0" sources."ms-2.1.2" ]; }) @@ -116139,7 +115376,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -116181,11 +115418,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bluebird-2.9.34" sources."boolbase-1.0.0" - (sources."boxen-5.0.1" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."boxen-5.0.1" sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" @@ -116202,7 +115435,7 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.6" - sources."cheerio-select-1.4.0" + sources."cheerio-select-1.5.0" (sources."chrome-launcher-0.13.4" // { dependencies = [ sources."mkdirp-0.5.5" @@ -116232,7 +115465,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" - sources."css-select-4.1.2" + sources."css-select-4.1.3" sources."css-what-5.0.1" sources."dashdash-1.14.1" sources."debounce-1.2.0" @@ -116257,7 +115490,7 @@ in sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."dot-prop-5.3.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" @@ -116358,11 +115591,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -116470,8 +115699,8 @@ in sources."marky-1.2.2" sources."mem-5.1.1" sources."merge-stream-2.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -116623,7 +115852,7 @@ in sources."supports-color-7.2.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."json-schema-traverse-1.0.0" sources."strip-ansi-6.0.0" @@ -116641,7 +115870,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" @@ -116703,11 +115932,11 @@ in sha512 = "OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g=="; }; dependencies = [ - sources."@types/eslint-7.2.12" + sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.47" sources."@types/json-schema-7.0.7" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -116725,16 +115954,16 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" @@ -116756,10 +115985,10 @@ in sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."neo-async-2.6.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -116795,22 +116024,22 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.7.0"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.0.tgz"; - sha512 = "7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; + sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.3" - sources."@webpack-cli/configtest-1.0.3" - sources."@webpack-cli/info-1.2.4" - sources."@webpack-cli/serve-1.4.0" + sources."@webpack-cli/configtest-1.0.4" + sources."@webpack-cli/info-1.3.0" + sources."@webpack-cli/serve-1.5.1" sources."clone-deep-4.0.1" sources."colorette-1.2.2" sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."fastest-levenshtein-1.0.12" sources."find-up-4.1.0" sources."function-bind-1.1.1" @@ -116847,7 +116076,7 @@ in sources."signal-exit-3.0.3" sources."strip-final-newline-2.0.0" sources."v8-compile-cache-2.3.0" - sources."webpack-merge-5.7.3" + sources."webpack-merge-5.8.0" sources."which-2.0.2" sources."wildcard-2.0.0" ]; @@ -116872,7 +116101,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -117153,8 +116382,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -117427,7 +116656,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."y18n-4.0.3" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" @@ -117451,9 +116680,9 @@ in sha512 = "k8UB2jLIb1Jip2nZbCz83T/XfhfjX6mB1yLJNYKrpYi7FQimfOoFv/0//iT6HV1K8FwUB5yUbCcnpLebJXJTug=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@types/json-schema-7.0.7" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -117508,10 +116737,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.2.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.4.tgz"; - sha512 = "fobRASGOskIqf/ciwZ3TF14RhqWga6dR8kUD6a2E0L2YAY5n1PIJv1dVPXEwvfKHBFWDo5VwIH2OAzt/Tw2poQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.3.0.tgz"; + sha512 = "E0gb1fXb8xNScgewQmvAmNLrnEto6MOaKlfzITVzR+bbU80LeV/YdrLw536ffcwiUv0arKQyfR/WIweBFrKWbg=="; }; dependencies = [ sources."@protobufjs/aspromise-1.1.2" @@ -117525,7 +116754,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -117642,7 +116871,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."ip-set-2.1.0" - sources."ipaddr.js-2.0.0" + sources."ipaddr.js-2.0.1" sources."is-ascii-1.0.0" sources."is-docker-2.2.1" sources."is-file-1.0.0" @@ -117739,7 +116968,7 @@ in sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."safe-buffer-5.2.1" sources."sax-1.1.4" sources."semver-5.1.1" @@ -117948,11 +117177,11 @@ in sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; }; dependencies = [ - sources."@babel/runtime-7.14.0" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" - (sources."@npmcli/arborist-2.6.1" // { + sources."@babel/runtime-7.14.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" + (sources."@npmcli/arborist-2.6.2" // { dependencies = [ sources."semver-7.3.5" ]; @@ -117984,7 +117213,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/vinyl-2.0.4" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -118047,7 +117276,7 @@ in sources."readable-stream-3.6.0" ]; }) - sources."boolean-3.1.0" + sources."boolean-3.1.2" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -118102,10 +117331,10 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."conf-1.4.0" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -118338,9 +117567,9 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."make-dir-1.3.0" - (sources."make-fetch-happen-8.0.14" // { + (sources."make-fetch-happen-9.0.2" // { dependencies = [ sources."http-cache-semantics-4.1.0" ]; @@ -118365,8 +117594,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -118388,6 +117617,7 @@ in sources."ms-2.0.0" sources."multimatch-5.0.0" sources."mute-stream-0.0.7" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -118424,7 +117654,7 @@ in ]; }) sources."npm-normalize-package-bin-1.0.1" - (sources."npm-package-arg-8.1.2" // { + (sources."npm-package-arg-8.1.4" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."semver-7.3.5" @@ -118436,7 +117666,7 @@ in sources."semver-7.3.5" ]; }) - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npm-run-path-2.0.2" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -118450,7 +117680,7 @@ in ]; }) sources."open-6.4.0" - (sources."ora-5.4.0" // { + (sources."ora-5.4.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -118487,7 +117717,7 @@ in sources."p-timeout-2.0.1" sources."p-try-1.0.0" sources."package-json-5.0.0" - (sources."pacote-11.3.3" // { + (sources."pacote-11.3.4" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -118800,7 +118030,7 @@ in sources."cross-spawn-7.0.3" sources."debug-4.3.2" sources."escape-string-regexp-4.0.0" - sources."execa-5.0.1" + sources."execa-5.1.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index e59ab78888c..1b1c61d642c 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "vscode-lldb", - "version": "1.6.3", + "version": "1.6.4", "dependencies": { "string-argv": "^0.3.1", "yaml": "^1.10.0", @@ -9,16 +9,15 @@ "@types/node": "^8.10.50", "@types/mocha": "^7.0.1", "@types/yauzl": "^2.9.0", - "@types/json5": "^0.0.30", - "typescript": "^3.7.0", - "mocha": "^7.0.1", + "typescript": "^4.2.4", + "mocha": "^8.4.0", "source-map-support": "^0.5.12", "memory-streams": "^0.1.3", - "vscode-debugprotocol": "^1.35.0", - "vscode-debugadapter-testsupport": "^1.35.0", - "vsce": "^1.73.0", - "webpack": "^4.39.1", - "webpack-cli": "^3.3.7", - "ts-loader": "^6.2.1" + "vscode-debugprotocol": "^1.47.0", + "vscode-debugadapter-testsupport": "^1.47.0", + "vsce": "=1.88.0", + "webpack": "^5.37.1", + "webpack-cli": "^4.7.0", + "ts-loader": "^8.0.0" } } diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index f0d6a8e8ee3..444f5a68121 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -5,14 +5,13 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-Lw9JX7x000pUd/1MnGPv+RcIKlCKFlVgEslwXgrdO4k="; - fetchSubmodules = true; + sha256 = "sha256-utElXMAJG8X7jFmY/oyrWOCkOiNG3jZHrf04vTBTi7M="; }; lldb = callPackage ./lldb.nix {}; @@ -24,7 +23,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-6nN+qVb1AEAMUth7d8mfQfLul0CpHnq9F93lXlp4mS0="; + cargoSha256 = "sha256-ZbD/+QWvpi88bHoSvDG0FKcsTsnthYR1SYkkJhqBbbU="; nativeBuildInputs = [ makeWrapper ]; @@ -71,8 +70,10 @@ in stdenv.mkDerivation rec { mkdir -p $ext/{adapter,formatters} mv -t $ext vsix-extracted/extension/* cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py + wrapProgram $ext/adapter/codelldb \ + --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" cp -t $ext/formatters ../formatters/*.py - ln -s ${lldb} $ext/lldb + ln -s ${lldb.lib} $ext/lldb # Mark that all components are installed. touch $ext/platform.ok From 7b92c7f79583c908952423935b75d51d0616149a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 12 Jun 2021 18:26:08 +0200 Subject: [PATCH 777/797] haskellPackages.hackage-db: Reactivate hydra job --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3a3282d2ab7..d119f0a0d33 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1953,4 +1953,6 @@ EOT # https://github.com/erikd/wide-word/issues/57 wide-word = doJailbreak super.wide-word; + hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 2c4612daac3..454b7338d66 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -89,6 +89,6 @@ self: super: { # hackage-db 2.1.1 is incompatible with Cabal < 3.4 # See https://github.com/NixOS/cabal2nix/issues/501 - hackage-db = super.hackage-db_2_1_0; + hackage-db = self.hackage-db_2_1_0; } From 37c8bfc077f6c160dc186f042c78843e2469a708 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 12 Jun 2021 19:20:47 +0200 Subject: [PATCH 778/797] haskellPackages.cabal2nix-unstable: Bump for alsa-lib alias --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index bd88c5e5a0a..8b058b2dc05 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -10,8 +10,8 @@ mkDerivation { pname = "cabal2nix"; version = "unstable-2021-06-12"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/5bb08e994aa17a46676007400794df703c53af58.tar.gz"; - sha256 = "1cwjmscy3rf64rd7pkkbmp1zri1f6bn46hjnmf6b33jg7wzw11g4"; + url = "https://github.com/NixOS/cabal2nix/archive/01feffa0aeee835504e0c0ccf4bca2e33a698252.tar.gz"; + sha256 = "0clckh0qqvjcb8szy1d6qqlxj6sqp28jc2p3vhzhkf95cv491si9"; }; isLibrary = true; isExecutable = true; From 6eaf494a8369d72d0f9d1e0deaec30764f8acdf4 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 12 Jun 2021 19:22:33 +0200 Subject: [PATCH 779/797] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 11 ++++++++ .../transitive-broken.yaml | 5 ++++ .../haskell-modules/hackage-packages.nix | 27 +++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index fad45fc45f1..b7561d38392 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -370,6 +370,7 @@ broken-packages: - biohazard - bio-sequence - birds-of-paradise + - biscuit-haskell - bisect-binary - bishbosh - bitcoin-hs @@ -998,6 +999,7 @@ broken-packages: - dhall-fly - dhall-text - dhall-to-cabal + - dhcp-lease-parser - dhrun - dia-base - diagrams-boolean @@ -2202,6 +2204,7 @@ broken-packages: - hs-carbon-examples - hscd - hs-cdb + - hscdio - hsclock - hScraper - hscuid @@ -2480,6 +2483,7 @@ broken-packages: - Irc - irc-dcc - irc-fun-types + - iri - iridium - iron-mq - irt @@ -2548,6 +2552,7 @@ broken-packages: - json-schema - jsonschema-gen - jsonsql + - json-syntax - json-tools - json-tracer - jsontsv @@ -3059,6 +3064,7 @@ broken-packages: - movie-monad - mpppc - mpris + - mptcp-pm - mpvguihs - mqtt - mqtt-hs @@ -3390,6 +3396,7 @@ broken-packages: - pandoc-utils - pang-a-lambda - pangraph + - pan-os-syslog - panpipe - pansite - pantry-tmp @@ -4209,6 +4216,7 @@ broken-packages: - shorten-strings - show-prettyprint - Shpadoinkle-backend-snabbdom + - Shpadoinkle-isreal - Shpadoinkle-streaming - shwifty - sifflet @@ -4282,6 +4290,7 @@ broken-packages: - slug - slugify - smallarray + - small-bytearray-builder - smallcheck-kind-generics - smallcheck-laws - smallcheck-lens @@ -4681,6 +4690,7 @@ broken-packages: - thank-you-stars - th-build - th-dict-discovery + - themoviedb - thentos-cookie-session - Theora - theoremquest @@ -4919,6 +4929,7 @@ broken-packages: - unordered-intmap - unpacked-either - unpacked-maybe + - unpacked-maybe-numeric - unpack-funcs - unroll-ghc-plugin - unsafely diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 408c750553f..66ab6c5799c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -165,6 +165,7 @@ dont-distribute-packages: - Barracuda - base16-lens - base32-bytestring + - base64-bytes - baserock-schema - BASIC - batchd @@ -1619,8 +1620,10 @@ dont-distribute-packages: - JsonGrammar - jsonifier - json-incremental-decoder + - json-query - jsons-to-schema - json-togo + - json-tokens - jspath - JunkDB-driver-gdbm - JunkDB-driver-hashtables @@ -2618,6 +2621,7 @@ dont-distribute-packages: - SGdemo - sgf - sgrep + - sha1 - shake-minify-css - shaker - shapefile @@ -3068,6 +3072,7 @@ dont-distribute-packages: - vfr-waypoints - ViennaRNA-extras - vigilance + - vimeta - vinyl-operational - vision - visual-graphrewrite diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01978189a4c..3e38c3b802e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18468,6 +18468,8 @@ self: { ]; description = "Isreal Swan will make a snowman for you!"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-lens" = callPackage @@ -38393,6 +38395,7 @@ self: { ]; description = "Base64 encoding of byte sequences"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "base64-bytestring" = callPackage @@ -42285,6 +42288,8 @@ self: { ]; description = "Library support for the Biscuit security token"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bisect-binary" = callPackage @@ -74312,6 +74317,8 @@ self: { ]; description = "Parse a DHCP lease file"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dhrun" = callPackage @@ -136412,6 +136419,8 @@ self: { ]; description = "Haskell bindings to the libcdio disc-reading library"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {cdio = null;}; "hscharm" = callPackage @@ -150233,6 +150242,8 @@ self: { ]; description = "RFC-based resource identifier library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "iridium" = callPackage @@ -153197,6 +153208,7 @@ self: { ]; description = "Kitchen sink for querying JSON"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "json-rpc" = callPackage @@ -153407,6 +153419,8 @@ self: { ]; description = "High-performance JSON parser and encoder"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "json-to-haskell" = callPackage @@ -153483,6 +153497,7 @@ self: { ]; description = "Tokenize JSON"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "json-tools" = callPackage @@ -179869,6 +179884,8 @@ self: { testHaskellDepends = [ base HUnit ip text ]; description = "A Multipath TCP path manager"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mpvguihs" = callPackage @@ -194484,6 +194501,8 @@ self: { benchmarkHaskellDepends = [ base byteslice gauge primitive ]; description = "Parse syslog traffic from PAN-OS"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "panda" = callPackage @@ -235794,6 +235813,7 @@ self: { ]; description = "SHA-1 Hash"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shade" = callPackage @@ -240420,6 +240440,8 @@ self: { doHaddock = false; description = "Serialize to bytes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "smallarray" = callPackage @@ -261054,6 +261076,8 @@ self: { ]; description = "Haskell API bindings for http://themoviedb.org"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "themplate" = callPackage @@ -272318,6 +272342,8 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "maybes of numeric values with fewer indirections"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unpacked-maybe-text" = callPackage @@ -276297,6 +276323,7 @@ self: { ]; description = "Frontend for video metadata tagging tools"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "vimus" = callPackage From 0c8e2c2a11570b5cdcca7282135fe9944410dd00 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 12 Jun 2021 19:31:13 +0200 Subject: [PATCH 780/797] haskellPackages.mptcp-pm: Disable on darwin to fix eval error --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3dc1a40c9de..6b07b67256b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -397,6 +397,7 @@ unsupported-platforms: mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ] mpi-hs-store: [ aarch64-linux, x86_64-darwin ] mplayer-spot: [ aarch64-linux ] + mptcp-pm: [ x86_64-darwin ] netlink: [ x86_64-darwin ] oculus: [ x86_64-darwin ] pam: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3e38c3b802e..ebfdbae6ba6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -179884,6 +179884,9 @@ self: { testHaskellDepends = [ base HUnit ip text ]; description = "A Multipath TCP path manager"; license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {}; From 682649cbc05124b8c7a6a3da5364da59ad778258 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 12 Jun 2021 13:59:14 -0400 Subject: [PATCH 781/797] ripgrep: 12.1.1 -> 13.0.0 --- pkgs/tools/text/ripgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index ca337deec93..3fa202135f5 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.1.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps"; + sha256 = "0pdcjzfi0fclbzmmf701fdizb95iw427vy3m1svy6gdn2zwj3ldr"; }; - cargoSha256 = "1nyfxma2vwfq6r614ng8qq8vanb540a5z0ibs85wz5sjm3hp1l4f"; + cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp"; cargoBuildFlags = lib.optional withPCRE2 "--features pcre2"; From e1d5e9da32aeed8fa8107f1a2e8d19ad0e707db5 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Sat, 12 Jun 2021 13:53:17 -0300 Subject: [PATCH 782/797] polylith: init at 0.1.0-alpha9 --- .../tools/misc/polylith/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/tools/misc/polylith/default.nix diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix new file mode 100644 index 00000000000..b29b2521d17 --- /dev/null +++ b/pkgs/development/tools/misc/polylith/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchurl, jre, runtimeShell }: + +stdenv.mkDerivation rec { + pname = "polylith"; + version = "0.1.0-alpha9"; + + src = fetchurl { + url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; + sha256 = "0mjn0fibj7z8wihk5frhyd5ai2bmzm909701sphjs7j9lgg0gc4k"; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + cat > "$out/bin/poly" < Date: Sat, 12 Jun 2021 20:40:06 +0200 Subject: [PATCH 783/797] transgui: fix transgui build on aarch64 Support for aarch64 was recencly added in fpc. This regenerate the Makefile to include aarch64 support as the one in the repository was too old to include it. --- pkgs/applications/networking/p2p/transgui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index ceccf44819f..0a2f90ecb71 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' + FPCDIR=${fpc}/lib/fpc/${fpc.version} fpcmake -w lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus ''; From e9c55912021adffb70185df5911540fdd47c7322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 12 Jun 2021 19:08:21 +0200 Subject: [PATCH 784/797] pythonPackages: move all throws to python-aliases.nix --- pkgs/top-level/python-aliases.nix | 15 ++++++++++++++- pkgs/top-level/python-packages.nix | 25 ------------------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 566176eb48c..4a19d69d562 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,10 +33,23 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ - smart_open = smart-open; # added 2021-03-14 + blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + faulthandler = throw "faulthandler is built into ${python.executable}"; + gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 + glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 HAP-python = hap-python; # added 2021-06-01 MechanicalSoup = mechanicalsoup; # added 2021-06-01 + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pytest-pep8 = pytestpep8; # added 2021-01-04 + pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 setuptools_scm = setuptools-scm; # added 2021-06-03 + smart_open = smart-open; # added 2021-03-14 + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0c04d2a972..1f353b5cc2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1097,8 +1097,6 @@ in { blockdiag = callPackage ../development/python-modules/blockdiag { }; - blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 - block-io = callPackage ../development/python-modules/block-io { }; blspy = callPackage ../development/python-modules/blspy { }; @@ -1180,8 +1178,6 @@ in { btrfs = callPackage ../development/python-modules/btrfs { }; - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 - bugsnag = callPackage ../development/python-modules/bugsnag { }; bugwarrior = callPackage ../development/python-modules/bugwarrior { }; @@ -1849,8 +1845,6 @@ in { desktop-notifier = callPackage ../development/python-modules/desktop-notifier { }; - detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; devpi-common = callPackage ../development/python-modules/devpi-common { }; @@ -2400,8 +2394,6 @@ in { fasttext = callPackage ../development/python-modules/fasttext { }; - faulthandler = throw "faulthandler is built into ${python.executable}"; - favicon = callPackage ../development/python-modules/favicon { }; fb-re2 = callPackage ../development/python-modules/fb-re2 { }; @@ -2797,8 +2789,6 @@ in { git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; - gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 - gitdb = callPackage ../development/python-modules/gitdb { }; github3_py = callPackage ../development/python-modules/github3_py { }; @@ -2812,8 +2802,6 @@ in { git-sweep = callPackage ../development/python-modules/git-sweep { }; - glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - glances-api = callPackage ../development/python-modules/glances-api { }; glasgow = callPackage ../development/python-modules/glasgow { }; @@ -5918,8 +5906,6 @@ in { inherit (pkgs) libusb1; }; - pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 - pyliblo = callPackage ../development/python-modules/pyliblo { }; pylibmc = callPackage ../development/python-modules/pylibmc { }; @@ -6016,8 +6002,6 @@ in { pymsgbox = callPackage ../development/python-modules/pymsgbox { }; - pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 - pymsteams = callPackage ../development/python-modules/pymsteams { }; py-multiaddr = callPackage ../development/python-modules/py-multiaddr { }; @@ -6615,9 +6599,6 @@ in { pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - pytest-pep8 = self.pytestpep8; # added 2021-01-04 - pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 - pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; @@ -7104,8 +7085,6 @@ in { pyzufall = callPackage ../development/python-modules/pyzufall { }; - qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 - qcelemental = callPackage ../development/python-modules/qcelemental { }; qcengine = callPackage ../development/python-modules/qcengine { }; @@ -7819,8 +7798,6 @@ in { smhi-pkg = callPackage ../development/python-modules/smhi-pkg { }; - smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - smmap = callPackage ../development/python-modules/smmap { }; smpplib = callPackage ../development/python-modules/smpplib { }; @@ -8440,8 +8417,6 @@ in { toposort = callPackage ../development/python-modules/toposort { }; - topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; torchvision = callPackage ../development/python-modules/torchvision { }; From a421a74be31c36ff85829e70a6621ab59fb98a18 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 12 Jun 2021 12:00:00 +0000 Subject: [PATCH 785/797] tt-rss-plugin-tumblr-gdpr: remove --- .../tt-rss/plugin-tumblr-gdpr/default.nix | 32 ------------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix deleted file mode 100644 index 7df8b717593..00000000000 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ... }: - -stdenv.mkDerivation rec { - pname = "tt-rss-plugin-tumblr-gdpr"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "GregThib"; - repo = "ttrss-tumblr-gdpr"; - rev = "v${version}"; - sha256 = "09cbghi5b6ww4i5677i39qc9rhpq70xmygp0d7x30239r3i23rpq"; - }; - - installPhase = '' - mkdir -p $out/tumblr_gdpr - - cp init.php $out/tumblr_gdpr - ''; - - meta = with lib; { - description = "Plugin for TT-RSS to workaround GDPR in Europe"; - longDescription = '' - Plugin for TT-RSS to workaround GDPR in Europe. - - The name of the plugin in TT-RSS is 'tumblr_gdpr'. - ''; - license = licenses.gpl3; - homepage = "https://github.com/GregThib/ttrss-tumblr-gdpr"; - maintainers = with maintainers; [ das_j ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3eb72cefa12..5939d7bb31b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1000,6 +1000,8 @@ mapAliases ({ /* Added 2021-01-02 */ ttyrec = ovh-ttyrec; + tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # added 2012-06-12 + zplugin = zinit; # Added 2021-01-30 posix_man_pages = man-pages-posix; # Added 2021-04-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e794f99b7e5..86be62dee06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19965,7 +19965,6 @@ in tt-rss = callPackage ../servers/tt-rss { }; tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { }; - tt-rss-plugin-tumblr-gdpr = callPackage ../servers/tt-rss/plugin-tumblr-gdpr { }; tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { }; tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { }; From 222dcb8ed714244637450ccbf504c957ce427718 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Sat, 12 Jun 2021 21:54:13 +0200 Subject: [PATCH 786/797] google-re2: init at 0.1.20210601 (#99938) Co-authored-by: Sandro --- .../python-modules/google-re2/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/google-re2/default.nix diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix new file mode 100644 index 00000000000..a2dbf512b89 --- /dev/null +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, pythonOlder, fetchPypi, pybind11, re2, six }: + +buildPythonPackage rec { + pname = "google-re2"; + version = "0.1.20210601"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f1ql95f97ss8i0rn1c37kgi0qrf1nq9b3q8xbq9x3gwg7xgzi71"; + }; + + propagatedBuildInputs = [ + pybind11 re2 six + ]; + + meta = with lib; { + description = "RE2 Python bindings"; + homepage = "https://github.com/google/re2"; + license = licenses.bsd3; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac93413268e..2655896600e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2944,6 +2944,8 @@ in { google-pasta = callPackage ../development/python-modules/google-pasta { }; + google-re2 = callPackage ../development/python-modules/google-re2 { }; + google-resumable-media = callPackage ../development/python-modules/google-resumable-media { }; googletrans = callPackage ../development/python-modules/googletrans { }; From 4988b9bda18b0ba4373e15edb71d8538b39fd2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Jun 2021 22:01:41 +0200 Subject: [PATCH 787/797] authenticator: mark as broken It's incompatible with the most recent version of libadwaita. --- pkgs/applications/misc/authenticator/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index 46b61720d0a..ffa34d041e9 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = licenses.gpl3Plus; From 10f85360c6df79697e32da02ca390113d3004745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 12 Jun 2021 23:13:40 +0200 Subject: [PATCH 788/797] maintainers: remove jD91mZM2 Thank you for every single commit to NixOS and nixpkgs. https://github.com/NixOS/nixpkgs/commits?author=jD91mZM2 https://www.redox-os.org/news/open-source-mental-health/ --- maintainers/maintainer-list.nix | 6 ------ pkgs/data/themes/yaru/default.nix | 2 +- pkgs/development/tools/rnix-lsp/default.nix | 2 +- pkgs/tools/X11/xidlehook/default.nix | 2 +- pkgs/tools/misc/powerline-rs/default.nix | 2 +- pkgs/tools/misc/termplay/default.nix | 2 +- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 990285cb61a..b328cb20215 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4623,12 +4623,6 @@ githubId = 1982341; name = "Jack Cummings"; }; - jD91mZM2 = { - email = "me@krake.one"; - github = "jD91mZM2"; - githubId = 12830969; - name = "jD91mZM2"; - }; jdagilliland = { email = "jdagilliland@gmail.com"; github = "jdagilliland"; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index c2f449e9f20..c158ec3f5a9 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = [ maintainers.jD91mZM2 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index 98670e9e184..27bad6b51d6 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index b7cb9c9d8ba..ac5d6fc964b 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { description = "xautolock rewrite in Rust, with a few extra features"; homepage = "https://github.com/jD91mZM2/xidlehook"; license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; badPlatforms = platforms.darwin; }; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index a8f57bd78c4..7222ac9be7d 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "powerline-shell rewritten in Rust, inspired by powerline-go"; license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index 5db3998409e..80c6341f025 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { description = "Play an image/video in your terminal"; homepage = "https://jd91mzm2.github.io/termplay/"; license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } From baf91ea7d9ffab6d1f95395b7c2f724a2e349698 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 9 Jun 2021 23:56:48 +0200 Subject: [PATCH 789/797] pythonPackages: set mainProgram to pname by default Calling `nix run poetry` or another python package usually fails because of the "pythonX" prefix in name. Adjust mainProgram to ignore that prefix. --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4917b167046..963073df620 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -176,6 +176,8 @@ let # default to python's platforms platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; + } // lib.optionalAttrs (attrs?pname) { + mainProgram = attrs.pname; } // meta; } // lib.optionalAttrs (attrs?checkPhase) { # If given use the specified checkPhase, otherwise use the setup hook. From 29aaf536bc3e7fdf2f8ca12d236bc05f3eb238af Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 12 Jun 2021 17:25:07 -0500 Subject: [PATCH 790/797] firefox-beta-bin: 85.0b6 -> 90.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 780 +++++++++--------- 1 file changed, 395 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 6d29a7bda9d..d14d5b3215b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,975 @@ { - version = "85.0b6"; + version = "90.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e6583b946d35db5b8d94bd33e183e397b85c6549a94961ec2cc395b30ba21b6b"; + sha256 = "07c06ddfe0b2d3f4acc89a8bd5de963ae8fb90aedb7710272adbccac178af867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7f69bf9371454796ef6cc9469bf1ba6d6c7317a3e559fefafacb3c4d215eaa73"; + sha256 = "b01b6f591d815e2dd3c0bb129952a4a5dbfc7f93d9eed2d61b8c387135768462"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "02ce58a9be06d2632e87daeb0e832d18e896c0ae376171d0d265d108530bf8ed"; + sha256 = "aebbf9e5edce5aa4a01b3dea5342d2335dadca261124f9557d727a2f03c5a123"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "04021d925774cfb01141f34a28800e339339f1b056255721d2c4aa4268156986"; + sha256 = "842c29a5aa563d1f386ed74820ba2cce763e86f8d86a943295b959a51bd8bf27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a85bc2a3c859b9b6e005c1cc5767f1519d255fac011208563c530d28bcec8935"; + sha256 = "8fe01d2193b4d60ce2134ebc5848abf6621cc49bc76d08890ce7588ac2d81311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d84113f01e450d76eccb1f464a3e6a44c3b5fd604c74891d175f0f7565c3b911"; + sha256 = "e5a929e0eb95a09ec408aa831853b1a5859bb0b1f3b133677568f18bc7ba5a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a2826a554577a666b337d95f2c46b292fbb228152282799f295994cb9f6b6563"; + sha256 = "32533dc55222e7e407b386f46d55ae78dc61581ec7653bbe9f8e9859b4d191ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c88db099ee75755d0e60cb8230731be9fafbf5ca3c0a6d0be232cfe1f93523eb"; + sha256 = "2d561a690d625cfff4fe163dda26eac5424e89b74bd6385543238c9e85abf39b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "625377e2bb881aeac0659600def64039bbc1c8518c99acd102f9e47dc956af0d"; + sha256 = "3cec173b9c23137d935221d715bfeb87353bc87bd316a219c8063b5977422bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5fd3c63066e098dc87337c6e4fb53aede9c9d817e1bc06b1fe11597d68f60f3a"; + sha256 = "ab9bd15850209de8d7ad1ef33f50c132babc2c6e70b4ceddee84081f2707b6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "85745ac8ae54b559592430744ce3a08566c1b20a078b961988870e570dba6eba"; + sha256 = "9f9c87c0bf0a08c23dc30b29bcfb79634a52dccfa945a4593451f6230e373686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "5ddd2c3244311bb975e510cefeb1c5e16f92de2d82ef7fd3f6cb6bc064fd70ef"; + sha256 = "21900bc7c61ebbf34f45da1b4740a722e00d6c0d27042a89e006fd99485e7b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e1d4f0ee1a72ea956966b07c3c48fcd089f5540ea1bf02857f41f125a9ab8762"; + sha256 = "6ccec2ac83ab36fb72a8db9293622d7b1c6fe55d1fb8ec6421a64e1210e7e0a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "519c50b7994b0d2bb3c162812424188958a51bdfe40d382db2e83912fb893484"; + sha256 = "7610d94fa66da37689abd3fa79e0703d77f68457c77287e5e61e66169baf7473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "37aeebb7dcd6240721c7377368751f2c48b3492846ef72d09e3fb5146db0cf5f"; + sha256 = "6241b68e5618b474b86529222f5a646f426983eb9e39b2a4d7c3d261cd26f4e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5902520410a45eacf141c9f8c414994298ec108ed0d97096f34156001373dccb"; + sha256 = "b981946aec3128a3e7da3ca76f7815373dc8963ed01d495ee02941954ca42fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "787a26c9f978643e6afaf9dadd88f7adbc18f6d8f6b5814da4752c21faac4078"; + sha256 = "c59f28aef1af64d1cf83e0e5e9ba4bd15be593da27e88e6ea7edaed80a3a64b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "09f5f3edfca2b082ad6f96ecf7b97d336d81c3d63bf1588bc2f38ff91e2d641c"; + sha256 = "b9cd59a9b7ca024f6931d8e25962349346d8c279d3c7983f1a76681784c38efc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "eef50a2a7b0109b62202922041dea12beea346e98fcd8d93f402ba7f08546dff"; + sha256 = "e185f4b874beeacca38bfde59958eb277ce83fcf47eee4cc16065e350707e52d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5ed270355c3fca3d8ce2ba15e2b9a322fa503339ef46c935851442523f91c277"; + sha256 = "ed323fc4a677afa40b1073640dc3fe9e5f49906842684677694a1c85d042c988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6343b55fa02570c7ed4c7eb47b6a8d6b0cbfb5cecb0199282b4cf58e5f344419"; + sha256 = "3c495c341ab226b13cca26fb4d1e79ba8a763c2944374f417b0d1d1e3afb6e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "863e118d3b6c0bf9e25bdef819ec0bb9d027802a99216640a4ee01650486ec8e"; + sha256 = "00d888cf643780473aa480c0a0ded49ad22b76ee0b902062cf014f140ddd2530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c5e58bb173cdaaf9ec09085e47d69c7601966ece7ef5aba85cffced211952e77"; + sha256 = "4421542a7a8d968b4e705852ca76ec4bed857c57df0d10afab17f27b701712e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a03057a3d852dbd8956aee7253e1a3b6550c843d8755d5c01fe2d72042c80c79"; + sha256 = "db89780192cd14f0fb43ac2974c7c8a72e1896ddcf2db7ff3f6eea9f2788051a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f705f2e633f30fe83a2546847e0dcf6da76e2b9c7edb1a1cbb104c56d45610a6"; + sha256 = "60cd22340342b689e12cabf13ae33a2af3a5ecc6dad5b5e15851fcec0405652b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1b04e80d0666900dba8356d761059bc99e39636b859059d34e79dca73bc6c97e"; + sha256 = "7524fa67ed3246fac49622fb360ddb9ca5b91cc0bdb7eb64d881bf9851dd9128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "078b7cbd04e73f2a62c60ceaeb73edf1dce4ffd656e523acc901e234eb6ff972"; + sha256 = "641c8f48694184ff77db1b7825317f623deae42acafccce35cf7b8b95d38d45e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "7131fe554e6b1eaff8af3bd62a565d4db746eb5f65cc9eebe9d6a20921eae0e3"; + sha256 = "e0c808695678e844efe04926bab17168fef0a97f8b125e724c4ebc606a5fc513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "131340d0124292055a8a3f6a7ad86e7f1d4648c47f18bcac37db0fb48b3150cb"; + sha256 = "64fc3ac8c3614cb128f7174802dc101b5c36a92fee5cd6dbd826f505e85c149d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a3c9eff230311f0b449f977f0304eb664614ad683467b165ee6f656530df9caf"; + sha256 = "e7bb62c4f6d4a00b0837fb720c08923f057610267ef97b0090ae8767c26e6867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "69a84d5384d13c486c0cb9bea45ee78662d30fe12f1e46a582f55b3129be6093"; + sha256 = "038a1f723017141ae12ec15a6fec3fc6a49cbdd6244d237c18cd36c70ea6e6d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e25dd52c7241b2df8d1866c118233af0cefd99d4d15011faf5a2b0429c01675a"; + sha256 = "e2c1d68ee029e3f1064277dc6c3844bdbbe3eb28b0492c1299ed6f8a9351ab56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1530c0d16b164a936d6b98d3ecdae44b8484d776767b307322f87f901b6c131a"; + sha256 = "c5e4dff35094ff645272bf402e4c56908b6df7b5c7d6b6925e86528d3ced89af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7589a12da470306b5212d669d5f2c527a400b4659d8a06f1e49a0a62f33f49ab"; + sha256 = "502f35f69f5f04477678f183e40f8958aa095724e65254cbbdaa9c72c1a40ed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f8a80894596182d66cf6ba9c2073619263f5262a187080e75eb2a3ce93095cb4"; + sha256 = "e353afc86a7b6c452870587b13fa093883e7680f2e44a14c94563d12d50de622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "97cf7abeaeb857fe20f0e31964eef346e4d4d9803af6b6c24bf26d436b4e42c4"; + sha256 = "10cb0a4ee3c42035a06e509a74e632dc269c407efb8dbad40bc4dfc2b2d6b9d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "76a580744c26419c15862729ba1525dc2c5216b221dd74af80d1e09cfb1ffb25"; + sha256 = "8cc1603bd589fb910df22b47a8d7e3611cff371deea4eb634127b68a523221df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "6b818eee14d5e4dd857a53982de224fadb454397c7efb18123c224baf513b222"; + sha256 = "b4867bf6406854f80dd402ab3f1ad1e20b7acae7e93587831913144e690cc84f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "68dfc0c439e815242333fdc8bd9752dfeaa1d6583acdfa5cc4c7092eca637b49"; + sha256 = "555a76d9915a471f134d8f3986e7afca341d201bcad73d90d5751d8ec86c17c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b529c00e2c0520b6e7362b21e9fa045838837660ebe5ba46b755164ed7e434d4"; + sha256 = "c72f1b40d5a9fbe689b76b3a0010ee1838b8b7fd7126dccb2a7c8907a87db0a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "43d273ca9f65bf3584ecc98f5f2409a916957d0d70fb296aa504cbebdfe5ed75"; + sha256 = "e63f1e83785b777dbf9c69982c314684937dc22456b19eb1e8e83c87af511938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ffeae00deb60a0db7c977dc1541ab90e948b206a59717d60271eb0f6a166ebef"; + sha256 = "41e02c58459a2b2e4dfee5ba4d8dce6fda51fd85ddcf7a4d18426d25b9049aa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f81a32c1bf88acc3e5b26e61ac6c153f1b9bbc7cde1685f8c0a366a4c4808dd4"; + sha256 = "5b4122ac4367a88de9d8551498633d396630ac4fbaa7012408382e8e7dbfd27f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "87e1a2cbdcbe4a7f2aff0537ad991ad39a8b992f38b6b2a0e2c4b2f65fd6c9d0"; + sha256 = "ec1d030b1980e747c415d6238cc5868c24ff6393cce6489f4775926e00fe55e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "88f171d4f84e3f89d7c433d793ae0032572444b322d72fa19abacdd0481c5df7"; + sha256 = "214f1dc79bd09d1f5e4dbba1311ebfbfd47ac4a418da2f6adb6c8c6285bfc4b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f88e6eb48e2ddc8c8a11d92fd82884fb487958cb8c54fa5268f15076774e7e4a"; + sha256 = "fddc2c4c13595e480696924cea10e5caeea81fb775d01a91e7b13a6701a1cd2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "0286e665df8b07339cb2a6f609623defaf489883b8865781aa7ba238d3c19f4e"; + sha256 = "39402ff53caddb69cb6248afbcc37814536fc0cd4767a2096923089168f48a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e71c9712d22a1d573b12a5d4274ac5fa8a91a1ce98bad9f4922f7f11c0770707"; + sha256 = "d2143e50a0f6bb19ce038e5fcc83530bbd5c781bb104da3a29d870f00acd2001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b61060e1f2aa2423cd9c2d9b79f8476927fa171abadd3d32885b7deeebf781ad"; + sha256 = "e2b035ece9d2911d131fb40eee6bd8f9c40506cc812978bce0bcf317ea9c8ef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6a2e987c69e384431cea1beff69059f0bf4259a80b318e8736c420cedf125187"; + sha256 = "a2c3ddfeba658b8c58b77e6abd6aaf2c4141c73b0ee6363e391f08f5a94e8ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "109736b666fbbb54ed5bfd1755092834f9c2670362ad272802643d5a98fb80bd"; + sha256 = "ea7c40e0d00a1d8d72d7cd397bbe7533959e1e715a2a7df8a205ce6e98d26fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4b1249e8634b130b6fc9021f570e375bc2c1bf74d50f1789b3a1325c0fd771ae"; + sha256 = "24c62141ec5bddfc431690bd21428bbf8ad07d7fecc9acdc242565a2dfe5fe91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a12af8d38c868d1af24d7a23faec32b79412768bf7438d3c2548d06676bb5d92"; + sha256 = "de40edc25528e7cff904d14feac97dd282067e27793a4d2a85311c260be4262c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "d844763e5f8475d9b2a81bc217b0b4840fc6fb18a037921266fe3ab4c835367a"; + sha256 = "a4daf7b8c77661f2dc211c6e4a4432de8c57e34be48556b707f167f7333f0a25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "bd2216fb6c24932738935ee9d5ae73816cf70def1dee3b3317c99faf67496cd3"; + sha256 = "6d4a3eb396871b35e4d880c98e48dd5dfd92e66b09a80066c20543f95ab3cfbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8a49b992da59ac781246bd8e7318a815659556c29279182cac6328fbbfcd3f35"; + sha256 = "ff5e9d651cb9224dde03d207042c5ee4312359d9b111839269eaadff49d2efb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c8a81f06e4dbcfbac2a6a065faab9981dc2503025918ee363d8b908ea6732b82"; + sha256 = "3433149001e07215dcce9f3b934edf5f188b8e88725a01372fb1e831f0dc00f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4c0c223829b974f26d3e34bf17b15112afba6709d7654a05e7ccc1a582d8cff4"; + sha256 = "79434cc64d0acbed593f3c859ef15623333239d2868d0b797e6e51252778466c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "07ad6f6accaa6246e23832e8cfb69f498ddb219d43787ac29688c99b9b359720"; + sha256 = "efb3302005785dc6fd7aa464c591978f11637e89aca3a6f41d4d855970fe68d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ac9f4ffc8cdb4ee8f3d0602b0ed9de4005dded584b6896c0cf0053d9951a637c"; + sha256 = "7940ac6685d94144e758f703511946aa422f7a9303f6e8461d29b65178068d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "a320b67f4b15d2fb5dc8ffd3dab13266810af06e0385f51b60d4ba5223ba4bbd"; + sha256 = "adfc49b40832942760d996da4e659c672def298159de535b03daf5064ebbb049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "3dade192f5234bad52a08d380d4ef8119eef5211152a1755b6c6e5fd72eee3cb"; + sha256 = "1212c04fb5b1a114b49562534e65c4983bfade7ae9290290e1b51f999476fdbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "77d4d9c8b5c6d308fca3f3519dfead9f75751ba93dfc1b2d5ef9ea880a1e2111"; + sha256 = "4172e9dd98806535b22162c2a4b50b1912936ac6d94ee99fc2315fc8e93e7fba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "25de0c8c747c3fd4093517efea1df8fb101b3a48612070f2d93c70901dee7792"; + sha256 = "4c65a755594a5e03611c0add1b506760853efcfc057b9c04c0237968d972960e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "96b31f76121bdb26840c693e2b3d70ad0ef0e0c7f194f650f9c683e92d5a85e8"; + sha256 = "7b82b581badc7d5ddcc02e008bb1b968a1ddccd42e4acc3f75863114ef00459b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "32ce40ffe03dd2695a50b43135c4fb22f06cf10b19c2067c80b962409ee1a0d1"; + sha256 = "db25e60614b1f31049886d17b5d9f7aa45f51a1230e5829d513d449752d4cad4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "672bd93968e0a3cf3b280afdd52fbfe62a1bad524dceebe2e9fc953f4509aae2"; + sha256 = "d0208622ac503716edd14383f9b3391064b0e5167ebeb6e349819253ab12cadd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2d003ab51d0531ba6f47aefbfa2f0b81fa815b378fefe318351b52a798a48e24"; + sha256 = "3e9eb15f215120151572feb8ae621cd9e07617962fd1797edbecd79f7176f950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6264b95a26189ba3e7f2490f5a122f9f42bca19cd31e6d3084b3bf2a1ea5e91f"; + sha256 = "db49b53e15f96dd4668e0224019f4413c3e41c5e696de137faa44ac547ad2560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "987fe7b39bc597e5bf2389f6d595fbe054dd3aff7febc48da19dcc2606454f5f"; + sha256 = "9b05c58c61c25b584dd32cd9973d42aed887b22e07feb8a64f20e8288a1ccbcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6c163f9876d53f5607867de871dad27e236c6bf0a2a46ed24425190724554579"; + sha256 = "bdcd745a9270d9fa34b070cd260285381f41481a2735bcde9cb73ffd038c924c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "71ed7be34b05652463232c449de558e9fcc4be0583516d5ab8a0fc0ae334f419"; + sha256 = "05ce159ae923326132d656b94b7ed78590109b14ce5436d65f262c00f7b70235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f1ecd7e990896d3471ffaddd1997b598b8fc3482caa3b6446a750a963ae71f10"; + sha256 = "1829442b517f425fa85feab5691ec63e2375473655d00a25618f21f4c3ff6797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "adcad49f775b592ab65080b8310d27ed26424f4aa547736dc100655586f263a4"; + sha256 = "5ea7bfa88a46b4d3409ab953537fcc87a5a8a95dfc314a9f7b4b991886be10dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "accd50a10d75fd234b38e50908d10fef5df4e6fc1873683f15656d695ccced9e"; + sha256 = "896c0a79ccebd764d4718342bd142d1cfdc172a666b2db2beafc3f1883b69edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "88b2f2176d8a739a639fb52eb8d0423343e5780e79f7986f066437ac33c74aa7"; + sha256 = "6c4f2da35945c331de90f292e35314ffd51c693f01ad69268062bbcad0e2a617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c2337b0a041926adc3d82d986fdbe1dbbea22046ec149614712e806873f4b46b"; + sha256 = "095abb133991ec166dd0d6bc86de71f6367bd338a21480577f2fc2210f42d69f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bd67822eb7aa7253fec770b39cc7e4389fa19373cc01d3a3b9e0568584cbef41"; + sha256 = "549d6fe7bb33d99a2e4a22438defeb5d5b090069f67d58063efdcc458edcaf9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "bb4c64f6e1a2f6b721e51ee26398a4f86cb67782eba15e9c8cfed472ff3ec597"; + sha256 = "5c7138c3ccefcfea898c00e428fb166b0c8883ebaa4980eb9f75507acd15f01b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7a55a33a184131c74da3fc2dad0dad7bb7c1230a1740d71c19ff3752ac53c7c5"; + sha256 = "a4cdf6b8a865b818301fa23a2ed3626f4e220b02cdc46475d1e39bc9e5245735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "72e8271aef0c4d38d577c04d3927f325b13bddab57d115b553ba4015a2b5a12f"; + sha256 = "69d42b943be2a848b5a28aadf240540f9cb7e527ea312d83e1ac559a361ccfdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5c1bba66c4e173c9e531dd14d746a96fb4ee393db9d815cf6de8c0ff2304036e"; + sha256 = "8b14c6a508f0c5676de085050cac2732a6852047356d28d6257dcf80691df0b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1decd5cef4fcc9faaa05a261686101338e45a0da6485144455c49c3df142d2d5"; + sha256 = "b145606546bac77e3e45b98a23bdeebd23b752b5a1045a72312e1cb6c6927fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-x86_64"; + sha256 = "212ff7d8d8addec767ce38d81a4a92103d9ee905f01387df9975bbf557795a8d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6a259dad0ded91cd4544f45def61570e8c06de5adeaba5b19fd3136c6f52f4f3"; + sha256 = "334684039f1350871356e58e0c467b2d93c6d56b00973601e24728a65ebf45fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "7096e5bf97b3392543ad75c685b2a6df2796a56e59237493aa869027c06213f3"; + sha256 = "96a9a309a869fa11effce362fd6f781e9c0067639a49b372170e0bc85eb11706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "52fc1ee59288de354e4dc4c1b46848651b4e462839a44157e2de101b4a538282"; + sha256 = "3bce10cbab2b6e913af910160c4935e814d2fe862428be78448b6c3b872df53f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "bf36d8e31638ed4332d442fa5e5f020ce8282be5afa608a4ff51c7c84443a378"; + sha256 = "96879338880bc4c632d31d2b096966a957c85de649a047a9ecd5f8e0eaaa43e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "09bcb9b641a43272e4ce2f991e48b8665425763261bbc13e8a4e7d905797ca0f"; + sha256 = "ab592b0b45491be0c573e604344a74291df2d7aa41604ae7961dd78e64987f49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e146a0e6906d34958989ad0ebdef6e6c42c2844027951fe2a8aa163c8e10ff98"; + sha256 = "d75e1569466425349d64c57836517a20be7f6e036bfa837815f6e60c9b1f4f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8ece3fb7b2f211331838d7980810a40c1b2c39dcac1bea22069ce9a303f0fdb3"; + sha256 = "5a35497e2e07cd5552f05a130c4ca161929e0643cf106e3bd6fd46fca71e2309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6fb0c5ad50d6002d00ece754309a1fb3074896fb5bdae482ca5170d928a1c9cf"; + sha256 = "504a498350b1399662a68ef1b5371e3d5bd9313c844a9389e862ebc74b28f073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "769b217f7540a2a58cfb38d323dcd1647645f0e80e522ef9370dd553a2e36ae5"; + sha256 = "46c4b1f8403f0fb645878b5cf2867871bfd74382d33963ddc3240ebd0222971f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ce69530fe87da4c2b8afe2e465709a19ae88a418e559896da7ea3958cab91808"; + sha256 = "909f7fbdd6d669f46bb3fdd7fdc929c4fccae59f3b6fcbce4fb6668e26661dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3c759f6a630200221b4bd96ddbfa363e46ec8a244c4fae1c66a6f8d66ffa4aa5"; + sha256 = "98114043b1b79dd9a151de04b2654fdc12885649e06a45c05818c1d66229a818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2d9620f5b4e34e5a9809898d739b94f9ecc0141e3a67e70da11aff8af19598ee"; + sha256 = "b2a0f7e1a18f77cbc33183a48a70f6459adde67329b7c2522d95622ac474f2f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2fe6f83d79aa66aee1d5503a6ba6bfc37aa6e950ebfb570524c4a9ac254f4047"; + sha256 = "3999a0a4f297acfa0e5e8e464df86774676c07f7df9cdf3a9ade243b17d91424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "74822d1537a9b3fbc1fbf413339161b6b89a2bd127ebfcd7bdfca87fac82de29"; + sha256 = "1557576b37ef31b8ac98f2663afab1e589acc071a489c415594b2b7880ae15b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1bf48b9bfae83d997ec1adfe04bdec7bd4e3f5f6a47e5a6e6400d08ab3b78058"; + sha256 = "1ee162319eb90015d06165d4e6fb4ba6071cfddc54dbb17e3b84ee6c5f9bb72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "3c5baf233f01c519b053f3ad788d49d62f6dbf60746b0b31af2720fe2ac3bc23"; + sha256 = "bb117ca51ff004a4320f58593f5aa45042e1ad9336989fee60810aa13b051ec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a1886b0394a417ac8bb840cde03b42d4fbd231e51155f7297d52eb7fefff2d3f"; + sha256 = "d204482d09bb66f08562dc57a7151230d02994ed7515443c2a8ae1cdb35e1533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "54b7736cf05c9ba024b4df5d6403364210416279fd708326022828b799514809"; + sha256 = "412812c1b9df963039f72652d24785f4401f414d4953c8a249c9bb8bb94e2f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1d363e82907335bde45f82e2314c3624a9fd590a49ee63421d05b0fdf7f2e582"; + sha256 = "3e2fe0a600137fdda9ed538dbc9292c8da03654d071c44651fae7a0917fd1428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "4602c533fc123382a208986694ddd00453c0eba6a15bc40c206a48121365325b"; + sha256 = "5d845562839f60c2c7b6b142411bb43764b67dbab604ea27852f2b61bf77bf22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eb44d9b866c1913cd39bbd84b6157e40ae3012c48fb7b9b8274a538fb746b57d"; + sha256 = "642f79d32cb8ffa869527dc394b316a95caa3b3c30b1e61303d49ef4becc7ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "07ae6203f29a8655c756469595ed25b586d20d73bee940fab2a036ded9a143c2"; + sha256 = "aef7ab7858de026b357f9af8d00c32759031e77aef42d6ce9338cdffb1b120dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a7b0b6f2c8bb7f8b33e8a8547ee1c1f2964947b3ed2bac05eb2a7f390475deee"; + sha256 = "856d428fc9cd62369b1b6834fbf577c94807ce4f958eb3c70accb45d4f86445e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5dfc013f318e2c9decf3b1782cc772509bfffdd351fdda8adc06eb3fe8a32e5e"; + sha256 = "8557c44af4b52dc6c72279b1b3b31a41c87c5cd9b1c23284e2e503362ba81ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "89dcf9884269c4b50203f5eef9aaf40531bb607553c953f5bc353388ef5c0d18"; + sha256 = "0fc37342f7539431522dd60f1eb319ade594efa494810416843a58a1291fbe40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "481d6542181678e22b0a2a8e36b1c1f8b3bd19b1e899a240b7b84aa625cf858f"; + sha256 = "e5577a0cfec17c2dc83c46570a1351363ec7bffc3bbca59390d3866459bcd33c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8e158be85c9103c3013581d897d631dd4e62198756eb107a02fdf106cedea92a"; + sha256 = "e4ea2fa2c4d15152d21fa1843a5d14d76c12aaaa0ea8326c8db29f219f877f88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f834b4e3085f7428b511a6d8ccaf2708a003136541de45842e387aaa2d1a0137"; + sha256 = "43d9d42a10ad996f8a447f932068a0366557d542c1f2a3be626703b2f09735d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "bf9d259767516e6f919c723217a83be34a2e4e390f67f3fb44c20d6f8152b62f"; + sha256 = "0c79fc024f1714d4267d3483c33e5ef75a0415fc487b0689d600ac5a9a8b8c9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4aa90c940c08f68a8b0e63eea0a4e4e52f2a50f81edc900b0efc22f3adcd33f0"; + sha256 = "df9e037da8af21c5a22c26f326389d8c171fdc3218e2df2b37795a2ea0af4987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e1d19e22368146eb9afbfa7535c60843583a538cd808bad2189b23f5a57d84e1"; + sha256 = "1e85bb05709e2efdbb48d5b788a0210a5ed83b52c709be06d4cae6d7a94ea9a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9a29e70939026b71eef2e3ca00d785a26d2668e5d7c0d329bc49fe6a35f9fc51"; + sha256 = "1074ee2af33d208875197e7f6434596b9d9bcbe6aa5ae911e11adb3606a8f06d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f3172deaa2b65bd3fe4cdd62a7fd4e81c936899cd83495c4f5e54d63fc8ba2e3"; + sha256 = "c2378d2924f99e3c8600d6d23023cb524ada34884645917e1adfd810583fa1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "009768d282619a145489ba9ddb4ac5d47eb0f686e41875d6cdfa97b7102df4b8"; + sha256 = "8f3f4c41c324d7b8b6e518f370899cef2aa58d311e2edea50be22991e0f0c865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4ab6d704389c53da46890471f8bb0a57ba488f78ee0f87c96da9f931931992c8"; + sha256 = "a702f5cc3d5cc80b189ab4e50579a4a0dd5a3b969497c0f17f22296ccd6aaeac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "afcf3c95a99fac0fd4fd6a6c2b1cfaf717b41cd5673d5016f10dbe6f5b79fb3e"; + sha256 = "628dce1cf52e132019eb538d260c692e360d33ba18067c5696b665118f1756c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8106ce5dcb41ed97a3deb4d98b5af23eead4651046e758ffb6ae9eeb96f05944"; + sha256 = "bea0b89ddeaf47d79d40ffd152c14846e7ece9d5cd62c3e11b3d8a47db26018e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b1178b1975b132f0c524941d46e7cd357c0aa20b7ea4f4a87e6e9991b0761c7d"; + sha256 = "79703843c31b39f48198e7477c1047c246c2bbf6ae23736483a1a3c68a3acee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "923187af4eff228d5b3b99f21ae14101f1956fdf6fd2c0de80e1196333ff8baf"; + sha256 = "a1defb47b1e0deca525e474790fbb75ab48825b59a996f8e2af6d8bb3fd04da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "99725d0085afcf7c6afd28090b75b3605d99df52d1d06c377ca50a6d6621fc4b"; + sha256 = "cc0b63ac061cc573a16ef419a856417242cb52f4f39525eaf4a03fe084659e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "24f5b9a87604b82907a56071518649c535568e4ef0b5d045763459badff766c3"; + sha256 = "9f0ccc88d783b2b5dcefa19c0761517ec4aa29ebd45e09d36f3b52d4c0d4841e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "aac17f4409ef25d6c4edceba79d446bb22b654016b0ac50ba069ddcfd023355f"; + sha256 = "f08eb49146b4ff68ad82c92accf80956c9b5e203d384021475cbc51abd1be67e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fcdca8bc26eed4d49bb93007b49024d192be06508e5957fc1e3e42ef3c3b372e"; + sha256 = "982cce3566baf096f37a3d9b4ab09324c0b0edd8bd1b31e711a269e2284fe5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9bf51b0df9d3cb62ec9a8675344aeedd2b4466854cebb000abd02d7c97da3777"; + sha256 = "8fcc7329ca0fd874e6b36d830bc6195d43387332b28bd2fdfbe09fad0a17c65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "647f628344b3951a8cc3e857ae02da89a818a6f8dcfec61de006d9f5b90d51d7"; + sha256 = "efb096d2e43e54f9ed0e18ed898db646839287f55996c86610a463c1d6b92cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "1c49d3fd8a909c74abffb2221cd9811e15125651ca42d333d4ef5d8f322b8535"; + sha256 = "8c3715c8063cbe7d7df698fa4e4380be1fd06d4e5c7976578f46fa3d40539417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3be80ec1f775ed8c78c703ee064cfedc20aa57f948a8c732008a58ae45e946a0"; + sha256 = "57077171b350b88ccfaceb8c0eb3ad1990748d80b2f40dbc3d761c1d0a73d6eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5331c0de8436a7cf1117c92249066160930b3902ce3d157a0cca53d74a85cfdf"; + sha256 = "14f24328d0e33a18ce6e3d67fbc95cecc61554d07035884181806a25391ab6b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "90b6957c43d85e223ef19496208e3df53ff82f5944bcf5c6152f83d76b744a7a"; + sha256 = "27a8b7fdb93b98f36aee3a5442564421436df91f17a68d58961238108992542a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5398cb9d6672b35b72162dfca4f5e612a813dcfbcb547bc028d6e1c6da06c199"; + sha256 = "2319b00f9b2bb0073045b08d170af666d217b2e4667611fbd8b9628c52680200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "775e8e385654b779a7be837e0de813e23ba9a3cbf6fa8748853684601d8a898d"; + sha256 = "65782353f01ad909dec1b473a6642b0a0e6733070df5c98f0a262b28aa536e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "209ae5fe213270d765ec71875db6e1ae3c78ab2f704cd9077e2bdce4160db6fc"; + sha256 = "e6cea933b4b1948f0eb84918df5b401968f6e449caae9a5a57ab765a8726eb89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "633ccd3a605887259b5a1d229c8661c4c83948e42e51ac87231457591c945efb"; + sha256 = "5702b1f19f7b99781447290abf32bbcf97c4ab889549ae5b9d73b20d49b0ecb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "09f6069395ee4f8b7efbc8efe8311abbdd247af624dc045aa00e795e0b9e74a7"; + sha256 = "599e8f6d6972a7d9c33ebd92527eb30abe7ea5098c0dc0ad91171818d2ea1ca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9f99c34b11f0630ff93275810d686fcdd9f22ba4db6c173f6c748926d365c7cc"; + sha256 = "d8303c9148c008e556dbe754eba46f2c056a93167e90088ce06fb1bcf425c27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b79dd9c64d5b57082a22a2b0c98adf1b095c9e157622054e1ea51c876beadf07"; + sha256 = "da8034b67d159a267b5a1e0d1d816c2030e52d1828fea29e46b8241486854e0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ac1c63c2f27e2eefab8d4fd0f5d928d2f6e3511fe6ce42a05b91f93c5cf5b782"; + sha256 = "7b7fa736a29a08108f6e3b5bb47aa768e3ee6c9dc58dae866dd70ab3ec6b04bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "401d74cb12c26412e7d5c31059deec4f8fd4494363f42d0c686a0711442d7c4f"; + sha256 = "7152458a1742f65ca69341d3762c0adec354acd7402c35213ac07ea2264107d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ce726dae6c56bf8745037a2a303aa12d4196587562342d570914d9ac45ec3227"; + sha256 = "362b5c4c2764f69c3cc175025cf3b0de054cc39e5a47bced76a67e8578d17a2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7846e0c8330669416025f2a80bdde899fb18662eaa319518b9ad125dad40a4bb"; + sha256 = "a19ec522293833dbb48a20e0da510d67825f2dc7892c6c7c9e66d844f74a62f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "9d16ff95e831721b146f7922bff50867e29268b52142ebf7524f85c0743677dc"; + sha256 = "cc0819e2c416b2473ef52eb1ee91dec88b38af97c420723562d90dab16f30952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8e26a368ae652752873a7c1989d1d2dcb7376012b576f43b126dde9f074f01c2"; + sha256 = "f24905a22e4a664af3cfffc859ce6ec453a1b40309c2756b45a74b999e056769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8a853b8fbaf02016103ab15a44081fd0893908371813d94d2e92393009e17684"; + sha256 = "e9813624c07dac6b9615f18baed1d24cbb1e34a2347e3d31034ba4718dba90b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "2d82c8260f92225c4138abe5bbb547ee132f24624de51ac8546fc8cc2d1c247c"; + sha256 = "e8670c1edbff38ee9400bcfc9bc9893ff036af337fcfcceb8d8f76c854474b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "84a767c016dcce5e425d905a67e2244d1257c77d0e17da69c4c3c1ab85feafb1"; + sha256 = "bb9243d36cf8c4e62258be1b692366243056d51164a183c7e10fcb3206e22902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c4d217ecc85d4f3c5ac5fbacbc6d37e19885d2959126465f01f45f2026db5d2a"; + sha256 = "7e57fa6e4da39014b4c7c53bf8b7e5b4f7868ba7e5c80726a3e03bf2d283baca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c2556486729ab7918eabd3fb917c71d3081e7926880712c6f78b847c868abfc0"; + sha256 = "acf4d5d11aa323659ef6c6ea0754104d642501cdc68e734d75bde77b662e207b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "30a9d1df4d121c02a3c1bb0d3c1ba2ac0674586ea56870cf9b259041334b7545"; + sha256 = "ab268fc166a3cf2b27df64472835d2ea487bf4860662db807a0700ac21ccfa0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "740a09e9152df1770ead58c1b4cbd5be307479edd29f0a14a96a3d578f90852b"; + sha256 = "478ea687157dc0922712a61652ad6884972551ed8ce4d01127a80c1efc106e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "eef655c31840dda8f5d972a1009deb7db42fef9a85f6d94fb8d7bb1080492b14"; + sha256 = "111876d47dd316c11e77439e076df41af384d3daed166f6f5d30b68bd0be4d52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6d5ac3729f737a0ecf115c4ba730ec12c43be59e00d9ff3e3df25eb95fa18920"; + sha256 = "0810c419383c606ff14d2bbac487368d2122599ee3a5684a288416069b52fac9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "da9a98bf577c1402ac07023fd2957fdf83385238dc6914403b3d3473fdc84608"; + sha256 = "79ab57756a0d232407752eecd621f13567e43592f84ce2995b13bf73513022b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "cbf2d767419494583b5a4393f4955ac5248a9f370c87006b9ff5a0b9ef2d46d6"; + sha256 = "856608639af7990122fa2fce426ef126d35dbc3525fc7515b5f26c93203aadb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8c203265e7424c68617f24b0c254846ca3c9f795f59dec2b1ee90bd2e9e24fbb"; + sha256 = "ddd8dfa8a85754d96b83ef24ae5f0b3748b084cc1fbc87670dfe576d7c65c012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "2527688b01ade72c23c8a166bc3fe71ab6ebbefa53f95431ad748172c757fc32"; + sha256 = "52f5327fe808e4273830ae5b71077d6419dff4c763c9e4fd9e64ac8c49b67f14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "54345ecf9bac43aeb9dc5bcce2f6ab95873c30d167c9f0e25276260236349ac2"; + sha256 = "0242eedfe6b5259738175f83686db3bfdd6d42db66173f7632c6ad9b064cdd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "7d55f9c3b0372e8df4f1efed73e7904d6ca76d42384e1d69297209aee89eb538"; + sha256 = "706c6525e5f6859b5d19a5c49ad787577064b1c12ad5088cff3e923d4fb3304d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7323cac2c5cc65cf6717c8e93c81cd8aa1e42c4dc26a8fafdb01e909d0d03627"; + sha256 = "6a3aca1232dbf5a018be45fc5411ca82a45f4be7ecb91fc052a429b9716ec8d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5aa7399107c721555b840632c724f0ba8ea410561b36ba278304ae2672674d13"; + sha256 = "ee10040074f9eb053a83308b104f84deabb2183bf7b1b9dbf349adfd3e25f523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "134e77e589dde44918e383dd3e08489ba855d9e15d542283f26c465bd84a1677"; + sha256 = "3bbd3358f8a6d84ae3183f8f67941f3653d70595feb4d74f9c3d287caa698932"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ee6da6a70f8565cade938fadb6d3b25c8edf860dc4210e26a1b93034adcb57da"; + sha256 = "61f21fef0fb76e40099f2264aae4969d1cd798f58dbf75db81c6366ddfe48335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "9fdd1fe265330c1b070d523e1af0d6dbde077583cb1e585b718112e49d044039"; + sha256 = "0edac08c5d0f400df2f2c7d26c410b2eb3b2a467a167d17fd57b50352b9ff079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b7fc81bc71c30f48c40ec5fb4f8318973122523515c523ddcd98126c7c3750ed"; + sha256 = "c036f77e862df5454e3be5f913448e1732585f19b3f4cd968824c139f82d8790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "09b877af3b15dad1e25f7c04a7e94990cd6e20705a26e3cf715a30626fa10646"; + sha256 = "927a08479433999af0808538ea3df289d3595ff0c88dc311c71d061875ada19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "81db09ed98266347740569c02cf0993ffb532dcf9e5c814496cb3e4b23133b35"; + sha256 = "fd7ec7834104629773481d47cf3c36deb1147326661788403c5ad676e18dc1a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "94bc77310c90876b2f787c1c004212947572fc45864758a7f59d2e2ee9488a16"; + sha256 = "b5125d265997ed75a68a9b9c8348efb1127da8c7e07233ee403bbc1c1c1d551a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "71ad541e5c119f05cea1ef6a730f860025d105112907f8dc6ba2a4d33f8efcd9"; + sha256 = "9a77df59be3a58f7ba75951f38461ac366afeb22a936c01562a01d509792ecbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d699396c833a48bab753a76456e653d90e62a0585a9c9ee9ffdc6b30d8958778"; + sha256 = "baf15728a07ba2ce73213edbc486cd060a95e9722867e129b4dcaa5b7dbdc20e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "6bc991fd34ec649da0e85e5959197db7e92e2b52cd9b5b3abc3d631ec5cf5bd2"; + sha256 = "201bfd1905918fde0134abff649e4153639d42beefca8e5cf695db13305c4869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "11de780455b3cca25ab64a58f3da00062fc29ef43973ab0d34435bb99463c23d"; + sha256 = "9a8b35abf95cedd5bd8c777e45dc412df76c5ab135fdffce1136f4d5400c4b5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "773964f567fd6df114795d3f362e553664d028f5d6ef7bed5852397852f5412e"; + sha256 = "371fc35135170674b3560a7472b479473c5f989d041c87cd030f8798861f1c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "284f486353dc7dd57f3dcdcc82314cb491f7a37d8aee04b2d35982f0bf9bbb0f"; + sha256 = "77df5a99a9577a3a07bb0f034a99f96afa85cb4b05200f56c41a3da2283a93f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "e1ca542f40f91b69743ce53ba001e6b10b55a57701ad6354f025f0f6a2a66727"; + sha256 = "5b72f4757d23c78e2f6ed33ba7afc99b09478d434b6d85b453f980d6a183fabb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8796aa6b9641a33558f4aa2c55cd425fcc9fe7e7c08fa7de2bb68341e337944f"; + sha256 = "f44f53326face336bebe48657abec77444fbeaf90c82ea57a596465f0fa2e87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a4aa9131f1cd1aadb550f6ca312e490142c4caaeb6cf9d3f2e81699bd9050f0d"; + sha256 = "5a284e9d3afc91691a2f4cc9454f8f113a2385db8e93cf243717e18755a066ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "995863c51f9f91f3667f3927b7135e995d47b2ebf5bb4d8ccab28b0825af41be"; + sha256 = "b2abb070d7d89d0fff19b9ba293961d863547da558804c9ee853ba280cab5524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-i686"; + sha256 = "a6a8233e17ecdc236c6741286272fb79148d30b86876d348097f93733937bfcb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "e0318bf4e87f2bafa43939fe3931b626501fbb5bbb91db5b50b71d946332a66d"; + sha256 = "723d94602a9914c1d572f85635ceb2622960b09bfdc99d4ae010efd1f65e4792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "0c1420ce0e3c4abdfe2ccbdacd1632c619438e84faa2cf29efead3a74ab437c4"; + sha256 = "78e0ed7271171c5eaed2831ed56afb98b525f8ae4cd9db78f6e5b2c6830b5c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "db256f39058d8e6e8d8301ac0ee435ff41b1c547b9357f99c91c8de325da9298"; + sha256 = "4d06b6cf8b81e39875f6b749286cc52d89d8c172e8a8af54f920906326404346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "fa02d3cc5fdd6512b84e04a27e0af95b01986403f16abc04484dbfe873fce537"; + sha256 = "9880b5fb724522d823fdbad3aea4c9b1376e9d97543ad47071a7438aef164b1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3a936bfe9b169dbb4f02f5984df1ccd0c37f19c7f83c05a56fbdb8ed3b6009eb"; + sha256 = "b198c6491a3618c0dc437cfef06c4564a8b70700b399013072201bbf003b2b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b995caf1c8128d8b6b60819d0ddcc3016f4247cf83cebe8c3aa2d1747f6520f5"; + sha256 = "f35c3b4a04742ad4e500fd60a5d6f80147e19b60d6ba1464c7df62707a8dcc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e4f53e17928fdaa1d85c8272079e5717fb9c443dc2659ac08d95524703883e2a"; + sha256 = "d3c2b7e536438e8d212c66463bb201475c1df143a040617aaeb08cc14e6962eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "84e7d6e01a570df7ef4b616e075cb93d1fc7fcd5da0a3adec179e99363ee5f92"; + sha256 = "c708a6886f3a22ec5ef66d9c3d26e051d153fea4ff01fceb65ac41cf090173e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "15bb01ebaab8ed4f022829b9bf7f16e2fb5fe90e5ca47e300e2cb2ccd66d922d"; + sha256 = "e26ab71962c17774721bc54bb612f963c61b3b5fb83f5c1473a84157c73c28bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a8fc45cc1ffc151414621d8e4f36ead409582e298f7e86bc2943ed6f20dd7f90"; + sha256 = "fc8d824190bec7889618e14cc439f6b96e878acec171ef270e54980000cb60d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ac0089e7ce04b218eae0ce40245a75626523035218cdc7ca2551a9af8a18d33b"; + sha256 = "ef932683f2b7eb51b043ac7c2b9dc1ffef3e048f3a92a5abc65550743e95440b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "eacf3a23fde07908effacbba3cc346d1e9af088ffde81711e3ab3e087bd86e6b"; + sha256 = "9e2695711d611ace940d8f6dcce037646bd96f0d0a533d551b73eb1adaa31b98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e31a9683560465fa6bc97edc46c42071431d62ba4a55f5f066d58ea60613990e"; + sha256 = "dbb0f78780deef67bfed9c1a126ec296657f327ce3a72beabcea0bbb9a033be3"; } ]; } From fdca145086cb64a9a8ec56fb78c56613073f26d2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 12 Jun 2021 17:25:14 -0500 Subject: [PATCH 791/797] firefox-devedition-bin: 85.0b6 -> 90.0b6 --- .../firefox-bin/devedition_sources.nix | 780 +++++++++--------- 1 file changed, 395 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a3c60e25783..619b6186b49 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,975 @@ { - version = "85.0b6"; + version = "90.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "eed87dd1f8683805d13f5d42f8d376ccc760c6c96b7b049ac6d5514e00122722"; + sha256 = "20c33b145287c4477e6516837c7bd763f0895750e40400e82ddb6f196b072b23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "233e9d412982933e2880d2c9b790d56cfdf15b1d55e8ee1f0819ec445faca451"; + sha256 = "edebcfa2f2c8a7af69d8d98ec4890d6ce8404f93d8e21a7d643458d769056286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d0bfab4288fe0fb53e0e0087d68d79699774900dd79b5eb32b36d33d757043b2"; + sha256 = "59a8423486afdf3860bd03c5ed2df595c5706f2d048f14d27acf50bc659da119"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d1181d7ea7d3e27f0ff531a3e3d547611f391e5ba0bbf0de4e3df6334b4b3e75"; + sha256 = "0c2f57d48e42602109bc30574f12843c09f68f84e810e3f7860d3185999bf7cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b9b08b7b267bb59b59e310b430298267d1b5ed89086b2dbe51f6f6550324e904"; + sha256 = "d505465fa32dd6e0a324955ca950cbef5826f3136b5d2deff3e5a42b8063e69a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "cfdfdf835966e03a3ca036dba3fc175282c0a8ea8c8db9ab0391837e50507e7a"; + sha256 = "fd87877ec1d0978b4f83451360d1eb4f2ff7c0e3fec9a9346b38f34545b89418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f32addb95c794a87ec44ac1a575ea0b9279c6f8b4bbd72b02793a289743f5028"; + sha256 = "a193474f5b728559acbabbfb5d746930909db38e83c2607c38d48a8b62376bb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "511ecef8b5cefcdb6f7c0cfd257c156097af8f59e130b6b1d74340437014abc9"; + sha256 = "b0ed4a45bb9ec405b4795d2e73eccd56e89555eaa40c4c72c64c0b5d7731bad0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e76dd71557d5655e1fe13081511a6bb84cbfdad9bfdc7b44379c0d0dc8f38dd8"; + sha256 = "1d7deb7f6bed82fe73e795677b4e60192dee7bc52e2a870c1ef53dc3a23e7390"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3d941653521853e57c2db3a1abeb5fadc81b11050ca69811b010d5fc63936bd6"; + sha256 = "379304d81c8ca21b41e63802394d30892572dc3a740d5fc701512ca482e2a649"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "47059e2a4a5174357be3a1e23cc8a97a0c2fa4cee6e58f437d45502ecd329197"; + sha256 = "8b54063ef6a1c015f2fac84426b6309df89e013dc8e7deeb862ca6ef54512a7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "47da19182c2ca2c8dc25acbba971cec2500097e20a977387c326036c9f4da527"; + sha256 = "80ca50a92ff6a46d140609558265efb422759ce320f5e7480a270b16fcaf486d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "248fb9f284fa482307be01ac59f082b84475ab550d5d8e53168e239c74cd5892"; + sha256 = "00c027ca3c56aea456d0187a0a664d34d5ad704af5220d508e7dfe29ef66a4fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "933e6a5f026eb2e50e8d40a90fde7db56325f7abe59caa99d2edc34bcad16f37"; + sha256 = "7126556936ac97989719922c4123f48508bf946ea51af05ce30182a8c5c798ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7d0943dcf8716eca125409310e821b87805b036cf01a9bf7ec06400b4e97b3e9"; + sha256 = "3f40d14e92fd79cf695b36c0c6357503bf08ffdf3e2105ea30b38919a0c40442"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d523417a57911df738d07fe6c899b95897686f8ea94e27cc778a02a21a417990"; + sha256 = "be85ba66f9d92f27fadc5bef7220b794ad1425c09424ff7c1ffea905f1495222"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dd7c7acfe40232ac66cb60ee6b3bc6a1dd84d2930f507898d74ddef8e6a60355"; + sha256 = "a69fb1355b2b0fb710954d2982750d9a11a80be924c4e8ca8664d97a77676f7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "51b8b9b772c901fd8b3bb61eebec4a0fd8541c51b9011be57cdb83311035e2bc"; + sha256 = "9142b0b44f4f375f2b426f3ed7af11646367b2a21db8cc3afb704d847552569b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b5175eb5e72644c3e7ed6dcbb1015716f923c50c59ce8e6ff3fea49195d08478"; + sha256 = "42f04094c7d3eaeff3e8bebb073c140870a94e7de29f367950c47ea963fd8ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "abfe077998a5f3bb2e1b4f2b69b84ca5af72e0d18dcb584bb0feae2e0023e299"; + sha256 = "17a234d289679e507f9bfe67d2b65d7a89dcb4b603e0b154b9faebb9044d320b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c8b8b4d9619348c9f97f03e222035eaef9d933d46526607ab2c42db7c4a5f21a"; + sha256 = "5c5e9ef0526aaccf67f6f0bd1bbd5415c2086c0ea8c9d9e614cdd053c5e3e9c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9dd9aeb143c9ac871e6c1cbe16b993f765d84b7fcdf50877e4cd89bb7281948a"; + sha256 = "61a4dd2a80d54c79436c2f3f62c4b56bb2d6449c0475cd938a4bc5c3c91a41fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "df2d745d5353ad3d91d5c62c00ebabb17209e91aad52c240efeffe002e6696d6"; + sha256 = "0ab2b7121ff045df76e043e165cffd3a4cf33f4a5d76f80d880e4135b3ac8e87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "7fd5df96fcc3a4ca2e960e83674e3120143eadd47c5b0360f11f573540d4f59c"; + sha256 = "20282abb72dc7bbc2db8898d6c18b2d877a6905449a221d4044bb2984594782a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d22f3d4b6a2f3b18b375b2592d78cb06c7c92318c6cd4a5e8c70942300bfad94"; + sha256 = "3bfdb83b8ec6ea8c2e95e4a7e50348370617135057053e89ccf9e61ae26710bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "a3f267296b829f6fd2344b3bc652abeba7780e0dc455f6f23fd2d7b66efdd846"; + sha256 = "b78b75d2832c240c764409d0130f7f70081c66ddfc6a4a710acb329325df3f36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ffc5f413b90025e5452e57b07795721456aa37e4bbb2a6784e732e8a57232e9f"; + sha256 = "28821baefc20114bd7785c04ddcf4aec363151f0c1ebb850d364b337a5141fbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c170fdce52b35551ae49d2cd330df761f0d0efc5628708edfa72aa513e89c99d"; + sha256 = "853620bc46a74bd425554e83a5866bc5bdec79e9f8129c83f0ba147c47ceec35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d256ade3513817ffa8d79ac652fd51578ca5a9c53043898e7f3520ffe6365829"; + sha256 = "570cc2cf48702b16384029ee8831e3ba4db39a50b1b02576a0c82d51beb03779"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0720a63b02f38ce97c902cc221a85e41ae0e2d36ecaac47f5f661d4be89b6abc"; + sha256 = "44f3cb224da4c0df900737ca5d4d80ce41f404f1d3aa36f6f470d6eb13d7c9bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "78a4aa339dd5e56b4458ca2096b538bc27d272b953d207e44a41c8ab19de68b5"; + sha256 = "24ac71b7d28b286fe026b1cea49777876eff5146bd47463071142524d4f18fb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "2de463eeb3f70f4d16ab677a6980c5fe229a69c1b0846804dcc58388b8679a7e"; + sha256 = "1a795decfbef4c7689eeb931f07d8b036943856239ffdd550882267a14395dc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ba880a3ff4e45c5d30d813a16e9fc088995a9c2fd2a32fda4d53c1e2ce74368f"; + sha256 = "807a38d68d0a5010c6309e2e725d210e3254de5c5b7375fbd209b864053ad25b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "820cf6d9813048f95719d6599a9a4cae1862a6677dca3172b87339a0735ac37b"; + sha256 = "6be1e617b3dcd59ec82607a8a1f8b5f145ca6c1cea7020ee678021ea5524d902"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "b2cbbac775d1b4a1d7e6930427198123e82f4959f3a65e38913d2238d6f3ad1b"; + sha256 = "48d4de4cc60ebc53acdcc4f8fea5b483b546f06527f24bf90340db141f1a043a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "256cded01f746ed016894e7491af075b0d1ab08302ce76dc62e71b4a27e6c390"; + sha256 = "4924bab4100d18fa65b1309a091f0e6042f34aa342508923dd8c3ca559dc9628"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "080ebf615b64afa8ae51fd198e5fcbe8bd8a9843ef5101c631c51ff880b2d46d"; + sha256 = "b2dcd37bc4c9ed6015321216040cbc27909061c668d8cc053f3385920ad9b18a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "27b6a7f9d52f3fa96ec69d99ef18faacf856561c7df187ba2fb568654afb2e50"; + sha256 = "bb50a6514aeed37e4fd96295c0e97ef026bc6fca8c62b7ce6bfdbc227b69b0dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "2ad562144f3daa93ac986821b56ac8229fd89ce2820186d5d318759f4f863d17"; + sha256 = "a038dd8daa01675758acb4adf50cb93b204f3573ee204f97cf170a16f300906a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "aaba5d2786dfe9cf2e5ef3f134a4f011deaf25f9e213c5295d905286881b4062"; + sha256 = "a2b385578b11bc12c3bd7230b3a22d03f08a260d26e8f287efb2756b0fd3f9e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fee5b30ca488d1eca1551fc645319f47af658a80a0bcb4c68509cfc5aa398784"; + sha256 = "6025d34743157cc0869d12aa5921d9951cffa660244804b092ce0f79ebe9abae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ace82312d206cf07d54ba722ab0ed30717f8ef0c0fbe881123ce87a94f16b67b"; + sha256 = "0c83746e1212350945277a65e0219e7bd871bf3bd01fd2e91194dd0e44e377c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a017dd9dd83217affcd89d7493c91e605fee0e238ff03d3d45d10466df9a5ba4"; + sha256 = "03675af908ee739dbe8f426fe7c4647f4b9073128544e990fd3e167020ba3a88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0d3f105a01e1f17f7ae0c95772d39a134f6435aacddc0eb5b4949a923df7b4e4"; + sha256 = "9cf3dc5faebef0342f2b165189312fb1d76b5882b0767241a8240a440fc33bc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "51807ec5741e07265b090804d7ec3b4cd93c8f459ef956372981d9e150eb4eec"; + sha256 = "b30deb7e51005523457e7f31428356178c1fd546440df2cb12f9420d89374c08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6955245256ec8ff28b0222cfd63cc9d77c2b9d4b379ef1e58293da7de0b579b0"; + sha256 = "b51db297071b1bcec3416e7904bc1340d1dcf3bc5fea5016e3311911782ae813"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "3d982431b0ef12cc6cc4010d4d1bc613184968a44c1f3f6ad08d8d52bcf1ef77"; + sha256 = "1e946e4c6893583836874e9ed951969a605b5f8de222d152d79ca003904af86b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "8fa2ac22a1c9a1074390cf49215198a49ad781129040eb5b17fac0d0d49f816c"; + sha256 = "6fb1006d097e353401e032090f08bf1911247b4c3923d2490a7f46cae3f69376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e39e23190108c37bf146cdd9e1c913aafce616f89946904669f7485c806c7f4f"; + sha256 = "a0de49c85a0726fd56038058acb6e1ab31e5100bbb759a6c5cc89191908fe402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3c5ec976abc93fc4b0cd2ee24babde515e92d9beb8d058ae6fd0007980210600"; + sha256 = "386c1b25b9f78b91b0474e512091b6907a598555a8e146ed61226332e3c04e22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6e9ecc227336f2e5b193678666f02eb8d82bfc13bbace4bac7a7045a691af358"; + sha256 = "185964b4ba62e93ce54004e28a8d6da65c9b5c657f191e4ef924528c92bf5fcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0550b02dc3ad2c2e4db998b7ccb90d7add1c1562b33fed34e0aebcb0c6157a4e"; + sha256 = "ff14f1d6c4ee8438cc471c151fea840cc81336de06e244b6e2c8ca193d97e490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5d2e3692c9791a29820d424af3e219e48a9fb766544c3f658bbf779f92e3dd06"; + sha256 = "36d9058cb4c0bd804f640665bfd05804a787ec59632010d682ea132f12660b18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c5949dfe7f7050b807b43b7050270c2bd748e688a6f54c7549859fc7f7b4b22b"; + sha256 = "da31f2928efa27843afe07872ecd9b6e286bac90a101c14e1dd1e806e3bdeb65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "c3e1e899942db90fe8cf2accea2c6de703ddf1e1871b842d59ee5e69b0a37441"; + sha256 = "7a8a1aaf9d78f7b1373374e70017252004c3d49de9c0b97e705fc5df7790834d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9da71516f7ac05965ee5045c957b1d2384a9e331a41db0c8ca648cce1c0bd40f"; + sha256 = "8641fa391ff8ac3cc25236ee6d19c043c39d651c674cca2badafee685b47eeef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3be5d104b4d9744911ed8a16b9186d3f0b2a83acee05cb1943e7e13bd14ed84f"; + sha256 = "7a676b767215a1d5d6537975fbe9e7e16156d21032901365c24b8b0dd1adb21f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "02dc5a6fca7fbafd2096f452324356e271496601b0ce78f9d64436bf96d8c234"; + sha256 = "3d5b3e6f04d7a617870a034a4c1b213246d48408eb4849cfaa8872f1aa8c8f13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0b719e71748e0c31f016fd56ec0940491a950b6bd02de3b96d66106b60574931"; + sha256 = "6534871a9a4414a59c3b885d7fa7d7637c9e1f220aa82afcb89e629795c61562"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "8d2400f28ecf500bd132a809219b5c1d5c9a469006c965754cff1b792ff9330a"; + sha256 = "c2b3cb52ea74f0d62b28e54f87662863b801d4f8fc357c088ecb690d042fe8f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "839aeb33e727f73e80cda1e1c025b969cd876a21ee56481afe9120bf0391898f"; + sha256 = "2a30d42025663aad7cf6f3039c0e4b8a1fe642dcf97b9d616e6a70c5f2ff0e82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "ce978edb70a7137e70d8635cb874838b613dcf2f5fcb52d88e0a55177671c91d"; + sha256 = "43f244482732b43c39f206fecbf1080c8a154e78707be98931549e0f6809b56f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "69e4b20678c3fca5e0f9be238ddbdde264478a5d7e772299d5d2f489bb1e260e"; + sha256 = "46b3273f508889c48d611568f0e927eac7e612c2fdafb3546c47f080ee928db7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4d9f58323d15af78ba5f4d168097f20a59836ba4a0d7517a617eaa2959f6214f"; + sha256 = "ea355f78f80ec11c44a5735838c5b48b6b915951872abfd8a935f8991010840c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b22cd9999df9160ff518f8a178b8795566e3e66cc3633199526790f91f2081cb"; + sha256 = "acda50b76ec558b2d941d77b4e523edc0fe4cce0f03e0201d881917a820dff9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "648ee88b4291cc0f01c021dee76267f4a552c9a009f32dcc6649fa889e32a558"; + sha256 = "ac72053ee1992338bf192ec3a10ff975cc973e72c5468de68f8441bc815553b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f686a56aa16386380c04763c845aa90288bd88959e7c06e93d7120d037263b4e"; + sha256 = "7f8c13888b7a24235c48f7c8c03ed66f7e3736247c936ddfcf88c8f3816c066c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "071f10187be11f066cbaf6e78464689799e6eea0d98cfd96a85e41557b7d9561"; + sha256 = "c0b50c45a6d198f60cd5703889771778bae6493e77e70d07518b6ae9ce9c4f4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "512c289cadfc4d3bcf3290feba112855610eabcf04db4bf5659b9dfe67d57ae9"; + sha256 = "0b75c4725e1d9f271a5f34781b8479ff6d6a11ef827afca97d52c599fb389d08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5910003d1453d62747a00ad96fd08a32401729df14718695a4ca2c6d2bb3554f"; + sha256 = "fd4e2d38c3dbbe0ef35799a89fb8cb50435e2a06ed49cec2a380144b3ccd0ec9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "15f5d9e9aeae9362857374c38e94f2dc7371b3d949ed73ee4dfb234370ebe0d3"; + sha256 = "a329a085eaa20c41105b70b2efdfc31260c2e5f9afaae97416a8c3a77e82f822"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1067c3a6c646d86f57c75ec9ca452b12c25f9dcbfa0c723cd685d494f9e79411"; + sha256 = "c418d18e275c4ce5641c8b0f7e30da75659137a4a5ef9dc43fbd2c206e1a1bdb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c743f319f5bf60758e4e9f5684378503df780eccf062e1566fbcbdc45c903116"; + sha256 = "d5cbb5282477c716966c6b30ca9a8f21771638cfbf2e3fce69663ff7bc58c6b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6763de605975b7ead71356aac3d239f04cad9373d1fbcd4b7e3d16c87efcde94"; + sha256 = "916934135d13a1b8c0a21543c3569f697358e8935cb9f6972c9e80f96fbb775c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aef0bb4fccc6814f225b4e6c073f5d825b6007ac420ad4febae195ad69d5fb71"; + sha256 = "5571914386329eb2b0eddf3e4ddbf98eeebf1ae86172fac533d2397a48c8cb31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "26a7a36e9e440587173660ee5192711b4d2807a1f735395f49fbcd36029261a4"; + sha256 = "6b78d8ed2d8df5c00198ccf6fc3221b215623ab4a0b6c21030cde5413f1a1165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1a45ddfb2e3fd999e0517b6d5f2f0a645c6f6ced044d468826fb5af5513b9410"; + sha256 = "ed31203623e85d3cd0ea23c54177542455af4013e2ed8ddf642056a99187f814"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1431c0c4f69f68548912bd4c1ca705d2bf031d24c4789477fabcb07c81ee8190"; + sha256 = "ef8f4020adae61fcd797ed23efc1bf54bd94609105a9bec4ac7f543fe876275b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c408b950a78894d3aa25c7809db91009e9c62ad8fcb46128b3fadd16c286dace"; + sha256 = "ca4a679042db1485d0ced1f81be3610493755ceb7a32887110f528029657b499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "bec096139548f807eb186c7251830026e13672a7ffd6433f362718939292f28f"; + sha256 = "aeb7a5e4a15eb836455dacf964826a08905ac822390e2f67230eccd32942e136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0f2d27abe79792a7b43757d5ba9f911c2fb4d8949dfe3575d313171af47b7ab8"; + sha256 = "93109db6d38da24dd3999960c866754966945dceebdfee960125039e1939b5d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ab009023546e88becac31221e77ff580d0e4afa0349cf0b757ba5791bf93da60"; + sha256 = "cc1787dca9c673d6ee937d7e0a2801cb345a0b06db3f6e53581e1151716d4170"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0abde9db34df6dfc52a8c330b5ee053b0f4e7ab9ada8aba0c73265ea18caef0c"; + sha256 = "281397c37d390635e44e1471b318ea9ba98f4b3b8d7670131c3262838ad26e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-x86_64"; + sha256 = "5255724df1ec3d05f33de152885d180dab52796317ec6739838029f20195ce3b"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "eb3b06f339e147a5842290f1f81fe64a6cd962bbedd558ab6799fc2ae693a84e"; + sha256 = "d8c5ae00cc8175e5b6beba8b1c7102a8a1f81860d5945c4e73cd77df5b5f8368"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "ff9defea15c81409bcd792e309acd1625befd28226135725247bd930522a0c52"; + sha256 = "270e079ef9ce1c7977d8cdcfaed1f34552c3058dd6cdad22f17b53c31d6c1dc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c1c60488aa488aacfd4e292c2ed8e89bfd16df176d9eff137bd84595cb238e42"; + sha256 = "747acadb00c955621ec470870478a63a10c4131c244282bdde2a269a9569d6e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e37978b0ca1a8f1c6511ce2075ef50c2c1f562bf12fb08aaccaa6ab2a352dfc7"; + sha256 = "9cdc0ccc264d071ee7f9d7208cd1fddb6179e016ad759c4d5e4dbb00f6508360"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "764b92edd78a83a069ab7e0227766da90ea0c86021abed7e7a6ec107632f9699"; + sha256 = "2e20a8e524e0b91832efa759627b0ddab02fac12d009e0b6bc81ba0833c94c2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e484d739d06204007319a209363e7246cca5649992b7473b5743ce383c8ee38c"; + sha256 = "1f4654b6d9d9d33992662288c47e79f8fcfbdf76db5ba0519bfb0de997756afa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3b96a7266f2e0910b3153c1ae1edebf9e735d8f579689fc45cd5284c92d06a8f"; + sha256 = "e7048a1226c8af17dd95d162b0d88ed9cd8b0ddfb08bc03920ed04e3d2cd2d8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "555ae2d93a212acfa8e4af43967d5a5935dfd6762287b3b32d475bc45a0bb1d4"; + sha256 = "5ae8a63c2c3dc8168910c231dcf54aac745327b818d66254a3caada129a83fb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "bb6dbff567ee057c65fc8aef70a18a03e0bca9652e2e3ed745925069f43a9186"; + sha256 = "3dc370ffe28c5ed91b8374c2f5ee41a0ae4bd094851a8dfb1d53b546595f558f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d37b36e3d15186dd48b5a8c885cf788621964f0ab0aa0d120876a28db2018dc6"; + sha256 = "a6f39e25aae7ed5b7d7d1e4ec8c67c4bd5f5ab28178d8f1fbbb817713dbecc1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e9bef37ead8534c8f3e0882361ccc1818583907bb2279eb737aa9e90c9223108"; + sha256 = "10d3c4c3638f0715001b8eb0026a6ca18a5b92d09e8e1d80f6b40246a5c7cafd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "3624c095348dd367c99248471cb2c76ee28c491c73f7cb8d6f0f2119a21e2c30"; + sha256 = "2142e803dd183e8f7fdf7949804e3cfef22dee2a0e665eeb60933368f54797c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7dc0ebebaae2f4a26bfdc8524ea55ada023819d08c98554c9193d2731e88f3ba"; + sha256 = "0617ccd22cc00872e5e5462636f150511ef5074052c8ad707bba98ae907f4ad7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a20f683f1572a71f709fc240c8c9461af8fbc0af60af32e9d057e8da8ddc954b"; + sha256 = "eaa38a9976a7ac2e99030559ba27ff56cac4820ab5f9757f5c2cef76db8c4536"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "62dc60c4ee5ffa1fbc53ee4bda855824ffbb7514d40033f4a17293462b6ee0d7"; + sha256 = "acc117bc014e08cfef0a26447097bb8df774d6246d569e6408021f0f8799af9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5b819b75a53e78adf628598bb98d6d704b61e5f009bf3e123a38d4fe0aac0c89"; + sha256 = "1bbab4c2b380edc694480e2f6427ddb539b5fe5fd2489f050998c920975725da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "64cab2b053e80195696cd00d01075c93c00fd51a80f9346f095065d1ef4abd02"; + sha256 = "4d438bef41db963a282b53d13fc54db0d685014e03684fa19e25109f94d7f6bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1ec6ac90f4a35465d25edbace93a503026befb193ec62bd99db995d25eba7137"; + sha256 = "ae0d76246adcf16e4e910a02c54c8227a1ebd930b24bfe32ee54e631310cc42e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "08021bf98c2b5d0cb3c0375d955c8b3dc03b6883d0b0ca674987cdeac5b9c7d0"; + sha256 = "7b262f731afe0ab9a35e604099197e470416a79c80141c672886473cccfe9f49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "37a47bd94f3839b805f5a7136f085c8e4c027778dab78998deabe0e7c348158f"; + sha256 = "7a3596146cc81954dc55c4040d3926326d468e447dc8fdffaac7a3fabe423d0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a8e779e51685ca4df1a110de3627b61e51a596a2b40f8ac7c1fcf2e923568ba8"; + sha256 = "8a1cd058dbd39c6c807a7819116f1af4b22ff936a71d67bc54047d72252721f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "7390ac3ac735a6fc9343c50591827fc90aca54ec8359c624447513759933f214"; + sha256 = "8e58b03730a2c32f0537537114ec662c7307d1f79c5f1aa3dbe60a8d95526194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "739a7047060a32d1ffe9945cf0411e9622c2708707bf49ee08b6935156e114f7"; + sha256 = "37bb7c1e9c015994ea23b6c069b227367c752a4a2cb968d983fe2b0fd0d35839"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f176298a95b26a6959cd72a8ad03a3711153746ebac9559511aa19dd14100298"; + sha256 = "fa97d80ac97b9d155c40ca0dcc21bc5d1255b3e6a54153402d965b35700d9f74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "714c46545143ba847f0b43d1d5436ba303b4f23e666bd15fb1881a0cda1eaf55"; + sha256 = "c9bc1be306267b7bb2282c8a543e6af66ccfaaa1f09769cd4c535d744a670b22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "087e0d3e8d429ddd86bb7d79a22402e782ace2deded642bc9c44ce5e66dd703d"; + sha256 = "8f3d423ea28e80303709b9323576695a674ea20c675bd825ab5431606e284136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "07e75aa7f99c60b2632192ccf7064099ebde5606241151cae8a4d9c094bacca1"; + sha256 = "57d9509c186eee016cc22568d1f90942e689aeb918ed55aef19764b53da46087"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3c8ae427e81be331960c329b3d964afffacd621b718dc9df114e18d3c4710e80"; + sha256 = "af43cab80b6f29346310171c32f8b8ea610f191ae48d6caf7db383826f23945c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "44be1f13ffa06c4f58af6bdf01f68a0189c30c436854c66536f2c97bbe5332bd"; + sha256 = "dc8e87e1e15cba292f3c5aadec017d8c0c6f2c5c5518f68b5267c7e707b27c4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "805d5d5c3ba6d60fa190b4b05210ddd655e70cfdcfecdc8096e9bdc6fd070fcf"; + sha256 = "c30e8c35a2eb997c62530a330fc411bf9f87996a717ea3e12f0747784ce287d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a894b1e6da776681f2107a122858a1a8ddb74f25e0e2f6d88c18c6e80f61e5bd"; + sha256 = "ab884b36e16d5401b54c1e75d77d553c9add8bd26ee38e57f11f433a163bc567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "58123b90a6cfb155d358c3432d6ed95c1703a99896be2672d9ab6f68a020faa7"; + sha256 = "0eb8d2548e8b79211dba6fd477393430ba77c7bfb2fc519eeb5e1a3f484504fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7b10083111ad5f9fed2138c37e53d2d226c0f2c46bf57308b1bf5b9ddae606f0"; + sha256 = "86522647d5107f3518002d8958af62272f0566e178b732a1243ff84da1b2579a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c363b7b16136efbfc66b8372bf8c2838bbc10db2a311668541ded0867db99595"; + sha256 = "e9b442a4aebca8f9740f657bd9c032661573890355efc2e418bc2a8ca66c07a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3948b70f35e76adbf380bdbad84436d155e2901246ac27836e731fd8e1c1e736"; + sha256 = "d0a850a7d9754bb71ff29985c4a129160ce3e99e30df1ef4e7c7a2e011b59771"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4e35172e333bb056f47673b7aba9986743596898377c71bd1c0b3c4658840f2c"; + sha256 = "4ba4529f6b391d946e876aa321648790b0ec7a92ea5530981dd2f726e04ce0b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "75b58c31907f673314185829c0a399820505973a5d58cf29ec64de5441c45617"; + sha256 = "01e4bcc9d4d01ff5ffb67540cdb815710ab12d9bf621ab1febe8237236960680"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "28cc600de58b575944d8bbd50d29f9eedb353f3960bcf0151cabf6f2a1e00aad"; + sha256 = "e3d38a32104b08219d06950d1f63726460ea631a7efe8f0eb594ff8aa4e398f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0b5d045b6d80925d85f8a3eb42da92ab046b1c3dc28ba3569b129c30f326d40d"; + sha256 = "20df30c114c27f1242d14139e0a62efde00a6fca686adb54ea9f30ce30a22776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "ccea08271b38fda0a7cf75095d44ff56fcb6e7771c1ebe3d030b509df2961581"; + sha256 = "441b5a41d4721cb6a3f99de3820611907e212415c4a398be9177693704d3cd80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8b551206bd37ebe4fb409a1d79db886466053de96a376770144769a2c9a0ad3a"; + sha256 = "b08fa76644afe19af1203fcf079e4908f1e441bf0db362cead45d13ad5f30a93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "edc27acb6ebd68dc581f33c8d89c0459c03471e1f127b5be158ec18e2edcc065"; + sha256 = "1754d25cf865a5d08c8a267abe0bce05c951644b58e0126f7085152538392028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c5856ab6c5ebcff8befea2c2c6bd5d7eacad0dfed9570e005b1f9d52fd620b7a"; + sha256 = "33c3a95df0a369c5feae813bda7f0cc8bbc9b1c63aba5cf4193647f03d86623b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "208a7403e2a029c5d8c05ec52b84a45b307756e37e811e962ee79907516a5390"; + sha256 = "ba977267c4ab955665fee6ebae8e5be2ac9a71118b118c2626942f4481e8b8f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "368558aaea92e5b4752f57c42a56c7de27b6d31010e3e978595403cf2535a781"; + sha256 = "52b1cbeae32276158a6e649299229c008f797e05d16af756f8e11ab10b8e5a68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0a5dc2f46d22418d7ff242630b10b7020575d8b7be65f1eb8e55c71ab0d29b26"; + sha256 = "45e3e210abb3d0e8647451a52c3ac8e17982d3774e557ffbde36383741b3ea88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "667581bd459553f5767f675b01eb4a7fd6f182311697bdab38399a39d05cc9d0"; + sha256 = "0d6b747bc77931771c9cf6ec23085bcc3def89d8586ebe310df6296a4690df74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "39c1fd32733842767360176c9e1cc6b14f2bb985879816639f83d480f71c4281"; + sha256 = "829019f441a1bdbabe67a367d755499c0fb2a79fe1e62c5fa319f7b786d8f096"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "389f12d17bc5b2a3c9a4288e053b39109269c94d56f3cba5b804c75e05498028"; + sha256 = "2a04c91377b2870c986d434e24626e119a2420028549a51e0dfc0be140ebbd57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "bf1b66499533b977bfbedb74fdfea613cc6fd15809c39b2f2730a37cb29b69a9"; + sha256 = "60ac0465a4cdae54b33035469d6897a5905678ebbe36b49a748fd87b0bf8e541"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "afcf26e568817414df71fb35debafe47f1c06b31cca80694b94c5a5ffdcdf523"; + sha256 = "237a0ef1486b7864bb8cfbccd17d8ae95a1935664acda423a1c4ae543aa4401d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ae79a2c5d6d8cb55642c744750b22753c09631c10b12fa28090f29eb6170fe14"; + sha256 = "137d3c301c5fb74d69481801eca7e7bd1cd01d10d0a87b68b177bc63382f8559"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "86500091baae2bcc2d72b021c32889f4b59abd853e01dd3cb19dd7107c9cc6cf"; + sha256 = "6d9e69ca5feb66721369a1c39e76ea3e0b4b4db855ca895137f55d61df129485"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a21cbd77270c7ac047e2b3eed1f17568dc8e3be4d99652c23f60391c5e758ec8"; + sha256 = "fe88f902475e01b1fb5a26abaf40fef31910eb1c812bce208eb9f55024225e95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "5c3ba65e947bec3380caa2f23b92d19e6ed3c52275b9869ac4a995b8aad4c86f"; + sha256 = "fce917ccb693ac825b387ea78f6a5e4de4816f8fe9d7fe5ad6c2b600a2a68cbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "cdc2fd0bbb6b94e11c9f0453473871220c92a89d92292e0bc57b2ce24c822ab4"; + sha256 = "71872966d982032bbafea002c3e7e03162b972ee7f8eb8df00d26bd5d3e8c70e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "1d32367cc51905f2bf8682d08166ed433cb37d711ca5b299693e3899b5508628"; + sha256 = "ea8d862701f94cbca2e5f22090cc1434f6f51f8afec5ec929c84c714f11c42ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8b0daa49b706e033894ad8703dc322bf347a3fb66b03c18d0c3c0ac6da4bd0a7"; + sha256 = "9bd5842125a2432fc997a416987414323f729685b8b0780db1183a8415ad3a94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e0336bd76c5b1c554ee4689de92cc1eb1937d22bcae70f3132622f09d854e82a"; + sha256 = "d094a0d50acfa2d2e28cc6c4bda43c4e4fa999e80ef97bf4090fa19d672515a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "33617f175a8d2b46e4ea03a0385755a0e9ff1a311397ef200b634ae9d16c2f76"; + sha256 = "077179806415be1461f4cf2dc5676c434b851fe99e62404cafa6736284cb432c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "db0ce57899c061a3065831f8188ea830b8fa3d01c43df5447c55b1fcf5b99376"; + sha256 = "69e9dbb8621fb196d2a59f7f96c3f368abebc7b512ccc492ea45959f9ba75446"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "920e894762732b7366d36f407562ea19a105e9a5634311bfdea7b88289527320"; + sha256 = "b5776defe739415915780672d31c35a277f885914ac56c09ac947e317f71ac5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "107698ba86e4460ca51ece41c983448dea0ac7bfd20425bb1c990f21350bdcec"; + sha256 = "37b347a27bb14ee9a2c6c7f672cf971de1a7826cbeb0588a4847c32b79dc0496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0eca42b163a923617e757c170b5a255087d5519f4ab14279d6a3f3c42d14271e"; + sha256 = "979cb88f236160d3091f7cfcb80d317fba4fac6ab2ec26d78a2c92651e856f21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "15b553fe56e20b8168698f409358fbb8cf7a56ba4dcf4079e8718cad2a005735"; + sha256 = "744cf7540dc3238442153b0edd50c687957f47531c0569ce32720e2e5160cbd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a56272b93828e6aff9db0769565199e107cd8864ebea666cd21d3f79ed8bfee5"; + sha256 = "66efbd08ad245c4629d05de0eec26f987d7d72d66ad097ab197bb31f29345284"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "10f1289068c7613cd2611bc3e9b5e2804e77b5853e07489bb60841307fbe87af"; + sha256 = "9099027e11d674ce49a0945194d724010980deab08360b4bc0240d007c307fbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "43f933ba3aef69d3af8987fb7b7a40ad1bdb8bc1285a6995e3706fb2731ea0c0"; + sha256 = "a7e43012fcb7a6b58ad20069452d69cc9624236983872f733239c487e4737fda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1d31536bced9c01229e9885153ef66875d67205196eb486a823161b96a14c520"; + sha256 = "396bb2a4e2c5385b5f74018d3eccb3db2526fdaf277ca99e74934cb17c738cd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "88364ae3eede1cd139077e5d7e2b588604d63deb49d6bb0933629a17209e78c2"; + sha256 = "7606eccf3e6ebe3190a1bfbb60bf88d991e0ff48453b9cc1c07a08ecf54e7932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "88defc592a591dcdccc8fde193f6b03429c0be3d30291e50f3d599e88b55bc09"; + sha256 = "b5570a8a3ee4445da1b18ee3217976e02923819f4b3d05f58caba65586f91294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "646c90f4fd53a8dc995a28ff6ee444a10a6380c37b5f8d2505e9cd401bf29895"; + sha256 = "2e4b6a279d3db48dc8a498ee5d038c6304782083a699a89d958f81bfa87d8916"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "416502c400bb436c4bf0a82c520045d44aea0968955528f8955446f4d9f3aa28"; + sha256 = "031c1fa63780985b4576305b2979bb3c7265cfb175b67393c0f0bfc23177711e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "62d6a1873b4cbf1650c731f588996d9c78bac8c286fb7bc2b22245bcdcfbdb94"; + sha256 = "797af316793586db1ab0e0cc9fcf75c1fe70a9c89d78ffa43e6ca6b4fce99c44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "cc7bbcc108a8f3b080ad957339b2a28a1733c1f4c9c9c4db226de65ed2650d3a"; + sha256 = "5363901c98627006d490d20f89fbe9a050cc23a018651934b39e0a0b7dde0d5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0a64005f83e01cc80d384d2ddc79fc582bf08d01c1e8ea3bd17ba9b6310db8b7"; + sha256 = "063ebaa12fa522c218990d01f5b312f019e223fee8efb57a10ff68197b8c529e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4f0d3b2930fbfed624503bb13aa2c02b641997856f7e9a490d27371af3243908"; + sha256 = "0eac26eb33852f0c0ea79869385010c623769933f5c8cd6c718ab9fde5eae61d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2e037b5eebee8308034540f0944972432e6246fa6f418af3b3b17fcf407ea603"; + sha256 = "15cad2c535889f2cc29021490d6bb28145e0f1df27676e3871d18d17b3db90bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "89b1f631a3b68f497070af726ca6a8b2e6a747c75032701c935e0309b014a4da"; + sha256 = "640b3099d96af524455026de4059a23fe75a54b330a8b4fd0a9efe58e55cf950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e861ed42e0e133e0f7ce1e094b69dbd0abd7a346842c3ae3b4a756d0f3a0b599"; + sha256 = "f12f1d587701cc78884fa5ae3d9997aed69ab6b57438e89419bda3330e1787d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "36dda4ae13eb19b8421e385284ec39d3ad10ac0da9530781f3a0a719a76fc92a"; + sha256 = "7ac1de885da3fd400e03d91adad4eee78736d7776d1b3134b38ecb9bc4d4614c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6799c6eabebf9bc677808666ca724d1bb704e171197087cb828e9ccdb345f27f"; + sha256 = "bab17427dc0d1af03bf8a28a1ac9f505d71ff2d84a184fa6ac99454d6623a269"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "3e2b342d2e12804b07497383c8e3e453851004aad50564cdb25ad9529679beef"; + sha256 = "47a04146475054fcb8d76880f06491e885e12862bd0444e6556ac1030ae8b2b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d77d658d2040dec3453583e6fad0b1f214c924aa1f4121ca2f258211e9b8b558"; + sha256 = "5c4993bcc60f8d116ef36ea6b502078c34c274f91ee455497203714281f3be46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fd73d7bd16fdfc4774a3a4426cd63bc6dbc90e47ce316dea75c8483110f3015b"; + sha256 = "7b5e2f52aa1864a6c1c96387a8f5fe3e788b8472d4852226919db430168b151e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "05a37242735661f27736384ceaaaf30bd3eeac85ea8a6b7e03d5dc07bd9db735"; + sha256 = "7717af1088d956ffaaf91f122e5929d3605b60938a40bfa829f791eb7833b620"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dd57277dda625c767ed7e0f3ac15b5597f1b17c862f33724a300589bc760bbd5"; + sha256 = "eea1dd966c8f4264616b89183a732f7c551c30c999c7bc95e3a6952c6ed667c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c5bcce6dc1dffe36a02b473bc100bab080991dbc85a92b5606c4b1d440a6bae1"; + sha256 = "1f472eab1edacbd4f94e5120a32ecd51b4ec507108b516a244582e0a6f177669"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1635583bed89c8efc3cccf6ccd294b2795defcdebac8d2faa2d0adb863200910"; + sha256 = "0cc517ed918facc26e76159b744b28397536736db641a45ac5e11bef9cf9b3d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bf1d180a93b0d1c2c4a9a177b906db957fa92fd1e9afc070f208c48c65921f48"; + sha256 = "edb56422879227089c8093397464e24c641d7d76bfd71e2dd6fde7a8b7b2498e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3c06f3513ef00756d7aa09aff5acf7da408cc02567a8187f51d01a78f016f7ad"; + sha256 = "ca64ed30ae3d073b51c3dc82c841eec88a7fa3913e82243dd8f67078f0ec59b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "107db384d90cf468233ffaca01bc18e332d931dfe60ade299be3b788876479ba"; + sha256 = "ce5c1df3db5e819f309a757e37c764f75dffc2cbf8737a8953349283f98855c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "75744dc4218b94400e480a30a93f697d5762e1d57e057ec5961ba76c0bbaa7f6"; + sha256 = "d1f5604c5204be5c6c5e323b1ffabb411051de8c31c1568cebb6cecda0c1a371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a02be173b477a7accc7eb3ba61f868baa6116b2f3b6c11fbf91544d37b8b3c96"; + sha256 = "805b77a1a561541e714c9ebaf23d0f5d50abb84766033e38056e0c528ac44d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "24397cab6c2f85bb59dae4b9b13136f4df73adc5d0ce1808615e96ca090b26c6"; + sha256 = "d9b5ca9b56132936391f0b56b3694dd741a6217f591acc7cecb73e947adac302"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3a10344dd08921246dc5ffc12e7bba8524bed0fa063ad0d369a9a3f3663ffc88"; + sha256 = "3b5aa0a8d598135a2bee5b9b7db478a106473f7708e24c89f103c8d67e233dec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-i686"; + sha256 = "6da4aef36fb8cd014e827a89a9ec9092c9d2005f493b29180048fe70688e8513"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c99dfb14a98f079a7275819bb1e7386eb1acbf9752cfa1a3c5dd7fd3b2d78cdd"; + sha256 = "972706bfdf85c74f7615222fd3dc15315fe9b339f2cf03509ea40461ffa09dc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "ffa4a07accc7bd9515f67a8a2a7abb881b517b2c3fda5f5cf9a7399ff1aeab0d"; + sha256 = "5e92dbef162c8553868c321c604315af544fc5a157ad80bbb6cf0dfc1e049ed3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d3c3539566237f9df3236d3850771c7589fc0af6367b20bb62df3b0417954278"; + sha256 = "2530799eca2427f2294b9020dacdd1360f12c07973627a4f27a1fd09fcee02c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e5691a1dab9000bab76f516e77f8d846e4d6ba9eccb7ffce5da7685981263be2"; + sha256 = "ab71a1db5a1a1a77e52819b48322186a7b2425ccea4528aa68c286f76733b0cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a165c58b79094f3c28f29bab43ea8d2921099148da2247d9c3829c468a066fac"; + sha256 = "f4816b4dcc0263451bfe4953c80ca9b2c19dcc882cd01523dee0fa95f8196db7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "71a6466c49b1e4554ddca9798130425bf29de8ba22cb4204ee63df1399e15dd8"; + sha256 = "6dad8a06f75a64ea647b7eac9b211611048d46f6cb82c339eed09f26554e97e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "dccca6a7697d16203325c956cad9b7ccc39e45d87fe50fd0a864cb92cb33889c"; + sha256 = "ea5eb3e482eb51804a935266a91957c5969f0faacf7ea6fc3aaeb39e0b0d3dc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "b94b825f2b70775093042ee10e3ba140ddf4882f2c54a46379790195aa932920"; + sha256 = "3048627e8fa53fa379f5d1c3ec9ea70733aadee3a8a9ae35c75187f820024a1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "eeeaf926708997925ad80bb8d62d0bb8badf464d030bde97c62239f90f9566d9"; + sha256 = "9cd8711b5a188e7c3fc954b65bd08b4ecb3b827816652ae859d5e6a57a15ae5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c465c1dd6e4df1011deefb9e75f778f000a2a48151d9447550f4ffa30da03400"; + sha256 = "89b09f5d295512e98fc374ee950a74aac041ecdde3bbad5cf42a07e5b3ae3ece"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "56420d01893a6ee9791f3984b4c8b676ffb0e300c734c9b90a8b2bfbbb3c3e44"; + sha256 = "925c0f9832d235aca22b0b26aef59f750f09d1d3ea2a391aab4087a44f743072"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d19e07a9120f3de2169614c3ffa3323dd2712903bdedff446ed2063ee54ba95f"; + sha256 = "3f8029b6f33a0954ea8d3029a5182b4b016356348d1a793f9f96261a5e7e6e99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "eefb93231e8603b69a793771f427de9f6520993744beb0f5de6bb1b06342b286"; + sha256 = "8d69eede16322268738bf8d4b75698a825391df1c06caa0ca2931555c832f124"; } ]; } From 22ae7ededae09201595440fec9809d34261b5767 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 12 Jun 2021 17:30:58 -0500 Subject: [PATCH 792/797] goofys: init at unstable-2021-03-26 --- pkgs/tools/filesystems/goofys/default.nix | 34 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/filesystems/goofys/default.nix diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix new file mode 100644 index 00000000000..94ce7be08e5 --- /dev/null +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "goofys"; + version = "unstable-2021-03-26"; + + src = fetchFromGitHub { + owner = "kahing"; + repo = "goofys"; + # Same as v0.24.0 but migrated to Go modules + rev = "0c993271269b539196330a18716a33fbeeebd624"; + sha256 = "18is5sv2a9wmsm0qpakly988z1qyl2b2hf2105lpxrgl659sf14p"; + }; + + vendorSha256 = "15yq0msh9icxd5n2zkkqrlwxifizhpa99d4aznv8clg32ybs61fj"; + + subPackages = [ "." ]; + + # Tests are using networking + postPatch = '' + rm internal/*_test.go + ''; + + meta = { + homepage = "https://github.com/kahing/goofys"; + description = "A high-performance, POSIX-ish Amazon S3 file system written in Go."; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.adisbladis ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68a9ff02a43..eb3861b14f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5315,6 +5315,8 @@ in go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; + goofys = callPackage ../tools/filesystems/goofys { }; + go-sct = callPackage ../tools/X11/go-sct { }; # rename to upower-notify? From e0b13fe95b22dcf97b048ac1775ad06ef1cfad51 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 13 Jun 2021 00:49:02 +0200 Subject: [PATCH 793/797] sauerbraten: set mainProgram to sauerbraten_client so that nix run nixpkgs#sauerbraten starts the game --- pkgs/games/sauerbraten/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 2d5f3d9a3c7..1e43674d2a4 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; maintainers = with maintainers; [ raskin ajs124 ]; + mainProgram = "sauerbraten_client"; hydraPlatforms = # raskin: tested amd64-linux; # not setting platforms because it is 0.5+ GiB of game data From 722e5ccfea7f42e11cfb10e92d444da1a9c9fc26 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 13 Jun 2021 02:33:06 +0200 Subject: [PATCH 794/797] prometheus-node-exporter: fix version info (#126580) Closes #126359 --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index ea351db83f4..f97485f9478 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -23,8 +23,12 @@ buildGoModule rec { goPackagePath = "github.com/prometheus/node_exporter"; in '' -ldflags= - -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version} - -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev} + -s -w + -X github.com/prometheus/common/version.Version=${version} + -X github.com/prometheus/common/version.Revision=${rev} + -X github.com/prometheus/common/version.Branch=unknown + -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs + -X github.com/prometheus/common/version.BuildDate=unknown ''; passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; From 72fd6f9ca7bbe087566fea304e54ec9455169ed1 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Sat, 12 Jun 2021 20:54:33 -0400 Subject: [PATCH 795/797] mg: 6.8.1 -> 6.9 (#126694) Co-authored-by: Sandro --- pkgs/applications/editors/mg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index ea5e162fdde..bd7774b5051 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mg"; - version = "6.8.1"; + version = "6.9"; src = fetchFromGitHub { owner = "ibara"; repo = "mg"; - rev = "mg-6.8.1"; - sha256 = "0fyqyi5sag13jx8bc22bvkgybddvsr0wdili9ikxnpnqg2w84fx7"; + rev = "mg-${version}"; + sha256 = "1w49yb9v1657rv1w5w7rc9ih1d2vzv6ym3mzhf2wgmh04pdm6hid"; }; enableParallelBuilding = true; From 16763ef031f9edc7f9bc5158a8f5e8dc318bce08 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 5 Jun 2021 19:03:03 -0300 Subject: [PATCH 796/797] ocamlPackages.magic-mime: 1.0.0 -> 1.1.3 --- .../ocaml-modules/magic-mime/default.nix | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 2a5ff08c018..15628bcf26c 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -1,27 +1,21 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchurl, buildDunePackage }: -let version = "1.0.0"; in +buildDunePackage rec { + pname = "magic-mime"; + version = "1.1.3"; -stdenv.mkDerivation { - pname = "ocaml-magic-mime"; - inherit version; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz"; - sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz"; + sha256 = "1xqjs8bba567yzrzgnr88j5ck97d36zw68zr9v29liya37k6rcvz"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib ]; - configurePlatforms = []; + minimalOCamlVersion = "4.03"; + useDune2 = true; - createFindlibDestdir = true; - - meta = { - homepage = "https://github.com/mirage/ocaml-magic-mime"; + meta = with lib; { description = "Convert file extensions to MIME types"; - platforms = ocaml.meta.platforms or []; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ vbgl ]; + homepage = "https://github.com/mirage/ocaml-magic-mime"; + license = licenses.isc; + maintainers = with maintainers; [ vbgl ]; }; } From 181d764372eb1735cc7daad95445e5e7064c08c4 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sun, 13 Jun 2021 07:45:07 +0300 Subject: [PATCH 797/797] hyprspace: init at 0.1.2 --- .../networking/hyprspace/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/hyprspace/default.nix diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix new file mode 100644 index 00000000000..863b05f8edc --- /dev/null +++ b/pkgs/applications/networking/hyprspace/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, iproute2mac }: + +buildGoModule rec { + pname = "hyprspace"; + version = "0.1.2"; + + propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YQJaK6i4GWEGSlf/1+hzjVhdN6ZjZC55v8w9KEedNg4="; + }; + + vendorSha256 = "sha256-ErqK2jDTpqUyvll+epdGKRYCJvyvCa90W1GVbbhF0a4="; + + meta = with lib; { + description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; + homepage = "https://github.com/hyprspace/hyprspace"; + license = licenses.asl20; + maintainers = with maintainers; [ yusdacra ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 262c775beb6..78e5bcdd966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19255,6 +19255,8 @@ in hydron = callPackage ../servers/hydron { }; + hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; + icecream = callPackage ../servers/icecream { }; icingaweb2 = callPackage ../servers/icingaweb2 { };