diff options
Diffstat (limited to 'pkgs/tools/misc')
179 files changed, 2697 insertions, 1157 deletions
diff --git a/pkgs/tools/misc/adrgen/default.nix b/pkgs/tools/misc/adrgen/default.nix new file mode 100644 index 0000000000000..08fec93b5871f --- /dev/null +++ b/pkgs/tools/misc/adrgen/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testVersion +, adrgen +}: + +buildGoModule rec { + pname = "adrgen"; + version = "0.4.0-beta"; + + src = fetchFromGitHub { + owner = "asiermarques"; + repo = "adrgen"; + rev = "v${version}"; + sha256 = "sha256-2ZE/orsfwL59Io09c4yfXt2enVmpSM/QHlUMgyd9RYQ="; + }; + + vendorSha256 = "sha256-aDtUD+KKKSE0TpSi4+6HXSBMqF/TROZZhT0ox3a8Idk="; + + passthru.tests.version = testVersion { + package = adrgen; + command = "adrgen version"; + version = "v${version}"; + }; + + meta = with lib; { + homepage = "https://github.com/asiermarques/adrgen"; + description = "A command-line tool for generating and managing Architecture Decision Records"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 2a8b8b0b024d9..0ced538046435 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - version = "3.14"; + version = "3.16"; pname = "aescrypt"; src = fetchurl { url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz"; - sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; + sha256 = "sha256-4uGS0LReq5dI7+Wel7ZWzFXx+utZWi93q4TUSw7AhNI="; }; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv"; diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index de526cf0ccfc7..5bc9e1d820fac 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "31.0.3"; + version = "31.0.3p1"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - sha256 = "0adhws565ny90vzh5jpkbcai8sfs3b9acs0bgl6bm9z1nr2xklnp"; + sha256 = "1f2svy381r798hjinrc2xiwz13gkkqxfill343zvv8jqkn8rzxhf"; }; patches = [ @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm755 ../vendor/avb/avbtool.py -t $out/bin - install -Dm755 ../vendor/mkbootimg/mkbootimg.py $out/bin/mkbootimg ''; meta = with lib; { @@ -56,6 +55,8 @@ stdenv.mkDerivation rec { - fastboot - mke2fs.android (required by fastboot) - simg2img, img2simg, append2simg + - lpdump, lpmake, lpadd, lpflash, lpunpack + - mkbootimg, unpack_bootimg, repack_bootimg ''; # https://developer.android.com/studio/command-line#tools-platform # https://developer.android.com/studio/releases/platform-tools diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index e248ac4a0c787..6d1ae6cfe3b7b 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-brG3DTpWRYmDemTeteuuNbF0JoDAXdcFwO12JC6/0/Q="; + sha256 = "sha256-dj/6bIJfNt/ZBVucjLRu2FYLoyuWZ72MB20eVCRvo0Y="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index 7a437cafc281a..379ed14f8ef69 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -30,7 +30,7 @@ buildRubyGem rec { propagatedBuildInputs = [ deps ]; preFixup = '' - wrapProgram $out/bin/anystyle --prefix PATH ${poppler_utils}/bin + wrapProgram $out/bin/anystyle --prefix PATH : ${poppler_utils}/bin ''; meta = with lib; { diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index d59134a033b74..122ca0abcff96 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, python3Packages, unstableGitUpdater, gnupg }: +{ lib, fetchFromGitHub, python3Packages, nix-update-script, gnupg }: python3Packages.buildPythonApplication rec { pname = "apt-offline"; - version = "unstable-2021-07-25"; + version = "1.8.4"; src = fetchFromGitHub { owner = "rickysarraf"; repo = pname; - rev = "7cfa5fc2736be2c832d0ddfa9255175a1f33158d"; - sha256 = "xX2wcvqoPdgqBAWvQmSd//YWMC4pPmrq0vQjhDUKwEA="; + rev = "v${version}"; + sha256 = "RBf/QG0ewLS6gnQTBXi0I18z8QrxoBAqEXZ7dro9z5A="; }; postPatch = '' @@ -28,8 +28,8 @@ python3Packages.buildPythonApplication rec { pythonimportsCheck = [ "apt-offline" ]; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/rickysarraf/apt-offline.git"; + passthru.updateScript = nix-update-script { + attrPath = pname; }; meta = with lib; { diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 5eef6a517f3ab..af728e9749af9 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "bandwidth"; - version = "1.10.4"; + version = "1.11.2"; src = fetchurl { url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; - sha256 = "sha256-e/eP2rA7ElFrh2Z4qTzRGR/cxY1UI6s+LQ9Og1x46/I="; + sha256 = "sha256-mjtvQAOH9rv12XszGdD5hIX197er7Uc74WfVaP32TpM="; }; postPatch = '' diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index e77bf22d826c4..a64a457cdf761 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QWZnzliiqUfg6kXq1VGTNczupxNCgz1gFURrB/K2b4A="; + sha256 = "sha256-TtpVldIAqyv+apXmbI+1L0NgZxoKdc6Ffrl4WOqRI9c="; }; installPhase = '' diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 44d7e93355bb7..d35d9ebcbcc04 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication { pname = "bashplotlib"; - version = "2019-01-02"; + version = "2021-03-31"; src = fetchFromGitHub { owner = "glamp"; repo = "bashplotlib"; - rev = "f7533172c4dc912b5accae42edd5c0f655d7468f"; - sha256 = "1sifqslvvz2c05spwrl81kcdg792l6jwvfd3ih9q5wjkvkm0plz8"; + rev = "db4065cfe65c0bf7c530e0e8b9328daf9593ad74"; + sha256 = "sha256-0S6mgy6k7CcqsDR1kE5xcXGidF1t061e+M+ZuP2Gk3c="; }; # No tests diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index a46a32d6a88be..b6801be354818 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3XwnlSPlyEE4oznXK59/rooZLtj1+VbozprXU2W0J5I="; + sha256 = "sha256-XF5wMLHdiyasB2H6thk6OrkAm5bZZmlPFlBl02k52qU="; }; - cargoSha256 = "sha256-g5yfE/s1N6EgI2ikiJbypI4iQbXPu6zGNoSVC6ldoWo="; + cargoSha256 = "sha256-GipH9CBzvfaDqov1v9bKtrsRhUfiQ/AhBi1p+gBTwzM="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index 735508fed216e..aca0a6b687f52 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao="; + sha256 = "sha256-q+FLmu2JCDTJ6zC8blkd27jAKWbNpPyKzmUj1bW1mfA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 7bda1d92afbec..5308d2098d5ef 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = "https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-misc/bfr/files/bfr-1.6-perl.patch?revision=1.1"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch"; sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj"; }) ]; diff --git a/pkgs/tools/misc/bitbucket-cli/default.nix b/pkgs/tools/misc/bitbucket-cli/default.nix new file mode 100644 index 0000000000000..4a770b187fe74 --- /dev/null +++ b/pkgs/tools/misc/bitbucket-cli/default.nix @@ -0,0 +1,27 @@ +{ lib +, python2 +}: + +python2.pkgs.buildPythonApplication rec { + pname = "bitbucket-cli"; + version = "0.5.1"; + + src = python2.pkgs.fetchPypi { + inherit pname version; + sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; + }; + + propagatedBuildInputs = with python2.pkgs; [ + requests + ]; + + # No tests + doCheck = false; + + meta = with lib; { + description = "Bitbucket command line interface"; + homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; + maintainers = with maintainers; [ refnil ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index fc82d8244970f..44cfa2fbfe72b 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,32 +1,45 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config, ... }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libusb1 +}: stdenv.mkDerivation rec { pname = "blink1"; - version = "1.98a"; + version = "2.2.0"; src = fetchFromGitHub { owner = "todbot"; - repo = "blink1"; + repo = "blink1-tool"; rev = "v${version}"; - sha256 = "sha256-o4pOF6Gp70AL63ih6BNOpRTCs7+qzeZrEqaR4hYDTG8="; + fetchSubmodules = true; + hash = "sha256-xuCjPSQUQ/KOcdsie/ndecUiEt+t46m4eI33PXJoAAY="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "@git submodule update --init" "true" + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - configurePhase = '' - cd commandline - ''; + makeFlags = [ + "GIT_TAG=v${version}" + "USBLIB_TYPE=HIDAPI" + "HIDAPI_TYPE=LIBUSB" + ]; - installPhase = '' - PREFIX=$out make install - ''; + hardeningDisable = [ "format" ]; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = { + meta = with lib; { description = "Command line client for the blink(1) notification light"; homepage = "https://blink1.thingm.com/"; - license = lib.licenses.cc-by-sa-30; - maintainers = [ lib.maintainers.cransom ]; - platforms = lib.platforms.linux; + license = with licenses; [ cc-by-sa-40 ]; + maintainers = with maintainers; [ cransom ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 2acc8dabbef96..b71b5b444e315 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - version = "0.17.0"; + version = "0.18.0"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { owner = "mjg59"; repo = "python-broadlink"; rev = version; - sha256 = "sha256-b3A36BdIvyl1RxNO5SyxLIpQmu1UHHekyh6vrFjwpp4="; + sha256 = "0nh9rn1zpc44qsc50360ycg02gwbgq59784mnkp01nhavnwwwx10"; }; format = "other"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index d1cc0503efc22..9961416e0d3d7 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.7.4"; + version = "1.9.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-laFLm6A0EeprSHuqBi3p4ykgBbCinYU1sf0iRV0PY/M="; + sha256 = "sha256-oIStnwbfp48QHkSlXgveH9AM2fmmrrSmwdvXxvbV/tg="; }; - cargoHash = "sha256-0ybig1S56cJjf6QGWuDasfsIiwRhK+bpWNKOjs4D7P8="; + cargoHash = "sha256-DOPFVa2w+ldG7fnundBGb+jM0t2E2jS0nJIIzekD2QE="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/btdu/default.nix b/pkgs/tools/misc/btdu/default.nix new file mode 100644 index 0000000000000..d297af0d44026 --- /dev/null +++ b/pkgs/tools/misc/btdu/default.nix @@ -0,0 +1,83 @@ +{stdenv, lib, fetchurl, dub, ncurses, ldc, zlib, removeReferencesTo }: + +let + _d_ae_ver = "0.0.3100"; + _d_btrfs_ver = "0.0.12"; + _d_ncurses_ver = "0.0.149"; + _d_emsi_containers_ver = "0.9.0"; +in +stdenv.mkDerivation rec { + pname = "btdu"; + version = "0.3.1"; + + srcs = [ + (fetchurl { + url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz"; + sha256 = "760b2f0d28920a78b7967dd34c429125135688a3aefc57ab3a92d07bc3ef10cb"; + }) + (fetchurl { + url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz"; + sha256 = "86fa09ef6c1be4cbe8ad1c85729054e5d691b41ff57c7980d99937ec0f45b950"; + }) + (fetchurl { + url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz"; + sha256 = "cf2b1fa3e94a0aa239d465adbac239514838835283521d632f571948aa517f92"; + }) + (fetchurl { + url = "https://github.com/D-Programming-Deimos/ncurses/archive/v${_d_ncurses_ver}.tar.gz"; + sha256 = "2c8497f5dd93f9d3a05ca7ed57c4fcaee1e988fd25a24de106917ddf72f34646"; + }) + (fetchurl { + url = "https://github.com/dlang-community/containers/archive/v${_d_emsi_containers_ver}.tar.gz"; + sha256 = "5e256b84bbdbd2bd625cba0472ea27a1fde6d673d37a85fe971a20d52874acaa"; + }) + ]; + + sourceRoot = "."; + + postUnpack = '' + mv ae-${_d_ae_ver} "ae" + ''; + + + nativeBuildInputs = [ dub ldc ]; + buildInputs = [ ncurses zlib ]; + + configurePhase = '' + runHook preConfigure + mkdir home + HOME="home" dub add-local ae ${_d_ae_ver} + HOME="home" dub add-local d-btrfs-${_d_btrfs_ver} ${_d_btrfs_ver} + HOME="home" dub add-local ncurses-${_d_ncurses_ver} ${_d_ncurses_ver} + HOME="home" dub add-local containers-${_d_emsi_containers_ver} ${_d_emsi_containers_ver} + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + cd ${pname}-${version} + HOME="../home" dub --skip-registry=all build -b release + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp btdu $out/bin/ + runHook postInstall + ''; + + postInstall = '' + ${removeReferencesTo}/bin/remove-references-to -t ${ldc} $out/bin/btdu + ''; + + passthru.updateScript = ./update.py; + + meta = with lib; { + description = "Sampling disk usage profiler for btrfs"; + homepage = "https://github.com/CyberShadow/btdu"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/tools/misc/btdu/update.py b/pkgs/tools/misc/btdu/update.py new file mode 100755 index 0000000000000..aa3b149d733ea --- /dev/null +++ b/pkgs/tools/misc/btdu/update.py @@ -0,0 +1,82 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p python39Packages.requests + +import requests +import subprocess + +pkgbuild = requests.get('https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=btdu').text + +def grabDepVersions(depDict, pkgbuild=pkgbuild): + for line in pkgbuild.split('\n'): + if depDict["string"] in line: + start = len(depDict["string"]) + 1 + depDict["version"] = line[start:] + break + +def grabDepHashes(key,pkgbuild=pkgbuild): + start = pkgbuild.find(key) + len(key) + end = start+64 + hashes = [] + for i in range(5): + hashes.append(pkgbuild[start:end]) + start = pkgbuild.find("'",end+1) + 1 + end = start+64 + return hashes + +def findLine(key,derivation): + count = 0 + lines = [] + for line in derivation: + if key in line: + lines.append(count) + count += 1 + return lines + +def updateVersions(btdu,ae,btrfs,ncurses,containers,derivation): + key = "let" + line = findLine(key,derivation)[0] + 1 + derivation[line+0] = f' _d_ae_ver = "{ae["version"]}";\n' + derivation[line+1] = f' _d_btrfs_ver = "{btrfs["version"]}";\n' + derivation[line+2] = f' _d_ncurses_ver = "{ncurses["version"]}";\n' + derivation[line+3] = f' _d_emsi_containers_ver = "{containers["version"]}";\n' + + key = "version = " + line = findLine(key,derivation)[0] + derivation[line] = f' version = "{btdu["version"]}";\n' + + return derivation + +def updateHashes(btdu,ae,btrfs,ncurses,containers,derivation): + key = "sha256 = " + hashLines = findLine(key,derivation) + for i in range(len(hashes)): + derivation[hashLines[i]] = f' sha256 = "{hashes[i]}";\n' + + return derivation + +if __name__ == "__main__": + + btdu = {"string": "pkgver"} + ae = {"string": "_d_ae_ver"} + btrfs = {"string": "_d_btrfs_ver"} + ncurses = {"string": "_d_ncurses_ver"} + containers = {"string": "_d_emsi_containers_ver"} + + grabDepVersions(btdu) + grabDepVersions(ae) + grabDepVersions(btrfs) + grabDepVersions(ncurses) + grabDepVersions(containers) + + hashes = grabDepHashes("sha256sums=('") + + nixpkgs = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip('\n') + btduFolder = "/pkgs/tools/misc/btdu/" + with open(nixpkgs + btduFolder + "default.nix", 'r') as arq: + derivation = arq.readlines() + + derivation = updateVersions(btdu,ae,btrfs,ncurses,containers,derivation) + derivation = updateHashes(btdu,ae,btrfs,ncurses,containers,derivation) + + with open(nixpkgs + btduFolder + "default.nix", 'w') as arq: + arq.writelines(derivation) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 932d9c19f3023..d8fdada870776 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.9.4"; + version = "2.11.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-idkPhBGrLz4xv/DnFt4iiO4jVRTsBmMXGhM0MQmVtpw="; + sha256 = "sha256-EwWV1Z+N2r8mW4Y9D1C0fnd5/s3xaijvmIT0eAwS9N4="; }; - vendorSha256 = "sha256-9uOlNgMsz4UklSk7UJDKZMjszoxQZK6mLQwhtK8I+Mc="; + vendorSha256 = "sha256-ipOuwV7HJWRtaj0/c9CrgQZsRrUc1BTUlWWpRypu9AA="; doCheck = false; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index e9c045638e442..08769893272ae 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2021-11-17"; + version = "unstable-2022-01-01"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "e0010117ca3eeb22e79346cb37f3897b7404ed12"; - sha256 = "GJSJyIQ+8kz/+8/3lgPVr+V6zoo7iW739Z2frLpMTJI="; + rev = "46d1a5f73c6b88da15d809154245dbf234e9479e"; + sha256 = "6uEbxkkNV5EGhiCSoWJgfRUUqUS3OFTVOZFlVyMp/x8="; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/tools/misc/clickclack/default.nix index 0bcea9a2e8ea3..c7e1cbee79a54 100644 --- a/pkgs/tools/misc/clickclack/default.nix +++ b/pkgs/tools/misc/clickclack/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clickclack"; - version = "0.2"; + version = "0.2.2"; src = fetchFromSourcehut { owner = "~proycon"; repo = "clickclack"; rev = version; - sha256 = "sha256-hldtHSRdw6yP9lUFna5yvJ3mOTbQbbQNnGM7fMQmmtM="; + hash = "sha256-ABVfJRSzbQ6jIpON2g2wS52QsyNQVfW6+AhTvjkkf6s="; }; buildInputs = [ diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 5eff549a6517c..005e1f4d02af1 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.27.1"; + version = "1.28.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-xVPs7D639KY2ryDZpivineH4yZSNXi78FWk2SFKX1sk="; + sha256 = "sha256-mQYzc5OPYEsxBeSRiPHvYvh8grPOgB5sWB9EBrY3a6A="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-913GJ/rPvDavQQMqDDTe4gBXziPPeQRPpUUG3DAz96g="; + vendorSha256 = "sha256-+vuhOrUvA6W6y/6oEvJtsYixyvRzFPzpbw0Qn0AnYRI="; checkFlags = [ "-short" ]; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 6723ad98f489a..dc264307e7d88 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nUEmlKqCskPEQCOS2NC6jF4yVDarJeb3p+BKZq/2qvw="; + sha256 = "sha256-XhewfU3l/n2wiF9pKm1OOKQ7REzz3WzcBiVgOiYnAYU="; }; - cargoSha256 = "sha256-yjjoQYYWK9/9fOP5ICnhpuF/07SyCszB9GCDr0GJ0v0="; + cargoSha256 = "sha256-Z3bc0w8slI9lHbDbrIK65xurtmTK4Y4caF7kxxJBA3Q="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index d77204836b2f5..097605026ee31 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , colord , gettext @@ -7,24 +8,25 @@ , gobject-introspection , gtk-doc , docbook-xsl-ns -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_412 , libxslt , glib , gtk3 +, gtk4 , pkg-config , lcms2 }: stdenv.mkDerivation rec { pname = "colord-gtk"; - version = "0.2.0"; + version = "0.3.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz"; - sha256 = "05y78jbcbar22sgyhzffhv98dbpl4v6k8j9p807h17y6ighglk1a"; + sha256 = "uUZmVtZtmm/7wt0E+pHI9q9Ra/nvqstpdE7sD1bzwdA="; }; nativeBuildInputs = [ @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { gobject-introspection gtk-doc docbook-xsl-ns - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_412 libxslt ]; @@ -48,6 +50,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ colord gtk3 + gtk4 ]; meta = with lib; { diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 89435332c9cb4..f3d7503b9c9d7 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , nixosTests , bash-completion @@ -29,13 +30,13 @@ stdenv.mkDerivation rec { pname = "colord"; - version = "1.4.5"; + version = "1.4.6"; outputs = [ "out" "dev" "devdoc" "man" "installedTests" ]; src = fetchurl { url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz"; - sha256 = "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p"; + sha256 = "dAdjGie/5dG2cueuQndwAcEF2GC3tzkig8jGMA3ojm8="; }; patches = [ @@ -95,7 +96,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d"; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index e6809b474ea2f..befe53b9d907a 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation (rec { ./fix-chmod-exit-code.patch # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433 ./disable-seek-hole.patch + # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=52330 + # This patch can be dropped, once we upgrade to the next coreutils version after 9.0 + ./fix-arm64-macos.patch ]; postPatch = '' diff --git a/pkgs/tools/misc/coreutils/fix-arm64-macos.patch b/pkgs/tools/misc/coreutils/fix-arm64-macos.patch new file mode 100644 index 0000000000000..d8880b23dcbfc --- /dev/null +++ b/pkgs/tools/misc/coreutils/fix-arm64-macos.patch @@ -0,0 +1,124 @@ +diff --git a/src/uname.c b/src/uname.c +index ae9b8e29d..e84fc477a 100644 +--- a/src/uname.c ++++ b/src/uname.c +@@ -27,7 +27,7 @@ + # include <sys/systeminfo.h> + #endif + +-#if HAVE_SYS_SYSCTL_H && ! defined __GLIBC__ ++#if HAVE_SYS_SYSCTL_H && ! defined __GLIBC__ && ! defined __APPLE__ + # if HAVE_SYS_PARAM_H + # include <sys/param.h> /* needed for OpenBSD 3.0 */ + # endif +@@ -44,11 +44,6 @@ + # endif + #endif + +-#ifdef __APPLE__ +-# include <mach/machine.h> +-# include <mach-o/arch.h> +-#endif +- + #include "system.h" + #include "die.h" + #include "error.h" +@@ -167,6 +162,24 @@ print_element (char const *element) + fputs (element, stdout); + } + ++/* Print ELEMENT, preceded by a space if something has already been ++ printed. But if the environment variable ENVVAR is set, print its ++ value instead of ELEMENT. */ ++ ++static void ++print_element_env (char const *element, char const *envvar) ++{ ++#ifdef __APPLE__ ++ if (envvar) ++ { ++ char const *val = getenv (envvar); ++ if (val) ++ element = val; ++ } ++#endif ++ print_element (element); ++} ++ + + /* Set all the option flags according to the switches specified. + Return the mask indicating which elements to print. */ +@@ -287,26 +300,36 @@ main (int argc, char **argv) + die (EXIT_FAILURE, errno, _("cannot get system name")); + + if (toprint & PRINT_KERNEL_NAME) +- print_element (name.sysname); ++ print_element_env (name.sysname, "UNAME_SYSNAME"); + if (toprint & PRINT_NODENAME) +- print_element (name.nodename); ++ print_element_env (name.nodename, "UNAME_NODENAME"); + if (toprint & PRINT_KERNEL_RELEASE) +- print_element (name.release); ++ print_element_env (name.release, "UNAME_RELEASE"); + if (toprint & PRINT_KERNEL_VERSION) +- print_element (name.version); ++ print_element_env (name.version, "UNAME_VERSION"); + if (toprint & PRINT_MACHINE) +- print_element (name.machine); ++ print_element_env (name.machine, "UNAME_MACHINE"); + } + + if (toprint & PRINT_PROCESSOR) + { + char const *element = unknown; ++#ifdef __APPLE__ ++# if defined __arm__ || defined __arm64__ ++ element = "arm"; ++# elif defined __i386__ || defined __x86_64__ ++ element = "i386"; ++# elif defined __ppc__ || defined __ppc64__ ++ element = "powerpc"; ++# endif ++#endif + #if HAVE_SYSINFO && defined SI_ARCHITECTURE +- { +- static char processor[257]; +- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) +- element = processor; +- } ++ if (element == unknown) ++ { ++ static char processor[257]; ++ if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) ++ element = processor; ++ } + #endif + #ifdef UNAME_PROCESSOR + if (element == unknown) +@@ -316,26 +339,6 @@ main (int argc, char **argv) + static int mib[] = { CTL_HW, UNAME_PROCESSOR }; + if (sysctl (mib, 2, processor, &s, 0, 0) >= 0) + element = processor; +- +-# ifdef __APPLE__ +- /* This kludge works around a bug in Mac OS X. */ +- if (element == unknown) +- { +- cpu_type_t cputype; +- size_t cs = sizeof cputype; +- NXArchInfo const *ai; +- if (sysctlbyname ("hw.cputype", &cputype, &cs, NULL, 0) == 0 +- && (ai = NXGetArchInfoFromCpuType (cputype, +- CPU_SUBTYPE_MULTIPLE)) +- != NULL) +- element = ai->name; +- +- /* Hack "safely" around the ppc vs. powerpc return value. */ +- if (cputype == CPU_TYPE_POWERPC +- && STRNCMP_LIT (element, "ppc") == 0) +- element = "powerpc"; +- } +-# endif + } + #endif + if (! (toprint == UINT_MAX && element == unknown)) diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix deleted file mode 100644 index 3fbdcfae0fe47..0000000000000 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake -, aesni ? stdenv.hostPlatform.aesSupport }: - -stdenv.mkDerivation { - pname = "cpuminer-multi"; - version = "unstable-2016-03-16"; - - src = fetchFromGitHub { - owner = "hyc"; - repo = "cpuminer-multi"; - rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; - sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; - }; - - buildInputs = [ autoconf automake curl jansson ]; - - preConfigure = '' - ./autogen.sh - ''; - - configureFlags = [ (if aesni then "--enable-aes-ni" else "--disable-aes-ni") ]; - - meta = with lib; { - description = "Multi-algo CPUMiner"; - homepage = "https://github.com/wolf9466/cpuminer-multi"; - license = licenses.gpl2; - # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index b351b6e4efb6a..1deae6b3f8330 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -7,7 +7,8 @@ let # Workaround the issue by providing click 7 explicitly. python = python3.override { packageOverrides = self: super: { - click = self.callPackage ../../../development/python-modules/click/7.nix { }; + # Use click 7 + click = self.callPackage ../../../development/python2-modules/click/default.nix { }; }; }; in with python.pkgs; buildPythonApplication rec { diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 4ad51baefe8cc..fbe3a68d58429 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "3.3.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; rev = version; - sha256 = "0p1j5f5jk0cci6bg4jfnnn80gyi9039ni4ma8zwindk7fyn9gpc8"; + sha256 = "sha256-UIgyKWMVSKAgUNqfxFYSfP+l9x52XAzrXr1nnfKub9I="; }; - cargoSha256 = "1q35c5szavpsnzflw33radg6blzql3sz3jyzyqqz97ac69zns920"; + cargoSha256 = "sha256-jPrkNKFmdVk3LEa20jtXSx+7S98fSrX7Rt/lexC0Gwo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 2a85c0dc2b8f8..f89626c55ffd9 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.5.2"; - sha256 = "sha256-kul0sjbwbCwadvrccG3KwL/fKWACFUg74QGvgfWE4FQ="; + rev = version; + sha256 = "00pmnzvd4l3w6chzw41mrf1pd7lrcwi1n7320bnq20rn8hsnbnxk"; }; nativeBuildInputs = [ @@ -39,10 +39,17 @@ stdenv.mkDerivation rec { ]; prePatch = '' - oldPath="\$""{datadir}/ddccontrol-db" - newPath="${ddccontrol-db}/share/ddccontrol-db" - sed -i -e "s|$oldPath|$newPath|" configure.ac - sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile* + substituteInPlace configure.ac \ + --replace \ + "\$""{datadir}/ddccontrol-db" \ + "${ddccontrol-db}/share/ddccontrol-db" + + substituteInPlace src/ddcpci/Makefile.am \ + --replace "chmod 4711" "chmod 0711" + '' + lib.optionalString (lib.versionAtLeast "0.6.0" version) '' + # Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115 + substituteInPlace src/lib/Makefile.am \ + --replace "/etc/" "\$""{sysconfdir}/" ''; preConfigure = '' diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 0a956a325197e..9ee56a2d509ad 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "sha256-mIYxGoITaFlHgqAfB6ZZFR3spGD0BElJZJJqFGM4r/I="; + sha256 = "0hbd2ybpqmm96icg387vr57dqkdbc20vyimqjq5yx0sdlp4ikzi7"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/dialog/default.nix b/pkgs/tools/misc/dialog/default.nix index dd31fed35832d..3cbea01be8a71 100644 --- a/pkgs/tools/misc/dialog/default.nix +++ b/pkgs/tools/misc/dialog/default.nix @@ -8,15 +8,15 @@ }: assert withLibrary -> libtool != null; -assert unicodeSupport -> ncurses.unicode && ncurses != null; +assert unicodeSupport -> ncurses.unicodeSupport && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20210621"; + version = "1.3-20211214"; src = fetchurl { url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g="; + hash = "sha256-zCll4FxqjDcHCza1ZBTqpWDfjYfyzqIXWeKJUOmyeks="; }; buildInputs = [ @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Display dialog boxes from shell"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ AndersonTorres spacefrogg ]; - platforms = ncurses.meta.platforms; + inherit (ncurses.meta) platforms; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 8e10a84762870..dd458c0d511f0 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -4,16 +4,18 @@ , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd , enableBloat ? false +# updater only +, writeScript }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "197"; + version = "204"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-EKTknFa6gGqd1kpy/k1Vh1Zya+XvBMlU5G6Rg2p66es="; + sha256 = "sha256-JYo/4pqe2ISpLHn90hTBtr0ffviX8m4lWgVb6zwceP4="; }; outputs = [ "out" "man" ]; @@ -48,7 +50,7 @@ python3Packages.buildPythonApplication rec { xz zip zstd ] ++ (with python3Packages; [ - argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c + argcomplete black debian defusedxml jsondiff jsbeautifier libarchive-c python_magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] @@ -75,6 +77,9 @@ python3Packages.buildPythonApplication rec { # Failing because of file-v5.40 has a slightly different output. # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 "test_text_proper_indentation" + + # fails because it fails to determine llvm version + "test_item3_deflate_llvm_bitcode" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" @@ -91,6 +96,19 @@ python3Packages.buildPythonApplication rec { "tests/comparators/test_macho.py" ]; + passthru = { + updateScript = writeScript "update-diffoscope" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of "Latest release: 198 (31 Dec 2021)"'. + newVersion="$(curl -s https://diffoscope.org/ | pcregrep -o1 'Latest release: ([0-9]+)')" + update-source-version ${pname} "$newVersion" + ''; + }; + meta = with lib; { description = "Perform in-depth comparison of files, archives, and directories"; longDescription = '' diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch index b88d6e0231ea5..2830acdd96553 100644 --- a/pkgs/tools/misc/diffoscope/ignore_links.patch +++ b/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -6,7 +6,7 @@ index 5f34d62..36999a3 100644 FILE_RE = re.compile(r"^\s*File:.*$") DEVICE_RE = re.compile(r"Device: [0-9a-f]+h/[0-9]+d\s+") INODE_RE = re.compile(r"Inode: [0-9]+\s+") -+ LINKS_RE = re.compile(r'Links: [0-9]+\s+') ++ LINKS_RE = re.compile(r"Links: [0-9]+\s+") ACCESS_TIME_RE = re.compile(r"^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$") CHANGE_TIME_RE = re.compile(r"^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$") BIRTH_TIME_RE = re.compile(r"^\s*Birth:.*$") diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e9d38cbdcc2c8..1920dac543431 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "direnv"; - version = "2.30.2"; + version = "2.30.3"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-lQcy3EXl6KicAzRbypyX8sh39vNbZE2aUHBtwx07s9g="; + sha256 = "sha256-cLDafCZH0WKexO6jCdzUhRWaxmQYb1ay9w9lje3cQ+U="; }; vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k="; @@ -29,6 +29,9 @@ buildGoModule rec { checkInputs = [ fish zsh ]; + # temporarily disable tests, check if they can be reenabled with the next release + doCheck = false; + checkPhase = '' export HOME=$(mktemp -d) make test-go test-bash test-fish test-zsh diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 96f2b28b5e3fd..57ab08971861c 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.15"; + version = "3.6"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-1BxBeZfZK/vjUgTZknQLTLyWnI4LYyc1BmQeMcbwFP8="; + sha256 = "sha256-/Not2jNwk3jX8TLN7CT3JXDilatSYXPaudGKNAgQDPY="; }; dontBuild = true; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index e94fabd015697..f0984696fe3f3 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.11"; + version = "2.17.0"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-XMhgTJiP4whw1r+WtdG5CsQl/GIZPEg7/ElIEMZyWqM="; + sha256 = "sha256-yac/WUVL10JU1V5f9LYh57yYzZ2JMf24jMd8Mun7OMU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-B4e8wT/RhpwtCb11HqN8vksshBaF/CmpMPT62aBuFnw="; + cargoSha256 = "sha256-Q0ZLMbnQeG/64QvAIPpa3k+lI6dbSSQcdYb5e2rX8U0="; doCheck = false; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index e95edb08b84ab..3bcb4cdfeb29d 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.6.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "sha256-aRXm31sGHvHPpqPck5+jplbWT52OzaiQIgU/C7llJs8="; + sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI="; }; - vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9"; + vendorSha256 = "sha256-oihi7E67VQmym9U1gdD802AYxWRrSowhzBiKg0CBDPc="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index d3abb37b9f476..c184dc0b3dd36 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.flokli ]; platforms = lib.platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin }; } diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index de2f2cc8a8652..6904d46677214 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Pseudorandom Number Sequence Test Program"; - homepage = "http://www.fourmilab.ch/random/"; + homepage = "https://www.fourmilab.ch/random/"; platforms = platforms.all; license = licenses.publicDomain; }; diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 43f71c2d69ee8..dfb61ca29ad9b 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -1,14 +1,15 @@ { lib -, python3 +, buildPythonPackage +, fetchPypi }: -with python3.pkgs; buildPythonPackage rec { +buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20211211.0"; + version = "20220209.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xF1/gUJCr4qRO+AnWeFO6b1YnQBOgve/23ZaGmCa910="; + sha256 = "sha256-FkFu3SvsowcsOFXvqWmpY3KEypXSb6KcpC/nJbQpDBA="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index d1b00e74ef7f4..444e0e122ef1d 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , python3 , fetchFromGitHub , fetchpatch @@ -11,27 +10,22 @@ let python = python3.override { packageOverrides = self: super: { - esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; + esphome-dashboard = self.callPackage ./dashboard.nix {}; }; }; in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.12.2"; + version = "2022.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Uq+VzU/j14+3LegEA9bQ1JGe5tUBuP0IX34LdritJdA="; + sha256 = "sha256-Pt57wI1cYTqT65zGOk1/GyvK0BqITxCzWIyXSNZ9D/0="; }; - patches = [ - # fix missing write permissions on src files before modifing them - ./fix-src-permissions.patch - ]; - postPatch = '' # remove all version pinning (E.g tornado==5.1.1 -> tornado) sed -i -e "s/==[0-9.]*//" requirements.txt diff --git a/pkgs/tools/misc/esphome/fix-src-permissions.patch b/pkgs/tools/misc/esphome/fix-src-permissions.patch deleted file mode 100644 index 5e92350105dd4..0000000000000 --- a/pkgs/tools/misc/esphome/fix-src-permissions.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f72c5035944065941daaa236b60664657c777726 Mon Sep 17 00:00:00 2001 -From: Martin Weinelt <hexa@darmstadt.ccc.de> -Date: Wed, 23 Jun 2021 04:50:35 +0200 -Subject: [PATCH] Set u+w for copied src files before trying to overwrite them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We store esphome in the nix store, which results in its file permissions -being 0444. Esphome, when compiling a firmware image, will copy these -files from the nix store to a working directory. When updating between -versions it will notice these files changed and try to copy the new -version over, which would break, because the user had no write -permissions on the files. - -❯ esphome compile 01e4ac.yml -INFO Reading configuration 01e4ac.yml... -INFO Detected timezone 'CET' with UTC offset 1 and daylight saving time from 27 March 02:00:00 to 30 October 03:00:00 -INFO Generating C++ source... -ERROR Error copying file /nix/store/lmzrgl1arqfd98jcss4rsmmy6dbffddn-esphome-1.19.2/lib/python3.8/site-packages/esphome/components/api/api_connection.cpp to 01e4ac/src/esphome/components/api/api_connection.cpp: [Errno 13] Permission denied: '01e4ac/src/esphome/components/api/api_connection.cpp' - -To fix this we modify chmod to 0644 just before esphome tries a copy -operation, which will fix permissions on existing working directories -just in time. ---- - esphome/helpers.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/esphome/helpers.py b/esphome/helpers.py -index ad7b8272..c456f4ff 100644 ---- a/esphome/helpers.py -+++ b/esphome/helpers.py -@@ -228,6 +228,10 @@ def copy_file_if_changed(src: os.PathLike, dst: os.PathLike) -> None: - if file_compare(src, dst): - return - mkdir_p(os.path.dirname(dst)) -+ try: -+ os.chmod(dst, 0o644) -+ except OSError: -+ pass - try: - shutil.copy(src, dst) - except OSError as err: --- -2.31.1 - diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 7f746b9a49bbe..c9d746cc96f68 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -14,8 +14,8 @@ let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; sha256 = { - "x86_64-linux" = "sha256-n8i4ZqjugeUfXpTzVgIwVomfPk6HvPEbTZLe/jFgwFg="; - "i686-linux" = "sha256-lLGfhW6el2ZOcaykH1kTjGldXo7/0q5O8QnslnDlWAQ="; + "x86_64-linux" = "1yj6ybc99nqpzv2wjmvi7khfb5viwlb2rbjdpvgr4pmlzmiv7n2k"; + "i686-linux" = "09ddcqxw1jhl8v461ngdgj2l4infn2xiwvaqxi6qp3swci627vmz"; }."${system}" or throwSystem; arch = { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.6.0"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 15af175248407..e8d77f0e612c1 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.3.0"; + version = "8.3.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-MSkQYsBZkQOFkOnjGY+VuifUZnzloSysAO/hsp+fy1A="; + sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg="; }; - cargoSha256 = "sha256-nwgAgyVaxs1ebu9ndUN3FlFiycyEbRgvUhZ8iGmrVhQ="; + cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix index f55c7f6d3b399..0815ae04d623b 100644 --- a/pkgs/tools/misc/fdtools/default.nix +++ b/pkgs/tools/misc/fdtools/default.nix @@ -78,9 +78,9 @@ in stdenv.mkDerivation { ''; meta = { - homepage = "https://code.dogmap.org./fdtools/"; + homepage = "https://code.dogmap.org/fdtools/"; description = "A set of utilities for working with file descriptors"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.Profpatsch ]; }; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 8d6b2d3829648..40ad6851f733d 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.27"; + version = "0.1.28"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Zn42GXtX1UZYa8m3Ig90xDkmwDG7egPE5fRzPYj9sw="; + sha256 = "sha256-1bSbeY0ijPKQ/bO1pD/gJ6AC1KNhUlQ1CP0ApbHKkPI="; }; - cargoSha256 = "sha256-brk6hpBq/wyt0TWQGojTk+bz3/2Jvwx7MoVSkTEq0hU="; + cargoSha256 = "sha256-d4Kv3CNDrsnit5ukw6EXdgjirGkeTEBZ0nm97ZQ8TZ0="; doInstallCheck = true; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 1c0fd19ad2aa9..82cf7a3b78fd9 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitHub -, fetchpatch , qtbase , cmake , qttools @@ -11,32 +10,15 @@ mkDerivation rec { pname = "flameshot"; - version = "0.10.2"; + version = "11.0.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4="; + sha256 = "sha256-SlnEXW3Uhdgl0icwYyYsKQOcYkAtHpAvL6LMXBF2gWM="; }; - patches = [ - # Use absolute install path for `Exec=` in the desktop file. - # This is required since KWin relies on absolute paths in `Exec=` to find a process' - # corresponding desktop file and check if it's allowed to take screenshot. - # Should be removed when the next release comes out. - (fetchpatch { - url = "https://github.com/flameshot-org/flameshot/commit/1031980ed1e62d24d7f719998b7951d48801e3fa.patch"; - sha256 = "sha256-o8Zz/bBvitXMDFt5rAfubiUPOx+EQ+ITgrfnFM3dFjE="; - }) - # Fix autostart write path. - # Should be removed when the next release comes out. - (fetchpatch { - url = "https://github.com/flameshot-org/flameshot/commit/7977cbb52c2d785abd0d85d9df5991e8f7cae441.patch"; - sha256 = "sha256-wWa9Y+4flBiggOMuX7KQyL+q3f2cALGeQBGusX2x6sk="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index f6dd32396d841..d860fe8cf3658 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd, openssl }: stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.8.9"; + version = "1.8.11"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-b+MZuZQB/sl0HcioU1KCxH3TNiXYSPBfC9dBKqCVeXk="; + sha256 = "sha256-DULXfkddBdCvTWkuWXjSTEujRZ3mVVzy//qeB3j0Vz8="; }; patches = lib.optionals stdenv.isDarwin [ @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison ]; - buildInputs = lib.optionals stdenv.isLinux [ systemd ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isLinux [ systemd ]; cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" ]; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index aa18409525d29..988483fbd6a18 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.10.0"; + version = "3.12.0"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DR73JXpOkpaOsymP9nxAklCxdoxAnjL1GeNF6D/tDTc="; + sha256 = "sha256-fVrtfLmZiVDTSeuoOltX/vunGSizSw+ZhQhBn9t0C3E="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 6c2abbf6c6440..ff514ceafb20f 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { pname = "fpp"; - version = "0.9.2"; + version = "0.9.5"; src = fetchFromGitHub { owner = "facebook"; repo = "PathPicker"; rev = version; - sha256 = "08p2xlz045fqyb0aj9pwwf2s5nb4b02i8zj81732q59yx5c6lrlv"; + sha256 = "sha256-4BkdGvG/RyF3JBnd/X5r5nboEHG4aqahcYHDunMv2zU="; }; + nativeBuildInputs = [ installShellFiles ]; + postPatch = '' substituteInPlace fpp --replace 'PYTHONCMD="python3"' 'PYTHONCMD="${python3.interpreter}"' ''; @@ -19,6 +21,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/fpp $out/bin cp -r fpp src $out/share/fpp ln -s $out/share/fpp/fpp $out/bin/fpp + installManPage debian/usr/share/man/man1/fpp.1 ''; meta = { diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index 7027a6da0fabd..a7b95f3efa632 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; mainProgram = "fsearch"; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/fsearch.x86_64-darwin }; } diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 0dc15ed603d83..c02ceaac119c8 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-L5Ka4nbzLAdiHigb9ByTonCmACtyWgduWOmp9tCqrz8="; + sha256 = "sha256-Z1F63tMO3qzi/PrdVR0WCcPXx5E6PwjYPF99Bolnxc8="; }; - cargoSha256 = "sha256-kyA/d9h/FCiX/AliIaMvkNNPqzl19v2WPEYcRWuivNU="; + cargoSha256 = "sha256-tGzfIQ4nAFA/mXPL6cOaz97W5tjtPGsmbTSkUDFSAzY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/gay/default.nix b/pkgs/tools/misc/gay/default.nix new file mode 100644 index 0000000000000..799473a4b9f29 --- /dev/null +++ b/pkgs/tools/misc/gay/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "gay"; + version = "1.2.8"; + + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "gay"; + # The repo doesn't have any tags + # This references version 1.2.8 + rev = "1e3e96815c68214533a925c86a52b0acf832a359"; + sha256 = "sha256-vouEFybcz27bcw/CpAGjFY8NYWQC+V0IE7h1a8XufZ0="; + }; + + meta = with lib; { + description = "Colour your text / terminal to be more gay"; + longDescription = '' + Applies pride flag colors to text, ala lolcat or displays a pride flag. + ''; + homepage = "https://github.com/ms-jpq/gay"; + maintainers = with maintainers; [ CodeLongAndProsper90 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 2cfd2cdac8bb6..355d3e348852c 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.4.3"; + version = "5.4.4"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-A/+XnLusceJXik86EiYeVFi4iplp4+izbYpWNp8QPiM="; + sha256 = "sha256-2kiaP7V/dGDHiYTqvVEwAaAMrSoLzYtvR4hgtG6iUoQ="; }; dontConfigure = true; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 16594f898b97e..948132416ab54 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gh-ost"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitHub { owner = "github"; repo = "gh-ost"; rev = "v${version}"; - sha256 = "sha256-q1wtATFm65c2esQ+TPR2f+YafYeOmC79EumHyGxXrnE="; + sha256 = "sha256-HtLtwqPijOE19iJ2AUNAnyc2ujLPeH43HSg3QRBbKEg="; }; goPackagePath = "github.com/github/gh-ost"; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 27eb1275a2da6..1afacc4b4b89e 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "git-town"; - version = "7.6.0"; + version = "7.7.0"; goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "sha256-yarJWIEIZuBcXXxltkiM7LwrEM8fveD3+JVoPGarhJQ="; + sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc="; }; ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 9803e8db0169f..82bc79a77fdb8 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Cellphone tool"; - homepage = "http://www.gnokii.org"; + homepage = "https://www.gnokii.org"; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; broken = true; # 2018-04-10 diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index fd1c80a35a099..0515a2bbb805d 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KDA5R3up37DLS9YIur4IOacwOq0zed5tj58jEmE0vpE="; + sha256 = "sha256-gTdmqyGJ+TipiwDtbnGFrEZjkAyNejNINlB5iZz5yTI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index fb82539191813..3f480a0ec5e4a 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.2.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p+QLZ0G75Mk0Z9G+u+qcxTTWzPZnuM+inLO0Lkojs84="; + sha256 = "sha256-pEZ7H7WOPpzCGMLPgyfVJudamSWynoB5qnZSbVXj5uk="; }; - vendorSha256 = "sha256-mAJrUGgO0iprQnYOa3TMENNJbJcgM1eiV/AG+TYP0Mg="; + vendorSha256 = "sha256-7c5bd5pEulcr1mpdEUr2tDZNwjRkjqXOLiu+2x5/uFs="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 7f5eef3b442b9..e52744223dea0 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-X41m7bCilDgnTMJy3ISz8g7dAtaz/lphwaCPZDGMDXk="; }; - vendorSha256 = "sha256-EKscJM8r1dbKRQPSZFwFqJYACkQynIS347460PuxQiU="; + vendorSha256 = "sha256-DvpdmURhOxDVFJiRtTGVw6u6y+s5XteT1owmdBJcKHA="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index bb44c800a312c..7692c49fa696d 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildPythonApplication }: +{ lib +, fetchFromGitHub +, buildPythonApplication +}: buildPythonApplication rec { pname = "grc"; @@ -27,7 +30,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; + homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"; description = "A generic text colouriser"; longDescription = '' Generic Colouriser is yet another colouriser (written in Python) for diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index ea983d6f0437f..745689e312fec 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { url = "https://marc.info/?l=grub-devel&m=146193404929072&q=mbox"; sha256 = "00wa1q5adiass6i0x7p98vynj9vsz1w0gn1g4dgz89v35mpyw2bi"; }) + + # Pull upstream patch to fix linkage against binutils-2.36. + (fetchpatch { + name = "binutils-2.36"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701"; + sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82"; + }) ]; postPatch = if kbdcompSupport then '' diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index edb94891fbe9e..13f3c42faa46b 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake +{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k"; }; - nativeBuildInputs = [ autogen flex bison python autoconf automake ]; + nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 3f5878472a79d..7a7ac20025444 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - sha256 = "10y42nn9lgkwdjia74qfyf937nam4md3pkyfjinj7jybvcran4bj"; + hash = "sha256-RyQZ9F+rZ0a/90hljSyNCzYK8eA3rYJlJkV7B5NPRzY="; }; buildInputs = [ ruby ]; diff --git a/pkgs/tools/misc/hidrd/default.nix b/pkgs/tools/misc/hidrd/default.nix index 74bb771c1d483..0c58a5e42f982 100644 --- a/pkgs/tools/misc/hidrd/default.nix +++ b/pkgs/tools/misc/hidrd/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ pacien ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin }; } diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/tools/misc/hiksink/default.nix index 3b4fb8b0af354..0fcdb2fdca07c 100644 --- a/pkgs/tools/misc/hiksink/default.nix +++ b/pkgs/tools/misc/hiksink/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "hiksink"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "CornerBit"; repo = pname; rev = version; - sha256 = "1m8hd7qbasxyq09ycnqma2y4b9s2k54h9i2rkzsa9sksc868wxh8"; + sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8="; }; - cargoSha256 = "15r6rwhyy0s5i0v9nzx3hfl5cvlb0hxnllcwfnw0bbn9km25l9r3"; + cargoSha256 = "sha256-vqzXpSPBwY7m/Fdob0mHH0OXnzyQwFk7x2kk9Tgez3M="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index 9f7fa31d3f2c4..c2c48bfa7d80d 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with lib; { description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; - homepage = "https://wiki.hyperledger.org/projects/Fabric"; + homepage = "https://wiki.hyperledger.org/display/fabric"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/tools/misc/inav-blackbox-tools/default.nix index 5f2fb65f9f3dc..43524f6a3fe2a 100644 --- a/pkgs/tools/misc/inav-blackbox-tools/default.nix +++ b/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin }; } diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index a22e6eab06cc2..293ee08a27525 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,31 +2,31 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.8"; + version = "0.9.18"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-8XS30fRxHPady/snr3gfo8Ryiw9O7EeDezcYYZjod1w="; + sha256 = "sha256-ukFY6Iy7RaUjECbMCMdOkulMdzUlsoBnyRiuzldXVc8="; }; - vendorSha256 = "sha256-8r7v3526kY+rFHkl1+KEwNbFrSnXPlpZD6kiK4ea+Zg="; + vendorSha256 = "sha256-D4tXBXtD3FlWvp4GPIuo/2p3MKg81DVPT5pKVOGe/5c="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; - # Install completions post-install + subPackages = [ "cmd/infracost" ]; + nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ terraform ]; - # Short only runs the unit-tests tagged short - checkFlags = [ "-v" "-short" ]; + # -short only runs the unit-tests tagged short + checkFlags = [ "-short" ]; checkPhase = '' runHook preCheck # Remove tests that require networking - rm cmd/infracost/{breakdown_test,diff_test}.go - # ldflags are required for some of the version testing - go test ./... $checkFlags ''${ldflags:+-ldflags="$ldflags"} + rm cmd/infracost/{breakdown_test,diff_test,run_test}.go + + go test $checkFlags ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES ./... runHook postCheck ''; diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 7da2a7fe729e8..39511f567fd3e 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "interactsh"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9h2RdP0rVmStl+obMbBHcbfiOBiJ/2sbk2XvH3YaHRo="; + sha256 = "sha256-TP2U2gQHmpAFHr5uh7MCNXZ22k8+U4h0bBxkMiMzof0="; }; vendorSha256 = "sha256-9ehliyOCrWSDHVtmuUFBdw4BY6ygOvr2JxxJ3TvmSFU="; diff --git a/pkgs/tools/misc/ised/default.upstream b/pkgs/tools/misc/ised/default.upstream deleted file mode 100644 index 6539bf477e545..0000000000000 --- a/pkgs/tools/misc/ised/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://ised.sourceforge.net/web_nav.html -SF_version_tarball -SF_redirect -minimize_overwrite diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 05abfeaeebad8..772eb520869b0 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "11.1.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-li7djFP5luEnbKUF+rynEiQbx704KNUJw8/AqwxPRnI="; + sha256 = "sha256-K2GMoLaH7D6UtPuL+GJMqsPFwriyyi7WMdfzBmOceSA="; }; - cargoSha256 = "sha256-X1Qe86U4zlN1umRQOiRPRcbgCayqF6GILSt/nM8m1Yg="; + cargoSha256 = "sha256-suBBEHGHUlZyxKy5hwhc2K/qTNis75GY33+7QhpmGos="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix index 4df8e03f2a158..b4a84adb457f5 100644 --- a/pkgs/tools/misc/kalker/default.nix +++ b/pkgs/tools/misc/kalker/default.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "kalker"; - version = "1.0.1-2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fXTsCHqm+wO/ygyg0y+44G9pgaaEEH9fgePCDH86/vU="; + sha256 = "sha256-NnX4+VmV4oZg/8Z3ZCWHGZ6dqDfvH30XErnrvKMxyls="; }; - cargoSha256 = "sha256-Ul21otEYCJuX5GnfV9OTpk/+3y32biASYZQpOecr8aU="; + cargoSha256 = "sha256-nSLbe3EhcLYylvyzOWuLIehBnD6mMofsNpFQVEybV8k="; buildInputs = [ gmp mpfr libmpc ]; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 3a9c83a8dad3e..cd30674b31a81 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -13,9 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-eiFG6lgsY5hf+XT3Kf5uA4Ai8vBbPsh1T4ObV+rj30Y="; - # remove when built with >= go 1.17 - tags = [ "zip117" ]; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = [ "kobotest" ]; diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/tools/misc/keymapviz/default.nix index c31fbd6e32567..d0c308c2471a8 100644 --- a/pkgs/tools/misc/keymapviz/default.nix +++ b/pkgs/tools/misc/keymapviz/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "keymapviz"; - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "yskoht"; repo = pname; rev = version; - sha256 = "sha256-lNpUH4BvlnHx0SDq5YSsHdcTeEnf6MH2WRUEsCWWHA0="; + sha256 = "sha256-I16iJ6/CrjpDOmlewIxa5Xu/b/97VNH3ATwDNi3SuP8="; }; propagatedBuildInputs = with python3.pkgs; [ regex ]; diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index a499c3eb46b47..5aec73bde5cbf 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-IXbOmeWLhGOijO1xLItw1wzbHxl0Zyd0dHvfcaPWE8U="; + sha256 = "sha256-bzpZuLFSoIjZpK9cbxQEeyRwzuP7aDRG/xn/0056j+c="; }; - cargoSha256 = "sha256-2XCtjMV8ko6jnvXYtJhLlNvB1uc0QLO/aYsQX40deBk="; + cargoSha256 = "sha256-o9e0EakIbi+qk0gPxlPGfNvRidmCklieJ94sYBSR3IY="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 126d5bd4c49bf..8765506ce3055 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2021.2"; + version = "2022"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-WxMB70TeN53S6PNYDUVZ7lBKw7DvKnJDiHek9/GUYcA="; + sha256 = "sha256-a+OFBNMtP6mDqg1k9rjDLEJhZDM+zdRpPbn3aeC+Qks="; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 2a63074c8d710..cfdce8e3c0bd2 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "lazydocker"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-bpc83DFAyrAQ3VI9saYe+10ZQqOHgscerRKRyjfYD4g="; + sha256 = "sha256-thUm33AdP9Huc2vcTRatC1ULHZd0edEQggEGTqOV3a0="; }; goPackagePath = "github.com/jesseduffield/lazydocker"; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 3c64f4240ea89..cdea90ef5bb26 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "less"; - version = "596"; + version = "600"; src = fetchurl { - url = "https://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-QhqP1ZfnIELu/P6OV2NnerxL6EM/bA321zmhbMDk1cM="; + url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"; + sha256 = "sha256-ZjPWqis8xxevssIFd4x8QsRiD2Ox1oLz0SyYrwvnTSA="; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 93983c8fe40bc..510a169f21506 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -1,4 +1,8 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, fetchFromGitHub +, fetchpatch +, rustPlatform +}: rustPlatform.buildRustPackage rec { pname = "licensor"; @@ -13,6 +17,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1h66d1brx441bg7vzbqdish4avgmc6h7rrkw2qf1siwmplwqqhw0"; + patches = [ + # Support for 2022, https://github.com/raftario/licensor/pull/68 + (fetchpatch { + name = "support-for-2022.patch"; + url = "https://github.com/raftario/licensor/commit/6b2f248e5ad9e454fe30d71397691e47ac69b19e.patch"; + sha256 = "sha256-kXiY5s2kuU+ibV3RpBoy7y3cmJU+gECBTsmRXWBOTP8="; + }) + ]; + meta = with lib; { description = "Write licenses to stdout"; homepage = "https://github.com/raftario/licensor"; diff --git a/pkgs/tools/misc/lookatme/default.nix b/pkgs/tools/misc/lookatme/default.nix new file mode 100644 index 0000000000000..b046e1569044b --- /dev/null +++ b/pkgs/tools/misc/lookatme/default.nix @@ -0,0 +1,57 @@ +{ lib, python3, fetchFromGitHub }: + +let + py = python3.override { + packageOverrides = self: super: { + self = py; + # use click 7 + click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + # needs pyyaml 5 + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; + version = "5.4.1"; + src = fetchFromGitHub { + owner = "yaml"; + repo = "pyyaml"; + rev = version; + sha256 = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM="; + }; + checkPhase = '' + runHook preCheck + PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all + runHook postCheck + ''; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { + pname = "lookatme"; + version = "2.3.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw="; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ + click + pyyaml + pygments + marshmallow + mistune + urwid + ]; + + meta = with lib; { + description = "An interactive, terminal-based markdown presenter"; + homepage = "https://github.com/d0c-s4vage/lookatme"; + license = licenses.mit; + maintainers = with maintainers; [ ameer ]; + }; +} diff --git a/pkgs/tools/misc/lottieconverter/default.nix b/pkgs/tools/misc/lottieconverter/default.nix index aae27cb652eb7..ad2721c36e3a1 100644 --- a/pkgs/tools/misc/lottieconverter/default.nix +++ b/pkgs/tools/misc/lottieconverter/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = with maintainers; [ CRTified ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/lottieconverter.x86_64-darwin }; } diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index c0d1c278bfddf..d72fad1a666c6 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,20 +2,22 @@ , fetchFromGitHub , rustPlatform , installShellFiles +, testVersion +, lsd }: rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "sha256-r/Rllu+tgKqz+vkxA8BSN+3V0lUUd6dEATfickQp4+s="; + sha256 = "sha256-4pa8yJjUTO5MUDuljfU9Vo2ZjbsIwWJsJj6VVNfN25A="; }; - cargoSha256 = "sha256-O8P29eYlHgmmAADZ/DgTBmj0ZOa+4u/Oee+TMF+/4Ro="; + cargoSha256 = "sha256-P0HJVp2ReJuLSZrArw/EAfLFDOZqswI0nD1SCHwegoE="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -25,18 +27,9 @@ rustPlatform.buildRustPackage rec { # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - testFile=$(mktemp /tmp/lsd-test.XXXX) - echo 'abc' > $testFile - $out/bin/lsd --classic --blocks "size,name" -l $testFile | grep "4 B $testFile" - $out/bin/lsd --version | grep "${version}" - rm $testFile - - runHook postInstallCheck - ''; + passthru.tests.version = testVersion { + package = lsd; + }; meta = with lib; { homepage = "https://github.com/Peltoche/lsd"; diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 2dc6ba9f89e4c..a38644f32dfda 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "5.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-si+5LvRUIWp48vsD1WxGWl2O/2bpaBX+ArkZPbBqtME="; + sha256 = "sha256-G95eQ5cIa5313k8YcuicbzPeq9VXVo2DgPMwfFMNXtk="; }; - cargoSha256 = "sha256-CN7PxPUkfyDGxVaf879Sp6w0UbqwL/is15xcfH2fm1w="; + cargoSha256 = "sha256-mkAklLtG/sB0eLla5cveMqyPXwMCE5ufer8qA5L9chg="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/tools/misc/mailman-rss/default.nix b/pkgs/tools/misc/mailman-rss/default.nix new file mode 100644 index 0000000000000..f71b62c67fc40 --- /dev/null +++ b/pkgs/tools/misc/mailman-rss/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, withTwitter ? false}: + +python3Packages.buildPythonApplication rec { + pname = "mailman-rss"; + version = "0.2.4"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00"; + }; + + propagatedBuildInputs = with python3Packages; [ python-dateutil future requests beautifulsoup4 ] + ++ lib.optional withTwitter python3Packages.twitter + ; + + # No tests in Pypi Tarball + doCheck = false; + + meta = with lib; { + description = "Mailman archive -> rss converter"; + homepage = "https://github.com/kyamagu/mailman-rss"; + license = licenses.mit; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 2d974b8af63dd..dc564776d893c 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -1,12 +1,6 @@ { lib, stdenv, fetchurl, zlib, perl, nixosTests }: let - # check if we can execute binaries for the host platform on the build platform - # even though the platforms aren't the same. mandoc can't be cross compiled - # (easily) because of its configurePhase, but we want to allow “native” cross - # such as pkgsLLVM and pkgsStatic. - executableCross = stdenv.hostPlatform.isCompatible stdenv.buildPlatform; - # Name of an UTF-8 locale _always_ present at runtime, used for UTF-8 support # (locale set by the user may differ). This would usually be C.UTF-8, but # darwin has no such locale. @@ -16,9 +10,6 @@ let else "C.UTF-8"; in -assert executableCross || - throw "mandoc relies on executing compiled programs in configurePhase, can't cross compile"; - stdenv.mkDerivation rec { pname = "mandoc"; version = "1.14.6"; @@ -57,7 +48,7 @@ stdenv.mkDerivation rec { printf '%s' "$configureLocal" > configure.local ''; - doCheck = executableCross; + doCheck = true; checkTarget = "regress"; checkInputs = [ perl ]; preCheck = "patchShebangs --build regress/regress.pl"; @@ -67,6 +58,19 @@ stdenv.mkDerivation rec { }; meta = with lib; { + # check if we can execute binaries for the host platform on the build platform + # even though the platforms aren't the same. mandoc can't be cross compiled + # (easily) because of its configurePhase which executes compiled programs + # for gathering information about the host system. Consequently, we can only + # allow “native” cross such as pkgsLLVM and pkgsStatic. + # For a lack of a better predicate at the moment, we compare the platforms' + # system tuples. See also: + # * https://github.com/NixOS/nixpkgs/pull/140271 + # * https://github.com/NixOS/nixpkgs/issues/61414 + # We need to use broken instead of, say a top level assert, to keep splicing + # working. + broken = stdenv.buildPlatform.system != stdenv.hostPlatform.system; + homepage = "https://mandoc.bsd.lv/"; description = "suite of tools compiling mdoc and man"; downloadPage = "http://mandoc.bsd.lv/snapshots/"; diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix new file mode 100644 index 0000000000000..08755ede14db5 --- /dev/null +++ b/pkgs/tools/misc/mandown/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "mandown"; + version = "0.1.3"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-8a4sImsjw+lzeVK4V74VpIKDcAhMR1bOmJYVWzfWEfc="; + }; + + cargoHash = "sha256-Wf1+dxwgPZ4CHpas+3P6n6kKDIISbnfI01+XksjxQlQ="; + + meta = with lib; { + description = "Markdown to groff (man page) converter"; + homepage = "https://gitlab.com/kornelski/mandown"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index 01a6d2933222f..62c8ca86e6f08 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { # No API changes. substituteInPlace pyproject.toml \ --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \ - --replace 'genanki = "^0.10.1"' 'genanki = "^0.11.0"' \ + --replace 'genanki = "^0.10.1"' 'genanki = "*"' \ --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"' ''; diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix index 0e75af62231c4..cdcdad99477a2 100644 --- a/pkgs/tools/misc/marlin-calc/default.nix +++ b/pkgs/tools/misc/marlin-calc/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin }; } diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index be24d3e2c0b71..3b12175fb5671 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/filemanager/ext.c \ --replace /bin/rm ${coreutils}/bin/rm + + substituteInPlace misc/ext.d/misc.sh.in \ + --replace /bin/cat ${coreutils}/bin/cat ''; preFixup = '' @@ -91,6 +94,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; repositories.git = "https://github.com/MidnightCommander/mc.git"; - updateWalker = true; }; } diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 612d35ffeb38f..583e415f093ca 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.11"; + version = "0.5.13"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-JyNrEIgvL4TQHpAEefDnLirXplGjJcUqsmALKY44VuM="; + sha256 = "sha256-6PGh+CUQH5LEV7/qctn+ihdZgqjt888wknXTfGPS3SI="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "sha256-7wyRHViPL+Hb9Rwrb1dAmmz+faOl9ddNlTdQ/XvTWE8="; + cargoSha256 = "sha256-dpDuM+kGuCC2xm5EdV2OoxLNbKgi8wmTGrr8K16AnpM="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index d8e09e72f7350..46e0ce92809af 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "mimeo"; - version = "2021.2"; + version = "2021.11"; src = fetchurl { - url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz"; - sha256 = "113ip024ggajjdx0l406g6lwypdrddxz6k3640y6lzqjivcgybjf"; + url = "https://xyne.dev/projects/mimeo/src/${pname}-${version}.tar.xz"; + sha256 = "1fi8svn4hg2hmvv28j026sks1hc0v8wh974g7ixcwfcg2xda6c4p"; }; buildInputs = [ file desktop-file-utils ]; @@ -23,9 +23,14 @@ python3Packages.buildPythonApplication rec { installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo"; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/mimeo --help > /dev/null + ''; + meta = with lib; { description = "Open files by MIME-type or file name using regular expressions"; - homepage = "https://xyne.archlinux.ca/projects/mimeo/"; + homepage = "https://xyne.dev/projects/mimeo/"; license = [ licenses.gpl2 ]; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 3f4dbb01e5a95..46a979d073705 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-5rFxVk+D11Iqr0SP2VYdMEnFwijpxQT8e5EoK2PYtmQ="; + sha256 = "sha256-pKNcgrhq5sh6AXKCStAIYAjTpW+tcnSheFHohp+Z84k="; }; - cargoSha256 = "sha256-40TJzhaD1bi/u8k472K89A51wKhm/XjBs13W6oU/06Q="; + cargoSha256 = "sha256-QonLcAixRR7HEefU6D7cSF/stWFodWLWQI7HAkPJHrY="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -43,5 +43,7 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ ]; platforms = platforms.unix; + # https://hydra.nixos.org/build/162650896/nixlog/1 + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index 50648716e1c38..71e4de7479c0d 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "mmctl"; - version = "6.2.1"; + version = "6.3.3"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-DhkBiczQ+4iwoufHMuy6Fn3a4q7gvkKGXTfLcUCCKis="; + sha256 = "sha256-V2p6diXymu37aJdHs0ZQJ7ak4LWe55KYCq15JRzMF48="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index c243e55841252..5528bb2f97c38 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -14,7 +14,6 @@ fontconfig, freetype, gdk-pixbuf, glib, -gnome2, gtk3, lib, libdrm, @@ -34,7 +33,7 @@ xorg, }: let - version = "1.29.6"; + version = "1.30.1"; rpath = lib.makeLibraryPath [ alsa-lib @@ -50,7 +49,6 @@ let freetype gdk-pixbuf glib - gnome2.GConf gtk3 libdrm libnotify @@ -84,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-yLbuHvZrI8C4X/burIo5cI+H8KEv++4FyRgtISpmPxE="; + sha256 = "sha256-MwkYgkDZmzZsthJxSK6c+0us0D4cPuDfuV1XBbeTNXE="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index a4dc2ba905c1a..b59a466e3d17a 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -17,7 +17,7 @@ let "mongofiles" "mongotop" ]; - version = "100.5.1"; + version = "100.5.2"; in buildGoPackage { pname = "mongo-tools"; @@ -30,7 +30,7 @@ in buildGoPackage { rev = version; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "sha256-Qxtb7DJOgrCUvoGVgmKh4qKS4duvEWwW9BLkdt5M5ZY="; + sha256 = "sha256-qYTfC7+5XWDCyQQFKmuPmDmwsekDdY6OAerxZgzf8D0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index ee6c9776c54b2..343a3d5c2a253 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mrtg"; - version = "2.17.8"; + version = "2.17.10"; src = fetchurl { url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz"; - sha256 = "sha256-GsLgr2ng7N73VeeYylmDSreKwYXCpe/9t2hcWPLvAbQ="; + sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w="; }; buildInputs = [ diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index f4dbf2cef6e12..61dba7569867d 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; - homepage = "https://mysqltuner.com/"; + homepage = "https://github.com/major/MySQLTuner-perl"; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg shamilton ]; }; diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix new file mode 100644 index 0000000000000..321b139ca157f --- /dev/null +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -0,0 +1,64 @@ +{ lib +, pkg-config +, dbus +, dconf +, fetchFromGitHub +, glib +, gnome +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, python3 +, substituteAll +, wrapGAppsHook +}: + +python3.pkgs.buildPythonPackage rec { + pname = "nautilus-open-any-terminal"; + version = "0.2.15"; + + src = fetchFromGitHub { + owner = "Stunkymonkey"; + repo = pname; + rev = version; + sha256 = "sha256-cc6Lh5XeAuU5Os4eJ0QcL6XJYB6DqxeUGaOf6m1OnpY="; + }; + + patches = [ ./hardcode-gsettings.patch ]; + + nativeBuildInputs = [ + glib + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + dbus + dconf + gnome.nautilus + gnome.nautilus-python + gobject-introspection + gsettings-desktop-schemas + gtk3 + python3.pkgs.pygobject3 + ]; + + postPatch = '' + substituteInPlace nautilus_open_any_terminal/open_any_terminal_extension.py \ + --subst-var-by gsettings_path ${glib.makeSchemaPath "$out" "$name"} + ''; + + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + + meta = with lib; { + description = "Extension for nautilus, which adds an context-entry for opening other terminal-emulators then `gnome-terminal`"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ stunkymonkey ]; + homepage = "https://github.com/Stunkymonkey/nautilus-open-any-terminal"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch new file mode 100644 index 0000000000000..402f78ed04b13 --- /dev/null +++ b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch @@ -0,0 +1,32 @@ +diff --git a/nautilus_open_any_terminal/open_any_terminal_extension.py b/nautilus_open_any_terminal/open_any_terminal_extension.py +index b02a995..a616399 100644 +--- a/nautilus_open_any_terminal/open_any_terminal_extension.py ++++ b/nautilus_open_any_terminal/open_any_terminal_extension.py +@@ -125,9 +125,10 @@ def set_terminal_args(*args): + + class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): + def __init__(self): +- source = Gio.SettingsSchemaSource.get_default() +- if source.lookup(GSETTINGS_PATH, True): +- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) ++ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++ if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ self._gsettings = Gio.Settings.new_full(_schema, None, None); + self._gsettings.connect("changed", self._bind_shortcut) + self._create_accel_group() + self._window = None +@@ -232,9 +233,10 @@ class OpenAnyTerminalExtension(GObject.GObject, Nautilus.MenuProvider): + return items + + +-source = Gio.SettingsSchemaSource.get_default() +-if source is not None and source.lookup(GSETTINGS_PATH, True): +- _gsettings = Gio.Settings.new(GSETTINGS_PATH) ++source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ _gsettings = Gio.Settings.new_full(_schema, None, None); + _gsettings.connect("changed", set_terminal_args) + value = _gsettings.get_string(GSETTINGS_TERMINAL) + if value in TERM_PARAMS: diff --git a/pkgs/tools/misc/netbootxyz-efi/default.nix b/pkgs/tools/misc/netbootxyz-efi/default.nix new file mode 100644 index 0000000000000..1394a8e745cb4 --- /dev/null +++ b/pkgs/tools/misc/netbootxyz-efi/default.nix @@ -0,0 +1,21 @@ +{ lib +, fetchurl +}: + +let + pname = "netboot.xyz-efi"; + version = "2.0.53"; +in fetchurl { + name = "${pname}-${version}"; + + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/${version}/netboot.xyz.efi"; + sha256 = "sha256-v7XqrhG94BLTpDHDazTiowQUXu/ITEcgVMmhlqgmSQE="; + + meta = with lib; { + homepage = "https://netboot.xyz/"; + description = "A tool to boot OS installers and utilities over the network, to be run from a bootloader"; + license = licenses.asl20; + maintainers = with maintainers; [ Enzime ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 0de14426f2134..f0fa2529f06ff 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-PEteip6FcaJ2wqdhSM9SqL7bJ4nimcOrC3s2pWunEIE="; + sha256 = "sha256-vMs4CyMhEy96gWMWXD74rTR1uNjU+y21i0dh6AdaMGE="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 8470837278b0b..a9c2a43734e98 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.0.2"; + version = "8.5.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-hMb7bAdk3xFcUe5CTu9LnIR3VSJDUKbMSE86s8d5udM="; + sha256 = "sha256-6IUNJ3DE+nRc+bmpDO7l1gXlD6UDGggTSYRMFT57v/Q="; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/tools/misc/odyssey/default.nix index 788f300673585..f154cffa9c6b7 100644 --- a/pkgs/tools/misc/odyssey/default.nix +++ b/pkgs/tools/misc/odyssey/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, postgresql }: stdenv.mkDerivation rec { pname = "odyssey"; - version = "1.0rc1"; + version = "1.2"; src = fetchFromGitHub { owner = "yandex"; repo = pname; rev = version; - sha256 = "0p9zzazx3bhwz7sz8l757lwdj8qx0ij2k3g0d12prs0xfi1qhcmz"; + sha256 = "sha256-wxENqB9CmRVsQY9jTPUlpdiXpuqoU/2hRCY41f9uH3A="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl postgresql ]; + cmakeFlags = [ "-DPQ_LIBRARY=${postgresql.lib}/lib" ]; installPhase = '' install -Dm755 -t $out/bin sources/odyssey diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 6e7484a7e40df..860a9758d4f49 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -3,6 +3,8 @@ , lib , stdenv , fetchpatch +, pkg-config +, zstd , CoreFoundation , libiconv , libresolv @@ -11,18 +13,24 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lrRp01ZeK9bGn7L7SqAxJAU9qugpHnC06CWChhVPGGQ="; + sha256 = "sha256-16oiZAyj6haBk6mgUT25pPDUrCMd7pGo2kAQ0gTe2kM="; }; - cargoSha256 = "sha256-vNa1OF1x/MCTo9B4DTDZNWyHTsOl7Za3EgjnpsL/gWg="; + # enable pkg-config feature of zstd + cargoPatches = [ ./zstd-pkg-config.patch ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; + cargoSha256 = "sha256-6wnfn33mfye5o/vY1JQX1Lc4+jzHiKKgGsSLxeJWyFc="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ zstd ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; meta = with lib; { description = "Git repository summary on your terminal"; diff --git a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch new file mode 100644 index 0000000000000..0ad7542bca647 --- /dev/null +++ b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch @@ -0,0 +1,31 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 202cda0..bc864cc 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -872,6 +872,7 @@ dependencies = [ + "tokei", + "toml", + "yaml-rust", ++ "zstd-sys", + ] + + [[package]] +@@ -1678,4 +1679,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" + dependencies = [ + "cc", + "libc", ++ "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index 8e0b5ff..48959b4 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -57,6 +57,8 @@ libc = "0.2.112" + [dev-dependencies] + more-asserts = "0.2" + paste = "1.0.6" ++# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library ++zstd-sys = { version = "1", features = [ "pkg-config" ] } + + [features] + fail-on-deprecated = [] diff --git a/pkgs/tools/misc/opencbm/default.nix b/pkgs/tools/misc/opencbm/default.nix index 2512747e74aae..434b3d421de22 100644 --- a/pkgs/tools/misc/opencbm/default.nix +++ b/pkgs/tools/misc/opencbm/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opencbm"; - version = "0.4.99.103"; + version = "0.4.99.104"; src = fetchFromGitHub { owner = "OpenCBM"; repo = "OpenCBM"; rev = "v${version}"; - sha256 = "06844yfgcbbwrp3iz5k8zd1zjawzbpvl131lgmkwz6d542c2k4k9"; + sha256 = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw="; }; makefile = "LINUX/Makefile"; @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { disk copier included. Successor of cbm4linux. Also supports the XU1541 and the XUM1541 devices (a.k.a. "ZoomFloppy"). ''; - license = licenses.gpl2; + homepage = "https://spiro.trikaliotis.net/opencbm"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.sander ]; }; diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix new file mode 100644 index 0000000000000..ddd21cbab5a06 --- /dev/null +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -0,0 +1,45 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "opentelemetry-collector-contrib"; + version = "0.44.0"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-collector-contrib"; + rev = "v${version}"; + sha256 = "sha256-JRkS51ybFnvCn3pKhDeXO0R23wzT1uso1PtXZllF1fA="; + }; + # proxy vendor to avoid hash missmatches between linux and macOS + proxyVendor = true; + vendorSha256 = "sha256-4MnUDakBfo3nhSqMjDYiqx6FNZvAB/9DE1yxOvmQAAk="; + + subPackages = [ "cmd/otelcontribcol" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/open-telemetry/opentelemetry-collector-contrib/internal/version.Version=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; + description = "OpenTelemetry Collector superset with additional community collectors"; + longDescription = '' + The OpenTelemetry Collector offers a vendor-agnostic implementation on how + to receive, process and export telemetry data. In addition, it removes the + need to run, operate and maintain multiple agents/collectors in order to + support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) + sending to multiple open-source or commercial back-ends. The Contrib + edition provides aditional vendor specific receivers/exporters and/or + components that are only useful to a relatively small number of users and + is multiple times larger as a result. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ uri-canva jk ]; + }; +} diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 6c83d72976d92..72aea5c44d9a9 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -1,30 +1,52 @@ { buildGoModule , fetchFromGitHub , lib +, writeScript }: +let + otelcontribcol = writeScript "otelcontribcol" '' + echo 'ERROR: otelcontribcol is now in `pkgs.opentelemetry-collector-contrib`, call the collector with `otelcorecol` or move to `pkgs.opentelemetry-collector-contrib`' >&2 + exit 1 + ''; +in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.40.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "open-telemetry"; - repo = "opentelemetry-collector-contrib"; + repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-YFgAS4WReyMnzb6FOeRUXHf1LUgknH5gWObiZNKMbv8="; + sha256 = "sha256-uwQR38L81galqrOEF2qWxKi1UelaUmpkeg0WbkcbYfs="; }; + # there is a nested go.mod + sourceRoot = "source/cmd/otelcorecol"; + vendorSha256 = "sha256-wzGv46wcPjpxiQsiNZQGC4DMHcMrWOEmacC5E0F2YCs="; - vendorSha256 = "sha256-DTZLYF3BoQGou59KaL56pkxySsoQ0xeJ5aF/SkewziE="; - proxyVendor = true; + preBuild = '' + # set the build version, can't be done via ldflags + sed -i -E 's/Version:(\s*)".*"/Version:\1"${version}"/' main.go + ''; - CGO_ENABLED = 0; + ldflags = [ "-s" "-w" ]; - subPackages = [ "cmd/otelcontribcol" ]; + postInstall = '' + cp ${otelcontribcol} $out/bin/otelcontribcol + ''; meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-collector"; - description = "OpenTelemetry Collector"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md"; + description = "OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data"; + longDescription = '' + The OpenTelemetry Collector offers a vendor-agnostic implementation on how + to receive, process and export telemetry data. In addition, it removes the + need to run, operate and maintain multiple agents/collectors in order to + support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) + sending to multiple open-source or commercial back-ends. + ''; license = licenses.asl20; - maintainers = [ maintainers.uri-canva ]; + maintainers = with maintainers; [ uri-canva jk ]; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index bc7baa55fecdf..bffcd5e1dca4b 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python, git +, python2, git }: let jdk = jdk8; jre = jdk8.jre; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ autoconf automake curl jdk nettools python git ]; + buildInputs = [ autoconf automake curl jdk nettools python2 git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index a0803a36839ff..0a3103cd4f94c 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "sha256-0mUGvu5o2MhlriNAUAUoyDrFgTw2weGGbQcBzaauKEQ="; + sha256 = "sha256-6FVMv+DowMYdRdsQFL2iwG/V9D2cLWkHUVkmR3/TuUI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/tools/misc/pandoc-drawio-filter/default.nix new file mode 100644 index 0000000000000..1279296143cc9 --- /dev/null +++ b/pkgs/tools/misc/pandoc-drawio-filter/default.nix @@ -0,0 +1,78 @@ +{ buildPythonApplication +, drawio +, fetchFromGitHub +, lib +, pandoc +, pandocfilters +, runCommand +, runtimeShell +, texlive +, writeScriptBin +, xvfb-run +}: + +let + version = "1.1"; + + src = fetchFromGitHub { + owner = "tfc"; + repo = "pandoc-drawio-filter"; + rev = version; + sha256 = "sha256-2XJSAfxqEmmamWIAM3vZqi0mZjUUugmR3zWw8Imjadk="; + }; + + wrappedDrawio = writeScriptBin "drawio" '' + #!${runtimeShell} + + # Electron really wants a configuration directory to not die with: + # "Error: Failed to get 'appData' path" + # so we give it some temp dir as XDG_CONFIG_HOME + tmpdir=$(mktemp -d) + + function cleanup { + rm -rf "$tmpdir" + } + trap cleanup EXIT + + # Drawio needs to run in a virtual X session, because Electron + # refuses to work and dies with an unhelpful error message otherwise: + # "The futex facility returned an unexpected error code." + XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@ + ''; + + pandoc-drawio-filter = buildPythonApplication { + pname = "pandoc-drawio-filter"; + + inherit src version; + + propagatedBuildInputs = [ + wrappedDrawio + pandocfilters + ]; + + passthru.tests.example-doc = + let + env = { + nativeBuildInputs = [ + pandoc + pandoc-drawio-filter + texlive.combined.scheme-tetex + ]; + }; + in + runCommand "$pandoc-drawio-filter-example-doc.pdf" env '' + cp -r ${src}/example/* . + pandoc -F pandoc-drawio example.md -T pdf -o $out + ''; + + meta = with lib; { + homepage = "https://github.com/tfc/pandoc-drawio-filter"; + description = "Pandoc filter which converts draw.io diagrams to PDF"; + license = licenses.mit; + maintainers = with maintainers; [ tfc ]; + }; + }; + +in + +pandoc-drawio-filter diff --git a/pkgs/tools/misc/panicparse/default.nix b/pkgs/tools/misc/panicparse/default.nix new file mode 100644 index 0000000000000..95bfc54fbb4b0 --- /dev/null +++ b/pkgs/tools/misc/panicparse/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "panicparse"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "maruel"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Bwvxj9Ifcq2WpicUBK+03fbGuoVAVF2Zmtpy/utUxoo="; + }; + + vendorSha256 = "sha256-ZHUxzGqsGX1c4mBA4TBO2+WnGDhwAOGi0uYQx+3OgL8="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Crash your app in style (Golang)"; + homepage = "https://github.com/maruel/panicparse"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 40599ff9c4e4e..a52ad6920bb1e 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20211222"; + version = "20220122"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-BYSRz0xSpIVZd73oA8Y2iLLKnFmRvhDnuLDArt5G0Zw="; + sha256 = "sha256-uCIaIUErylcq2ERbeYHf1iWjxtSHcs2kaN+1uIYzfgA="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 5c88ea2349f77..76df2a6882738 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.2.0"; + version = "3.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "v${version}"; - sha256 = "0r75a128r8ghrccc1flmpxblfrab5kg6fypzrlfmv2aqhkqg1brb"; + sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index e0375e2349e33..4d0c331373455 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.6.1"; + version = "10.8.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-ixDMd9/tO793yVvIE60n5gytfDAmcuA631/ZON9v6LA="; + sha256 = "sha256-O1jqaUQZymCNcp+mznLtK0xRr0RHKe77zcbmcCkMqn8="; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix new file mode 100644 index 0000000000000..d5a4c0e429850 --- /dev/null +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "phrase-cli"; + version = "2.4.4"; + + src = fetchFromGitHub { + owner = "phrase"; + repo = "phrase-cli"; + rev = version; + sha256 = "0xlfcj0jd6x4ynzg6d0p3wlmfq660w3zm13nzx04jfcjnks9sqvl"; + }; + + vendorSha256 = "1ablrs3prw011bpad8vn87y3c81q44mps873nhj278hlkz6im34g"; + + postInstall = '' + ln -s $out/bin/phrase-cli $out/bin/phrase + ''; + + meta = with lib; { + homepage = "http://docs.phraseapp.com"; + description = "PhraseApp API v2 Command Line Client"; + license = licenses.mit; + maintainers = with maintainers; [ juboba ]; + }; +} diff --git a/pkgs/tools/misc/pinsel/default.nix b/pkgs/tools/misc/pinsel/default.nix new file mode 100644 index 0000000000000..de6cc3700838d --- /dev/null +++ b/pkgs/tools/misc/pinsel/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, lua, glib }: + +stdenv.mkDerivation rec { + pname = "pinsel"; + version = "unstable-2021-09-13"; + + src = fetchFromGitHub { + owner = "Nooo37"; + repo = pname; + rev = "24b0205ca041511b3efb2a75ef296539442f9f54"; + sha256 = "sha256-w+jiKypZODsmZq3uWGNd8PZhe1SowHj0thcQTX8WHfQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config glib ]; + + buildInputs = [ lua gtk3 ]; + + makeFlags = [ "INSTALLDIR=${placeholder "out"}/bin" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with lib; { + description = "Minimal screenshot annotation tool with lua config"; + homepage = "https://github.com/Nooo37/pinsel"; + # no license + license = licenses.unfree; + maintainers = with maintainers; [ lom ]; + mainProgram = "pinsel"; + }; +} diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix index c5fb8c124f8a6..f65941e784b24 100644 --- a/pkgs/tools/misc/pipectl/default.nix +++ b/pkgs/tools/misc/pipectl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-wa/SKKNXkl8XxE7XORodoAlrMc2QNGXGPE+/yya209Y="; + hash = "sha256-+o5hIDtDAh4r+AKCUhueQ3GBYf2sZtMATGX73Qg+tbo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 82b0e3dea1052..42b673e5b18b8 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.16"; + version = "1.2022.1"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-0yN/29VKWiqp2Hi9aIN6GMlfMJPxrewsCQyyPVy6RAM="; + sha256 = "sha256-oEOhf7nLVGJqoK/pyTWzF+s3OYsGcEy5pIj8obSrkRY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix index faff84e52fa63..f4504a73637e1 100644 --- a/pkgs/tools/misc/plocate/default.nix +++ b/pkgs/tools/misc/plocate/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ config +, stdenv , lib , fetchgit , pkg-config @@ -8,20 +9,21 @@ , liburing , zstd }: - +let + dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; +in stdenv.mkDerivation rec { pname = "plocate"; - version = "1.1.7"; + version = "1.1.15"; src = fetchgit { url = "https://git.sesse.net/plocate"; rev = version; - sha256 = "sha256-5Ie4qgiKUoI9Kma6YvjXirvBbpbKVuaMSSAZa36zN3M="; + sha256 = "sha256-r8/LivQhJkMTE8ejznr+eGplXFrQl4xwCgXOwbR4wlw="; }; postPatch = '' sed -i meson.build \ - -e "s@unitdir =.*@unitdir = '$out/lib/systemd/system'@" \ -e '/mkdir\.sh/d' ''; @@ -30,16 +32,16 @@ stdenv.mkDerivation rec { buildInputs = [ systemd liburing zstd ]; mesonFlags = [ - # I don't know why we can't do this but instead have to resort to patching meson.build - # "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "-Dsharedstatedir=/var/lib" + "-Dsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dsharedstatedir=${builtins.dirOf dbfile}" + "-Ddbpath=${builtins.baseNameOf dbfile}" ]; meta = with lib; { description = "Much faster locate"; homepage = "https://plocate.sesse.net/"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg SuperSandro2000 ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index 32595e17c06f4..913bfc00a1586 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.40.0"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b/9NEURp42d/j/Fk8NUS0ZAG99q56eg0pEU/xkFnvrM="; + sha256 = "sha256-go3EXmC9Vp0xXi1mH65p85FKsTe0CbyNXw3VVRrnpeQ="; }; repo = fetchFromGitLab { @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "postmarketOS"; repo = pname; rev = version; - sha256 = "sha256-2yyHAHoIlwHX2+LbwwK7AGrBDZlfkhtCcKAKHdJMBdQ="; + sha256 = "sha256-7Y4rxSdJQaIlq4yiadvrEro0JM5xoHeISDKHz69T4z8="; }; pmb_test = "${repo}/test"; diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/tools/misc/popsicle/default.nix new file mode 100644 index 0000000000000..e9369270fcd00 --- /dev/null +++ b/pkgs/tools/misc/popsicle/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetchFromGitHub +, rustc +, cargo +, rustPlatform +, pkg-config +, dbus +, glib +, cairo +, pango +, atk +, lib +, gdk-pixbuf +, gtk3 +}: + +rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { + pname = "popsicle"; + version = "unstable-2021-12-20"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "b02ebf5f2e6c18777453ca9a144d69689a6fa901"; + sha256 = "03ilhvnr4mwy7b8bipp616h16m2ilxzxz2zjpkzy3afwvh9bz1mx"; + }; + + cargoSha256 = "1c54wxyrfxk5chnjhxw6vaznm7ff9dkx1rxlgp417jfygiwijjs4"; + + nativeBuildInputs = [ gtk3 pkg-config ]; + + buildInputs = [ + gtk3 + dbus + glib + cairo + pango + atk + gdk-pixbuf + ]; + + # Use the stdenv default phases (./configure; make) instead of the + # ones from buildRustPackage. + configurePhase = "configurePhase"; + buildPhase = "buildPhase"; + checkPhase = "checkPhase"; + installPhase = "installPhase"; + + postPatch = '' + # Have to do this here instead of in preConfigure because + # cargoDepsCopy gets unset after postPatch. + configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "DESTDIR=${placeholder "out"}" + ]; + + postInstall = '' + # install man page, icon, etc... + mv $out/usr/local/* $out + rm -rf $out/usr + ''; + + meta = with lib; { + description = "Multiple USB File Flasher"; + homepage = "https://github.com/pop-os/popsicle"; + maintainers = with maintainers; [ _13r0ck ]; + license = licenses.mit; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 41d3ecf17872c..307e5e9c74611 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -3,7 +3,7 @@ with python3Packages; buildPythonPackage rec { pname = "pre-commit"; - version = "2.16.0"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U="; + sha256 = "c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"; }; patches = [ diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 882ea148b2017..871398822a5c2 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.5.1"; + version = "5.5.3"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-EQOIbpP80t/SVwrY/iEYTdfE1L/VmI5VxBrr+mBvICo="; + sha256 = "sha256-vjcAvTdqrZFmtVDkG/K4mHiInF63BPOyUXLVKIOq7qU="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 78bb6c839e6e7..d0125377763d9 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -1,31 +1,116 @@ -{ lib, fetchurl, appimageTools }: +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, zlib +, libusb1 +, libGL +, qmake +, wrapQtAppsHook +, mkDerivation +, qttools +, qtbase +, qt3d +, qtsvg +, qtserialport +, qtdeclarative +, qtquickcontrols +, qtquickcontrols2 +, qtgraphicaleffects +, qtwayland +}: let - pname = "qflipper"; - version = "0.5.3"; - name = "${pname}-${version}"; - src = fetchurl { - url = "https://update.flipperzero.one/builds/qFlipper/${version}/qFlipper-x86_64-${version}.AppImage"; - sha256 = "sha256-UFGFl1zb0t1y7FBd5EX1YS3npWM5slL/wLiTOF/CLNM="; + version = "0.8.2"; + timestamp = "99999999999"; + commit = "nix-${version}"; + hash = "sha256-BaqKlF2SZueykFhtj91McP39oXYAx+lz8eXhn5eouqg="; + + udev_rules = '' + #Flipper Zero serial port + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess" + #Flipper Zero DFU + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", ATTRS{manufacturer}=="STMicroelectronics", TAG+="uaccess" + ''; + +in +mkDerivation { + pname = "qFlipper"; + inherit version; + + src = fetchFromGitHub { + owner = "flipperdevices"; + repo = "qFlipper"; + rev = version; + inherit hash; + fetchSubmodules = true; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { - inherit name src; + nativeBuildInputs = [ + pkg-config + qmake + qttools + ]; + + buildInputs = [ + zlib + libusb1 + libGL + wrapQtAppsHook + + qtbase + qt3d + qtsvg + qtserialport + qtdeclarative + qtquickcontrols + qtquickcontrols2 + qtgraphicaleffects + ] ++ lib.optionals (stdenv.isLinux) [ + qtwayland + ]; + + preBuild = '' + substituteInPlace qflipper_common.pri \ + --replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \ + --replace 'GIT_TIMESTAMP = 0' 'GIT_TIMESTAMP = ${timestamp}' \ + --replace 'GIT_COMMIT = unknown' 'GIT_COMMIT = "${commit}"' + cat qflipper_common.pri - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ${lib.optionalString stdenv.isLinux '' + install -Dm755 qFlipper $out/bin/qFlipper + ''} + ${lib.optionalString stdenv.isDarwin '' + install -Dm755 qFlipper.app/Contents/MacOS/qFlipper $out/bin/qFlipper + ''} + cp qFlipperTool $out/bin + + mkdir -p $out/share/applications + cp installer-assets/appimage/qFlipper.desktop $out/share/applications - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/qFlipper - install -m 444 -D ${appimageContents}/qFlipper.desktop -t $out/share/applications - cp -r ${appimageContents}/usr/share/icons $out/share + mkdir -p $out/share/icons + cp application/assets/icons/qFlipper.png $out/share/icons + + mkdir -p $out/etc/udev/rules.d + tee $out/etc/udev/rules.d/42-flipperzero.rules << EOF + ${udev_rules} + EOF + + runHook postInstall ''; meta = with lib; { description = "Cross-platform desktop tool to manage your flipper device"; homepage = "https://flipperzero.one/"; - license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ cab404 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; # qtbase doesn't build yet on aarch64-darwin }; + } diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 5067e1e0fabe5..21eb7bdab292e 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -1,5 +1,11 @@ { lib , python3 +, pkgsCross +, avrdude +, dfu-programmer +, dfu-util +, gcc-arm-embedded +, teensy-loader-cli }: python3.pkgs.buildPythonApplication rec { @@ -30,6 +36,16 @@ python3.pkgs.buildPythonApplication rec { milc pygments pyusb + ] ++ [ # Binaries need to be in the path so this is in propagatedBuildInputs + avrdude + dfu-programmer + dfu-util + teensy-loader-cli + gcc-arm-embedded + pkgsCross.avr.buildPackages.binutils + pkgsCross.avr.buildPackages.binutils.bintools + pkgsCross.avr.buildPackages.gcc8 + pkgsCross.avr.libcCross ]; # buildPythonApplication requires setup.py; the setup.py file crafted below @@ -61,6 +77,6 @@ python3.pkgs.buildPythonApplication rec { - ... and many more! ''; license = licenses.mit; - maintainers = with maintainers; [ bhipple babariviere ]; + maintainers = with maintainers; [ bhipple babariviere ekleog ]; }; } diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix index 8ead57a07eb98..6db1675fe02c0 100644 --- a/pkgs/tools/misc/rates/default.nix +++ b/pkgs/tools/misc/rates/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rates"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lunush"; repo = pname; rev = version; - sha256 = "077qxs4kwfprsai07dninkhmj3ihnghdxan98iv8gmsl3pijbgwh"; + sha256 = "sha256-ivJ6rD4+EYeMg6nOWzf3lp521+7NTBq5vCn7648q0T8="; }; - cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w"; + cargoSha256 = "sha256-dsWAxYFB096SZN5tfzEMokdQ8qw1aR/6Hmjtkdw1L8E="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index a94a4c9bd35b2..22b669e4fdc61 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.11"; + version = "03.04.00"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-CCZ7CENeI8zNUgtBYesGWbqf53OCr9hBTN1ibegB4lo="; + sha256 = "sha256-uIpIygxV5l122FN8sz+OMeQh8iL4Vy87EM1/CjFvLVI="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix index 400a63f7dfe37..4b56dec9d5211 100644 --- a/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rpcsvc-proto"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9"; + sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index c67dddf536fc1..3a7baa62bae89 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.6.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ITn31ENEf2bysgJgV3u+NNPXk1pfIkUyJWIvS2DOrzY="; + sha256 = "sha256-Yt+RWox+0VOw8SH7Ry/o4NHOg3IGcebVeE9OWGP17do="; }; nativeBuildInputs = [ cmake util-linux ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index bfc2ce2c0e99f..09422cd2d4bc4 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -29,7 +29,7 @@ , bubblewrap , pcre , check -, python +, python2 , json_c , zchunk , libmodulemd @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.14"; + version = "2022.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-WOG21wSbjXMc/6OHJBEKFOhvnIt+SFpZikB8XkfN32Y="; + sha256 = "sha256-wy6zmVy7+31+wadLldWdf/IyT0dyLArYLmGw/Kgd+sU="; }; nativeBuildInputs = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { librepo pcre check - python + python2 # libdnf # vendored unstable branch # required by vendored libdnf diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index dd61b82d4080c..e7e0e420810d8 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { pname = "screen"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://gnu/screen/${pname}-${version}.tar.gz"; - sha256 = "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf"; + sha256 = "1x1hqy4h47i7hk85f779lkwkm7gkq8h8mxwd0znkh5adpf0m4czr"; }; configureFlags= [ @@ -16,34 +16,20 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = [ - (fetchpatch { - # Fixes denial of services in encoding.c, remove > 4.8.0 - name = "CVE-2021-26937.patch"; - url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch"; - sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0"; - }) - ] ++ lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); - postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) - # XXX: Awful hack to allow cross-compilation. - '' sed -i ./configure \ - -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' - ''; # " - - buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam - ++ lib.optional stdenv.isDarwin utmp; - - # Build fails due to missing dependencies on autogenerated header: - # screen.h:48:10: fatal error: comm.h: No such file or directory - # It will be fixed in next screen-4.9.0 release. The patches are - # invasive. Disabling parallelism for 4.8.0. - enableParallelBuilding = false; + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ + ncurses + ] ++ lib.optional stdenv.isLinux pam + ++ lib.optional stdenv.isDarwin utmp; doCheck = true; diff --git a/pkgs/tools/misc/scrub/default.nix b/pkgs/tools/misc/scrub/default.nix new file mode 100644 index 0000000000000..baa3732b58406 --- /dev/null +++ b/pkgs/tools/misc/scrub/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + pname = "scrub"; + version = "2.6.1"; + + src = fetchFromGitHub { + owner = "chaos"; + repo = "scrub"; + rev = version; + sha256 = "0ndcri2ddzqlsxvy1b607ajyd4dxpiagzx331yyi7hf3ijph129f"; + }; + + buildInputs = [ autoconf automake libtool ]; + + preConfigure = "./autogen.sh"; + + meta = with lib; { + description = "Disk overwrite utility"; + homepage = "https://github.com/chaos/scrub"; + changelog = "https://raw.githubusercontent.com/chaos/scrub/master/NEWS"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ j0hax ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 394cd8a8ede38..85bc57d3556d7 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.1"; + version = "1.2"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-0z9PHni/ni4p4nfeStrZmFFHHtyqT8GYJWVWr5IzFKw="; + sha256 = "sha256-cx+mIVrY9tB5k1YnAHkpGahXVG6S+JBshJKkzEbcKZI="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 2fb9553a7fea9..048e8eb6008ad 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -3,6 +3,10 @@ , fetchFromGitHub , ffmpeg , yt-dlp +, libsecret +, python3 +, pkg-config +, nodejs , electron , makeWrapper , makeDesktopItem @@ -13,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-0moxrRxydH/g3J5cQmaFSDhTZh9OnUi8ncPVw7q1JC0="; + sha256 = "sha256-wQEP3fdp+Mhgoz873cgF65WouWtbEdCdXfLiVSmrjyA="; }; nativeBuildInputs = [ @@ -55,6 +59,34 @@ stdenvNoCC.mkDerivation rec { "--production" ]; + pkgConfig = { + keytar = { + nativeBuildInputs = [ + python3 + pkg-config + ]; + buildInputs = [ + libsecret + ]; + postInstall = '' + yarn --offline run build + # Remove unnecessary store path references. + rm build/config.gypi + ''; + }; + }; + + preBuild = '' + # Set up headers for node-gyp, which is needed to build keytar. + mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" + + # Set up version which node-gyp checks in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/lib/install.js#L87-L96> against the version in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/package.json#L15>. + echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" + + # Link node headers so that node-gyp does not try to download them. + ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" + ''; + packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; yarnNix = ./yarndeps.nix; diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/tools/misc/sharedown/update.sh index 584cb8511a7cd..d08a258a6a838 100755 --- a/pkgs/tools/misc/sharedown/update.sh +++ b/pkgs/tools/misc/sharedown/update.sh @@ -1,9 +1,19 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update yarn yarn2nix-moretea.yarn2nix +#!nix-shell -i bash -p common-updater-scripts curl jq yarn yarn2nix-moretea.yarn2nix set -euo pipefail -nix-update sharedown +owner=kylon +repo=Sharedown +latestVersion=$(curl "https://api.github.com/repos/$owner/$repo/releases/latest" | jq -r '.tag_name') +currentVersion=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.version' | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" && "${BUMP_LOCK-}" != "1" ]]; then + # Skip update when already on the latest version. + exit 0 +fi + +update-source-version sharedown "$latestVersion" dirname="$(realpath "$(dirname "$0")")" sourceDir="$(nix-build -A sharedown.src --no-out-link)" diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index 5b5638db5055b..58cfe65b3dd20 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/pkgs/tools/misc/sharedown/yarn.lock @@ -109,14 +109,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "16.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae" - integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA== + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab" + integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog== "@types/node@^14.6.2": - version "14.17.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz#fe4b38b3f07617c0fa31ae923fca9249641038f0" - integrity sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg== + version "14.18.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz#0e5944eefe2b287391279a19b407aa98bd14436d" + integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q== "@types/plist@^3.0.1": version "3.0.2" @@ -137,9 +137,9 @@ integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== "@types/yargs@^17.0.1": - version "17.0.7" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz#44a484c634761da4391477515a98772b82b5060f" - integrity sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg== + version "17.0.8" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" + integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== dependencies: "@types/yargs-parser" "*" @@ -179,10 +179,10 @@ ansi-align@^3.0.0: dependencies: string-width "^4.1.0" -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^5.0.1: version "5.0.1" @@ -239,11 +239,24 @@ app-builder-lib@22.14.5: semver "^7.3.5" temp-file "^3.4.0" +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + arch@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -266,6 +279,11 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" @@ -440,9 +458,9 @@ cacheable-request@^6.0.0: responselike "^1.0.2" camelcase@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== chalk@^2.4.2: version "2.4.2" @@ -491,13 +509,13 @@ cli-boxes@^2.2.1: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-truncate@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" - integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "^1.0.0" - string-width "^2.0.0" + slice-ansi "^3.0.0" + string-width "^4.2.0" clipboardy@2.3.0: version "2.3.0" @@ -524,6 +542,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -612,6 +635,11 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -659,7 +687,14 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +debug@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -680,6 +715,13 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -702,15 +744,25 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.901419: - version "0.0.901419" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" - integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== +devtools-protocol@0.0.937139: + version "0.0.937139" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz#bdee3751fdfdb81cb701fd3afa94b1065dafafcf" + integrity sha512-daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ== dir-compare@^2.4.0: version "2.4.0" @@ -737,17 +789,16 @@ dmg-builder@22.14.5: dmg-license "^1.0.9" dmg-license@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" - integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== + version "1.0.10" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" + integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" ajv "^6.10.0" - cli-truncate "^1.1.0" crc "^3.8.0" - iconv-corefoundation "^1.1.6" - plist "^3.0.1" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" smart-buffer "^4.0.2" verror "^1.10.0" @@ -780,7 +831,7 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.13.1: +electron-builder@^22.14.5: version "22.14.5" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496" integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg== @@ -823,10 +874,10 @@ electron-publish@22.14.5: lazy-val "^1.0.5" mime "^2.5.2" -electron@^15.3.1: - version "15.3.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a" - integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ== +electron@^16.0.6: + version "16.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" + integrity sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -892,6 +943,11 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + extract-zip@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -951,9 +1007,9 @@ find-up@^4.0.0: path-exists "^4.0.0" follow-redirects@^1.14.4: - version "1.14.5" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" - integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== font-awesome@^4.7.0: version "4.7.0" @@ -1007,6 +1063,20 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -1026,6 +1096,11 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + glob@^7.1.3, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -1092,9 +1167,9 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -1111,15 +1186,20 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== hosted-git-info@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -1136,12 +1216,12 @@ https-proxy-agent@5.0.0: agent-base "6" debug "4" -iconv-corefoundation@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a" - integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw== +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== dependencies: - cli-truncate "^1.1.0" + cli-truncate "^2.1.0" node-addon-api "^1.6.3" iconv-lite@^0.6.2: @@ -1213,10 +1293,12 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -1350,6 +1432,14 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" +keytar@^7.7.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2" + integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A== + dependencies: + node-addon-api "^3.0.0" + prebuild-install "^6.0.0" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -1443,6 +1533,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1450,12 +1545,12 @@ minimatch@3.0.4, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp-classic@^0.5.2: +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== @@ -1477,16 +1572,33 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abi@^2.21.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== + dependencies: + semver "^5.4.1" + node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== +node-addon-api@^3.0.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + node-fetch@2.6.5: version "2.6.5" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" @@ -1514,6 +1626,26 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + object-keys@^1.0.12: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -1602,7 +1734,7 @@ pkg-dir@4.2.0: dependencies: find-up "^4.0.0" -plist@^3.0.1: +plist@^3.0.1, plist@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== @@ -1610,6 +1742,25 @@ plist@^3.0.1: base64-js "^1.5.1" xmlbuilder "^9.0.7" +prebuild-install@^6.0.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.21.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -1655,13 +1806,13 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -puppeteer@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz#0808719c38e15315ecc1b1c28911f1c9054d201f" - integrity sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg== +puppeteer@13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz#9cd9bb8ec090bade183ca186bf342396bdffa135" + integrity sha512-wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A== dependencies: debug "4.3.2" - devtools-protocol "0.0.901419" + devtools-protocol "0.0.937139" extract-zip "2.0.1" https-proxy-agent "5.0.0" node-fetch "2.6.5" @@ -1673,7 +1824,7 @@ puppeteer@11.0.0: unbzip2-stream "1.4.3" ws "8.2.3" -rc@^1.2.8: +rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -1694,7 +1845,7 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@^2.2.2: +readable-stream@^2.0.6, readable-stream@^2.2.2: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -1761,16 +1912,16 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -1800,7 +1951,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@^5.5.0: +semver@^5.4.1, semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -1824,6 +1975,11 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -1853,12 +2009,28 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== -slice-ansi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" - integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== dependencies: - is-fullwidth-code-point "^2.0.0" + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" smart-buffer@^4.0.2: version "4.2.0" @@ -1888,15 +2060,16 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1919,12 +2092,12 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: - ansi-regex "^3.0.0" + ansi-regex "^2.0.0" strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" @@ -1964,7 +2137,7 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -tar-fs@2.1.1: +tar-fs@2.1.1, tar-fs@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== @@ -2029,6 +2202,13 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" @@ -2161,6 +2341,13 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -2222,23 +2409,23 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs-parser@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" + integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== yargs@^17.0.1: - version "17.2.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea" - integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q== + version "17.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" + integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== dependencies: cliui "^7.0.2" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" - string-width "^4.2.0" + string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^20.2.2" + yargs-parser "^21.0.0" yauzl@^2.10.0: version "2.10.0" diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index 046a6c71bad2d..153a9282427dd 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/pkgs/tools/misc/sharedown/yarndeps.nix @@ -6,7 +6,7 @@ path = fetchurl { name = "7zip_bin___7zip_bin_5.1.1.tgz"; url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; }; } { @@ -14,7 +14,7 @@ path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; + sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; }; } { @@ -22,7 +22,7 @@ path = fetchurl { name = "_electron_get___get_1.13.1.tgz"; url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz"; - sha1 = "42a0aa62fd1189638bd966e23effaebb16108368"; + sha512 = "U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA=="; }; } { @@ -30,7 +30,7 @@ path = fetchurl { name = "_electron_universal___universal_1.0.5.tgz"; url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; - sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; + sha512 = "zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag=="; }; } { @@ -38,7 +38,7 @@ path = fetchurl { name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; + sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; } { @@ -46,7 +46,7 @@ path = fetchurl { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; + sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_sindresorhus_is___is_0.14.0.tgz"; url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; } { @@ -62,7 +62,7 @@ path = fetchurl { name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; } { @@ -70,7 +70,7 @@ path = fetchurl { name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; url = "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz"; - sha1 = "24499e69c3aeda4926670675b9fdfeb9ab15f19d"; + sha512 = "eX+O8P/xIkuCDeDI3IOIoyzuTJLVqbGnoBhLiBoFU7MwntF02ygQcByMinhUtXv2zm0pOSy6zeKoQTKAVBK60A=="; }; } { @@ -78,7 +78,7 @@ path = fetchurl { name = "_types_debug___debug_4.1.7.tgz"; url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; } { @@ -86,7 +86,7 @@ path = fetchurl { name = "_types_fs_extra___fs_extra_9.0.13.tgz"; url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha1 = "7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; } { @@ -94,7 +94,7 @@ path = fetchurl { name = "_types_glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha1 = "bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; } { @@ -102,7 +102,7 @@ path = fetchurl { name = "_types_minimatch___minimatch_3.0.5.tgz"; url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; } { @@ -110,23 +110,23 @@ path = fetchurl { name = "_types_ms___ms_0.7.31.tgz"; url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; - sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; } { - name = "_types_node___node_16.11.10.tgz"; + name = "_types_node___node_17.0.10.tgz"; path = fetchurl { - name = "_types_node___node_16.11.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz"; - sha1 = "2e3ad0a680d96367103d3e670d41c2fed3da61ae"; + name = "_types_node___node_17.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz"; + sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; }; } { - name = "_types_node___node_14.17.34.tgz"; + name = "_types_node___node_14.18.9.tgz"; path = fetchurl { - name = "_types_node___node_14.17.34.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz"; - sha1 = "fe4b38b3f07617c0fa31ae923fca9249641038f0"; + name = "_types_node___node_14.18.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz"; + sha512 = "j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q=="; }; } { @@ -134,7 +134,7 @@ path = fetchurl { name = "_types_plist___plist_3.0.2.tgz"; url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01"; + sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; }; } { @@ -142,7 +142,7 @@ path = fetchurl { name = "_types_verror___verror_1.10.5.tgz"; url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; - sha1 = "2a1413aded46e67a1fe2386800e291123ed75eb1"; + sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; }; } { @@ -150,15 +150,15 @@ path = fetchurl { name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; + sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; } { - name = "_types_yargs___yargs_17.0.7.tgz"; + name = "_types_yargs___yargs_17.0.8.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz"; - sha1 = "44a484c634761da4391477515a98772b82b5060f"; + name = "_types_yargs___yargs_17.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz"; + sha512 = "wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw=="; }; } { @@ -166,7 +166,7 @@ path = fetchurl { name = "_types_yauzl___yauzl_2.9.2.tgz"; url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + sha512 = "8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA=="; }; } { @@ -174,7 +174,7 @@ path = fetchurl { name = "agent_base___agent_base_6.0.2.tgz"; url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -182,7 +182,7 @@ path = fetchurl { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } { @@ -190,7 +190,7 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { @@ -198,15 +198,15 @@ path = fetchurl { name = "ansi_align___ansi_align_3.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha1 = "0cdf12e111ace773a86e9a1fad1225c43cb19a59"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; } { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; + name = "ansi_regex___ansi_regex_2.1.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -214,7 +214,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -222,7 +222,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -230,7 +230,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -238,7 +238,7 @@ path = fetchurl { name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz"; - sha1 = "cb0825c5e12efc85b196ac3ed9c89f076c61040e"; + sha512 = "ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw=="; }; } { @@ -246,7 +246,15 @@ path = fetchurl { name = "app_builder_lib___app_builder_lib_22.14.5.tgz"; url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz"; - sha1 = "a61a50b132b858e98fdc70b6b88994ae99b4f96d"; + sha512 = "k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg=="; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; } { @@ -254,7 +262,15 @@ path = fetchurl { name = "arch___arch_2.2.0.tgz"; url = "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz"; - sha1 = "1bc47818f305764f23ab3306b0bfc086c5a29d11"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; } { @@ -262,7 +278,7 @@ path = fetchurl { name = "argparse___argparse_2.0.1.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { @@ -270,7 +286,7 @@ path = fetchurl { name = "asar___asar_3.1.0.tgz"; url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; - sha1 = "70b0509449fe3daccc63beb4d3c7d2e24d3c6473"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; } { @@ -278,7 +294,15 @@ path = fetchurl { name = "assert_plus___assert_plus_1.0.0.tgz"; url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { @@ -286,7 +310,7 @@ path = fetchurl { name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; }; } { @@ -294,7 +318,7 @@ path = fetchurl { name = "async___async_0.9.2.tgz"; url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; }; } { @@ -302,7 +326,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; }; } { @@ -310,7 +334,7 @@ path = fetchurl { name = "at_least_node___at_least_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; } { @@ -318,7 +342,7 @@ path = fetchurl { name = "axios___axios_0.24.0.tgz"; url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha1 = "804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"; + sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; }; } { @@ -326,7 +350,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; } { @@ -334,7 +358,7 @@ path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } { @@ -342,7 +366,7 @@ path = fetchurl { name = "bl___bl_4.1.0.tgz"; url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; } { @@ -350,7 +374,7 @@ path = fetchurl { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; }; } { @@ -358,7 +382,7 @@ path = fetchurl { name = "bluebird___bluebird_3.7.2.tgz"; url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; } { @@ -366,7 +390,7 @@ path = fetchurl { name = "boolean___boolean_3.1.4.tgz"; url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; - sha1 = "f51a2fb5838a99e06f9b6ec1edb674de67026435"; + sha512 = "3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="; }; } { @@ -374,7 +398,7 @@ path = fetchurl { name = "bootstrap___bootstrap_5.1.3.tgz"; url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz"; - sha1 = "ba081b0c130f810fa70900acbc1c6d3c28fa8f34"; + sha512 = "fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q=="; }; } { @@ -382,7 +406,7 @@ path = fetchurl { name = "boxen___boxen_5.1.2.tgz"; url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha1 = "788cb686fc83c1f486dfa8a40c68fc2b831d2b50"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; } { @@ -390,7 +414,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -398,7 +422,7 @@ path = fetchurl { name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha1 = "bd7dc26ae2972d0eda253be061dba992349c19f0"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; }; } { @@ -406,7 +430,7 @@ path = fetchurl { name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha1 = "890dd90d923a873e08e10e5fd51a57e5b7cce0ec"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; }; } { @@ -414,7 +438,7 @@ path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; }; } { @@ -422,7 +446,7 @@ path = fetchurl { name = "buffer_equal___buffer_equal_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + sha1 = "WWFrSYME1Var1GaWayLu2j7KX74="; }; } { @@ -430,7 +454,7 @@ path = fetchurl { name = "buffer_fill___buffer_fill_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; + sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; }; } { @@ -438,7 +462,7 @@ path = fetchurl { name = "buffer_from___buffer_from_1.1.2.tgz"; url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; } { @@ -446,7 +470,7 @@ path = fetchurl { name = "buffer___buffer_5.7.1.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; } { @@ -454,7 +478,7 @@ path = fetchurl { name = "builder_util_runtime___builder_util_runtime_8.9.1.tgz"; url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz"; - sha1 = "25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"; + sha512 = "c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg=="; }; } { @@ -462,7 +486,7 @@ path = fetchurl { name = "builder_util___builder_util_22.14.5.tgz"; url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz"; - sha1 = "42a18608d2a566c0846e91266464776c8bfb0cc9"; + sha512 = "zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA=="; }; } { @@ -470,15 +494,15 @@ path = fetchurl { name = "cacheable_request___cacheable_request_6.1.0.tgz"; url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } { - name = "camelcase___camelcase_6.2.1.tgz"; + name = "camelcase___camelcase_6.3.0.tgz"; path = fetchurl { - name = "camelcase___camelcase_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz"; - sha1 = "250fd350cfd555d0d2160b1d51510eaf8326e86e"; + name = "camelcase___camelcase_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; } { @@ -486,7 +510,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -494,7 +518,7 @@ path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { @@ -502,7 +526,7 @@ path = fetchurl { name = "charenc___charenc_0.0.2.tgz"; url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; - sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + sha1 = "wKHS86cJLgN3S/qD8UwPxXkKhmc="; }; } { @@ -510,7 +534,7 @@ path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } { @@ -518,7 +542,7 @@ path = fetchurl { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + sha1 = "BKEGZywYsIWrd02YPfo+oTjyIgU="; }; } { @@ -526,7 +550,7 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { @@ -534,7 +558,7 @@ path = fetchurl { name = "ci_info___ci_info_3.3.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; - sha1 = "b4ed1fb6818dea4803a55c623041f9165d2066b2"; + sha512 = "riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="; }; } { @@ -542,15 +566,15 @@ path = fetchurl { name = "cli_boxes___cli_boxes_2.2.1.tgz"; url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; } { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; path = fetchurl { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; } { @@ -558,7 +582,7 @@ path = fetchurl { name = "clipboardy___clipboardy_2.3.0.tgz"; url = "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz"; - sha1 = "3c2903650c68e46a91b388985bc2774287dba290"; + sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; } { @@ -566,7 +590,7 @@ path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } { @@ -574,7 +598,15 @@ path = fetchurl { name = "clone_response___clone_response_1.0.2.tgz"; url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -582,7 +614,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -590,7 +622,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -598,7 +630,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -606,7 +638,7 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { @@ -614,7 +646,7 @@ path = fetchurl { name = "colors___colors_1.0.3.tgz"; url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + sha1 = "BDP0TYCWgP3rYO0mDxsMJi6CpAs="; }; } { @@ -622,7 +654,7 @@ path = fetchurl { name = "combined_stream___combined_stream_1.0.8.tgz"; url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } { @@ -630,7 +662,7 @@ path = fetchurl { name = "commander___commander_2.9.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + sha1 = "nJkJQXbhIkDLItbFFGCYQA/g99Q="; }; } { @@ -638,7 +670,7 @@ path = fetchurl { name = "commander___commander_5.1.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; } { @@ -646,7 +678,7 @@ path = fetchurl { name = "compare_version___compare_version_0.1.2.tgz"; url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; + sha1 = "AWLsLZNR9d3VmpICy6k1NmpyUIA="; }; } { @@ -654,7 +686,7 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -662,7 +694,7 @@ path = fetchurl { name = "concat_stream___concat_stream_1.6.2.tgz"; url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } { @@ -670,7 +702,7 @@ path = fetchurl { name = "config_chain___config_chain_1.1.13.tgz"; url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } { @@ -678,7 +710,15 @@ path = fetchurl { name = "configstore___configstore_5.0.1.tgz"; url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { @@ -686,7 +726,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; }; } { @@ -694,7 +734,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.3.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -702,7 +742,7 @@ path = fetchurl { name = "crc___crc_3.8.0.tgz"; url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; } { @@ -710,7 +750,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; } { @@ -718,7 +758,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -726,7 +766,7 @@ path = fetchurl { name = "crypt___crypt_0.0.2.tgz"; url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + sha1 = "iNf/fsDfuG9xPch7u0LQRNPmxBs="; }; } { @@ -734,7 +774,15 @@ path = fetchurl { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; + }; + } + { + name = "debug___debug_4.3.3.tgz"; + path = fetchurl { + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; } { @@ -742,7 +790,7 @@ path = fetchurl { name = "debug___debug_4.3.2.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; } { @@ -750,7 +798,7 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { @@ -758,7 +806,15 @@ path = fetchurl { name = "decompress_response___decompress_response_3.3.0.tgz"; url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; + }; + } + { + name = "decompress_response___decompress_response_4.2.1.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; } { @@ -766,7 +822,7 @@ path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } { @@ -774,7 +830,7 @@ path = fetchurl { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; } { @@ -782,7 +838,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -790,7 +846,23 @@ path = fetchurl { name = "delayed_stream___delayed_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; }; } { @@ -798,15 +870,15 @@ path = fetchurl { name = "detect_node___detect_node_2.1.0.tgz"; url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; } { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; - sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz"; + sha512 = "daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ=="; }; } { @@ -814,7 +886,7 @@ path = fetchurl { name = "dir_compare___dir_compare_2.4.0.tgz"; url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; + sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; }; } { @@ -822,15 +894,15 @@ path = fetchurl { name = "dmg_builder___dmg_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz"; - sha1 = "137c0b55e639badcc0b119eb060e6fa4ed61d948"; + sha512 = "1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w=="; }; } { - name = "dmg_license___dmg_license_1.0.9.tgz"; + name = "dmg_license___dmg_license_1.0.10.tgz"; path = fetchurl { - name = "dmg_license___dmg_license_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz"; - sha1 = "a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"; + name = "dmg_license___dmg_license_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz"; + sha512 = "SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A=="; }; } { @@ -838,7 +910,7 @@ path = fetchurl { name = "dot_prop___dot_prop_5.3.0.tgz"; url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; } { @@ -846,7 +918,7 @@ path = fetchurl { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; } { @@ -854,7 +926,7 @@ path = fetchurl { name = "dotenv___dotenv_9.0.2.tgz"; url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } { @@ -862,7 +934,7 @@ path = fetchurl { name = "duplexer3___duplexer3_0.1.4.tgz"; url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; }; } { @@ -870,7 +942,7 @@ path = fetchurl { name = "ejs___ejs_3.1.6.tgz"; url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; } { @@ -878,7 +950,7 @@ path = fetchurl { name = "electron_builder___electron_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz"; - sha1 = "3a25547bd4fe3728d4704da80956a794c5c31496"; + sha512 = "N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg=="; }; } { @@ -886,7 +958,7 @@ path = fetchurl { name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"; - sha1 = "fc258c5e896859904bbe3d01da06902c04b51c3a"; + sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; } { @@ -894,15 +966,15 @@ path = fetchurl { name = "electron_publish___electron_publish_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz"; - sha1 = "34bcdce671f0e651330db20040d6919c77c94bd6"; + sha512 = "h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg=="; }; } { - name = "electron___electron_15.3.2.tgz"; + name = "electron___electron_16.0.7.tgz"; path = fetchurl { - name = "electron___electron_15.3.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz"; - sha1 = "4f0cbad781d14e0194f5dfef1709e09a70c8074a"; + name = "electron___electron_16.0.7.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz"; + sha512 = "/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w=="; }; } { @@ -910,7 +982,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -918,7 +990,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -926,7 +998,7 @@ path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -934,7 +1006,7 @@ path = fetchurl { name = "env_paths___env_paths_2.2.1.tgz"; url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; } { @@ -942,7 +1014,7 @@ path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; } { @@ -950,7 +1022,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -958,7 +1030,7 @@ path = fetchurl { name = "escape_goat___escape_goat_2.1.1.tgz"; url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; } { @@ -966,7 +1038,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -974,7 +1046,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -982,7 +1054,15 @@ path = fetchurl { name = "execa___execa_1.0.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + } + { + name = "expand_template___expand_template_2.0.3.tgz"; + path = fetchurl { + name = "expand_template___expand_template_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; } { @@ -990,7 +1070,7 @@ path = fetchurl { name = "extract_zip___extract_zip_2.0.1.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -998,7 +1078,7 @@ path = fetchurl { name = "extract_zip___extract_zip_1.7.0.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; - sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; }; } { @@ -1006,7 +1086,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.4.1.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; - sha1 = "8d172c064867f235c0c84a596806d279bf4bcc07"; + sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; }; } { @@ -1014,7 +1094,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -1022,7 +1102,7 @@ path = fetchurl { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -1030,7 +1110,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; }; } { @@ -1038,7 +1118,7 @@ path = fetchurl { name = "filelist___filelist_1.0.2.tgz"; url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; }; } { @@ -1046,15 +1126,15 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz"; - sha1 = "f09a5848981d3c772b5392309778523f8d85c381"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; } { @@ -1062,7 +1142,7 @@ path = fetchurl { name = "font_awesome___font_awesome_4.7.0.tgz"; url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + sha1 = "j6jPBBGhoxr9B7BtKQK7n8gVoTM="; }; } { @@ -1070,7 +1150,7 @@ path = fetchurl { name = "form_data___form_data_4.0.0.tgz"; url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha1 = "93919daeaf361ee529584b9b31664dc12c9fa452"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; } { @@ -1078,7 +1158,7 @@ path = fetchurl { name = "fs_constants___fs_constants_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; - sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; } { @@ -1086,7 +1166,7 @@ path = fetchurl { name = "fs_extra___fs_extra_10.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; - sha1 = "9ff61b655dde53fb34a82df84bb214ce802e17c1"; + sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; } { @@ -1094,7 +1174,7 @@ path = fetchurl { name = "fs_extra___fs_extra_8.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; } { @@ -1102,7 +1182,7 @@ path = fetchurl { name = "fs_extra___fs_extra_9.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } { @@ -1110,7 +1190,15 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -1118,7 +1206,7 @@ path = fetchurl { name = "get_caller_file___get_caller_file_2.0.5.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -1126,7 +1214,7 @@ path = fetchurl { name = "get_stream___get_stream_4.1.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; } { @@ -1134,7 +1222,15 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + } + { + name = "github_from_package___github_from_package_0.0.0.tgz"; + path = fetchurl { + name = "github_from_package___github_from_package_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "l/tdlr/eiXMxPyDoKI75oWf6ZM4="; }; } { @@ -1142,7 +1238,7 @@ path = fetchurl { name = "glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } { @@ -1150,7 +1246,7 @@ path = fetchurl { name = "global_agent___global_agent_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha1 = "ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"; + sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } { @@ -1158,7 +1254,7 @@ path = fetchurl { name = "global_dirs___global_dirs_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; }; } { @@ -1166,7 +1262,7 @@ path = fetchurl { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; }; } { @@ -1174,7 +1270,7 @@ path = fetchurl { name = "globalthis___globalthis_1.0.2.tgz"; url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; - sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; + sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; }; } { @@ -1182,15 +1278,15 @@ path = fetchurl { name = "got___got_9.6.0.tgz"; url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; } { @@ -1198,7 +1294,7 @@ path = fetchurl { name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + sha1 = "TK+tdrxi8C+gObL5Tpo906ORpyU="; }; } { @@ -1206,7 +1302,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -1214,7 +1310,15 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -1222,15 +1326,15 @@ path = fetchurl { name = "has_yarn___has_yarn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; } { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; }; } { @@ -1238,7 +1342,7 @@ path = fetchurl { name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; } { @@ -1246,15 +1350,15 @@ path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; } { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz"; - sha1 = "27c135470237f6f8d13462fa1f5eaf250523c29a"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; + sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } { @@ -1262,7 +1366,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.6.3.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; } { @@ -1270,7 +1374,7 @@ path = fetchurl { name = "ieee754___ieee754_1.2.1.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } { @@ -1278,7 +1382,7 @@ path = fetchurl { name = "import_lazy___import_lazy_2.1.0.tgz"; url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; }; } { @@ -1286,7 +1390,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -1294,7 +1398,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -1302,7 +1406,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -1310,7 +1414,7 @@ path = fetchurl { name = "ini___ini_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; } { @@ -1318,7 +1422,7 @@ path = fetchurl { name = "ini___ini_1.3.8.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha1 = "a29da425b48806f34767a4efce397269af28432c"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } { @@ -1326,7 +1430,7 @@ path = fetchurl { name = "is_buffer___is_buffer_1.1.6.tgz"; url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; } { @@ -1334,7 +1438,7 @@ path = fetchurl { name = "is_ci___is_ci_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; } { @@ -1342,7 +1446,7 @@ path = fetchurl { name = "is_ci___is_ci_3.0.1.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; - sha1 = "db6ecbed1bd659c43dac0f45661e7674103d1867"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; } { @@ -1350,15 +1454,15 @@ path = fetchurl { name = "is_docker___is_docker_2.2.1.tgz"; url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; - sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; } { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -1366,7 +1470,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -1374,7 +1478,7 @@ path = fetchurl { name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; }; } { @@ -1382,7 +1486,7 @@ path = fetchurl { name = "is_npm___is_npm_5.0.0.tgz"; url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; + sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; }; } { @@ -1390,7 +1494,7 @@ path = fetchurl { name = "is_obj___is_obj_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; } { @@ -1398,7 +1502,7 @@ path = fetchurl { name = "is_path_inside___is_path_inside_3.0.3.tgz"; url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; } { @@ -1406,7 +1510,7 @@ path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; }; } { @@ -1414,7 +1518,7 @@ path = fetchurl { name = "is_typedarray___is_typedarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; }; } { @@ -1422,7 +1526,7 @@ path = fetchurl { name = "is_wsl___is_wsl_2.2.0.tgz"; url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; - sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } { @@ -1430,7 +1534,7 @@ path = fetchurl { name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha1 = "d502d3382590ea3004893746754c89139973e232"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; } { @@ -1438,7 +1542,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -1446,7 +1550,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha1 = "5d6def3edebf6e8ca8cae9c30183a804b5f8be80"; + sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; } { @@ -1454,7 +1558,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; }; } { @@ -1462,7 +1566,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { @@ -1470,7 +1574,7 @@ path = fetchurl { name = "iso8601_duration___iso8601_duration_1.3.0.tgz"; url = "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-1.3.0.tgz"; - sha1 = "29d7b69e0574e4acdee50c5e5e09adab4137ba5a"; + sha512 = "K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ=="; }; } { @@ -1478,7 +1582,7 @@ path = fetchurl { name = "jake___jake_10.8.2.tgz"; url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; }; } { @@ -1486,7 +1590,7 @@ path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } { @@ -1494,7 +1598,7 @@ path = fetchurl { name = "json_buffer___json_buffer_3.0.0.tgz"; url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; }; } { @@ -1502,7 +1606,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -1510,7 +1614,7 @@ path = fetchurl { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; }; } { @@ -1518,7 +1622,7 @@ path = fetchurl { name = "json5___json5_2.2.0.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; - sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; } { @@ -1526,7 +1630,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; }; } { @@ -1534,7 +1638,15 @@ path = fetchurl { name = "jsonfile___jsonfile_6.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + } + { + name = "keytar___keytar_7.7.0.tgz"; + path = fetchurl { + name = "keytar___keytar_7.7.0.tgz"; + url = "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz"; + sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; }; } { @@ -1542,7 +1654,7 @@ path = fetchurl { name = "keyv___keyv_3.1.0.tgz"; url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } { @@ -1550,7 +1662,7 @@ path = fetchurl { name = "latest_version___latest_version_5.1.0.tgz"; url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; } { @@ -1558,7 +1670,7 @@ path = fetchurl { name = "lazy_val___lazy_val_1.0.5.tgz"; url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha1 = "6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"; + sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; }; } { @@ -1566,7 +1678,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -1574,7 +1686,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -1582,7 +1694,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; } { @@ -1590,7 +1702,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; } { @@ -1598,7 +1710,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -1606,7 +1718,7 @@ path = fetchurl { name = "make_dir___make_dir_3.1.0.tgz"; url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } { @@ -1614,7 +1726,7 @@ path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; }; } { @@ -1622,7 +1734,7 @@ path = fetchurl { name = "md5___md5_2.3.0.tgz"; url = "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz"; - sha1 = "c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"; + sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; } { @@ -1630,7 +1742,7 @@ path = fetchurl { name = "mime_db___mime_db_1.51.0.tgz"; url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; - sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; } { @@ -1638,7 +1750,7 @@ path = fetchurl { name = "mime_types___mime_types_2.1.34.tgz"; url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; - sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; } { @@ -1646,7 +1758,7 @@ path = fetchurl { name = "mime___mime_2.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; - sha1 = "a2a682a95cd4d0cb1d6257e28f83da7e35800367"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; } { @@ -1654,7 +1766,15 @@ path = fetchurl { name = "mimic_response___mimic_response_1.0.1.tgz"; url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + } + { + name = "mimic_response___mimic_response_2.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; } { @@ -1662,7 +1782,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -1670,7 +1790,7 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; } { @@ -1678,7 +1798,7 @@ path = fetchurl { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; - sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; } { @@ -1686,7 +1806,7 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.5.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; } { @@ -1694,7 +1814,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -1702,7 +1822,15 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + } + { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + path = fetchurl { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; } { @@ -1710,7 +1838,15 @@ path = fetchurl { name = "nice_try___nice_try_1.0.5.tgz"; url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + } + { + name = "node_abi___node_abi_2.30.1.tgz"; + path = fetchurl { + name = "node_abi___node_abi_2.30.1.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; } { @@ -1718,7 +1854,15 @@ path = fetchurl { name = "node_addon_api___node_addon_api_1.7.2.tgz"; url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; + }; + } + { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; } { @@ -1726,7 +1870,7 @@ path = fetchurl { name = "node_fetch___node_fetch_2.6.5.tgz"; url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; + sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; }; } { @@ -1734,7 +1878,7 @@ path = fetchurl { name = "normalize_url___normalize_url_4.5.1.tgz"; url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; } { @@ -1742,7 +1886,7 @@ path = fetchurl { name = "npm_conf___npm_conf_1.1.3.tgz"; url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; } { @@ -1750,7 +1894,31 @@ path = fetchurl { name = "npm_run_path___npm_run_path_2.0.2.tgz"; url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; }; } { @@ -1758,7 +1926,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -1766,7 +1934,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -1774,7 +1942,7 @@ path = fetchurl { name = "p_cancelable___p_cancelable_1.1.0.tgz"; url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; } { @@ -1782,7 +1950,7 @@ path = fetchurl { name = "p_finally___p_finally_1.0.0.tgz"; url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; }; } { @@ -1790,7 +1958,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -1798,7 +1966,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -1806,7 +1974,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -1814,7 +1982,7 @@ path = fetchurl { name = "package_json___package_json_6.5.0.tgz"; url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; } { @@ -1822,7 +1990,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -1830,7 +1998,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -1838,7 +2006,7 @@ path = fetchurl { name = "path_key___path_key_2.0.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; }; } { @@ -1846,7 +2014,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -1854,7 +2022,7 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; }; } { @@ -1862,7 +2030,7 @@ path = fetchurl { name = "pify___pify_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; }; } { @@ -1870,7 +2038,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { @@ -1878,7 +2046,15 @@ path = fetchurl { name = "plist___plist_3.0.4.tgz"; url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; - sha1 = "a62df837e3aed2bb3b735899d510c4f186019cbe"; + sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + }; + } + { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; } { @@ -1886,7 +2062,7 @@ path = fetchurl { name = "prepend_http___prepend_http_2.0.0.tgz"; url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; }; } { @@ -1894,7 +2070,7 @@ path = fetchurl { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -1902,7 +2078,7 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { @@ -1910,7 +2086,7 @@ path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; }; } { @@ -1918,7 +2094,7 @@ path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; - sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; }; } { @@ -1926,7 +2102,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -1934,7 +2110,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -1942,15 +2118,15 @@ path = fetchurl { name = "pupa___pupa_2.1.1.tgz"; url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; } { - name = "puppeteer___puppeteer_11.0.0.tgz"; + name = "puppeteer___puppeteer_13.0.1.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz"; - sha1 = "0808719c38e15315ecc1b1c28911f1c9054d201f"; + name = "puppeteer___puppeteer_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz"; + sha512 = "wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A=="; }; } { @@ -1958,7 +2134,7 @@ path = fetchurl { name = "rc___rc_1.2.8.tgz"; url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; } { @@ -1966,7 +2142,7 @@ path = fetchurl { name = "read_config_file___read_config_file_6.2.0.tgz"; url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; + sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; }; } { @@ -1974,7 +2150,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -1982,7 +2158,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -1990,7 +2166,7 @@ path = fetchurl { name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; } { @@ -1998,7 +2174,7 @@ path = fetchurl { name = "registry_url___registry_url_5.1.0.tgz"; url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; } { @@ -2006,7 +2182,7 @@ path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -2014,7 +2190,7 @@ path = fetchurl { name = "responselike___responselike_1.0.2.tgz"; url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; }; } { @@ -2022,7 +2198,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -2030,23 +2206,23 @@ path = fetchurl { name = "roarr___roarr_2.15.4.tgz"; url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; } { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; + name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -2054,7 +2230,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -2062,7 +2238,7 @@ path = fetchurl { name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; } { @@ -2070,7 +2246,7 @@ path = fetchurl { name = "sax___sax_1.2.4.tgz"; url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; } { @@ -2078,7 +2254,7 @@ path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; }; } { @@ -2086,7 +2262,7 @@ path = fetchurl { name = "semver_diff___semver_diff_3.1.1.tgz"; url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; }; } { @@ -2094,7 +2270,7 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; } { @@ -2102,7 +2278,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -2110,7 +2286,7 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { @@ -2118,7 +2294,15 @@ path = fetchurl { name = "serialize_error___serialize_error_7.0.1.tgz"; url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { @@ -2126,7 +2310,7 @@ path = fetchurl { name = "shebang_command___shebang_command_1.2.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; }; } { @@ -2134,7 +2318,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -2142,7 +2326,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_1.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; }; } { @@ -2150,7 +2334,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { @@ -2158,15 +2342,31 @@ path = fetchurl { name = "signal_exit___signal_exit_3.0.6.tgz"; url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; - sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + }; + } + { + name = "simple_concat___simple_concat_1.0.1.tgz"; + path = fetchurl { + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + } + { + name = "simple_get___simple_get_3.1.0.tgz"; + path = fetchurl { + name = "simple_get___simple_get_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; }; } { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; }; } { @@ -2174,7 +2374,7 @@ path = fetchurl { name = "smart_buffer___smart_buffer_4.2.0.tgz"; url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } { @@ -2182,7 +2382,7 @@ path = fetchurl { name = "source_map_support___source_map_support_0.5.21.tgz"; url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; } { @@ -2190,7 +2390,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -2198,7 +2398,7 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.1.2.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; } { @@ -2206,15 +2406,15 @@ path = fetchurl { name = "stat_mode___stat_mode_1.0.0.tgz"; url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; } { - name = "string_width___string_width_2.1.1.tgz"; + name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -2222,7 +2422,7 @@ path = fetchurl { name = "string_width___string_width_4.2.3.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -2230,7 +2430,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -2238,15 +2438,15 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; + name = "strip_ansi___strip_ansi_3.0.1.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -2254,7 +2454,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_6.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -2262,7 +2462,7 @@ path = fetchurl { name = "strip_eof___strip_eof_1.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; }; } { @@ -2270,7 +2470,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; }; } { @@ -2278,7 +2478,7 @@ path = fetchurl { name = "sumchecker___sumchecker_3.0.1.tgz"; url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; }; } { @@ -2286,7 +2486,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -2294,7 +2494,7 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { @@ -2302,7 +2502,7 @@ path = fetchurl { name = "tar_fs___tar_fs_2.1.1.tgz"; url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; - sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; } { @@ -2310,7 +2510,7 @@ path = fetchurl { name = "tar_stream___tar_stream_2.2.0.tgz"; url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; - sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; } { @@ -2318,7 +2518,7 @@ path = fetchurl { name = "temp_file___temp_file_3.4.0.tgz"; url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha1 = "766ea28911c683996c248ef1a20eea04d51652c7"; + sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; }; } { @@ -2326,7 +2526,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -2334,7 +2534,7 @@ path = fetchurl { name = "tmp_promise___tmp_promise_3.0.3.tgz"; url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha1 = "60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; }; } { @@ -2342,7 +2542,7 @@ path = fetchurl { name = "tmp___tmp_0.2.1.tgz"; url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; } { @@ -2350,7 +2550,7 @@ path = fetchurl { name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; }; } { @@ -2358,7 +2558,7 @@ path = fetchurl { name = "tr46___tr46_0.0.3.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; }; } { @@ -2366,7 +2566,15 @@ path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + sha1 = "QFkjkJWS1W94pYGENLC3hInKXys="; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; }; } { @@ -2374,7 +2582,7 @@ path = fetchurl { name = "tunnel___tunnel_0.0.6.tgz"; url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; }; } { @@ -2382,7 +2590,7 @@ path = fetchurl { name = "type_fest___type_fest_0.13.1.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } { @@ -2390,7 +2598,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -2398,7 +2606,7 @@ path = fetchurl { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; } { @@ -2406,7 +2614,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; }; } { @@ -2414,7 +2622,7 @@ path = fetchurl { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; - sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } { @@ -2422,7 +2630,7 @@ path = fetchurl { name = "unique_string___unique_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; } { @@ -2430,7 +2638,7 @@ path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } { @@ -2438,7 +2646,7 @@ path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } { @@ -2446,7 +2654,7 @@ path = fetchurl { name = "update_notifier___update_notifier_5.1.0.tgz"; url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; } { @@ -2454,7 +2662,7 @@ path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } { @@ -2462,7 +2670,7 @@ path = fetchurl { name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; }; } { @@ -2470,7 +2678,7 @@ path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + sha1 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; }; } { @@ -2478,7 +2686,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -2486,7 +2694,7 @@ path = fetchurl { name = "verror___verror_1.10.1.tgz"; url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; - sha1 = "4bf09eeccf4563b109ed4b3d458380c972b0cdeb"; + sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; }; } { @@ -2494,7 +2702,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; }; } { @@ -2502,7 +2710,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_5.0.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; }; } { @@ -2510,7 +2718,7 @@ path = fetchurl { name = "which___which_1.3.1.tgz"; url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; } { @@ -2518,7 +2726,15 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + } + { + name = "wide_align___wide_align_1.1.5.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; } { @@ -2526,7 +2742,7 @@ path = fetchurl { name = "widest_line___widest_line_3.1.0.tgz"; url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; } { @@ -2534,7 +2750,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -2542,7 +2758,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { @@ -2550,7 +2766,7 @@ path = fetchurl { name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; } { @@ -2558,7 +2774,7 @@ path = fetchurl { name = "ws___ws_8.2.3.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; - sha1 = "63a56456db1b04367d0b721a0b80cae6d8becbba"; + sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; } { @@ -2566,7 +2782,7 @@ path = fetchurl { name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; } { @@ -2574,7 +2790,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; }; } { @@ -2582,7 +2798,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + sha1 = "Ey7mPS7FVlxVfiD0wi35rKaGsQ0="; }; } { @@ -2590,7 +2806,7 @@ path = fetchurl { name = "y18n___y18n_5.0.8.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } { @@ -2598,23 +2814,23 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; + name = "yargs_parser___yargs_parser_21.0.0.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + name = "yargs_parser___yargs_parser_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; }; } { - name = "yargs___yargs_17.2.1.tgz"; + name = "yargs___yargs_17.3.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.2.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz"; - sha1 = "e2c95b9796a0e1f7f3bf4427863b42e0418191ea"; + name = "yargs___yargs_17.3.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz"; + sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; }; } { @@ -2622,7 +2838,7 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; }; } ]; diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix index 1895acacac270..a0ec572a409d1 100644 --- a/pkgs/tools/misc/shunit2/default.nix +++ b/pkgs/tools/misc/shunit2/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, resholvePackage +, fetchFromGitHub +, bash +, coreutils +, gnused +, gnugrep +, findutils +, ncurses +}: -stdenv.mkDerivation { +resholvePackage rec { pname = "shunit2"; - version = "2019-08-10"; + version = "2.1.8"; src = fetchFromGitHub { owner = "kward"; - repo = "shunit2"; - rev = "ba130d69bbff304c0c6a9c5e8ab549ae140d6225"; - sha256 = "1bsn8dhxbjfmh01lq80yhnld3w3fw1flh7nwx12csrp58zsvlmgk"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IZHkgkVqzeh+eEKCDJ87sqNhSA+DU6kBCNDdQaUEeiM="; }; installPhase = '' @@ -22,10 +31,59 @@ stdenv.mkDerivation { $out/bin/shunit2 ''; + solutions = { + shunit = { + # Caution: see __SHUNIT_CMD_ECHO_ESC before changing + interpreter = "${bash}/bin/sh"; + scripts = [ "bin/shunit2" ]; + inputs = [ coreutils gnused gnugrep findutils ncurses ]; + # resholve's Nix API is analogous to the CLI flags + # documented in 'man resholve' + fake = { + # "missing" functions shunit2 expects the user to declare + function = [ + "oneTimeSetUp" + "oneTimeTearDown" + "setUp" + "tearDown" + "suite" + "noexec" + ]; + # shunit2 is both bash and zsh compatible, and in + # some zsh-specific code it uses this non-bash builtin + builtin = [ "setopt" ]; + }; + fix = { + # stray absolute path; make it resolve from coreutils + "/usr/bin/od" = true; + /* + Caution: this one is contextually debatable. shunit2 + sets this variable after testing whether `echo -e test` + yields `test` or `-e test`. Since we're setting the + interpreter, we can pre-test this. But if we go fiddle + the interpreter later, I guess we _could_ break it. + */ + "$__SHUNIT_CMD_ECHO_ESC" = [ "'echo -e'" ]; + "$SHUNIT_CMD_TPUT" = [ "tput" ]; # from ncurses + }; + keep = { + # dynamically defined in shunit2:_shunit_mktempFunc + eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ]; + + # dynamic based on CLI flag + "$_SHUNIT_LINENO_" = true; + }; + execer = [ + # drop after https://github.com/abathur/binlore/issues/2 + "cannot:${ncurses}/bin/tput" + ]; + }; + }; + meta = with lib; { homepage = "https://github.com/kward/shunit2"; - description = "A xUnit based unit test framework for Bourne based shell scripts"; - maintainers = with maintainers; [ cdepillabout utdemir ]; + description = "An xUnit based unit test framework for Bourne based shell scripts"; + maintainers = with maintainers; [ abathur utdemir ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 63931914e942f..e7a39709630ee 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -32,6 +32,9 @@ rustPlatform.buildRustPackage rec { chmod +x $out/bin/sk-share ''; + # https://github.com/lotabout/skim/issues/440 + doCheck = !stdenv.isAarch64; + meta = with lib; { description = "Command-line fuzzy finder written in Rust"; homepage = "https://github.com/lotabout/skim"; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 37361abf2b2f3..80d9e191c8a60 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, util-linux, json_c, nixosTests +, lvm2, pam, python2, util-linux, json_c, nixosTests , ncurses }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 - lvm2 pam python util-linux json_c ncurses + lvm2 pam python2 util-linux json_c ncurses ]; passthru.tests.snapper = nixosTests.snapper; diff --git a/pkgs/tools/misc/snore/default.nix b/pkgs/tools/misc/snore/default.nix index 5efeafcd26f61..92c3de77c8421 100644 --- a/pkgs/tools/misc/snore/default.nix +++ b/pkgs/tools/misc/snore/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.1"; + version = "0.2"; pname = "snore"; src = fetchFromGitHub { owner = "clamiax"; repo = pname; rev = version; - sha256 = "1ic1qy6ybnjlkz5rb1hpvq6dcdmxw5xcx34qcadrsfdjizxcv8pp"; + sha256 = "sha256-EOwbRqtQEuGZ+aeCBNVfLUq4m/bFWJTvMDM6a+y74qc="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index a088705036d08..b2abec09741d8 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -1,36 +1,54 @@ { lib , stdenv -, buildPackages -, fetchgit -, autoreconfHook +, fetchurl +, cmake , gmp -, ncurses , halibut +, ncurses , perl }: stdenv.mkDerivation rec { pname = "spigot"; - version = "20200901"; - src = fetchgit { - url = "https://git.tartarus.org/simon/spigot.git"; - rev = "9910e5bdc203bae6b7bbe1ed4a93f13755c1cae"; - sha256 = "1az6v9gk0g2k197lr288nmr9jv20bvgc508vn9ic3v7mav7hf5bf"; + version = "20210527"; + srcVersion = "20210527.7dd3cfd"; + + src = fetchurl { + url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/${pname}-${srcVersion}.tar.gz"; + hash = "sha256-EBS3lgfLtsyBQ8mzoJPyZhRBJNmkVSeF5XecGgcvqtw="; }; - nativeBuildInputs = [ autoreconfHook halibut perl ]; + nativeBuildInputs = [ + cmake + halibut + perl + ]; - configureFlags = [ "--with-gmp" ]; + buildInputs = [ + gmp + ncurses + ]; - buildInputs = [ gmp ncurses ]; + outputs = [ "out" "man" ]; strictDeps = true; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + [ `$out/bin/spigot -b 10 -d 10 e` == "2.7182818284" ] || exit 1 + [ `$out/bin/spigot -b 10 -d 10 pi` == "3.1415926535" ] || exit 1 + [ `$out/bin/spigot -b 10 -d 10 sqrt\(2\)` == "1.4142135623" ] || exit 1 + + runHook postInstallCheck + ''; + meta = with lib; { - description = "A command-line exact real calculator"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = with maintainers; [ mcbeth ]; + description = "A command-line exact real calculator"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres mcbeth ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 89d4bb662da7d..d61fd9ddda985 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -6,26 +6,26 @@ , openssl , installShellFiles , libiconv +, nixosTests , Security +, Foundation }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rr0HCr/uJDsBQiKJIPdEL3WOaLgMY2Nq2JGOq4dEUxQ="; + sha256 = "sha256-mqUE4JzNBhvtDpT2LM23eHX8q93wtPqA+/zr/PxEDiE="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - - buildFeatures = lib.optional (!stdenv.isDarwin) "notify-rust"; + ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ]; postInstall = '' for shell in bash fish zsh; do @@ -34,16 +34,20 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-UT6t1GbyON/wrIF/oXXhsT3Z61LFjggSPWKpSDHp+PI="; + cargoSha256 = "sha256-hQNDiayVT4UgbxcxdXssi/evPvwgyvG/UOFyEHj7jpo="; preCheck = '' HOME=$TMPDIR ''; + passthru.tests = { + inherit (nixosTests) starship; + }; + meta = with lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras davidtwco Br1ght0ne Frostman marsam ]; + maintainers = with maintainers; [ bbigras danth davidtwco Br1ght0ne Frostman marsam ]; }; } diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index f3cd9b785f2fb..554822ba8de34 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,17 @@ buildGoModule rec { pname = "steampipe"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-P/Fys9/V71+VL5Az3EGGaW+tdeQbr2wO+jvVSVZmJT0="; + sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys="; }; - vendorSha256 = "sha256-PYaq74NNEOJ1jZ6PoS6zcTiUN4JA9JDjO7GB9tqgT6c="; + vendorSha256 = "sha256-hqjjwYBVnuw7Bt2901tPIkfvYLy955IdeMbeSWTjtL0="; + proxyVendor = true; # tests are failing for no obvious reasons doCheck = false; diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index 8bfca884f1f89..1d922a2184330 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "synth"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "getsynth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MeZ5bkOMTJVvaBfGahKsXvaYhfMKcYzPFsBp/p2dPQQ="; + sha256 = "sha256-TtIZwGHSfY7Xz6hmrsmaB7dXfjSPcBD4yDyC27TJ4B4="; }; - cargoSha256 = "sha256-lNeDpUla/PfGd/AogdcOtrmL1Jp+0Ji9LH1CF7uOEe0="; + cargoSha256 = "sha256-V5GA5XR3wkcBdbxRjO8PkF7Q3yg1NVUjXsdAHVip4Bc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/taoup/default.nix b/pkgs/tools/misc/taoup/default.nix index 969df132be82d..df61794185d1c 100644 --- a/pkgs/tools/misc/taoup/default.nix +++ b/pkgs/tools/misc/taoup/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "taoup"; - version = "1.1.14"; + version = "1.1.16"; src = fetchFromGitHub { owner = "globalcitizen"; repo = pname; rev = "v${version}"; - sha256 = "1gs6f66fg1l504riw481nvyw7cchbr3qjks4mkj2qb3s9147ad8j"; + hash = "sha256-LNS4m7Er4dQKYDuHMF/5mAi4yGcYzppxfqVKFOT6I/s="; }; buildInputs = [ rubyEnv bash ncurses ]; @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib/taoup} cp taoup $out/lib/taoup @@ -51,6 +53,8 @@ stdenv.mkDerivation rec { cp taoup-fortune $out/bin chmod +x $out/bin/taoup-fortune + + runHook postInstall ''; meta = { diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index a3aa31d4deddf..87d6dcfb0c2eb 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.31"; + version = "3.32"; src = fetchFromGitHub { owner = "nvbn"; repo = pname; rev = version; - sha256 = "sha256-eKKUUJr00sUtT4u91MUgJjyPOXp3NigYVfYUP/sDBhY="; + sha256 = "sha256-bRCy95owBJaxoyCNQF6gEENoxCkmorhyKzZgU1dQN6I="; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 84c927260c068..151b8292a5964 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -24,19 +24,19 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; + sha256 = "sha256-hHel3BVMzTYfE59kxxADnm8tqtUFntqS3RzmJSZlWjM="; }; # XXX: See patch files for relevant explanations. patches = [ ./patches/0001-makefile-correctly-sed-paths.patch - ./patches/0002-tlp-sleep.service-reintroduce.patch + ./patches/0002-reintroduce-tlp-sleep-service.patch ]; buildInputs = [ perl ]; @@ -50,12 +50,11 @@ # [1]: https://github.com/NixOS/nixpkgs/issues/65718 # [2]: https://github.com/linrunner/TLP/blob/ab788abf4936dfb44fbb408afc34af834230a64d/Makefile#L4-L46 makeFlags = [ - "DESTDIR=${placeholder "out"}" - "TLP_NO_INIT=1" "TLP_WITH_ELOGIND=0" "TLP_WITH_SYSTEMD=1" + "DESTDIR=${placeholder "out"}" "TLP_BATD=/share/tlp/bat.d" "TLP_BIN=/bin" "TLP_CONFDEF=/share/tlp/defaults.conf" diff --git a/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch index 40d89e207dc4b..08bbafc4b9da0 100644 --- a/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch +++ b/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch @@ -57,23 +57,6 @@ index ab05720..075b42f 100644 rm -f $(_ELOD)/49-tlp-sleep rm -f $(_SHCPL)/tlp-stat rm -f $(_SHCPL)/bluetooth -diff --git a/tlp-sleep b/tlp-sleep -deleted file mode 100644 -index e548d55..0000000 ---- a/tlp-sleep -+++ /dev/null -@@ -1,11 +0,0 @@ --#!/bin/sh -- --# tlp - systemd suspend/resume hook --# --# Copyright (c) 2021 Thomas Koch <linrunner at gmx.net> and others. --# This software is licensed under the GPL v2 or later. -- --case $1 in -- pre) tlp suspend ;; -- post) tlp resume ;; --esac diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 index 0000000..79c202c diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 99d6a0100e564..e1b96d971779e 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "8.1.2"; + version = "8.2.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2ID3VVT4cQ1yZAD2WVKqkoE7qbe2nNMp1nlwfTxmlZo="; + sha256 = "sha256-WyiEKC5WUwIGCaxXqiqNyOcGVZgfd2lVFMxQxhgJhMc="; }; - cargoSha256 = "sha256-o1V6u7FmP+p+ApL0AmaqTQTZ2f0sZTpx2ro4lR/DFi8="; + cargoSha256 = "sha256-ZcOSHEZHGa1XhGQlW4pR5hBJ2SpSbkKuRS6OSHGg9Lo="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 0a51eda485707..41ee4ead7bd2e 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs="; + sha256 = "sha256-hbsVk82iTZGVvypZHhUk/By0sSQxmZQBog2/3qKE94s="; }; - vendorSha256 = "sha256-1VRK8tmsbOuP5t5uJ1h+KPcS4K9D+y6UQKeUP2HPXrQ="; + vendorSha256 = "sha256-i1ir/aT/jaK//rmH9k/eK4LIRh0OmEytc0mGO7IrpqI="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix deleted file mode 100644 index 1d0f9a5d8288f..0000000000000 --- a/pkgs/tools/misc/trac/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, buildPythonApplication -, fetchPypi -, Babel -, docutils -, pygments -, pytz -, jinja2 -, pysqlite -, psycopg2 -, pymysql -, git -, setuptools -}: - - -buildPythonApplication rec { - pname = "trac"; - version = "1.4.1"; - - src = fetchPypi { - inherit version; - pname = "Trac"; - sha256 = "0d61ypn0j9wb8119bj3pj7s8swfjykdl0sz398p92k9bvxh4dayz"; - }; - - prePatch = '' - # Removing the date format tests as they are outdated - substituteInPlace trac/util/tests/__init__.py \ - --replace "suite.addTest(datefmt.test_suite())" "" - # Removing Pygments tests as per https://trac.edgewall.org/ticket/13229 - substituteInPlace trac/mimeview/tests/__init__.py \ - --replace "suite.addTest(pygments.test_suite())" "" - ''; - - propagatedBuildInputs = [ - Babel - docutils - pygments - pytz - jinja2 - pysqlite - psycopg2 - pymysql - git - setuptools - ]; - - meta = with lib; { - description = "Integrated SCM, wiki, issue tracker and project environment"; - homepage = "https://trac.edgewall.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ mmahut ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/traefik-certs-dumper/default.nix b/pkgs/tools/misc/traefik-certs-dumper/default.nix index fc0062185b233..50954dab7ae8d 100644 --- a/pkgs/tools/misc/traefik-certs-dumper/default.nix +++ b/pkgs/tools/misc/traefik-certs-dumper/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik-certs-dumper"; - version = "2.7.4"; + version = "2.8.1"; src = fetchFromGitHub { owner = "ldez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-exkBDrNGvpOz/VD6yfE1PKL4hzs/oZ+RxMwm/ytuV/0="; + sha256 = "sha256-o5nTxTyLuKtWcJvcWZuVwK970DMJfEaJw8vDcShulr0="; }; - vendorSha256 = "sha256-NmYfdX5BKHZvFzlkh/kkK0voOzNj1EPn53Mz/B7eLd0="; + vendorSha256 = "sha256-rBSRZ7gKUx3tBXqhkTOmAyEx9pLw41/Bt3O+AiHqXpw="; excludedPackages = "integrationtest"; meta = with lib; { diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index fe121c2d51cef..9d2036b97f783 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ]; + # workaround https://github.com/NixOS/nixpkgs/issues/155458 + preBuild = lib.optionalString stdenv.cc.isClang '' + rm version + ''; + enableParallelBuilding = true; dontWrapQtApps = true; diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 226109ab20c09..d9a97f6c23509 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttygif"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "icholy"; repo = pname; rev = version; - sha256 = "1w9c3h6hik2gglwsw8ww63piy66i4zqr3273wh5rc9r2awiwh643"; + sha256 = "sha256-GsMeVR2wNivQguZ6B/0v39Td9VGHg+m3RtAG9DYkNmU="; }; makeFlags = [ "CC:=$(CC)" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index d5a37e2e67f03..d8ba086112078 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi }: +{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "231"; + version = "273"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "0mcglb84zfmrai2bcdg9j0ck8jp8h7ii2rf4m38yjggy0dvii2lc"; + sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; }; nativeBuildInputs = [ bison flex ]; @@ -17,8 +17,16 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "tests"; - # Remove failing test-- mentions 'usr/bin' so probably related :) - preCheck = "rm -rf tests/017"; + postPatch = '' + # Fixup references to /usr/bin in tests + substituteInPlace tests/017/realpath.tl --replace /usr/bin /bin + substituteInPlace tests/017/realpath.expected --replace /usr/bin /bin + + substituteInPlace tests/018/process.tl --replace /usr/bin/env ${lib.getBin coreutils}/bin/env + ''; + + # Remove failing tests -- 018/chmod tries setting sticky bit + preCheck = "rm -rf tests/018/chmod*"; postInstall = '' d=$out/share/vim-plugins/txr diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/tools/misc/tz/default.nix index 8148dfdec7020..30e2fa3ece21d 100644 --- a/pkgs/tools/misc/tz/default.nix +++ b/pkgs/tools/misc/tz/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-D0rakLZ+swrDwBMcr+EJPgaYsQTWob50QteW1PoIdNk="; }; - vendorSha256 = "sha256-gMHPWf/kFb55GyyMciLWRzvrQXUGDQ72RNkIhkMVe54="; + vendorSha256 = "sha256-PGsj7pLtd+xpy9Dhv6qJX5sHin4YAOdXaYj4QCSFte4="; meta = with lib; { description = "A time zone helper"; diff --git a/pkgs/tools/misc/unparam/default.nix b/pkgs/tools/misc/unparam/default.nix new file mode 100644 index 0000000000000..5840a0d82be8a --- /dev/null +++ b/pkgs/tools/misc/unparam/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "unparam"; + version = "unstable-2021-12-14"; + + src = fetchFromGitHub { + owner = "mvdan"; + repo = "unparam"; + rev = "d0ef000c54e5fbf955d67422b0495b9f29b354da"; + sha256 = "sha256-fH/LcshpOk+UFfQ5dE2eHi6Oi5cm8umeXoyHJvhpAbE="; + }; + + vendorSha256 = "sha256-pfIxWvJYAus4DShTcBI1bwn/Q2c5qWvCwPCwfUsv8c0="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Find unused parameters in Go"; + homepage = "https://github.com/mvdan/unparam"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index 2f504a0cef8c3..00c6441cffe9d 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "upterm"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - sha256 = "sha256-wzDK7iQN/z/M1mTKPCH3c+OjFsavplV/0oMiOe5thuI="; + sha256 = "sha256-JxyrH48CXaaa+LkTpUPsT9aq95IuuvDoyfZndrSF1IA="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 6281060675532..2fb3196b1f4fc 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.8"; + version = "0.0.12"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "0hx5ypy58d182gxpgs0dxcw03pdgvrcikbhczg6yqpdjjh7163as"; + sha256 = "01zwvadfd570vbsy52svp0vi5r2p873c33vn2h4mr7868myl6q9g"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256:1ynw97dr40yg18jaqgvz3shs0s0j6pvvlkrbka2ganiv8c9fvbyw"; + hash = "sha256:19li3gmb5dmrmiiiy9ihr1rl68lz14j2gsgqpjcsn52rkcy17dzh"; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 379c896210166..90f4505e027f6 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -29,7 +29,7 @@ let pname = "vector"; - version = "0.19.0"; + version = "0.20.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -38,10 +38,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A+Ok/BNEs0V00B8P6ghSHZ2pQ8tumfpkurplnvjpWZ8="; + sha256 = "sha256-OkT1Gj66Z4sj3YtaMlU1lbquTECPG34qydXGbx24Ig4="; }; - cargoSha256 = "sha256-B9z+8TqAl0yFaou1LfNcFsDJjw7qGti6MakDPhz49tc="; + cargoSha256 = "sha256-O2uy0wK4pdwjAYzIKJnCzJVsA3n+U+dw731y7OPJfP0="; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -71,8 +71,10 @@ rustPlatform.buildRustPackage { # flaky on linux-x86_64 "--skip=sources::socket::test::tcp_with_tls_intermediate_ca" - "--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics" + "--skip=sources::aws_kinesis_firehose::tests::aws_kinesis_firehose_forwards_events" + "--skip=sources::aws_kinesis_firehose::tests::aws_kinesis_firehose_forwards_events_gzip_request" + "--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure" ]; # recent overhauls of DNS support in 0.9 mean that we try to resolve diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 5667c8a4c46c5..4e5641e304ce5 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -35,7 +35,7 @@ in appimageTools.wrapType2 { description = "Yet another keyboard configurator"; homepage = "https://caniusevia.com/"; license = licenses.unfree; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix index 4b65a63431bd0..f882ce4b5be3d 100644 --- a/pkgs/tools/misc/viddy/default.nix +++ b/pkgs/tools/misc/viddy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-V/x969wi5u5ND9QgJfc4vtI2t1G1ETlATzeqnpHMncc="; }; - vendorSha256 = "sha256-iSgFDTNeRPpCMxNqj2LhYV+6/eskGa58e+rT0Nhg+pE="; + vendorSha256 = "sha256-LtRHnZF0ynnIp77K9anljqq42BumXohDMwlU7hzSxZk="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index d0a6114316fc1..71d67ed7489b3 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA="; + sha256 = "sha256-83ff0T2P5aRQ6cM9z7IEuoi7syvJldIuzzdiTrygckA="; }; - cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg="; + cargoSha256 = "sha256-W1tLQTTMOKB/BR9P3y3goPIdOe12Qdkf4wYPlhbQjzY="; meta = with lib; { description = "A generator for LS_COLORS with support for multiple color themes"; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 5cd52a6a4ac3b..b9c9d73006aa9 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakatime"; - version = "1.18.7"; + version = "1.35.4"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "171x4pixmh5ni89iawdjl1fk9gr10bgp5bnslpskhspcqzyl1y5b"; + sha256 = "sha256-MG2ROWQh8A7LrdOnDWLG9AsHjzfv84KjmjZXhJlMrLQ="; }; - vendorSha256 = "01c2vbnafhhm345nyfmvbvj5mga6laf9w46lhh0flq6kdgdw168s"; + vendorSha256 = "sha256-8FaM83+d1VQ/9le2hD0nqErhH/jOHMxbNz2o4D3qWb8="; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index 538f5113fd8d3..67df4056b5f40 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "12c677agkmiqs35qfpqfj7c4kxkizhbk9l6hig36dslzp4fwpl70"; + sha256 = "sha256-LaPH6nGQanweAG0niS75hr7zbO/9A3iZjS8wHD//oJ4="; }; sourceRoot = "source/src"; diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 491c362eed40d..d1244cc73c47d 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; }; - NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; - preConfigure = '' substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC" ''; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 31d5712e5b33a..1c49d68cd00a8 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20210917"; + version = "20220213"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-l8Wv15DLWRvJ+I6KeTNbIjp+S5EgoqhLOWd0wEyXckk="; + sha256 = "sha256-lFb8NwKg8GBgkVsg01rlGrP31APwhFaCFT7QdqiT6J0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index b8e838b4d2283..b73b41acd88d3 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.12.27"; + version = "2022.2.4"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-IkTfN1l1FIfnlrI7ZyFr7pjnCDKjpDwlJrCw4Lv7y1s="; + sha256 = "sha256-gbUO18+c/MBC2PWhrS0c17E8SLNsB/rxiAaW6sCn3bU="; }; propagatedBuildInputs = [ websockets mutagen ] diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index ef4d212a6201f..633fd2fb7e37f 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytarchive"; - version = "0.3.0"; + version = "unstable-2021-12-29"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "v${version}"; - sha256 = "sha256-7D92xKxU2WBMDJSY5uFKDbLHWlyT761xuZDiBJ1GxE4="; + rev = "2d87608c0b159da876538380b3e613bce2797599"; + sha256 = "sha256-/cnyKcbgd6I0Ad5aZQd2pCbnU6HZYfuPHK2Ty7yYgHs="; }; vendorSha256 = "sha256-r9fDFSCDItQ7YSj9aTY1LXRrFE9T3XD0X36ywCfu0R8="; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 95b4a8907230b..3bb0f4382bbf2 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -16,30 +16,25 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-JuLfFC3oz2FvCaD+XPuL1N8tGKmv4atyZIBeDKWYgT8="; + hash = "sha256-NJLXXam7FmBWj9sM+S71e5o5e6OtVpw0m32kUo3Fbec="; }; nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; - dontBuild = true; + installFlags = [ "PREFIX=${placeholder "out"}" "doc" ]; + postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ chafa coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp ]} - - gzip -c docs/man/ytfzf.1 > docs/man/ytfzf.1.gz - gzip -c docs/man/ytfzf.5 > docs/man/ytfzf.5.gz - install -Dt "$out/share/man/man1" docs/man/ytfzf.1.gz - install -Dt "$out/share/man/man5" docs/man/ytfzf.5.gz ''; meta = with lib; { diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 23b040f26097a..66fd783a00e50 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,22 +2,23 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "4.0.7"; + version = "4.0.8"; + format = "pyproject"; src = fetchFromGitHub { repo = "yubikey-manager"; rev = version; owner = "Yubico"; - sha256 = "sha256-PG/mIM1rcs1SAz2kfQtfUWoMBIwLz2ASZM0YQrz9w5I="; + sha256 = "sha256-OszXOu/NhoX4WutsT4Z1LsY54KTOWRKt13yDo2fzDbA="; }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'cryptography = "^2.1 || ^3.0"' 'cryptography = "*"' substituteInPlace "ykman/pcsc/__init__.py" \ - --replace '/usr/bin/pkill' '${procps}/bin/pkill' + --replace 'pkill' '${procps}/bin/pkill' ''; - format = "pyproject"; - nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = @@ -60,6 +61,6 @@ python3Packages.buildPythonPackage rec { license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ benley mic92 ]; + maintainers = with maintainers; [ benley lassulus pinpox ]; }; } diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 751f68bf089d7..16d126e4dd757 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.13"; + version = "1.8.14"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-74EWeLkSRrVsJuucdN8sSTl5fPmboViYW0qdovBZQ5U="; + sha256 = "sha256-Jy5fcXqXbuJTOAP8vpZjN0qmDR/cVACztcIxl4aXNKs="; }; dontBuild = true; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index 74e7e7223d145..3732361ea8340 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -1,17 +1,12 @@ -{ fetchFromGitHub, lib, python2Packages }: -let - pythonPackages = python2Packages; +{ lib +, fetchFromGitHub +, python3 +}: -in pythonPackages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "zabbix-cli"; version = "2.2.1"; - - propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; - - # argparse is part of the standardlib - prePatch = '' - substituteInPlace setup.py --replace "'argparse'," "" - ''; + format = "setuptools"; src = fetchFromGitHub { owner = "usit-gd"; @@ -20,10 +15,24 @@ in pythonPackages.buildPythonApplication rec { sha256 = "0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz"; }; + propagatedBuildInputs = with python3.pkgs; [ + requests + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + # TypeError: option values must be strings + "test_descriptor_del" + "test_initialize" + ]; + meta = with lib; { description = "Command-line interface for Zabbix"; - homepage = src.meta.homepage; - license = [ licenses.gpl3 ]; - maintainers = [ maintainers.womfoo ]; + homepage = "https://github.com/unioslo/zabbix-cli"; + license = licenses.gpl3Plus; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 2fb985c791620..6a09ba4e0ec5b 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-DJ7FGtcsWGk4caS22aXo+8chCcvEdRlVrSRmIHsETD4="; + sha256 = "sha256-GYbRu2ZEFswyOBUbg6jdAZQRogIDT/YolEElZT8h744="; }; - cargoSha256 ="sha256-dWdFBSZwTEvxrPiXtTWcYLtC+4XFb5R7Wu4r1YpHQRk="; + cargoSha256 = "sha256-ogWFAO3xMH4vho9SRjyeHCDxRtAx6exGkMpNhz2VOLA"; nativeBuildInputs = [ installShellFiles |