Merge branch 'master' into staging-next

This commit is contained in:
Martin Weinelt 2021-06-22 00:58:31 +02:00 committed by GitHub
commit eef9694ebc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
217 changed files with 3418 additions and 1215 deletions

View file

@ -742,7 +742,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
stk = { stk = {
shortName = "stk"; shortName = "stk";
fullName = "Synthesis Tool Kit 4.3"; fullName = "Synthesis Tool Kit 4.3";
url = https://github.com/thestk/stk/blob/master/LICENSE; url = "https://github.com/thestk/stk/blob/master/LICENSE";
}; };
tcltk = spdx { tcltk = spdx {

View file

@ -2381,6 +2381,16 @@
githubId = 75067; githubId = 75067;
name = "Daniel Duan"; name = "Daniel Duan";
}; };
dearrude = {
name = "Ebrahim Nejati";
email = "dearrude@tfwno.gf";
github = "dearrude";
githubId = 30749142;
keys = [{
longkeyid = "rsa4096/19151E03BF2CF012";
fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000";
}];
};
deepfire = { deepfire = {
email = "_deepfire@feelingofgreen.ru"; email = "_deepfire@feelingofgreen.ru";
github = "deepfire"; github = "deepfire";
@ -5653,6 +5663,16 @@
githubId = 72546287; githubId = 72546287;
name = "L3af"; name = "L3af";
}; };
lach = {
email = "iam@lach.pw";
github = "CertainLach";
githubId = 6235312;
keys = [{
longkeyid = "rsa3072/40B5D6948143175F";
fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F";
}];
name = "Yaroslav Bolyukin";
};
laikq = { laikq = {
email = "gwen@quasebarth.de"; email = "gwen@quasebarth.de";
github = "laikq"; github = "laikq";
@ -6200,6 +6220,12 @@
githubId = 36235154; githubId = 36235154;
name = "Sean Haugh"; name = "Sean Haugh";
}; };
maaslalani = {
email = "maaslalani0@gmail.com";
github = "maaslalani";
githubId = 42545625;
name = "Maas Lalani";
};
madjar = { madjar = {
email = "georges.dubus@compiletoi.net"; email = "georges.dubus@compiletoi.net";
github = "madjar"; github = "madjar";
@ -7324,6 +7350,12 @@
githubId = 17120571; githubId = 17120571;
name = "Xinhao Luo"; name = "Xinhao Luo";
}; };
newam = {
email = "alexmgit@protonmail.com";
github = "newAM";
githubId = 7845120;
name = "Alex M.";
};
nikitavoloboev = { nikitavoloboev = {
email = "nikita.voloboev@gmail.com"; email = "nikita.voloboev@gmail.com";
github = "nikitavoloboev"; github = "nikitavoloboev";
@ -11004,6 +11036,16 @@
githubId = 3889405; githubId = 3889405;
name = "vyp"; name = "vyp";
}; };
wakira = {
name = "Sheng Wang";
email = "sheng@a64.work";
github = "wakira";
githubId = 2338339;
keys = [{
longkeyid = "rsa4096/0x8C9B0A8FC0C0D862";
fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862";
}];
};
wamserma = { wamserma = {
name = "Markus S. Wamser"; name = "Markus S. Wamser";
email = "github-dev@mail2013.wamser.eu"; email = "github-dev@mail2013.wamser.eu";

View file

@ -203,4 +203,12 @@ with lib.maintainers; {
]; ];
scope = "Group registration for Serokell employees who collectively maintain packages."; scope = "Group registration for Serokell employees who collectively maintain packages.";
}; };
tts = {
members = [
hexa
mic92
];
scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages";
};
} }

View file

@ -309,6 +309,12 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem>
<para>
The <literal>antlr</literal> package now defaults to the 4.x
release instead of the old 2.7.7 version.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="sec-release-21.11-notable-changes"> <section xml:id="sec-release-21.11-notable-changes">

View file

@ -113,11 +113,11 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
<link xlink:href="https://www.gnuradio.org/">GNURadio</link> 3.8 was <link xlink:href="https://www.gnuradio.org/">GNURadio</link> 3.8 and 3.9 were
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finally</link> <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finally</link>
packaged, along with a rewrite to the Nix expressions, allowing users to packaged, along with a rewrite to the Nix expressions, allowing users to
override the features upstream supports selecting to compile or not to. override the features upstream supports selecting to compile or not to.
Additionally, the attribute <code>gnuradio</code> and <code>gnuradio3_7</code> Additionally, the attribute <code>gnuradio</code> (3.9), <code>gnuradio3_8</code> and <code>gnuradio3_7</code>
now point to an externally wrapped by default derivations, that allow you to now point to an externally wrapped by default derivations, that allow you to
also add `extraPythonPackages` to the Python interpreter used by GNURadio. also add `extraPythonPackages` to the Python interpreter used by GNURadio.
Missing environmental variables needed for operational GUI were also added Missing environmental variables needed for operational GUI were also added
@ -853,7 +853,7 @@ environment.systemPackages = [
<listitem> <listitem>
<para> <para>
<link xlink:href="https://kodi.tv/">Kodi</link> has been updated to version 19.1 "Matrix". See <link xlink:href="https://kodi.tv/">Kodi</link> has been updated to version 19.1 "Matrix". See
the <link xlink:href="https://kodi.tv/article/kodi-190-matrix-release">announcement</link> for the <link xlink:href="https://kodi.tv/article/kodi-19-0-matrix-release">announcement</link> for
further details. further details.
</para> </para>
</listitem> </listitem>

View file

@ -85,4 +85,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- GitVersionTree - GitVersionTree
- NDeskOptions - NDeskOptions
* The `antlr` package now defaults to the 4.x release instead of the
old 2.7.7 version.
## Other Notable Changes {#sec-release-21.11-notable-changes} ## Other Notable Changes {#sec-release-21.11-notable-changes}

View file

@ -41,7 +41,7 @@ rec {
# The human version (e.g. 21.05-pre) is left as is, because it is useful # The human version (e.g. 21.05-pre) is left as is, because it is useful
# for external modules that test with e.g. nixosTest and rely on that # for external modules that test with e.g. nixosTest and rely on that
# version number. # version number.
config.system.nixos.revision = "constant-nixos-revision"; config.system.nixos.revision = mkForce "constant-nixos-revision";
} }
{ key = "nodes"; _module.args.nodes = nodes; } { key = "nodes"; _module.args.nodes = nodes; }
] ++ optional minimal ../modules/testing/minimal-kernel.nix; ] ++ optional minimal ../modules/testing/minimal-kernel.nix;

View file

@ -157,7 +157,10 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ "/run/wrappers" ] ++ cfg.extraPackages; # https://www.zabbix.com/documentation/current/manual/config/items/userparameters
# > User parameters are commands executed by Zabbix agent.
# > /bin/sh is used as a command line interpreter under UNIX operating systems.
path = with pkgs; [ bash "/run/wrappers" ] ++ cfg.extraPackages;
serviceConfig = { serviceConfig = {
ExecStart = "@${cfg.package}/sbin/zabbix_agentd zabbix_agentd -f --config ${configFile}"; ExecStart = "@${cfg.package}/sbin/zabbix_agentd zabbix_agentd -f --config ${configFile}";

View file

@ -257,7 +257,6 @@ in
partOf = optional config.networking.firewall.enable "firewall.service"; partOf = optional config.networking.firewall.enable "firewall.service";
restartTriggers = [ fail2banConf jailConf pathsConf ]; restartTriggers = [ fail2banConf jailConf pathsConf ];
reloadIfChanged = true;
path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ] ++ cfg.extraPackages; path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ] ++ cfg.extraPackages;

View file

@ -18,13 +18,29 @@ let
maintainers = [ adisbladis ]; maintainers = [ adisbladis ];
}; };
machine = { pkgs, lib, ... }: { machine = { pkgs, lib, ... }:
let
usersharePath = "/var/lib/samba/usershares";
in {
virtualisation.emptyDiskImages = [ 4096 ]; virtualisation.emptyDiskImages = [ 4096 ];
networking.hostId = "deadbeef"; networking.hostId = "deadbeef";
boot.kernelPackages = kernelPackage; boot.kernelPackages = kernelPackage;
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
boot.zfs.enableUnstable = enableUnstable; boot.zfs.enableUnstable = enableUnstable;
services.samba = {
enable = true;
extraConfig = ''
registry shares = yes
usershare path = ${usersharePath}
usershare allow guests = yes
usershare max shares = 100
usershare owner only = no
'';
};
systemd.services.samba-smbd.serviceConfig.ExecStartPre =
"${pkgs.coreutils}/bin/mkdir -m +t -p ${usersharePath}";
environment.systemPackages = [ pkgs.parted ]; environment.systemPackages = [ pkgs.parted ];
# Setup regular fileSystems machinery to ensure forceImportAll can be # Setup regular fileSystems machinery to ensure forceImportAll can be
@ -58,8 +74,15 @@ let
"udevadm settle", "udevadm settle",
"zpool create rpool /dev/vdb1", "zpool create rpool /dev/vdb1",
"zfs create -o mountpoint=legacy rpool/root", "zfs create -o mountpoint=legacy rpool/root",
# shared datasets cannot have legacy mountpoint
"zfs create rpool/shared_smb",
"mount -t zfs rpool/root /tmp/mnt", "mount -t zfs rpool/root /tmp/mnt",
"udevadm settle", "udevadm settle",
# wait for samba services
"systemctl is-system-running --wait",
"zfs set sharesmb=on rpool/shared_smb",
"zfs share rpool/shared_smb",
"smbclient -gNL localhost | grep rpool_shared_smb",
"umount /tmp/mnt", "umount /tmp/mnt",
"zpool destroy rpool", "zpool destroy rpool",
"udevadm settle", "udevadm settle",

View file

@ -1,42 +1,35 @@
{ lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }: { lib, buildGoModule, fetchFromGitHub, copyDesktopItems }:
buildGoModule rec { buildGoModule rec {
pname = "NoiseTorch"; pname = "NoiseTorch";
version = "0.10.1"; version = "0.11.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lawl"; owner = "lawl";
repo = "NoiseTorch"; repo = "NoiseTorch";
rev = version; rev = version;
sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; sha256 = "0rjs6hbi7dvd179lzjmvqy4rv4pbc9amgzb8jfky4yc0zh8xf5z5";
}; };
patches = [
# Get version from environment instead of git tags
./version.patch
];
vendorSha256 = null; vendorSha256 = null;
doCheck = false; doCheck = false;
ldflags = [ "-X main.version=${version}" "-X main.distribution=nix" ];
subPackages = [ "." ]; subPackages = [ "." ];
buildInputs = [ rnnoise-plugin ]; nativeBuildInputs = [ copyDesktopItems ];
postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'";
preBuild = '' preBuild = ''
export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; make -C c/ladspa/
go generate; go generate
rm ./scripts/* rm ./scripts/*
''; '';
postInstall = '' postInstall = ''
mkdir -p $out/share/icons/hicolor/256x256/apps/ install -D ./assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/noisetorch.png
cp assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/ copyDesktopItems assets/noisetorch.desktop $out/share/applications/
mkdir -p $out/share/applications/
cp assets/noisetorch.desktop $out/share/applications/
''; '';
meta = with lib; { meta = with lib; {
@ -44,6 +37,6 @@ buildGoModule rec {
homepage = "https://github.com/lawl/NoiseTorch"; homepage = "https://github.com/lawl/NoiseTorch";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ panaeon ]; maintainers = with maintainers; [ panaeon legendofmiracles ];
}; };
} }

View file

@ -1,37 +0,0 @@
diff --git a/scripts/embedversion.go b/scripts/embedversion.go
index ce0a756..60e7a5e 100644
--- a/scripts/embedversion.go
+++ b/scripts/embedversion.go
@@ -1,24 +1,18 @@
package main
import (
- "os"
- "os/exec"
- "strings"
+ "os"
+ "strings"
)
func main() {
- cmd := exec.Command("git", "describe", "--tags")
- ret, err := cmd.Output()
- if err != nil {
- panic("Couldn't read git tags to embed version number")
- }
- version := strings.TrimSpace(string(ret))
+ version := strings.TrimSpace(string(os.Getenv("version")))
- out, _ := os.Create("version.go")
- defer out.Close()
+ out, _ := os.Create("version.go")
+ defer out.Close()
- out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\""))
- out.Write([]byte(version))
- out.Write([]byte("\"\n"))
+ out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\""))
+ out.Write([]byte(version))
+ out.Write([]byte("\"\n"))
}

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pt2-clone"; pname = "pt2-clone";
version = "1.29"; version = "1.31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "pt2-clone"; repo = "pt2-clone";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-xnw4UL30nUv/Ru6x/7d05gC0X9nREMdXO9QWBjVoIvo="; sha256 = "sha256-hIm9HWKBTFmxU9jI41PfScZIHpZOZpjvV2jgaMX/KSg=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "vorta"; pname = "vorta";
version = "0.7.6"; version = "0.7.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "borgbase"; owner = "borgbase";
repo = "vorta"; repo = "vorta";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bzhabRVgl1eLTS4KtFkn4xw2KDTZJyFU6zCJdHW5IGE="; sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ=";
}; };
postPatch = '' postPatch = ''

View file

@ -7,16 +7,16 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "polkadot"; pname = "polkadot";
version = "0.9.3"; version = "0.9.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paritytech"; owner = "paritytech";
repo = "polkadot"; repo = "polkadot";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-BxBrgcAJm6KM6ha494xlwiLYOSAr71gDFgqlH5RPqMM="; sha256 = "sha256-fe6iCSp4TxKKsVVBrvbSMROXqigTfxFCOLN1gAqRTv0=";
}; };
cargoSha256 = "131fkdazcspblzblmd9nhkymwn7qh6lhaqvi1jqnsq4951l9f4ms"; cargoSha256 = "18pg09v14991aqq7cjg0w5x36526y6sx1hvxlqb20zvrgmv722cq";
nativeBuildInputs = [ clang ]; nativeBuildInputs = [ clang ];

View file

@ -0,0 +1,60 @@
{ lib
, stdenv
, callPackage
, runCommand
, makeWrapper
, octave
, imagemagick
, python3
}:
# To test:
# $(nix-build -E 'with import <nixpkgs> {}; jupyter.override { definitions = { octave = octave-kernel.definition; }; }')/bin/jupyter-notebook
let
kernel = callPackage ./kernel.nix {
python3Packages = python3.pkgs;
};
in
rec {
launcher = runCommand "octave-kernel-launcher" {
inherit octave;
python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]);
buildInputs = [ makeWrapper ];
} ''
mkdir -p $out/bin
makeWrapper $python/bin/python $out/bin/octave-kernel \
--add-flags "-m octave_kernel" \
--suffix PATH : $octave/bin
'';
sizedLogo = size: stdenv.mkDerivation {
name = ''octave-logo-${octave.version}-${size}x${size}.png'';
src = octave.src;
buildInputs = [ imagemagick ];
dontConfigure = true;
dontInstall = true;
buildPhase = ''
convert ./libgui/src/icons/logo.png -resize ${size}x${size} $out
'';
};
definition = {
displayName = "Octave";
argv = [
"${launcher}/bin/octave-kernel"
"-f"
"{connection_file}"
];
language = "octave";
logo32 = sizedLogo "32";
logo64 = sizedLogo "64";
};
}

View file

@ -0,0 +1,30 @@
{ lib, octave, python3Packages }:
with python3Packages;
buildPythonPackage rec {
pname = "octave-kernel";
version = "0.32.0";
src = fetchPypi {
pname = "octave_kernel";
inherit version;
sha256 = "0dfbxfcf3bz4jswnpkibnjwlkgy0y4j563nrhaqxv3nfa65bksif";
};
propagatedBuildInputs = [ metakernel ipykernel ];
# Tests require jupyter_kernel_test to run, but it hasn't seen a
# release since 2017 and seems slightly abandoned.
# Doing fetchPypi on it doesn't work, even though it exists here:
# https://pypi.org/project/jupyter_kernel_test/.
doCheck = false;
meta = with lib; {
description = "A Jupyter kernel for Octave.";
homepage = "https://github.com/Calysto/octave_kernel";
license = licenses.bsd3;
maintainers = with maintainers; [ thomasjm ];
platforms = platforms.all;
};
}

View file

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "tiled"; pname = "tiled";
version = "1.5.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bjorn"; owner = "bjorn";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Pf9nA5DUAJ+PPNG+oP7RO4/TD8fy4ADsyq625a6cbFk="; sha256 = "sha256-XVIkyf9cQZXjFuGGCliCSY22X8EkoPEl1EpGCrMTsgY=";
}; };
nativeBuildInputs = [ pkg-config qmake ]; nativeBuildInputs = [ pkg-config qmake ];

View file

@ -0,0 +1,71 @@
{ python3Packages
, qtbase
, ghostscript
, wrapQtAppsHook
, lib
}:
python3Packages.buildPythonApplication rec {
pname = "veusz";
version = "3.3.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "4ClgYwiU21wHDve2q9cItSAVb9hbR2F+fJc8znGI8OA=";
};
nativeBuildInputs = [ wrapQtAppsHook python3Packages.sip ];
buildInputs = [ qtbase ];
# veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap
# it automatically -> we have to do it explicitly
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/veusz"
'';
# For some reason, if sip5 is found on the PATH, the option --sip-dir is
# ignored in setupPyBuildFlags, see
# https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L292
postPatch = ''
substituteInPlace pyqtdistutils.py \
--replace "'-I', pyqt5_include_dir," "'-I', '${python3Packages.pyqt5}/share/sip/PyQt5',"
patchShebangs tests/runselftest.py
'';
# you can find these options at
# https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L71
setupPyBuildFlags = [
# --sip-dir does nothing here, but it should be the correct way to set the
# sip_dir, so I'm leaving it here for future versions
"--sip-dir=${python3Packages.pyqt5}/share/sip"
"--qt-include-dir=${qtbase.dev}/include"
# veusz tries to find a libinfix and fails without one
# but we simply don't need a libinfix, so set it to empty here
"--qt-libinfix="
];
propagatedBuildInputs = with python3Packages; [
numpy
pyqt5
# optional requirements:
dbus-python
h5py
# astropy -- fails to build on master
# optional TODO: add iminuit, pyemf and sampy
];
installCheckPhase = ''
wrapQtApp "tests/runselftest.py"
QT_QPA_PLATFORM=minimal tests/runselftest.py
'';
meta = with lib; {
description = "A scientific plotting and graphing program with a GUI";
homepage = "https://veusz.github.io/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ laikq ];
};
}

View file

@ -1,24 +1,52 @@
{ lib, fetchFromGitHub, python2Packages, gettext }: { stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, python3
, wrapGAppsHook
, gtkmm3
, gtksourceview
, gtksourceviewmm
, gspell
, libxmlxx
, sqlite
, curl
, libuchardet
, fmt
, spdlog
}:
python2Packages.buildPythonApplication rec { stdenv.mkDerivation rec {
pname = "cherrytree"; pname = "cherrytree";
version = "0.39.4"; version = "0.99.37";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "giuspen"; owner = "giuspen";
repo = "cherrytree"; repo = "cherrytree";
rev = version; rev = version;
sha256 = "1wycgn1f3b858qb6kn2bsaabak8n52qkpd24w54xz6fjizlnw7x0"; sha256 = "1a2scwjrjijxwyfpqih23zzay3yqhyzpxnp66388fcir1cmp8zih";
}; };
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [
cmake
pkg-config
python3
wrapGAppsHook
];
propagatedBuildInputs = with python2Packages; [ pygtk dbus-python pygtksourceview ]; buildInputs = [
gtkmm3
patches = [ ./subprocess.patch ]; gtksourceview
gtksourceviewmm
doCheck = false; gspell
libxmlxx
sqlite
curl
libuchardet
fmt
spdlog
];
meta = with lib; { meta = with lib; {
description = "An hierarchical note taking application"; description = "An hierarchical note taking application";
@ -31,8 +59,9 @@ python2Packages.buildPythonApplication rec {
you have scattered around your hard drive can be conveniently placed into you have scattered around your hard drive can be conveniently placed into
a Cherrytree document where you can easily find it. a Cherrytree document where you can easily find it.
''; '';
homepage = "http://www.giuspen.com/cherrytree"; homepage = "https://www.giuspen.com/cherrytree";
license = licenses.gpl3; changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };
} }

View file

@ -1,14 +0,0 @@
diff -Naur cherrytree-0.37.1-orig/setup.py cherrytree-0.37.1/setup.py
--- cherrytree-0.37.1-orig/setup.py 2016-01-08 20:50:50.000000000 +0100
+++ cherrytree-0.37.1/setup.py 2016-07-05 20:30:27.768178682 +0200
@@ -205,4 +205,9 @@
},
distclass=CherryTreeDist
)
- subprocess.call("update-desktop-database")
+ try:
+ subprocess.check_call(['update-desktop-database'])
+ except subprocess.CalledProcessError:
+ pass # handle errors in the called executable
+ except OSError:
+ pass # executable not found

View file

@ -0,0 +1,22 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "cobalt";
version = "0.16.5";
src = fetchFromGitHub {
owner = "cobalt-org";
repo = "cobalt.rs";
rev = "v${version}";
sha256 = "wSvjPifnA8oc0vVmHBMdsMKzX7Gg6TdbPzIXl/SHqn8=";
};
cargoSha256 = "27LcoGBI4elt80uQkTwvToOyEmd2+/3ma5Y32OFrJaw=";
meta = with lib; {
description = "Static site generator written in Rust";
homepage = "https://github.com/cobalt-org/cobalt.rs/";
license = licenses.mit;
maintainers = with maintainers; [ ethancedwards8 ];
};
}

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dbeaver"; pname = "dbeaver";
version = "21.1.0"; # When updating also update fetchedMavenDeps.sha256 version = "21.1.1"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dbeaver"; owner = "dbeaver";
repo = "dbeaver"; repo = "dbeaver";
rev = version; rev = version;
sha256 = "sha256-MHfW6gZFB2osE+8Ek7I40fg2cdowph3hvKqkjG7+rY4="; sha256 = "sha256-enUwX+BxgPy4c1Vwo1+vN3lFYz4LgofgKvZOYuz/050=";
}; };
fetchedMavenDeps = stdenv.mkDerivation { fetchedMavenDeps = stdenv.mkDerivation {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
dontFixup = true; dontFixup = true;
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "sha256-FdWQ+2U5bIXSASm3SaLjyQlaRc1AkYPpFJSP4PnCWJw="; outputHash = "sha256-vNC+LmGEepZCepPodY3c783moReppqNw32d7AUuvBZc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,5 +1,18 @@
{ lib, stdenv, fetchurl, curl, zlib, glib, xorg, dbus, fontconfig, libGL, { lib
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: , stdenv
, fetchurl
, curl
, zlib
, glib
, xorg
, dbus
, fontconfig
, libGL
, freetype
, xkeyboard_config
, makeDesktopItem
, makeWrapper
}:
let let
curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
@ -30,7 +43,7 @@ stdenv.mkDerivation rec {
categories = "Development;IDE;"; categories = "Development;IDE;";
}; };
nativeBuildInputs = [makeWrapper]; nativeBuildInputs = [ makeWrapper ];
ldLibraryPath = lib.makeLibraryPath [ ldLibraryPath = lib.makeLibraryPath [
stdenv.cc.cc stdenv.cc.cc
@ -51,6 +64,8 @@ stdenv.mkDerivation rec {
]; ];
installPhase = '' installPhase = ''
runHook preInstall
BASEDIR=$out/lib/robo3t BASEDIR=$out/lib/robo3t
mkdir -p $BASEDIR/bin mkdir -p $BASEDIR/bin
@ -72,13 +87,15 @@ stdenv.mkDerivation rec {
makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \ makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \
--suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
runHook postInstall
''; '';
meta = { meta = with lib; {
homepage = "https://robomongo.org/"; homepage = "https://robomongo.org/";
description = "Query GUI for mongodb"; description = "Query GUI for mongodb. Formerly called Robomongo";
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
license = lib.licenses.gpl3; license = licenses.gpl3Only;
maintainers = [ lib.maintainers.eperuffo ]; maintainers = with maintainers; [ eperuffo ];
}; };
} }

View file

@ -1,77 +0,0 @@
{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
stdenv.mkDerivation rec {
pname = "robomongo";
version = "0.9.0";
src = fetchurl {
url = "https://download.robomongo.org/${version}/linux/robomongo-${version}-linux-x86_64-0786489.tar.gz";
sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad";
};
icon = fetchurl {
url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png";
sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2";
};
desktopItem = makeDesktopItem {
name = "robomongo";
exec = "robomongo";
icon = icon;
comment = "Query GUI for mongodb";
desktopName = "Robomongo";
genericName = "MongoDB management tool";
categories = "Development;IDE;mongodb;";
};
nativeBuildInputs = [makeWrapper];
ldLibraryPath = lib.makeLibraryPath [
stdenv.cc.cc
zlib
glib
xorg.libXi
xorg.libxcb
xorg.libXrender
xorg.libX11
xorg.libSM
xorg.libICE
xorg.libXext
dbus
fontconfig
freetype
];
installPhase = ''
BASEDIR=$out/lib/robomongo
mkdir -p $BASEDIR/bin
cp bin/* $BASEDIR/bin
mkdir -p $BASEDIR/lib
cp -r lib/* $BASEDIR/lib
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications
mkdir -p $out/share/icons
cp ${icon} $out/share/icons/robomongo.png
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robomongo
mkdir $out/bin
makeWrapper $BASEDIR/bin/robomongo $out/bin/robomongo \
--suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
'';
meta = {
homepage = "https://robomongo.org/";
description = "Query GUI for mongodb";
platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64;
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.eperuffo ];
};
}

View file

@ -0,0 +1,34 @@
{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }:
buildGoModule rec {
pname = "slides";
version = "0.2.0";
src = fetchFromGitHub {
owner = "maaslalani";
repo = "slides";
rev = "v${version}";
sha256 = "0vwpisyvsgmvrzp26hapghgqmm3fhrzrvdnmws00xc2q3fsij9qx";
};
checkInputs = [
bash
go
python3
ruby
];
vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f";
ldflags = [
"-s" "-w"
"-X=main.Version=${version}"
];
meta = with lib; {
description = "Terminal based presentation tool";
homepage = "https://github.com/maaslalani/slides";
license = licenses.mit;
maintainers = with maintainers; [ maaslalani ];
};
}

View file

@ -4,13 +4,13 @@
# logitech-udev-rules instead of adding this to services.udev.packages on NixOS # logitech-udev-rules instead of adding this to services.udev.packages on NixOS
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "solaar"; pname = "solaar";
version = "1.0.5"; version = "1.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pwr-Solaar"; owner = "pwr-Solaar";
repo = "Solaar"; repo = "Solaar";
rev = version; rev = version;
sha256 = "sha256-k87DqIkvy5CVEsHT82ZArSM2JBi5sYdSCPfP4KjI850="; sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ticker"; pname = "ticker";
version = "4.0.3"; version = "4.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "achannarasappa"; owner = "achannarasappa";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YVpspFBwao/7M2nTVMw+ANc0roL0vBO4DpNUb7Thp3Q="; sha256 = "sha256-FavbBGmChWQ3xySPHlw5HisZwVaNe/NaxA6+InN8fL8=";
}; };
vendorSha256 = "sha256-nidOIjrTL4llV5GORebXOOPGeL6TxkurDY82cIc7+mU="; vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU=";
preBuild = '' preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}")

View file

@ -1,29 +1,39 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }: { lib
, stdenv
, fetchurl
, pkg-config
, makeself
, yasm
, fuse
, wxGTK
, lvm2
, substituteAll
, e2fsprogs
, exfat
, ntfs3g
, btrfs-progs
}:
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "veracrypt"; pname = "veracrypt";
version = "1.24-Hotfix1"; version = "1.24-Update7";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2";
sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c"; sha256 = "0i7h44zn2mjzgh416l7kfs0dk6qc7b1bxsaxqqqcvgrpl453n7bc";
}; };
patches = [ patches = [
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 (substituteAll {
(fetchpatch { src = ./fix-paths.patch;
url = "https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch"; ext2 = "${e2fsprogs}/bin/mkfs.ext2";
sha256 = "1xm9cl6zinlr0vah5xr9bvh0y9gw4331zl7d2n5xvqrcdxw3ww1y"; ext3 = "${e2fsprogs}/bin/mkfs.ext3";
stripLen = 1; ext4 = "${e2fsprogs}/bin/mkfs.ext4";
}) exfat = "${exfat}/bin/mkfs.exfat";
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 ntfs = "${ntfs3g}/bin/mkfs.ntfs";
(fetchpatch { btrfs = "${btrfs-progs}/bin/mkfs.btrfs";
url = "https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch";
sha256 = "0qsccilip0ksnlzxina38a052gb533r4s422lxhrj3wv9zgpp7l3";
stripLen = 1;
}) })
]; ];

View file

@ -0,0 +1,22 @@
diff --color --unified --recursive --text a/Core/VolumeCreator.h b/Core/VolumeCreator.h
--- a/Core/VolumeCreator.h 2021-06-20 20:54:50.725210056 +0300
+++ b/Core/VolumeCreator.h 2021-06-20 20:58:46.117742419 +0300
@@ -77,12 +77,12 @@
switch (fsType)
{
#if defined (TC_LINUX)
- case VolumeCreationOptions::FilesystemType::Ext2: return "mkfs.ext2";
- case VolumeCreationOptions::FilesystemType::Ext3: return "mkfs.ext3";
- case VolumeCreationOptions::FilesystemType::Ext4: return "mkfs.ext4";
- case VolumeCreationOptions::FilesystemType::NTFS: return "mkfs.ntfs";
- case VolumeCreationOptions::FilesystemType::exFAT: return "mkfs.exfat";
- case VolumeCreationOptions::FilesystemType::Btrfs: return "mkfs.btrfs";
+ case VolumeCreationOptions::FilesystemType::Ext2: return "@ext2@";
+ case VolumeCreationOptions::FilesystemType::Ext3: return "@ext3@";
+ case VolumeCreationOptions::FilesystemType::Ext4: return "@ext4@";
+ case VolumeCreationOptions::FilesystemType::NTFS: return "@ntfs@";
+ case VolumeCreationOptions::FilesystemType::exFAT: return "@exfat@";
+ case VolumeCreationOptions::FilesystemType::Btrfs: return "@btrfs@";
#elif defined (TC_MACOSX)
case VolumeCreationOptions::FilesystemType::MacOsExt: return "newfs_hfs";
case VolumeCreationOptions::FilesystemType::exFAT: return "newfs_exfat";

View file

@ -0,0 +1,24 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "vul";
version = "unstable-2020-02-15";
src = fetchFromGitHub {
owner = "LukeSmithxyz";
repo = pname;
rev = "f6ebd8f6b6fb8a111e7b59470d6748fcbe71c559";
sha256 = "aUl4f82sGOWkEvTDNILDszj5hztDRvYpHVovFl4oOCc=";
};
makeFlags = [
"PREFIX=${placeholder "out"}"
];
meta = with lib; {
description = "Latin Vulgate Bible on the Command Line";
homepage = "https://github.com/LukeSmithxyz/vul";
license = licenses.publicDomain;
maintainers = [ maintainers.j0hax ];
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "xplr"; pname = "xplr";
version = "0.14.1"; version = "0.14.2";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "08gb4dnnzdy3whn2411xmar1wpvmc014scbniicksra8p1xizh0b"; sha256 = "1bgylz2x44rjxpd6dvd44pr57f18di0nj5sbqh4my8lkanr7isli";
}; };
buildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "1yxbirqf6c4bc364gw0nnjrjvhvjy2j2pbmvlpakv0bmyfphhb95"; cargoSha256 = "07rlmz4rkgdcvr0dvbrz56s5vacxcvy09rgz70kr692xlpym4jvq";
meta = with lib; { meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer"; description = "A hackable, minimal, fast TUI file explorer";

View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.25.72"; version = "1.25.73";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "7bvcLKc/ZyVSTGOsRIO9qgHc8dSYOJaoEHJw7V2Vl/M="; sha256 = "mSK3hT0Rp03Bq0k+NCYo6S5w+eA9SXXxO3Lo7QWrc9U=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -44,9 +44,9 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "91.0.4472.101", "version": "91.0.4472.114",
"sha256": "1d3y621iclkq6nvxrapk5aihv50x13hjha0c2gcp2xxfma96253q", "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1",
"sha256bin64": "12j5q5b9v0jpiznjnh89831w8lv399vd1z4ljhbsnsidbsygrbr1", "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-04-06", "version": "2021-04-06",
@ -55,8 +55,8 @@
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "91.0.4472.101-1", "rev": "91.0.4472.114-1",
"sha256": "1ca8gjxz3w730446qns253ibs9lx22iysxq5sphb3pw2w0069q8r" "sha256": "1xb5g3hybaiwn3y1zw1fxd3g0zwmvplrs06sdqnxzsr1qm8b874h"
} }
} }
} }

View file

@ -2,13 +2,13 @@
mkYarnPackage rec { mkYarnPackage rec {
pname = "vieb"; pname = "vieb";
version = "5.1.0"; version = "5.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jelmerro"; owner = "Jelmerro";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-0C2gD40nPgEZopGMPsd5ajwcwFRjcu4Xc2DTpEwSK4c="; sha256 = "sha256-wLaOqjDxgjfv4+TJeLE0dkrhfdnNSjiDqtFcHTm8uG4=";
}; };
packageJSON = ./package.json; packageJSON = ./package.json;
@ -50,6 +50,7 @@ mkYarnPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://vieb.dev/"; homepage = "https://vieb.dev/";
changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}";
description = "Vim Inspired Electron Browser"; description = "Vim Inspired Electron Browser";
maintainers = with maintainers; [ gebner fortuneteller2k ]; maintainers = with maintainers; [ gebner fortuneteller2k ];
platforms = platforms.unix; platforms = platforms.unix;

View file

@ -1,9 +1,8 @@
{ {
"name": "vieb", "name": "vieb",
"productName": "Vieb", "productName": "Vieb",
"version": "5.1.0", "version": "5.2.0",
"description": "Vim Inspired Electron Browser", "description": "Vim Inspired Electron Browser",
"bin": "app.js",
"main": "app/index.js", "main": "app/index.js",
"scripts": { "scripts": {
"build": "node build.js", "build": "node build.js",
@ -30,9 +29,9 @@
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"devDependencies": { "devDependencies": {
"archiver": "5.3.0", "archiver": "5.3.0",
"electron": "13.1.1", "electron": "13.1.2",
"electron-builder": "22.11.5", "electron-builder": "22.11.7",
"eslint": "7.28.0", "eslint": "7.29.0",
"eslint-plugin-compat": "3.9.0", "eslint-plugin-compat": "3.9.0",
"eslint-plugin-sort-keys-fix": "1.1.1", "eslint-plugin-sort-keys-fix": "1.1.1",
"jest-environment-jsdom": "27.0.3", "jest-environment-jsdom": "27.0.3",

View file

@ -14,32 +14,32 @@
dependencies: dependencies:
"@babel/highlight" "^7.10.4" "@babel/highlight" "^7.10.4"
"@babel/code-frame@^7.12.13": "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5":
version "7.12.13" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
dependencies: dependencies:
"@babel/highlight" "^7.12.13" "@babel/highlight" "^7.14.5"
"@babel/compat-data@^7.14.4": "@babel/compat-data@^7.14.5":
version "7.14.4" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"
integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ== integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==
"@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
version "7.14.3" version "7.14.6"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab"
integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg== integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==
dependencies: dependencies:
"@babel/code-frame" "^7.12.13" "@babel/code-frame" "^7.14.5"
"@babel/generator" "^7.14.3" "@babel/generator" "^7.14.5"
"@babel/helper-compilation-targets" "^7.13.16" "@babel/helper-compilation-targets" "^7.14.5"
"@babel/helper-module-transforms" "^7.14.2" "@babel/helper-module-transforms" "^7.14.5"
"@babel/helpers" "^7.14.0" "@babel/helpers" "^7.14.6"
"@babel/parser" "^7.14.3" "@babel/parser" "^7.14.6"
"@babel/template" "^7.12.13" "@babel/template" "^7.14.5"
"@babel/traverse" "^7.14.2" "@babel/traverse" "^7.14.5"
"@babel/types" "^7.14.2" "@babel/types" "^7.14.5"
convert-source-map "^1.7.0" convert-source-map "^1.7.0"
debug "^4.1.0" debug "^4.1.0"
gensync "^1.0.0-beta.2" gensync "^1.0.0-beta.2"
@ -47,137 +47,144 @@
semver "^6.3.0" semver "^6.3.0"
source-map "^0.5.0" source-map "^0.5.0"
"@babel/generator@^7.14.2", "@babel/generator@^7.14.3", "@babel/generator@^7.7.2": "@babel/generator@^7.14.5", "@babel/generator@^7.7.2":
version "7.14.3" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785"
integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA== integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==
dependencies: dependencies:
"@babel/types" "^7.14.2" "@babel/types" "^7.14.5"
jsesc "^2.5.1" jsesc "^2.5.1"
source-map "^0.5.0" source-map "^0.5.0"
"@babel/helper-compilation-targets@^7.13.16": "@babel/helper-compilation-targets@^7.14.5":
version "7.14.4" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
integrity sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA== integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
dependencies: dependencies:
"@babel/compat-data" "^7.14.4" "@babel/compat-data" "^7.14.5"
"@babel/helper-validator-option" "^7.12.17" "@babel/helper-validator-option" "^7.14.5"
browserslist "^4.16.6" browserslist "^4.16.6"
semver "^6.3.0" semver "^6.3.0"
"@babel/helper-function-name@^7.14.2": "@babel/helper-function-name@^7.14.5":
version "7.14.2" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ== integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
dependencies: dependencies:
"@babel/helper-get-function-arity" "^7.12.13" "@babel/helper-get-function-arity" "^7.14.5"
"@babel/template" "^7.12.13" "@babel/template" "^7.14.5"
"@babel/types" "^7.14.2" "@babel/types" "^7.14.5"
"@babel/helper-get-function-arity@^7.12.13": "@babel/helper-get-function-arity@^7.14.5":
version "7.12.13" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
dependencies: dependencies:
"@babel/types" "^7.12.13" "@babel/types" "^7.14.5"
"@babel/helper-member-expression-to-functions@^7.13.12": "@babel/helper-hoist-variables@^7.14.5":
version "7.13.12" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
dependencies: dependencies:
"@babel/types" "^7.13.12" "@babel/types" "^7.14.5"
"@babel/helper-module-imports@^7.13.12": "@babel/helper-member-expression-to-functions@^7.14.5":
version "7.13.12" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8"
integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==
dependencies: dependencies:
"@babel/types" "^7.13.12" "@babel/types" "^7.14.5"
"@babel/helper-module-transforms@^7.14.2": "@babel/helper-module-imports@^7.14.5":
version "7.14.2" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA== integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
dependencies: dependencies:
"@babel/helper-module-imports" "^7.13.12" "@babel/types" "^7.14.5"
"@babel/helper-replace-supers" "^7.13.12"
"@babel/helper-simple-access" "^7.13.12"
"@babel/helper-split-export-declaration" "^7.12.13"
"@babel/helper-validator-identifier" "^7.14.0"
"@babel/template" "^7.12.13"
"@babel/traverse" "^7.14.2"
"@babel/types" "^7.14.2"
"@babel/helper-optimise-call-expression@^7.12.13": "@babel/helper-module-transforms@^7.14.5":
version "7.12.13" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e"
integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==
dependencies: dependencies:
"@babel/types" "^7.12.13" "@babel/helper-module-imports" "^7.14.5"
"@babel/helper-replace-supers" "^7.14.5"
"@babel/helper-simple-access" "^7.14.5"
"@babel/helper-split-export-declaration" "^7.14.5"
"@babel/helper-validator-identifier" "^7.14.5"
"@babel/template" "^7.14.5"
"@babel/traverse" "^7.14.5"
"@babel/types" "^7.14.5"
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0": "@babel/helper-optimise-call-expression@^7.14.5":
version "7.13.0" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
"@babel/helper-replace-supers@^7.13.12":
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: dependencies:
"@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/types" "^7.14.5"
"@babel/helper-optimise-call-expression" "^7.12.13"
"@babel/traverse" "^7.14.2"
"@babel/types" "^7.14.4"
"@babel/helper-simple-access@^7.13.12": "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0":
version "7.13.12" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
"@babel/helper-replace-supers@^7.14.5":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
dependencies: dependencies:
"@babel/types" "^7.13.12" "@babel/helper-member-expression-to-functions" "^7.14.5"
"@babel/helper-optimise-call-expression" "^7.14.5"
"@babel/traverse" "^7.14.5"
"@babel/types" "^7.14.5"
"@babel/helper-split-export-declaration@^7.12.13": "@babel/helper-simple-access@^7.14.5":
version "7.12.13" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"
integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==
dependencies: dependencies:
"@babel/types" "^7.12.13" "@babel/types" "^7.14.5"
"@babel/helper-validator-identifier@^7.14.0": "@babel/helper-split-export-declaration@^7.14.5":
version "7.14.0" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
"@babel/helper-validator-option@^7.12.17":
version "7.12.17"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
"@babel/helpers@^7.14.0":
version "7.14.0"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
dependencies: dependencies:
"@babel/template" "^7.12.13" "@babel/types" "^7.14.5"
"@babel/traverse" "^7.14.0"
"@babel/types" "^7.14.0"
"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": "@babel/helper-validator-identifier@^7.14.5":
version "7.14.0" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
"@babel/helper-validator-option@^7.14.5":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
"@babel/helpers@^7.14.6":
version "7.14.6"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635"
integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==
dependencies: dependencies:
"@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.14.5"
"@babel/traverse" "^7.14.5"
"@babel/types" "^7.14.5"
"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
dependencies:
"@babel/helper-validator-identifier" "^7.14.5"
chalk "^2.0.0" chalk "^2.0.0"
js-tokens "^4.0.0" 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": "@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.2":
version "7.14.4" version "7.14.6"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2"
integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA== integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==
"@babel/plugin-syntax-async-generators@^7.8.4": "@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4" version "7.8.4"
@ -257,48 +264,49 @@
"@babel/helper-plugin-utils" "^7.8.0" "@babel/helper-plugin-utils" "^7.8.0"
"@babel/plugin-syntax-top-level-await@^7.8.3": "@babel/plugin-syntax-top-level-await@^7.8.3":
version "7.12.13" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript@^7.7.2": "@babel/plugin-syntax-typescript@^7.7.2":
version "7.12.13" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-plugin-utils" "^7.14.5"
"@babel/template@^7.12.13", "@babel/template@^7.3.3": "@babel/template@^7.14.5", "@babel/template@^7.3.3":
version "7.12.13" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
dependencies: dependencies:
"@babel/code-frame" "^7.12.13" "@babel/code-frame" "^7.14.5"
"@babel/parser" "^7.12.13" "@babel/parser" "^7.14.5"
"@babel/types" "^7.12.13" "@babel/types" "^7.14.5"
"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.7.2": "@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.2":
version "7.14.2" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870"
integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA== integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg==
dependencies: dependencies:
"@babel/code-frame" "^7.12.13" "@babel/code-frame" "^7.14.5"
"@babel/generator" "^7.14.2" "@babel/generator" "^7.14.5"
"@babel/helper-function-name" "^7.14.2" "@babel/helper-function-name" "^7.14.5"
"@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-hoist-variables" "^7.14.5"
"@babel/parser" "^7.14.2" "@babel/helper-split-export-declaration" "^7.14.5"
"@babel/types" "^7.14.2" "@babel/parser" "^7.14.5"
"@babel/types" "^7.14.5"
debug "^4.1.0" debug "^4.1.0"
globals "^11.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.14.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": "@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
version "7.14.4" version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz#bfd6980108168593b38b3eb48a24aa026b919bc0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff"
integrity sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw== integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==
dependencies: dependencies:
"@babel/helper-validator-identifier" "^7.14.0" "@babel/helper-validator-identifier" "^7.14.5"
to-fast-properties "^2.0.0" to-fast-properties "^2.0.0"
"@bcoe/v8-coverage@^0.2.3": "@bcoe/v8-coverage@^0.2.3":
@ -306,20 +314,27 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@cliqz/adblocker-content@^1.22.1": "@cliqz/adblocker-content@^1.22.1", "@cliqz/adblocker-content@^1.22.2":
version "1.22.1" version "1.22.2"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz#71bc0d0d473ae96d5086badb2f4d624769fa56c4" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz#643849d5f08c167eb84a2e7e3f1f9fbc41a3889b"
integrity sha512-CSOCdK/SJOZVWGVJuurfL0KtPq1AhSp3ng6BAo3SLXAd+WP7obERw2qFWQ0uzrApY/N1a1hvzfw31uonqRakXg== integrity sha512-EsV00IdW8sGujGnylOGR8dm401FdIfPRAjuevsRlZjgDE+hQKj6n5wwrZaylPIh994hWesg6bxWTmXpJ2Sy2QQ==
dependencies: dependencies:
"@cliqz/adblocker-extended-selectors" "^1.22.1" "@cliqz/adblocker-extended-selectors" "^1.22.2"
"@cliqz/adblocker-electron-preload@1.22.1", "@cliqz/adblocker-electron-preload@^1.22.1": "@cliqz/adblocker-electron-preload@1.22.1":
version "1.22.1" version "1.22.1"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af"
integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA==
dependencies: dependencies:
"@cliqz/adblocker-content" "^1.22.1" "@cliqz/adblocker-content" "^1.22.1"
"@cliqz/adblocker-electron-preload@^1.22.1":
version "1.22.2"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz#eea674767a60abe4e5f9ccb46188d33656f551d0"
integrity sha512-4JSqNNYo4hXMoZjnyBVTd3z2yV2n5qeoNPk+WaeOFEF9uJXhqPR+Sz7scNB6nMYnRuSQfraeogtdaA4s0JkJWQ==
dependencies:
"@cliqz/adblocker-content" "^1.22.2"
"@cliqz/adblocker-electron@1.22.1": "@cliqz/adblocker-electron@1.22.1":
version "1.22.1" version "1.22.1"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b"
@ -329,22 +344,22 @@
"@cliqz/adblocker-electron-preload" "^1.22.1" "@cliqz/adblocker-electron-preload" "^1.22.1"
tldts-experimental "^5.6.21" tldts-experimental "^5.6.21"
"@cliqz/adblocker-extended-selectors@^1.22.1": "@cliqz/adblocker-extended-selectors@^1.22.2":
version "1.22.1" version "1.22.2"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz#234ee70a1736e3690b25a7a073818f5a851bf9a8" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz#1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90"
integrity sha512-uXB1TybAq6MgqsG09fcY8Qw0P9EOWp4G7KQ4QNXQd4HIP4o3zcJgBd5MKeclJAD/QOyPdhnb+a9JdwVFyqMamQ== integrity sha512-/u4SmQ1wr7d80iGP705fZrfHjJUTf/1MyRXz5Wltt7i3OHvOCQEoST2mqNlfx0W/9gIWzxA7cFRLY0/aITmzTw==
"@cliqz/adblocker@^1.22.1": "@cliqz/adblocker@^1.22.1":
version "1.22.1" version "1.22.2"
resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz#dae3dd6c59f16244012d1e736150f618b2d578e6" resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz#99a14d56327734d3083a077d96fe7b91c236bf7a"
integrity sha512-kir/tVTe0VabtJfcRipDX+/UBnZn0aN0lX4GQT7wZIHMOACpW37eix7wGkzVS+icbwu1bEqZ+O8Q98UlORPm4w== integrity sha512-P+a8gYbRbQy38mYsr7932h2cnK/7AEuQrmCEfLTO1+abCr2v5RM2Qb+cCn/JVnQSeqnysebAIXoV+PUzrjfpiQ==
dependencies: dependencies:
"@cliqz/adblocker-content" "^1.22.1" "@cliqz/adblocker-content" "^1.22.2"
"@cliqz/adblocker-extended-selectors" "^1.22.1" "@cliqz/adblocker-extended-selectors" "^1.22.2"
"@remusao/guess-url-type" "^1.1.2" "@remusao/guess-url-type" "^1.1.2"
"@remusao/small" "^1.1.2" "@remusao/small" "^1.1.2"
"@remusao/smaz" "^1.7.1" "@remusao/smaz" "^1.7.1"
"@types/chrome" "^0.0.144" "@types/chrome" "^0.0.145"
"@types/firefox-webext-browser" "^82.0.0" "@types/firefox-webext-browser" "^82.0.0"
tldts-experimental "^5.6.21" tldts-experimental "^5.6.21"
@ -706,10 +721,10 @@
dependencies: dependencies:
"@babel/types" "^7.3.0" "@babel/types" "^7.3.0"
"@types/chrome@^0.0.144": "@types/chrome@^0.0.145":
version "0.0.144" version "0.0.145"
resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz#7dd9188e355aa17e3ad397f50b5cd3ad12caf788" resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz#6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8"
integrity sha512-BgoiO7/KP9hRNrCR2Wq+aKWT5Dh9bTofuWaRtcqPcj8YKhZojQgb6sSdIqvds2C+eO63BwaR9KHVMYYgZdGGBg== integrity sha512-vLvTMmfc8mvwOZzkmn2UwlWSNu0t0txBkyuIv8NgihRkvFCe6XJX65YZAgAP/RdBit3enhU2GTxCr+prn4uZmA==
dependencies: dependencies:
"@types/filesystem" "*" "@types/filesystem" "*"
"@types/har-format" "*" "@types/har-format" "*"
@ -788,9 +803,9 @@
integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
"@types/node@*": "@types/node@*":
version "15.12.2" version "15.12.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d" resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26"
integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww== integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA==
"@types/node@^14.6.2": "@types/node@^14.6.2":
version "14.17.3" version "14.17.3"
@ -806,9 +821,9 @@
xmlbuilder ">=11.0.1" xmlbuilder ">=11.0.1"
"@types/prettier@^2.1.5": "@types/prettier@^2.1.5":
version "2.2.3" version "2.3.0"
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz#2e8332cc7363f887d32ec5496b207d26ba8052bb"
integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== integrity sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw==
"@types/stack-utils@^2.0.0": "@types/stack-utils@^2.0.0":
version "2.0.0" version "2.0.0"
@ -825,7 +840,7 @@
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==
"@types/yargs@^16.0.0", "@types/yargs@^16.0.1": "@types/yargs@^16.0.0", "@types/yargs@^16.0.2":
version "16.0.3" version "16.0.3"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01"
integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ==
@ -861,9 +876,9 @@ acorn@^7.1.1, acorn@^7.4.0:
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.2.4: acorn@^8.2.4:
version "8.3.0" version "8.4.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz#1193f9b96c4e8232f00b11a9edff81b2c8b98b88" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60"
integrity sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw== integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w==
agent-base@6: agent-base@6:
version "6.0.2" version "6.0.2"
@ -963,10 +978,10 @@ app-builder-bin@3.5.13:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" 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== integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==
app-builder-lib@22.11.5: app-builder-lib@22.11.7:
version "22.11.5" version "22.11.7"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz#d49f49dc2d9fd225249e4ae7e30add2996e7062f" resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6"
integrity sha512-lLEDvJuLdc4IVyADJK6t4qEIjRhOUj4p19B1RS/8pN/oAb8X5Qe1t3Einbsi4oFBJBweH2LIygnSAwumjQh9iA== integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==
dependencies: dependencies:
"7zip-bin" "~5.1.1" "7zip-bin" "~5.1.1"
"@develar/schema-utils" "~2.6.5" "@develar/schema-utils" "~2.6.5"
@ -974,12 +989,12 @@ app-builder-lib@22.11.5:
"@malept/flatpak-bundler" "^0.4.0" "@malept/flatpak-bundler" "^0.4.0"
async-exit-hook "^2.0.1" async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9" bluebird-lst "^1.0.9"
builder-util "22.11.5" builder-util "22.11.7"
builder-util-runtime "8.7.6" builder-util-runtime "8.7.7"
chromium-pickle-js "^0.2.0" chromium-pickle-js "^0.2.0"
debug "^4.3.2" debug "^4.3.2"
ejs "^3.1.6" ejs "^3.1.6"
electron-publish "22.11.5" electron-publish "22.11.7"
fs-extra "^10.0.0" fs-extra "^10.0.0"
hosted-git-info "^4.0.2" hosted-git-info "^4.0.2"
is-ci "^3.0.0" is-ci "^3.0.0"
@ -1178,9 +1193,9 @@ bluebird@^3.5.5:
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
boolean@^3.0.1: boolean@^3.0.1:
version "3.1.0" version "3.1.2"
resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz#a245080649ebb80e7c0ea218a480e4e913136336" resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2"
integrity sha512-K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g== integrity sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw==
boxen@^5.0.0: boxen@^5.0.0:
version "5.0.1" version "5.0.1"
@ -1265,17 +1280,25 @@ builder-util-runtime@8.7.6:
debug "^4.3.2" debug "^4.3.2"
sax "^1.2.4" sax "^1.2.4"
builder-util@22.11.5: builder-util-runtime@8.7.7:
version "22.11.5" version "8.7.7"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz#08836d00e6bef39bdffd8a66fb07d2d5021b9c3c" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"
integrity sha512-ur9ksncYOnJg/VuJz3PdsBQHeg9tjdOC2HVj8mQ0WNcn/H3MO4tnwKBOWWikPDiWEjeBSvFUmYBnGFkRiUNkww== integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==
dependencies:
debug "^4.3.2"
sax "^1.2.4"
builder-util@22.11.7:
version "22.11.7"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467"
integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==
dependencies: dependencies:
"7zip-bin" "~5.1.1" "7zip-bin" "~5.1.1"
"@types/debug" "^4.1.5" "@types/debug" "^4.1.5"
"@types/fs-extra" "^9.0.11" "@types/fs-extra" "^9.0.11"
app-builder-bin "3.5.13" app-builder-bin "3.5.13"
bluebird-lst "^1.0.9" bluebird-lst "^1.0.9"
builder-util-runtime "8.7.6" builder-util-runtime "8.7.7"
chalk "^4.1.1" chalk "^4.1.1"
debug "^4.3.2" debug "^4.3.2"
fs-extra "^10.0.0" fs-extra "^10.0.0"
@ -1314,9 +1337,9 @@ camelcase@^6.2.0:
integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219:
version "1.0.30001236" version "1.0.30001239"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8"
integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ== integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ==
chalk@^2.0.0, chalk@^2.4.2: chalk@^2.0.0, chalk@^2.4.2:
version "2.4.2" version "2.4.2"
@ -1498,16 +1521,16 @@ configstore@^5.0.1:
xdg-basedir "^4.0.0" xdg-basedir "^4.0.0"
convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
version "1.7.0" version "1.8.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
dependencies: dependencies:
safe-buffer "~5.1.1" safe-buffer "~5.1.1"
core-js@^3.6.5: core-js@^3.6.5:
version "3.14.0" version "3.15.0"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044"
integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA== integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
core-util-is@1.0.2, core-util-is@~1.0.0: core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2" version "1.0.2"
@ -1672,13 +1695,13 @@ dir-compare@^2.4.0:
commander "2.9.0" commander "2.9.0"
minimatch "3.0.4" minimatch "3.0.4"
dmg-builder@22.11.5: dmg-builder@22.11.7:
version "22.11.5" version "22.11.7"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz#0df9843def73a217097956982fa21bb4d6a5836e" resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89"
integrity sha512-91Shh9+OK9RwBlBURxvhSnQNibEh/JYNAnMOfFguyNbasSfF50Jme4b3dgsQrHTTTfkFijcvzykPPFAZofQs6g== integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==
dependencies: dependencies:
app-builder-lib "22.11.5" app-builder-lib "22.11.7"
builder-util "22.11.5" builder-util "22.11.7"
builder-util-runtime "8.7.6" builder-util-runtime "8.7.6"
fs-extra "^10.0.0" fs-extra "^10.0.0"
iconv-lite "^0.6.2" iconv-lite "^0.6.2"
@ -1744,17 +1767,17 @@ ejs@^3.1.6:
dependencies: dependencies:
jake "^10.6.1" jake "^10.6.1"
electron-builder@22.11.5: electron-builder@22.11.7:
version "22.11.5" version "22.11.7"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz#914d8183e1bab7cda43ef1d67fc3d17314c7e242" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596"
integrity sha512-QIhzrmSLNteItRvmAjwNpsya08oZeOJIrxFww/Alkjcwnrn5Xgog2qf3Xfa3ocuNUQIwb+mMzZrzqnPu0Mamyg== integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==
dependencies: dependencies:
"@types/yargs" "^16.0.1" "@types/yargs" "^16.0.2"
app-builder-lib "22.11.5" app-builder-lib "22.11.7"
builder-util "22.11.5" builder-util "22.11.7"
builder-util-runtime "8.7.6" builder-util-runtime "8.7.7"
chalk "^4.1.1" chalk "^4.1.1"
dmg-builder "22.11.5" dmg-builder "22.11.7"
fs-extra "^10.0.0" fs-extra "^10.0.0"
is-ci "^3.0.0" is-ci "^3.0.0"
lazy-val "^1.0.5" lazy-val "^1.0.5"
@ -1762,28 +1785,28 @@ electron-builder@22.11.5:
update-notifier "^5.1.0" update-notifier "^5.1.0"
yargs "^17.0.1" yargs "^17.0.1"
electron-publish@22.11.5: electron-publish@22.11.7:
version "22.11.5" version "22.11.7"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz#2fcd3280c4267e70e4aa15003c9b7dc34923320e" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"
integrity sha512-peN4tEP80Kb6reuwKKvSu9p/XUWpx/7x747u5NSg7Kg2axBjzdMtX5ZqBThfPtJWJhSWZ7PEYWmNyUCfdQl2Ag== integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==
dependencies: dependencies:
"@types/fs-extra" "^9.0.11" "@types/fs-extra" "^9.0.11"
builder-util "22.11.5" builder-util "22.11.7"
builder-util-runtime "8.7.6" builder-util-runtime "8.7.7"
chalk "^4.1.1" chalk "^4.1.1"
fs-extra "^10.0.0" fs-extra "^10.0.0"
lazy-val "^1.0.5" lazy-val "^1.0.5"
mime "^2.5.2" mime "^2.5.2"
electron-to-chromium@^1.3.723: electron-to-chromium@^1.3.723:
version "1.3.750" version "1.3.752"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz#7e5ef6f478316b0bd656af5942fe502610e97eaf" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09"
integrity sha512-Eqy9eHNepZxJXT+Pc5++zvEi5nQ6AGikwFYDCYwXUFBr+ynJ6pDG7MzZmwGYCIuXShLJM0n4bq+aoKDmvSGJ8A== integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A==
electron@13.1.1: electron@13.1.2:
version "13.1.1" version "13.1.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz#de1ea908bcac2197d7a5a373fb68c0c66043e10e" resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90"
integrity sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog== integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g==
dependencies: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^14.6.2" "@types/node" "^14.6.2"
@ -1916,10 +1939,10 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
eslint@7.28.0: eslint@7.29.0:
version "7.28.0" version "7.29.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"
integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==
dependencies: dependencies:
"@babel/code-frame" "7.12.11" "@babel/code-frame" "7.12.11"
"@eslint/eslintrc" "^0.4.2" "@eslint/eslintrc" "^0.4.2"
@ -3718,9 +3741,9 @@ readdir-glob@^1.0.0:
minimatch "^3.0.4" minimatch "^3.0.4"
regexpp@^3.1.0: regexpp@^3.1.0:
version "3.1.0" version "3.2.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
registry-auth-token@^4.0.0: registry-auth-token@^4.0.0:
version "4.2.1" version "4.2.1"
@ -4455,9 +4478,9 @@ write-file-atomic@^3.0.0:
typedarray-to-buffer "^3.1.5" typedarray-to-buffer "^3.1.5"
ws@^7.4.5: ws@^7.4.5:
version "7.4.6" version "7.5.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691"
integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw==
xdg-basedir@^4.0.0: xdg-basedir@^4.0.0:
version "4.0.0" version "4.0.0"
@ -4500,9 +4523,9 @@ yallist@^4.0.0:
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
yargs-parser@^20.2.2: yargs-parser@^20.2.2:
version "20.2.7" version "20.2.9"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
yargs@^16.0.3: yargs@^16.0.3:
version "16.2.0" version "16.2.0"

View file

@ -18,163 +18,171 @@
}; };
} }
{ {
name = "_babel_code_frame___code_frame_7.12.13.tgz"; name = "_babel_code_frame___code_frame_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_code_frame___code_frame_7.12.13.tgz"; name = "_babel_code_frame___code_frame_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz";
sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb";
}; };
} }
{ {
name = "_babel_compat_data___compat_data_7.14.4.tgz"; name = "_babel_compat_data___compat_data_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_compat_data___compat_data_7.14.4.tgz"; name = "_babel_compat_data___compat_data_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz";
sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; sha1 = "8ef4c18e58e801c5c95d3c1c0f2874a2680fadea";
}; };
} }
{ {
name = "_babel_core___core_7.14.3.tgz"; name = "_babel_core___core_7.14.6.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_core___core_7.14.3.tgz"; name = "_babel_core___core_7.14.6.tgz";
url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz";
sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38"; sha1 = "e0814ec1a950032ff16c13a2721de39a8416fcab";
}; };
} }
{ {
name = "_babel_generator___generator_7.14.3.tgz"; name = "_babel_generator___generator_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_generator___generator_7.14.3.tgz"; name = "_babel_generator___generator_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz";
sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"; sha1 = "848d7b9f031caca9d0cd0af01b063f226f52d785";
}; };
} }
{ {
name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@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.5.tgz";
sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; sha1 = "7a99c5d0967911e972fe2c3411f7d5b498498ecf";
}; };
} }
{ {
name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz";
sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2"; sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4";
}; };
} }
{ {
name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz";
sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815";
}; };
} }
{ {
name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz";
sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d";
}; };
} }
{ {
name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz";
sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; sha1 = "d5c70e4ad13b402c95156c7a53568f504e2fb7b8";
}; };
} }
{ {
name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz";
sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"; sha1 = "6d1a44df6a38c957aa7c312da076429f11b422f3";
}; };
} }
{ {
name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz";
sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; sha1 = "7de42f10d789b423eb902ebd24031ca77cb1e10e";
}; };
} }
{ {
name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz";
sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; sha1 = "f27395a8619e0665b3f0364cddb41c25d71b499c";
}; };
} }
{ {
name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz";
sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9";
}; };
} }
{ {
name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz";
sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; sha1 = "0ecc0b03c41cd567b4024ea016134c28414abb94";
}; };
} }
{ {
name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz";
sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; sha1 = "66ea85cf53ba0b4e588ba77fc813f53abcaa41c4";
}; };
} }
{ {
name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz";
sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a";
}; };
} }
{ {
name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz";
sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; sha1 = "d0f0e277c512e0c938277faa85a3968c9a44c0e8";
}; };
} }
{ {
name = "_babel_helpers___helpers_7.14.0.tgz"; name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helpers___helpers_7.14.0.tgz"; name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz";
sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3";
}; };
} }
{ {
name = "_babel_highlight___highlight_7.14.0.tgz"; name = "_babel_helpers___helpers_7.14.6.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_highlight___highlight_7.14.0.tgz"; name = "_babel_helpers___helpers_7.14.6.tgz";
url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz";
sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; sha1 = "5b58306b95f1b47e2a0199434fa8658fa6c21635";
}; };
} }
{ {
name = "_babel_parser___parser_7.14.4.tgz"; name = "_babel_highlight___highlight_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_parser___parser_7.14.4.tgz"; name = "_babel_highlight___highlight_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz";
sha1 = "a5c560d6db6cd8e6ed342368dea8039232cbab18"; sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9";
};
}
{
name = "_babel_parser___parser_7.14.6.tgz";
path = fetchurl {
name = "_babel_parser___parser_7.14.6.tgz";
url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz";
sha1 = "d85cc68ca3cac84eae384c06f032921f5227f4b2";
}; };
} }
{ {
@ -266,43 +274,43 @@
}; };
} }
{ {
name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz";
sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; sha1 = "c1cfdadc35a646240001f06138247b741c34d94c";
}; };
} }
{ {
name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz";
sha1 = "9dff111ca64154cef0f4dc52cf843d9f12ce4474"; sha1 = "b82c6ce471b165b5ce420cf92914d6fb46225716";
}; };
} }
{ {
name = "_babel_template___template_7.12.13.tgz"; name = "_babel_template___template_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_template___template_7.12.13.tgz"; name = "_babel_template___template_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz";
sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4";
}; };
} }
{ {
name = "_babel_traverse___traverse_7.14.2.tgz"; name = "_babel_traverse___traverse_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_traverse___traverse_7.14.2.tgz"; name = "_babel_traverse___traverse_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz";
sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b"; sha1 = "c111b0f58afab4fea3d3385a406f692748c59870";
}; };
} }
{ {
name = "_babel_types___types_7.14.4.tgz"; name = "_babel_types___types_7.14.5.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_types___types_7.14.4.tgz"; name = "_babel_types___types_7.14.5.tgz";
url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz";
sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; sha1 = "3bb997ba829a2104cedb20689c4a5b8121d383ff";
}; };
} }
{ {
@ -314,11 +322,11 @@
}; };
} }
{ {
name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz";
path = fetchurl { path = fetchurl {
name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz";
url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz"; url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz";
sha1 = "71bc0d0d473ae96d5086badb2f4d624769fa56c4"; sha1 = "643849d5f08c167eb84a2e7e3f1f9fbc41a3889b";
}; };
} }
{ {
@ -329,6 +337,14 @@
sha1 = "8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af"; sha1 = "8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af";
}; };
} }
{
name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz";
path = fetchurl {
name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz";
url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz";
sha1 = "eea674767a60abe4e5f9ccb46188d33656f551d0";
};
}
{ {
name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz";
path = fetchurl { path = fetchurl {
@ -338,19 +354,19 @@
}; };
} }
{ {
name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz";
path = fetchurl { path = fetchurl {
name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz";
url = "https://registry.yarnpkg.com/@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.2.tgz";
sha1 = "234ee70a1736e3690b25a7a073818f5a851bf9a8"; sha1 = "1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90";
}; };
} }
{ {
name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; name = "_cliqz_adblocker___adblocker_1.22.2.tgz";
path = fetchurl { path = fetchurl {
name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; name = "_cliqz_adblocker___adblocker_1.22.2.tgz";
url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz"; url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz";
sha1 = "dae3dd6c59f16244012d1e736150f618b2d578e6"; sha1 = "99a14d56327734d3083a077d96fe7b91c236bf7a";
}; };
} }
{ {
@ -634,11 +650,11 @@
}; };
} }
{ {
name = "_types_chrome___chrome_0.0.144.tgz"; name = "_types_chrome___chrome_0.0.145.tgz";
path = fetchurl { path = fetchurl {
name = "_types_chrome___chrome_0.0.144.tgz"; name = "_types_chrome___chrome_0.0.145.tgz";
url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz"; url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz";
sha1 = "7dd9188e355aa17e3ad397f50b5cd3ad12caf788"; sha1 = "6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8";
}; };
} }
{ {
@ -738,11 +754,11 @@
}; };
} }
{ {
name = "_types_node___node_15.12.2.tgz"; name = "_types_node___node_15.12.4.tgz";
path = fetchurl { path = fetchurl {
name = "_types_node___node_15.12.2.tgz"; name = "_types_node___node_15.12.4.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz"; url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz";
sha1 = "1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"; sha1 = "e1cf817d70a1e118e81922c4ff6683ce9d422e26";
}; };
} }
{ {
@ -762,11 +778,11 @@
}; };
} }
{ {
name = "_types_prettier___prettier_2.2.3.tgz"; name = "_types_prettier___prettier_2.3.0.tgz";
path = fetchurl { path = fetchurl {
name = "_types_prettier___prettier_2.2.3.tgz"; name = "_types_prettier___prettier_2.3.0.tgz";
url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz"; url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz";
sha1 = "ef65165aea2924c9359205bf748865b8881753c0"; sha1 = "2e8332cc7363f887d32ec5496b207d26ba8052bb";
}; };
} }
{ {
@ -842,11 +858,11 @@
}; };
} }
{ {
name = "acorn___acorn_8.3.0.tgz"; name = "acorn___acorn_8.4.0.tgz";
path = fetchurl { path = fetchurl {
name = "acorn___acorn_8.3.0.tgz"; name = "acorn___acorn_8.4.0.tgz";
url = "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz";
sha1 = "1193f9b96c4e8232f00b11a9edff81b2c8b98b88"; sha1 = "af53266e698d7cffa416714b503066a82221be60";
}; };
} }
{ {
@ -970,11 +986,11 @@
}; };
} }
{ {
name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; name = "app_builder_lib___app_builder_lib_22.11.7.tgz";
path = fetchurl { path = fetchurl {
name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; name = "app_builder_lib___app_builder_lib_22.11.7.tgz";
url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz"; url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz";
sha1 = "d49f49dc2d9fd225249e4ae7e30add2996e7062f"; sha1 = "c0ad1119ebfbf4189a8280ad693625f5e684dca6";
}; };
} }
{ {
@ -1162,11 +1178,11 @@
}; };
} }
{ {
name = "boolean___boolean_3.1.0.tgz"; name = "boolean___boolean_3.1.2.tgz";
path = fetchurl { path = fetchurl {
name = "boolean___boolean_3.1.0.tgz"; name = "boolean___boolean_3.1.2.tgz";
url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz"; url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz";
sha1 = "a245080649ebb80e7c0ea218a480e4e913136336"; sha1 = "e30f210a26b02458482a8cc353ab06f262a780c2";
}; };
} }
{ {
@ -1258,11 +1274,19 @@
}; };
} }
{ {
name = "builder_util___builder_util_22.11.5.tgz"; name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz";
path = fetchurl { path = fetchurl {
name = "builder_util___builder_util_22.11.5.tgz"; name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz";
url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz"; url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz";
sha1 = "08836d00e6bef39bdffd8a66fb07d2d5021b9c3c"; sha1 = "6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d";
};
}
{
name = "builder_util___builder_util_22.11.7.tgz";
path = fetchurl {
name = "builder_util___builder_util_22.11.7.tgz";
url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz";
sha1 = "ae9707afa6a31feafa13c274ac83b4fe28ef1467";
}; };
} }
{ {
@ -1298,11 +1322,11 @@
}; };
} }
{ {
name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz";
path = fetchurl { path = fetchurl {
name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz"; url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz";
sha1 = "0a80de4cdf62e1770bb46a30d884fc8d633e3958"; sha1 = "66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8";
}; };
} }
{ {
@ -1522,19 +1546,19 @@
}; };
} }
{ {
name = "convert_source_map___convert_source_map_1.7.0.tgz"; name = "convert_source_map___convert_source_map_1.8.0.tgz";
path = fetchurl { path = fetchurl {
name = "convert_source_map___convert_source_map_1.7.0.tgz"; name = "convert_source_map___convert_source_map_1.8.0.tgz";
url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz";
sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369";
}; };
} }
{ {
name = "core_js___core_js_3.14.0.tgz"; name = "core_js___core_js_3.15.0.tgz";
path = fetchurl { path = fetchurl {
name = "core_js___core_js_3.14.0.tgz"; name = "core_js___core_js_3.15.0.tgz";
url = "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz"; url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz";
sha1 = "62322b98c71cc2018b027971a69419e2425c2a6c"; sha1 = "db9554ebce0b6fd90dc9b1f2465c841d2d055044";
}; };
} }
{ {
@ -1746,11 +1770,11 @@
}; };
} }
{ {
name = "dmg_builder___dmg_builder_22.11.5.tgz"; name = "dmg_builder___dmg_builder_22.11.7.tgz";
path = fetchurl { path = fetchurl {
name = "dmg_builder___dmg_builder_22.11.5.tgz"; name = "dmg_builder___dmg_builder_22.11.7.tgz";
url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz"; url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz";
sha1 = "0df9843def73a217097956982fa21bb4d6a5836e"; sha1 = "5956008c18d40ee72c0ea01ffea9590dbf51df89";
}; };
} }
{ {
@ -1818,35 +1842,35 @@
}; };
} }
{ {
name = "electron_builder___electron_builder_22.11.5.tgz"; name = "electron_builder___electron_builder_22.11.7.tgz";
path = fetchurl { path = fetchurl {
name = "electron_builder___electron_builder_22.11.5.tgz"; name = "electron_builder___electron_builder_22.11.7.tgz";
url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz"; url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz";
sha1 = "914d8183e1bab7cda43ef1d67fc3d17314c7e242"; sha1 = "cd97a0d9f6e6d388112e66b4376de431cca4d596";
}; };
} }
{ {
name = "electron_publish___electron_publish_22.11.5.tgz"; name = "electron_publish___electron_publish_22.11.7.tgz";
path = fetchurl { path = fetchurl {
name = "electron_publish___electron_publish_22.11.5.tgz"; name = "electron_publish___electron_publish_22.11.7.tgz";
url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz"; url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz";
sha1 = "2fcd3280c4267e70e4aa15003c9b7dc34923320e"; sha1 = "4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a";
}; };
} }
{ {
name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz";
path = fetchurl { path = fetchurl {
name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz"; url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz";
sha1 = "7e5ef6f478316b0bd656af5942fe502610e97eaf"; sha1 = "0728587f1b9b970ec9ffad932496429aef750d09";
}; };
} }
{ {
name = "electron___electron_13.1.1.tgz"; name = "electron___electron_13.1.2.tgz";
path = fetchurl { path = fetchurl {
name = "electron___electron_13.1.1.tgz"; name = "electron___electron_13.1.2.tgz";
url = "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz"; url = "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz";
sha1 = "de1ea908bcac2197d7a5a373fb68c0c66043e10e"; sha1 = "8c9abf9015766c9cbc16f10c99282d00d6ae1b90";
}; };
} }
{ {
@ -2010,11 +2034,11 @@
}; };
} }
{ {
name = "eslint___eslint_7.28.0.tgz"; name = "eslint___eslint_7.29.0.tgz";
path = fetchurl { path = fetchurl {
name = "eslint___eslint_7.28.0.tgz"; name = "eslint___eslint_7.29.0.tgz";
url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; url = "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz";
sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820"; sha1 = "ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0";
}; };
} }
{ {
@ -3890,11 +3914,11 @@
}; };
} }
{ {
name = "regexpp___regexpp_3.1.0.tgz"; name = "regexpp___regexpp_3.2.0.tgz";
path = fetchurl { path = fetchurl {
name = "regexpp___regexpp_3.1.0.tgz"; name = "regexpp___regexpp_3.2.0.tgz";
url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz";
sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2";
}; };
} }
{ {
@ -4786,11 +4810,11 @@
}; };
} }
{ {
name = "ws___ws_7.4.6.tgz"; name = "ws___ws_7.5.0.tgz";
path = fetchurl { path = fetchurl {
name = "ws___ws_7.4.6.tgz"; name = "ws___ws_7.5.0.tgz";
url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz";
sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; sha1 = "0033bafea031fb9df041b2026fc72a571ca44691";
}; };
} }
{ {
@ -4858,11 +4882,11 @@
}; };
} }
{ {
name = "yargs_parser___yargs_parser_20.2.7.tgz"; name = "yargs_parser___yargs_parser_20.2.9.tgz";
path = fetchurl { path = fetchurl {
name = "yargs_parser___yargs_parser_20.2.7.tgz"; name = "yargs_parser___yargs_parser_20.2.9.tgz";
url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz";
sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee";
}; };
} }
{ {

View file

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "kubelogin"; pname = "kubelogin";
version = "1.23.2"; version = "1.23.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "int128"; owner = "int128";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Vj7qk1x4d94GgthmHhWbQvsfnZE1UL3Bdk5zjAb3vWs="; sha256 = "sha256-qhdt/j1yFlCr+CCM3VQHxRVMEelZDsjhDJW9CYNCx2U=";
}; };
subPackages = ["."]; subPackages = ["."];
vendorSha256 = "sha256-JsBseRIbStsX44rLsGAERFUSWUuLcNycRDAcOMconnE="; vendorSha256 = "sha256-RxIrnwIHDi9umu9bqpz3lnpNFdIWoTP657Te9iBv4IA=";
# Rename the binary instead of symlinking to avoid conflict with the # Rename the binary instead of symlinking to avoid conflict with the
# Azure version of kubelogin # Azure version of kubelogin

View file

@ -1121,10 +1121,10 @@
"owner": "hashicorp", "owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/vsphere", "provider-source-address": "registry.terraform.io/hashicorp/vsphere",
"repo": "terraform-provider-vsphere", "repo": "terraform-provider-vsphere",
"rev": "v1.24.3", "rev": "v2.0.1",
"sha256": "1sc60x3r4nb48p8yb7778fpk78acq808jzcd5ijnwxqakccml5kl", "sha256": "0ah3bi4zpg8j59v4bj9a8vyknpnyl1g8bx4qyfwwz4gnqp9m4anr",
"vendorSha256": null, "vendorSha256": null,
"version": "1.24.3" "version": "2.0.1"
}, },
"vthunder": { "vthunder": {
"owner": "terraform-providers", "owner": "terraform-providers",

View file

@ -15,33 +15,27 @@
, webkitgtk , webkitgtk
, glib-networking , glib-networking
, librsvg , librsvg
, gst_all_1
, xdg-utils , xdg-utils
, gst_all_1
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "newsflash"; pname = "newsflash";
version = "1.4.1"; version = "1.4.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "news-flash"; owner = "news-flash";
repo = "news_flash_gtk"; repo = "news_flash_gtk";
rev = version; rev = version;
hash = "sha256-pskmvztKOwutXRHVnW5u68/0DAuV9Gb+Ovp2JbXiMYo="; hash = "sha256-8W158GrvVGu5b3TG5bomK+hAF6jttZuImkmtcZOl91o=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E="; hash = "sha256-zHtD3NVWYQ5njg17Z2YmEttiK2oiq01OiAXIZofIqKI=";
}; };
# https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5
# obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo
# build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0
# https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes
RUSTC_BOOTSTRAP = 1;
patches = [ patches = [
# Post install tries to generate an icon cache & update the # Post install tries to generate an icon cache & update the
# desktop database. The gtk setup hook drop-icon-theme-cache.sh # desktop database. The gtk setup hook drop-icon-theme-cache.sh
@ -79,14 +73,14 @@ stdenv.mkDerivation rec {
sqlite sqlite
webkitgtk webkitgtk
# open link in browser
xdg-utils
# TLS support for loading external content in webkitgtk WebView # TLS support for loading external content in webkitgtk WebView
glib-networking glib-networking
# SVG support for gdk-pixbuf # SVG support for gdk-pixbuf
librsvg librsvg
# Open links in browser
xdg-utils
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
# Audio & video support for webkitgtk WebView # Audio & video support for webkitgtk WebView
gstreamer gstreamer
@ -100,5 +94,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.com/news-flash/news_flash_gtk"; homepage = "https://gitlab.com/news-flash/news_flash_gtk";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ kira-bruneau ]; maintainers = with maintainers; [ kira-bruneau ];
platforms = platforms.unix;
}; };
} }

View file

@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 53f911c..361a233 100644 index 1d7089c..1952e7f 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -61,5 +61,3 @@ meson.add_dist_script( @@ -61,5 +61,3 @@ meson.add_dist_script(

View file

@ -0,0 +1,123 @@
{ appimageTools
, fetchurl
, lib
}:
# You can debug this package with: $ ELECTRON_ENABLE_LOGGING=true timedoctor
let
version = "3.12.12";
sha256 = "01j149c6lacgysll3sajxlb43m1al08kdcwc6zyzw80nrp4iagf6";
in
appimageTools.wrapType2 {
name = "timedoctor-${version}";
src = fetchurl {
inherit sha256;
url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage";
};
multiPkgs = _: with _; [
alsaLib
atk
at-spi2-atk
at-spi2-core
cairo
coreutils
cups
dbus
dbus.lib
desktop-file-utils
expat
expat.dev
file
freetype
gcc
gcc-unwrapped.lib
gdb
gdk-pixbuf
git
glib
glibc
gnome.gdk_pixbuf
gnome.gtk
gnome.gtk.dev
gnome.zenity
gnome2.GConf
gnumake
gnutar
gpsd
gtk3
gtk3.dev
gtk3-x11
gtk3-x11.dev
kdialog
libappindicator-gtk2.out
libexif
(libjpeg.override { enableJpeg8 = true; }).out
libnotify
libpng
libxml2
libxslt
netcat
nettools
nodePackages.asar
nspr
nss
openjdk
pango
patchelf
python38
strace
sqlite
sqlite.dev
udev
unzip
utillinux
watch
wget
which
wrapGAppsHook
xdg_utils
xorg.libX11
xorg.libXau
xorg.libXaw
xorg.libXaw3d
xorg.libxcb
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXdmcp
xorg.libXext
xorg.libXfixes
xorg.libXfont
xorg.libXfont2
xorg.libXft
xorg.libXi
xorg.libXinerama
xorg.libXmu
xorg.libXp
xorg.libXpm
xorg.libXpresent
xorg.libXrandr
xorg.libXrender
xorg.libXres
xorg.libXScrnSaver
xorg.libXt
xorg.libXTrap
xorg.libXtst
xorg.libXv
xorg.libXvMC
xorg.libXxf86dga
xorg.libXxf86misc
xorg.libXxf86vm
xorg.xcbutilkeysyms
zip
zlib
zsh
];
meta = with lib; {
description = "Employee time tracking software";
homepage = "https://www.timedoctor.com";
license = licenses.unfree;
maintainers = with maintainers; [ kamadorueda ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "element";
version = "1.0.0";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = pname;
rev = "v${version}";
sha256 = "gjdcNvYNnxb6hOE/MQjTezZeYGBWTr4E8/Pt8YQv3lY=";
};
vendorSha256 = "A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg=";
meta = with lib; {
description = "The periodic table on the command line";
homepage = "https://github.com/gennaro-tedesco/element";
license = licenses.asl20;
maintainers = [ maintainers.j0hax ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }: { lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo4, getopt, readline, texlive }:
lib.fix (eukleides: stdenv.mkDerivation rec { lib.fix (eukleides: stdenv.mkDerivation rec {
pname = "eukleides"; pname = "eukleides";
@ -9,12 +9,16 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
}; };
# use $CC instead of hardcoded gcc patches = [
patches = [ ./use-CC.patch ]; # use $CC instead of hardcoded gcc
./use-CC.patch
# allow PostScript transparency in epstopdf call
./gs-allowpstransparency.patch
];
nativeBuildInputs = [ bison flex texinfo makeWrapper ]; nativeBuildInputs = [ bison flex texinfo4 makeWrapper ];
buildInputs = [ readline texLive ]; buildInputs = [ getopt readline ];
preConfigure = '' preConfigure = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
@ -34,19 +38,15 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/euktoeps \ wrapProgram $out/bin/euktoeps \
--set-default TEXINPUTS : \ --prefix PATH : ${lib.makeBinPath [ getopt ]}
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
--prefix PATH : "${texLive}/bin"
wrapProgram $out/bin/euktopdf \
--set-default TEXINPUTS : \
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
--prefix PATH : "${texLive}/bin"
''; '';
outputs = [ "out" "doc" "tex" ]; outputs = [ "out" "doc" "tex" ];
passthru.tlType = "run"; passthru.tlType = "run";
passthru.pkgs = [ eukleides.tex ]; passthru.pkgs = [ eukleides.tex ]
# packages needed by euktoeps, euktopdf and eukleides.sty
++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs);
meta = { meta = {
description = "Geometry Drawing Language"; description = "Geometry Drawing Language";

View file

@ -0,0 +1,10 @@
--- a/bash/euktopdf
+++ b/bash/euktopdf
@@ -55,6 +55,6 @@ do
exit 1
fi
dvips -q -E -o $base.eps $base.dvi &&
- epstopdf $base.eps &&
+ epstopdf --gsopt=-dALLOWPSTRANSPARENCY $base.eps &&
rm -f $base.{tex,log,dvi,eps}
done

View file

@ -1,30 +1,41 @@
{ lib, stdenv { lib
, stdenv
, fetchurl , fetchurl
, cmake , cmake
, pkg-config
, gtk3
, perl
, vte
, pcre2
, glib , glib
, gtk3
, makeWrapper , makeWrapper
, pcre2
, perl
, pkg-config
, vte
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sakura"; pname = "sakura";
version = "3.7.1"; version = "3.8.2";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; sha256 = "sha256-nd/okZrg4RZzyiKHmuMkVl0Jh7FOlI4dK63/U4/htbk=";
}; };
nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; nativeBuildInputs = [
cmake
makeWrapper
perl
pkg-config
];
buildInputs = [ gtk3 vte pcre2 glib ]; buildInputs = [
glib
gtk3
pcre2
vte
];
# Set path to gsettings-schemata so sakura knows # Set path to gsettings-schemata so sakura knows where to find colorchooser,
# where to find colorchooser, fontchooser etc. # fontchooser etc.
postInstall = '' postInstall = ''
wrapProgram $out/bin/sakura \ wrapProgram $out/bin/sakura \
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gitstatus"; pname = "gitstatus";
version = "1.5.1"; version = "1.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romkatv"; owner = "romkatv";
repo = "gitstatus"; repo = "gitstatus";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh"; sha256 = "sha256-MQG4thW73gDqY68bKP2FO8z5uc2R/tED+/X9qas/GOA=";
}; };
buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, { lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2,
curl curl
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
./gcc6.patch ./gcc6.patch
]; ];
nativeBuildInputs = [ cmake antlr ]; nativeBuildInputs = [ cmake antlr2 ];
buildInputs = [ libxml2 libxslt boost libarchive python curl ]; buildInputs = [ libxml2 libxslt boost libarchive python curl ];
meta = { meta = {

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xhyve"; pname = "xhyve";
version = "20191001"; version = "20210203";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "machyve"; owner = "machyve";
repo = "xhyve"; repo = "xhyve";
rev = "1f46a3d0bbeb6c90883f302425844fcc3800a776"; rev = "83516a009c692ea5d2993d1071e68d05d359b11e";
sha256 = "0mm9xa0v6n7xl2qypnppq5abdncd31vffiklrhcrlni5ymyh9ia5"; sha256 = "1pjdg4ppy6qh3vr1ls5zyw3jzcvwny9wydnmfpadwij1hvns7lj3";
}; };
buildInputs = [ Hypervisor vmnet xpc libobjc zlib ]; buildInputs = [ Hypervisor vmnet xpc libobjc zlib ];

View file

@ -1,13 +1,13 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "0.039"; version = "0.040";
in in
fetchzip { fetchzip {
name = "JuliaMono-ttf-${version}"; name = "JuliaMono-ttf-${version}";
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
sha256 = "sha256-M9T78xnSN1hcHLXkut09eD2IFrgCRTG9fAPqMv4MXWY="; sha256 = "sha256-Rrsvs682aWXZqydnOifXTJMa4uPl/aCGbVNRPGxkZng=";
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype

View file

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub }:
let
pname = "vazir-code-font";
version = "1.1.2";
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
repo = "vazir-code-font";
rev = "v${version}";
postFetch = ''
tar xf $downloadedFile --strip=1
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
'';
sha256 = "0ivwpn9xm2zwhwgg9mghyiy5v66cn4786w9j6rkff5cmzshv279r";
meta = with lib; {
homepage = "https://github.com/rastikerdar/vazir-code-font";
description = "A Persian (farsi) Monospaced Font for coding";
license = licenses.publicDomain;
platforms = platforms.all;
maintainers = [ maintainers.dearrude ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl, gtk-engine-murrine }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sweet"; pname = "sweet";
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
}) })
]; ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
sourceRoot = "."; sourceRoot = ".";
installPhase = '' installPhase = ''

View file

@ -35,6 +35,8 @@ lib.makeScope pkgs.newScope (self: with self; {
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { };
tumbler = callPackage ./core/tumbler { }; tumbler = callPackage ./core/tumbler { };
xfce4-panel = callPackage ./core/xfce4-panel { }; xfce4-panel = callPackage ./core/xfce4-panel { };

View file

@ -0,0 +1,36 @@
{ lib
, mkXfceDerivation
, gtk3
, thunar
, exo
, libxfce4util
, intltool
, gettext
, taglib
}:
mkXfceDerivation {
category = "thunar-plugins";
pname = "thunar-media-tags-plugin";
version = "0.3.0";
sha256 = "sha256-jtgcHH5U5GOvzDVUwPEreMtTdk5DT6sXvFPDbzbF684=";
nativeBuildInputs = [
intltool
gettext
];
buildInputs = [
thunar
exo
gtk3
libxfce4util
taglib
];
meta = with lib; {
description = "Thunar plugin providing tagging and renaming features for media files";
maintainers = with maintainers; [ ncfavier ];
};
}

View file

@ -0,0 +1,26 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "jrsonnet";
version = "0.3.8";
src = fetchFromGitHub {
rev = "v${version}";
owner = "CertainLach";
repo = "jrsonnet";
sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4=";
};
postInstall = ''
ln -s $out/bin/jrsonnet $out/bin/jsonnet
'';
cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ=";
meta = {
description = "Purely-functional configuration language that helps you define JSON data";
maintainers = with lib.maintainers; [ lach ];
license = lib.licenses.mit;
homepage = "https://github.com/CertainLach/jrsonnet";
};
}

View file

@ -7,12 +7,16 @@ import json
import os import os
import re import re
import subprocess import subprocess
import sys
from codecs import iterdecode from codecs import iterdecode
from datetime import datetime from datetime import datetime
from urllib.request import urlopen, Request from urllib.request import urlopen, Request
DEFAULT_NIX = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix')
def get_latest_chromium_build(): def get_latest_chromium_build():
HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux'
print(f'GET {HISTORY_URL}') print(f'GET {HISTORY_URL}')
@ -39,6 +43,16 @@ def get_commit(ref):
return json.loads(http_response.read().decode()) return json.loads(http_response.read().decode())
def get_current_revision():
"""Get the current revision of llvmPackages_git."""
with open(DEFAULT_NIX) as f:
for line in f:
rev = re.search(r'^ rev = "(.*)";', line)
if rev:
return rev.group(1)
sys.exit(1)
def nix_prefetch_url(url, algo='sha256'): def nix_prefetch_url(url, algo='sha256'):
"""Prefetches the content of the given URL.""" """Prefetches the content of the given URL."""
print(f'nix-prefetch-url {url}') print(f'nix-prefetch-url {url}')
@ -55,13 +69,15 @@ clang_revision = re.search(r"^CLANG_REVISION = '(.+)'$", clang_update_script, re
clang_commit_short = re.search(r"llvmorg-[0-9]+-init-[0-9]+-g([0-9a-f]{8})", clang_revision).group(1) clang_commit_short = re.search(r"llvmorg-[0-9]+-init-[0-9]+-g([0-9a-f]{8})", clang_revision).group(1)
release_version = re.search(r"^RELEASE_VERSION = '(.+)'$", clang_update_script, re.MULTILINE).group(1) release_version = re.search(r"^RELEASE_VERSION = '(.+)'$", clang_update_script, re.MULTILINE).group(1)
commit = get_commit(clang_commit_short) commit = get_commit(clang_commit_short)
if get_current_revision() == commit["sha"]:
print('No new update available.')
sys.exit(0)
date = datetime.fromisoformat(commit['commit']['committer']['date'].rstrip('Z')).date().isoformat() date = datetime.fromisoformat(commit['commit']['committer']['date'].rstrip('Z')).date().isoformat()
version = f'unstable-{date}' version = f'unstable-{date}'
print('Prefetching source tarball...') print('Prefetching source tarball...')
hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["sha"]}.tar.gz') hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["sha"]}.tar.gz')
print('Updating default.nix...') print('Updating default.nix...')
default_nix = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix') with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f:
with fileinput.FileInput(default_nix, inplace=True) as f:
for line in f: for line in f:
result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line)
result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result)

View file

@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
setSourceRoot = ''export sourceRoot="$(echo */src)"''; setSourceRoot = ''export sourceRoot="$(echo */src)"'';
# MosML needs a specific RPATH entry pointing to $(out)/lib (added
# by the build system), which patchelf will remove.
dontPatchELF = true;
meta = with lib; { meta = with lib; {
description = "A light-weight implementation of Standard ML"; description = "A light-weight implementation of Standard ML";
longDescription = '' longDescription = ''

View file

@ -8,24 +8,24 @@ let
glslang = fetchFromGitHub { glslang = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "glslang"; repo = "glslang";
rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73";
sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; sha256 = "sha256-tkWVvYmSpJPaZ8VJOkAWndDWhA0PiHAkR3feBAo+knM=";
}; };
spirv-tools = fetchFromGitHub { spirv-tools = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Tools"; repo = "SPIRV-Tools";
rev = "b63f0e5ed3e818870968ebf6af73317127fd07b0"; rev = "c2d5375fa7cc87c93f692e7200d5d974283d4391";
sha256 = "1chv30azfp76nha428ivg4ixrij6d8pxj5kn3jam87gmkmgc9zhm"; sha256 = "sha256-tMJRljrlH+qb+27rTn+3LuEyMOVpiU0zSCiGNfUTb6g=";
}; };
spirv-headers = fetchFromGitHub { spirv-headers = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Headers"; repo = "SPIRV-Headers";
rev = "979924c8bc839e4cb1b69d03d48398551f369ce7"; rev = "0c28b6451d77774912e52949c1e57fa726edf113";
sha256 = "07vyjlblpm4zhfds612h86lnz0qvrj5qqw5z2zzfa3m9fax7cm85"; sha256 = "sha256-KpCMceTV/BRaoJe1qeXhKYQNQqdGaM6Q9nklpJKzHFY=";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "shaderc"; pname = "shaderc";
version = "2020.2"; version = "2021.0";
outputs = [ "out" "lib" "bin" "dev" "static" ]; outputs = [ "out" "lib" "bin" "dev" "static" ];
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
owner = "google"; owner = "google";
repo = "shaderc"; repo = "shaderc";
rev = "v${version}"; rev = "v${version}";
sha256 = "1sxz8872x3rdlrhmbn83r1vniq4j51jnk0ka3447fq68il4myf1w"; sha256 = "sha256-RfSMzrGVtdXbr/mjSrHoN447e3vMQfJbesQMvLOARBs=";
}; };
patchPhase = '' patchPhase = ''

View file

@ -8,18 +8,22 @@
, cppunit , cppunit
, log4cpp , log4cpp
, osmosdr , osmosdr
, gmp
, mpir
, fftwFloat
, icu
}: }:
mkDerivation rec { mkDerivation rec {
pname = "gr-ais"; pname = "gr-ais";
version = "2015-12-20"; version = "2020-08-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bistromath"; owner = "bistromath";
repo = "gr-ais"; repo = "gr-ais";
rev = "cdc1f52745853f9c739c718251830eb69704b26e"; rev = "2162103226f3dae43c8c2ab23b79483b84346665";
sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b";
}; };
disabledForGRafter = "3.8"; disabledForGRafter = "3.9";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -32,6 +36,10 @@ mkDerivation rec {
osmosdr osmosdr
boost boost
log4cpp log4cpp
gmp
mpir
fftwFloat
icu
]; ];
meta = with lib; { meta = with lib; {

View file

@ -10,14 +10,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guile-gcrypt"; pname = "guile-gcrypt";
version = "0.2.1"; version = "0.3.0";
src = fetchFromGitea { src = fetchFromGitea {
domain = "notabug.org"; domain = "notabug.org";
owner = "cwebber"; owner = "cwebber";
repo = "guile-gcrypt"; repo = "guile-gcrypt";
rev = "v${version}"; rev = "v${version}";
sha256 = "LKXIwO8v/T/h1JKARWD5ta57sgRcVu7hcYYwr3wUQ1g="; sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ=";
}; };
postConfigure = '' postConfigure = ''

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guile-git"; pname = "guile-git";
version = "0.3.0"; version = "0.5.1";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "guile-git"; owner = "guile-git";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1s77s70gzfj6h7bglq431kw8l4iknhsfpc0mnvcp4lkhwdcgyn1n"; sha256 = "7Cnuyk9xAPTvz9R44O3lvKDrT6tUQui7YzxIoqhRfPQ=";
}; };
postConfigure = '' postConfigure = ''

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guile-json"; pname = "guile-json";
version = "4.4.1"; version = "4.5.2";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz";
sha256 = "sha256-UqZt3pqXQzeHpzEiMvOMKSh1gK/K2KaJ70jMllNxBPc="; sha256 = "GrBG7DaxxEwEGsJ1Vo2Bh4TXH6uaXZX5Eoz+iiUFGTM=";
}; };
postConfigure = '' postConfigure = ''

View file

@ -3,6 +3,6 @@
# How to obtain `sha256`: # How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation { mkDerivation {
version = "23.3.4.3"; version = "23.3.4.4";
sha256 = "wmR0XTMrJ3608HD341lNlYChwxs/8jb12Okw3RNHGCA="; sha256 = "dnoSGfBUZrgcnNQNAoqmVOxK/NQlt1DC187sxg7mPq8=";
} }

View file

@ -208,7 +208,7 @@ in with passthru; stdenv.mkDerivation {
# * https://bugs.python.org/issue35523 # * https://bugs.python.org/issue35523
# * https://github.com/python/cpython/commit/e6b247c8e524 # * https://github.com/python/cpython/commit/e6b247c8e524
./3.7/no-win64-workaround.patch ./3.7/no-win64-workaround.patch
] ++ optionals (isPy37 || isPy38 || isPy39) [ ] ++ optionals (pythonAtLeast "3.7") [
# Fix darwin build https://bugs.python.org/issue34027 # Fix darwin build https://bugs.python.org/issue34027
./3.7/darwin-libutil.patch ./3.7/darwin-libutil.patch
] ++ optionals (pythonOlder "3.8") [ ] ++ optionals (pythonOlder "3.8") [
@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation {
( (
if isPy35 then if isPy35 then
./3.5/python-3.x-distutils-C++.patch ./3.5/python-3.x-distutils-C++.patch
else if isPy37 || isPy38 || isPy39 then else if pythonAtLeast "3.7" then
./3.7/python-3.x-distutils-C++.patch ./3.7/python-3.x-distutils-C++.patch
else else
fetchpatch { fetchpatch {

View file

@ -1,14 +1,16 @@
{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp }: { stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp, removeReferencesTo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rakudo"; pname = "rakudo";
version = "2021.05"; version = "2021.06";
src = fetchurl { src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
sha256 = "0h9kdb4vvscflifmclx0zhwb5qfakiggnbvlf9cx2hmp5vnk71jk"; sha256 = "11ixlqmvbb37abksdysg5r4lkbwzr486lkc0ssl3wca4iiy3mhgf";
}; };
nativeBuildInputs = [ removeReferencesTo ];
buildInputs = [ icu zlib gmp perl ]; buildInputs = [ icu zlib gmp perl ];
configureScript = "perl ./Configure.pl"; configureScript = "perl ./Configure.pl";
configureFlags = [ configureFlags = [
@ -16,15 +18,14 @@ stdenv.mkDerivation rec {
"--with-nqp=${nqp}/bin/nqp" "--with-nqp=${nqp}/bin/nqp"
]; ];
# Remove test of profiler, fails since 2020.09 disallowedReferences = [ stdenv.cc.cc ];
preCheck = "rm t/09-moar/01-profilers.t"; postFixup = ''
remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/share/perl6/runtime/dynext/libperl6_ops_moar.so)"
# Some tests fail on Darwin '';
doCheck = !stdenv.isDarwin;
meta = with lib; { meta = with lib; {
description = "Raku implementation on top of Moar virtual machine"; description = "Raku implementation on top of Moar virtual machine";
homepage = "https://www.rakudo.org"; homepage = "https://rakudo.org";
license = licenses.artistic2; license = licenses.artistic2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; maintainers = with maintainers; [ thoughtpolice vrthra sgo ];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "moarvm"; pname = "moarvm";
version = "2021.05"; version = "2021.06";
src = fetchurl { src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "15x8lra3k7lpcisfxvrrz3jqp2dilfrwgqzxkknwlfsfcrw8fk5i"; sha256 = "19vjcyb9fg9msjw1ih00c2qby480gl4highw24zx7j84slhsj013";
}; };
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
homepage = "https://www.moarvm.org/"; homepage = "https://moarvm.org";
license = licenses.artistic2; license = licenses.artistic2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; maintainers = with maintainers; [ thoughtpolice vrthra sgo ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nqp"; pname = "nqp";
version = "2021.05"; version = "2021.06";
src = fetchurl { src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "0gzpzzvqs3xar5657yx07hsvqn3xckdfvq9jw73qfccbbb9gjg5l"; sha256 = "1d00lajjdd2k510fb0cb6c8bpklvlnncykf6jz8j8djfp0b2i696";
}; };
buildInputs = [ perl ]; buildInputs = [ perl ];

View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wasmer"; pname = "wasmer";
version = "1.0.2"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wasmerio"; owner = "wasmerio";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0ciia8hhkkyh6rmrxgbk3bgwjwzkcba6645wlcm0vlgk2w4i5m3z"; sha256 = "191f60db2y1f3xw1x81mw88vclf1c4kgvnfv74g5vb3vn7n57c5j";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "140bzxhsyfif99x5a1m1d45ppb6jzvy9m4xil7z1wg2pnq9k7zz8"; cargoSha256 = "0hhwixqhrl79hpzmvq7ga3kp2cfrwr4i8364cwnr7195xwnfxb0k";
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
@ -32,7 +32,9 @@ rustPlatform.buildRustPackage rec {
]; ];
cargoTestFlags = [ cargoTestFlags = [
"--features" "test-cranelift,test-jit" "--features" "test-cranelift"
# Can't use test-jit :
# error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit`
]; ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
@ -47,6 +49,6 @@ rustPlatform.buildRustPackage rec {
''; '';
homepage = "https://wasmer.io/"; homepage = "https://wasmer.io/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne ]; maintainers = with maintainers; [ Br1ght0ne shamilton ];
}; };
} }

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.7.4"; version = "0.7.4";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/files/${pname}-${version}.tar.gz"; url = "https://liba52.sourceforge.net/files/${pname}-${version}.tar.gz";
sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM=";
}; };
@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
"--enable-shared" "--enable-shared"
]; ];
makeFlags = [
"AR=${stdenv.cc.targetPrefix}ar"
];
# fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686
# which can also be fixed with # which can also be fixed with
# hardeningDisable = lib.optional stdenv.isi686 "pic"; # hardeningDisable = lib.optional stdenv.isi686 "pic";

View file

@ -1,41 +1,42 @@
{ stdenv, fetchFromGitHub, cmake, jsoncpp, libuuid, zlib, openssl, lib }: { stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, openssl, lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "drogon"; pname = "drogon";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "an-tao"; owner = "an-tao";
repo = "drogon"; repo = "drogon";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ncdlsi3zhmpdwh83d52npb1b2q982y858yl88zl2nfq4zhcm3wa"; sha256 = "18wn9ashv3h3pal6x5za6y7byfcrd49zy3wfx4hx0ygxzplmss0r";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ cmakeFlags = [
# examples are used in the test during installCheckPhase, otherwise they are unnecessary "-DBUILD_TESTING=${if doInstallCheck then "ON" else "OFF"}"
"-DBUILD_EXAMPLES=${if doInstallCheck then "ON" else "OFF"}" "-DBUILD_EXAMPLES=OFF"
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
jsoncpp jsoncpp
libuuid libossp_uuid
zlib zlib
openssl openssl
]; ];
patches = [ patches = [
# this part of the test fails because it attempts to configure a CMake project that uses find_package on itself # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself
# the rest of the test runs fine because it uses executables that are built in buildPhase when BUILD_EXAMPLES is enabled # this patch makes drogon and trantor visible to the test
./no_cmake_test.patch ./fix_find_package.patch
]; ];
# modifying PATH here makes drogon_ctl visible to the test
installCheckPhase = '' installCheckPhase = ''
cd .. cd ..
patchShebangs test.sh patchShebangs test.sh
./test.sh PATH=$PATH:$out/bin ./test.sh
''; '';
doInstallCheck = true; doInstallCheck = true;

View file

@ -0,0 +1,13 @@
diff --git a/test.sh b/test.sh
index f017b9a..027031e 100755
--- a/test.sh
+++ b/test.sh
@@ -135,7 +135,7 @@ if [ $os = "windows" ]; then
conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths
cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install"
fi
-cmake .. $cmake_gen
+cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor
if [ $? -ne 0 ]; then
echo "Failed to run CMake for example project"

View file

@ -1,42 +0,0 @@
diff --git a/test.sh b/test.sh
index e5da08e..ba620cc 100755
--- a/test.sh
+++ b/test.sh
@@ -157,37 +157,6 @@ cd ../views
echo "Hello, world!" >>hello.csp
-cd ../build
-if [ $os = "windows" ]; then
- conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths
- cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install"
-fi
-cmake .. $cmake_gen
-
-if [ $? -ne 0 ]; then
- echo "Error in testing"
- exit -1
-fi
-
-cmake --build . -- $make_flags
-
-if [ $? -ne 0 ]; then
- echo "Error in testing"
- exit -1
-fi
-
-if [ $os = "linux" ]; then
- if [ ! -f "drogon_test" ]; then
- echo "Failed to build drogon_test"
- exit -1
- fi
-else
- if [ ! -f "Debug\drogon_test.exe" ]; then
- echo "Failed to build drogon_test"
- exit -1
- fi
-fi
-
cd ../../
rm -rf drogon_test

View file

@ -0,0 +1,37 @@
From 2d6dd1c286eb57fbf968510318cafc94888b98de Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sun, 13 Jun 2021 21:56:03 +0200
Subject: [PATCH] Darwin build fix
---
gspell/Makefile.am | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gspell/Makefile.am b/gspell/Makefile.am
index 69ee421..7c58973 100644
--- a/gspell/Makefile.am
+++ b/gspell/Makefile.am
@@ -95,6 +95,7 @@ nodist_libgspell_core_la_SOURCES = \
$(BUILT_SOURCES)
libgspell_core_la_LIBADD = \
+ $(GTK_MAC_LIBS) \
$(CODE_COVERAGE_LIBS)
libgspell_core_la_CFLAGS = \
@@ -161,6 +162,12 @@ gspell_private_headers += \
gspell_private_c_files += \
gspell-osx.c
+libgspell_core_la_CFLAGS += \
+ -xobjective-c
+
+libgspell_core_la_LDFLAGS += \
+ -framework Cocoa
+
endif # OS_OSX
if HAVE_INTROSPECTION
--
2.29.3

View file

@ -2,6 +2,8 @@
, fetchurl , fetchurl
, pkg-config , pkg-config
, libxml2 , libxml2
, autoreconfHook
, gtk-doc
, glib , glib
, gtk3 , gtk3
, enchant2 , enchant2
@ -9,6 +11,7 @@
, vala , vala
, gobject-introspection , gobject-introspection
, gnome , gnome
, gtk-mac-integration
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,17 +26,26 @@ stdenv.mkDerivation rec {
sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw";
}; };
patches = [
# Extracted from: https://github.com/Homebrew/homebrew-core/blob/2a27fb86b08afc7ae6dff79cf64aafb8ecc93275/Formula/gspell.rb#L125-L149
./0001-Darwin-build-fix.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
vala vala
gobject-introspection gobject-introspection
libxml2 libxml2
autoreconfHook
gtk-doc
]; ];
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk3
icu icu
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
gtk-mac-integration
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -53,6 +65,6 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Projects/gspell"; homepage = "https://wiki.gnome.org/Projects/gspell";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; buildInputs = [ glibmm gtkmm3 gtksourceview3 ];
meta = with lib; { meta = with lib; {
platforms = platforms.linux; platforms = platforms.unix;
homepage = "https://developer.gnome.org/gtksourceviewmm/"; homepage = "https://developer.gnome.org/gtksourceviewmm/";
description = "C++ wrapper for gtksourceview"; description = "C++ wrapper for gtksourceview";
license = licenses.lgpl2; license = licenses.lgpl2;

View file

@ -1,6 +1,16 @@
{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkg-config, gcc { stdenv
, config
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, libusb1
, ninja
, pkg-config
, gcc
, cudaSupport ? config.cudaSupport or false, cudatoolkit , cudaSupport ? config.cudaSupport or false, cudatoolkit
, enablePython ? false, pythonPackages ? null }: , enablePython ? false, pythonPackages ? null
}:
assert cudaSupport -> cudatoolkit != null; assert cudaSupport -> cudatoolkit != null;
assert enablePython -> pythonPackages != null; assert enablePython -> pythonPackages != null;
@ -24,7 +34,13 @@ stdenv.mkDerivation rec {
] ++ lib.optional cudaSupport cudatoolkit ] ++ lib.optional cudaSupport cudatoolkit
++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]);
patches = lib.optionals enablePython [ patches = [
# fix build on aarch64-darwin
# https://github.com/IntelRealSense/librealsense/pull/9253
(fetchpatch {
url = "https://github.com/IntelRealSense/librealsense/commit/beb4c44debc8336de991c983274cad841eb5c323.patch";
sha256 = "05mxsd2pz3xrvywdqyxkwdvxx8hjfxzcgl51897avz4v2j89pyq8";
})
./py_sitepackage_dir.patch ./py_sitepackage_dir.patch
./py_pybind11_no_external_download.patch ./py_pybind11_no_external_download.patch
]; ];
@ -57,6 +73,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/IntelRealSense/librealsense"; homepage = "https://github.com/IntelRealSense/librealsense";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ brian-dawn ]; maintainers = with maintainers; [ brian-dawn ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; platforms = platforms.unix;
}; };
} }

View file

@ -9,14 +9,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libslirp"; pname = "libslirp";
version = "4.6.0"; version = "4.6.1";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "slirp"; owner = "slirp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1Zp1+PW0WtNzRYIA87X42CJeSzVFhi5sGi9/rlUP4Vo="; sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw=";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.9.8"; version = "4.9.8";
pname = "nco"; pname = "nco";
nativeBuildInputs = [ flex which antlr ]; nativeBuildInputs = [ flex which antlr2 ];
buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ];
src = fetchzip { src = fetchzip {

View file

@ -0,0 +1,30 @@
{ stdenv, lib, fetchFromGitHub, cmake, gfortran, python3 } :
stdenv.mkDerivation rec {
pname = "xcfun";
version = "2.1.1";
src = fetchFromGitHub {
owner = "dftlibs";
repo = pname;
rev = "v${version}";
sha256= "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid";
};
nativeBuildInputs = [
cmake
gfortran
];
propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pybind11 ])) ];
cmakeFlags = [ "-DXCFUN_MAX_ORDER=3" ];
meta = with lib; {
description = "A library of exchange-correlation functionals with arbitrary-order derivatives";
homepage = "https://github.com/dftlibs/xcfun";
license = licenses.mpl20;
platforms = platforms.linux;
maintainers = [ maintainers.sheepforce ];
};
}

View file

@ -3,7 +3,7 @@
# This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html
/*nixpkgsSource ? (builtins.fetchTarball { /*nixpkgsSource ? (builtins.fetchTarball {
name = "nixpkgs-20.09"; name = "nixpkgs-20.09";
url = https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
}), }),
pkgs ? import nixpkgsSource {}, pkgs ? import nixpkgsSource {},
@ -41,7 +41,7 @@ let
# If you copy this example out of nixpkgs, something like this will work: # If you copy this example out of nixpkgs, something like this will work:
/*androidEnvNixpkgs = fetchTarball { /*androidEnvNixpkgs = fetchTarball {
name = "androidenv"; name = "androidenv";
url = https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz; url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";
sha256 = "<fill me in with nix-prefetch-url --unpack>"; sha256 = "<fill me in with nix-prefetch-url --unpack>";
}; };

View file

@ -14,6 +14,10 @@ buildPythonPackage rec {
}; };
checkPhase = '' checkPhase = ''
export HOME=$TMPDIR
mkdir -p $HOME/.matplotlib
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
pushd tests pushd tests
py.test -Wignore::DeprecationWarning ./. py.test -Wignore::DeprecationWarning ./.
popd popd

View file

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohue"; pname = "aiohue";
version = "2.5.0"; version = "2.5.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-4q5JvkUmEoOomcwblXhvB/5Qdr6aMR0lDb4t4bjDjw8="; sha256 = "01ywyiwqa7nyd4kprqxcycv50xydsi95q3lzidpm2r3kn1byis1y";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,33 @@
{ lib
, requests
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "aladdin-connect";
version = "0.3";
src = fetchFromGitHub {
owner = "shoejosh";
repo = pname;
rev = version;
sha256 = "0nimd1nw1haxn8s2207fcrmpjyfp6nx97n560l6hzqyqqmf2d1d1";
};
propagatedBuildInputs = [
requests
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "aladdin_connect" ];
meta = with lib; {
description = "Python library for interacting with Genie Aladdin Connect devices";
homepage = "https://github.com/shoejosh/aladdin-connect";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "anyascii";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;
sha256 = "1b6jdd9nx15py0jqjdn154m6m491517sqlk57bbyj3x4xzywadkh";
};
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Unicode to ASCII transliteration";
homepage = "https://github.com/anyascii/anyascii";
license = licenses.isc;
maintainers = teams.tts.members;
};
}

View file

@ -6,14 +6,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "coqpit"; pname = "coqpit";
version = "0.0.6.6"; version = "0.0.9";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coqui-ai"; owner = "coqui-ai";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0wb5wf84i5h4ycm732kn4316v7schhm91s2rrklfw9sny5dqmdnh"; sha256 = "1dh3bp7m9fjfrfrahblibrx91sagndkdi0325ail63kyvlhzbkma";
}; };
checkInputs = [ checkInputs = [
@ -32,6 +32,6 @@ buildPythonPackage rec {
''; '';
homepage = "https://github.com/coqui-ai/coqpit"; homepage = "https://github.com/coqui-ai/coqpit";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ hexa mic92 ]; maintainers = teams.tts.members;
}; };
} }

View file

@ -1,18 +1,23 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchFromGitHub
, stringcase , stringcase
, typing-inspect , typing-inspect
, marshmallow-enum , marshmallow-enum
, hypothesis
, mypy
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dataclasses-json"; pname = "dataclasses-json";
version = "0.5.2"; version = "0.5.2";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "lidatong";
sha256 = "56ec931959ede74b5dedf65cf20772e6a79764d20c404794cce0111c88c085ff"; repo = pname;
rev = "v${version}";
sha256 = "1gcnm41rwg0jvq4vhr57vv9hyasws425zl8h4p05x2nzq86l0w1n";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -21,6 +26,19 @@ buildPythonPackage rec {
marshmallow-enum marshmallow-enum
]; ];
checkInputs = [
hypothesis
mypy
pytestCheckHook
];
disabledTests = [
# AssertionError: Type annotations check failed
"test_type_hints"
];
pythonImportsCheck = [ "dataclasses_json" ];
meta = with lib; { meta = with lib; {
description = "Simple API for encoding and decoding dataclasses to and from JSON"; description = "Simple API for encoding and decoding dataclasses to and from JSON";
homepage = "https://github.com/lidatong/dataclasses-json"; homepage = "https://github.com/lidatong/dataclasses-json";

View file

@ -0,0 +1,27 @@
{ lib, buildPythonPackage, fetchFromGitHub, urllib3, pytest }:
buildPythonPackage rec {
pname = "downloader-cli";
version = "0.3.1";
src = fetchFromGitHub {
owner = "deepjyoti30";
repo = pname;
rev = version;
sha256 = "0gbbjxb9vf5g890cls3mwzl8lmcn6jkpgm5cbrif740mn2b4q228";
};
propagatedBuildInputs = [ urllib3 ];
# Disable checks due to networking (Errno 101)
doCheck = false;
pythonImportsCheck = [ "downloader_cli" ];
meta = with lib; {
description = "A simple downloader written in Python with an awesome customizable progressbar. ";
homepage = "https://github.com/deepjyoti30/downloader-cli";
license = licenses.mit;
maintainers = with maintainers; [ j0hax ];
};
}

View file

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "ecoaliface";
version = "0.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "1hzx0r3311f952jik3pgmrg74xp5m6w9c5v6snfrb8w2m19vs6qy";
};
propagatedBuildInputs = [
requests
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "ecoaliface" ];
meta = with lib; {
description = "Python library for interacting with eCoal water boiler controllers";
homepage = "https://github.com/matkor/ecoaliface";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "enturclient";
version = "0.2.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "hfurubotten";
repo = pname;
rev = "v${version}";
sha256 = "158xzv9c2drjgrdhfqm0xzx2d34v45gr5rnjfsi94scffvprgwrg";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "enturclient" ];
meta = with lib; {
description = "Python library for interacting with the Entur.org API";
homepage = "https://github.com/hfurubotten/enturclient";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -7,12 +7,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "feedparser"; pname = "feedparser";
version = "6.0.2"; version = "6.0.6";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074"; sha256 = "1syd15460a6m397rajdpbr9q0hgxm1j6xf9ba18z9pighxdjmxkq";
}; };
propagatedBuildInputs = [ sgmllib3k ]; propagatedBuildInputs = [ sgmllib3k ];

View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-access-context-manager"; pname = "google-cloud-access-context-manager";
version = "0.1.2"; version = "0.1.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; sha256 = "sha256-VFPmTKiFwwL1THpjDeFeHgssXvIRB+ppvZb9aU1yPV4=";
}; };
propagatedBuildInputs = [ google-api-core ]; propagatedBuildInputs = [ google-api-core ];

View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
, google-api-core
, grpc_google_iam_v1
, mock
, proto-plus
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-appengine-logging";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0rkayy2qzsc70b0rdvzd2bxwp5f07rfqb95cyj57dkphq71mrrhw";
};
propagatedBuildInputs = [
google-api-core
grpc_google_iam_v1
proto-plus
];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [
"google.cloud.appengine_logging"
"google.cloud.appengine_logging_v1"
];
meta = with lib; {
description = "Appengine logging client library";
homepage = "https://github.com/googleapis/python-appengine-logging";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -26,7 +26,7 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2, < 0.2.1"' --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"'
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -14,14 +14,18 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-automl"; pname = "google-cloud-automl";
version = "2.2.0"; version = "2.3.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "874defad583e90e55a3e83aff27eb5fe108d9197d839cd45f3eacf2395881806"; sha256 = "sha256-UjYzSWtP4cp0p7Is2qIGWBgEhjgTv0YeL0N9D7etIbY=";
}; };
propagatedBuildInputs = [ google-api-core libcst proto-plus ]; propagatedBuildInputs = [
google-api-core
libcst
proto-plus
];
checkInputs = [ checkInputs = [
google-cloud-storage google-cloud-storage
@ -35,10 +39,13 @@ buildPythonPackage rec {
preCheck = '' preCheck = ''
# do not shadow imports # do not shadow imports
rm -r google rm -r google
# requires credentials
rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py
''; '';
disabledTestPaths = [
# requires credentials
"tests/system/gapic/v1beta1/test_system_tables_client_v1.py"
];
disabledTests = [ disabledTests = [
# requires credentials # requires credentials
"test_prediction_client_client_info" "test_prediction_client_client_info"

View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer"; pname = "google-cloud-bigquery-datatransfer";
version = "3.1.0"; version = "3.1.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "98065257189388b6cc797478c4b2bdf86e9e8cdcaca5d170ded027646444a586"; sha256 = "sha256-msjNBqYL/cUE85+80IblGAyGhM/+/ndFqf9qY5xXVik=";
}; };
propagatedBuildInputs = [ google-api-core libcst proto-plus ]; propagatedBuildInputs = [ google-api-core libcst proto-plus ];

View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
, google-api-core
, grpc_google_iam_v1
, mock
, proto-plus
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0s8vlw157z10yzzkrfyzfl31iad96wfl3ywk9g3gmmh0jfgy0gfj";
};
propagatedBuildInputs = [
google-api-core
grpc_google_iam_v1
proto-plus
];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [
"google.cloud.bigquery_logging"
"google.cloud.bigquery_logging_v1"
];
meta = with lib; {
description = "Bigquery logging client library";
homepage = "https://github.com/googleapis/python-bigquery-logging";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -17,11 +17,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-bigquery"; pname = "google-cloud-bigquery";
version = "2.13.1"; version = "2.18.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "915f93c61c03d1d6024d5b19355bb96af25da9f924d0b5bab5cde851e1bd48f4"; sha256 = "sha256-0JLyWfQKN7kYnXW/DRJp3ZH+EesLv7/CXJPmxXYtb4M=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -51,6 +51,8 @@ buildPythonPackage rec {
# requires credentials # requires credentials
"test_bigquery_magic" "test_bigquery_magic"
"TestBigQuery" "TestBigQuery"
# Mocking of _ensure_bqstorage_client fails
"test_to_arrow_ensure_bqstorage_client_wo_bqstorage"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

View file

@ -1,33 +1,55 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, grpc_google_iam_v1
, google-api-core , google-api-core
, google-cloud-core , google-cloud-core
, pytest , grpc_google_iam_v1
, libcst
, mock , mock
, proto-plus
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-bigtable"; pname = "google-cloud-bigtable";
version = "1.7.0"; version = "2.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "90bd53a19c33c34101b8567c82a6dc0386af4118d70e1ad69b49375358a21aa6"; sha256 = "sha256-89fXmr3jHTtp8QOMFeueJwslHJ7Q6srQ/Kxsp0mLlKU=";
}; };
checkInputs = [ pytest mock ]; propagatedBuildInputs = [
propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ]; google-api-core
google-cloud-core
grpc_google_iam_v1
libcst
proto-plus
];
checkInputs = [
mock
pytestCheckHook
];
checkPhase = '' checkPhase = ''
# Prevent google directory from shadowing google imports
rm -r google rm -r google
pytest tests/unit -k 'not policy'
''; '';
disabledTests = [
"policy"
];
pythonImportsCheck = [
"google.cloud.bigtable_admin_v2"
"google.cloud.bigtable_v2"
"google.cloud.bigtable"
];
meta = with lib; { meta = with lib; {
description = "Google Cloud Bigtable API client library"; description = "Google Cloud Bigtable API client library";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; homepage = "https://github.com/googleapis/python-bigtable";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
}; };

View file

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-container"; pname = "google-cloud-container";
version = "2.4.0"; version = "2.4.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c62d15f58459fbe83ba5789f800ac27b4be9a1d7735f6c6b702cd6c3f8c6f0c9"; sha256 = "sha256-59k8o5ndb7X9D5kZAkhTHJxYPRqF580snuSFSVRZ7ng=";
}; };
propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];

Some files were not shown because too many files have changed in this diff Show more