diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index bfb951c84a9..a90b49ba798 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -124,6 +124,11 @@ /var/lib/powerdns to /run/pdns. + + + btc1 has been abandoned upstream, and removed. + + riak-cs package removed along with services.riak-cs module. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 44f4c44a56c..6e3ddb875e1 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -183,6 +183,11 @@ sub pciCheck { push @imports, "(modulesPath + \"/hardware/network/broadcom-43xx.nix\")"; } + # In case this is a virtio scsi device, we need to explicitly make this available. + if ($vendor eq "0x1af4" && $device eq "0x1004") { + push @initrdAvailableKernelModules, "virtio_scsi"; + } + # Can't rely on $module here, since the module may not be loaded # due to missing firmware. Ideally we would check modules.pcimap # here. diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix index ab51bba2f6a..fe1616f411f 100644 --- a/nixos/modules/services/networking/stunnel.nix +++ b/nixos/modules/services/networking/stunnel.nix @@ -16,8 +16,12 @@ let serverConfig = { options = { accept = mkOption { - type = types.int; - description = "On which port stunnel should listen for incoming TLS connections."; + type = types.either types.str types.int; + description = '' + On which [host:]port stunnel should listen for incoming TLS connections. + Note that unlike other softwares stunnel ipv6 address need no brackets, + so to listen on all IPv6 addresses on port 1234 one would use ':::1234'. + ''; }; connect = mkOption { @@ -129,7 +133,6 @@ in type = with types; attrsOf (submodule serverConfig); example = { fancyWebserver = { - enable = true; accept = 443; connect = 8080; cert = "/path/to/pem/file"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2ac9e058dc6..6d6e64b5f75 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -311,6 +311,7 @@ in rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; sanoid = handleTest ./sanoid.nix {}; + sbt = handleTest ./sbt.nix {}; sddm = handleTest ./sddm.nix {}; service-runner = handleTest ./service-runner.nix {}; shadowsocks = handleTest ./shadowsocks {}; diff --git a/nixos/tests/sbt.nix b/nixos/tests/sbt.nix new file mode 100644 index 00000000000..004d9c2e140 --- /dev/null +++ b/nixos/tests/sbt.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "sbt"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + machine = { pkgs, ... }: + { + environment.systemPackages = [ pkgs.sbt ]; + }; + + testScript = + '' + machine.succeed( + "(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version} (this may take some time)'" + ) + ''; +}) diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 29ef027f2f2..e321119d838 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "098fk8fwcgssnfr1gilqg8g17zvch62lrn3rqsswpzbr3an5adb3"; + sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 4832fce1e96..b92808775c8 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkg-config, qttools -, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi +, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj"; }; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ]; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a7b97e9daaf..427d29768d6 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6"; + sha256 = "19h47mrxjm6x83pqcxfsshf48kd1babfk0kwdy1c7fjri7kj0g0s"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/btc1.nix b/pkgs/applications/blockchains/btc1.nix deleted file mode 100644 index 3442c9ba807..00000000000 --- a/pkgs/applications/blockchains/btc1.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 -, boost, zlib, miniupnpc, qt4, protobuf, qrencode, libevent -, AppKit -, withGui ? !stdenv.isDarwin -}: - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.15.1"; - - src = fetchurl { - url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz"; - sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; - }; - - nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ]; - buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ] - ++ optional stdenv.isDarwin AppKit; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; - - meta = { - description = "Peer-to-peer electronic cash system (btc1 client)"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - btc1 is an implementation of a Bitcoin full node with segwit2x hard fork - support. - ''; - homepage = "https://github.com/btc1/bitcoin"; - license = licenses.mit; - maintainers = with maintainers; [ sorpaas ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 5b34007ec40..1bfe642752b 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.33"; + version = "7.35"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1k4zl7knlpwxrpqk1axkmy8x12915z15h3q2sjnx3jcnx6qw73ja"; + sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5"; }; patches = (substituteAll { @@ -29,15 +29,14 @@ mkDerivation rec { wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = "https://www.gpxsee.org/"; description = "GPS log file viewer and analyzer"; longDescription = '' GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats. ''; + homepage = "https://www.gpxsee.org/"; + changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; license = licenses.gpl3; maintainers = with maintainers; [ womfoo sikmir ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index a6dd86393ff..d8e55e113b2 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.1.4"; + version = "4.2.0"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "1gw3cmc8c1xxc55bm71v1dz9x9560lbhx9nkwprarhxlmn0m0zzp"; + sha256 = "0dhwaadk2qw7avpfnw0mgqv3yhjsm4qm88yyy4w24a3cqzrvb56g"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index c111f7eccfe..be5cb51d450 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { let t = goPackagePath; in '' -ldflags= - -s -X ${t}/pkg/buildinfo.Version=${version} + -s -X ${t}/pkg/buildinfo.Version=v${version} -X ${t}/pkg/buildinfo.GitSHA=${rev} -X ${t}/pkg/buildDate=unknown ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 4467e8304db..ebe787a2519 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -167,6 +167,7 @@ let hcloud = callPackage ./hcloud {}; keycloak = callPackage ./keycloak {}; libvirt = callPackage ./libvirt {}; + linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix new file mode 100644 index 00000000000..60cd7f2d763 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-provider-linuxbox"; + version = "0.3.11"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = pname; + rev = "v${version}"; + sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39"; + }; + + vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k"; + + postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}"; + + passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox"; + + meta = with stdenv.lib; { + homepage = "https://github.com/numtide/terraform-provider-linuxbox"; + description = "Basic building block for Seed DevOps"; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 5603ff13b19..9656db0bd84 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.37.2"; # Please backport all updates to the stable channel. + version = "1.37.3"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0n4g2fh1ibw6fl5vbnnchx2vafasqrq8rl9w0ch7lai665zkxsk3"; + sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index d496e78748d..0353f2e7ceb 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.4"; + version = "2.23.8"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0xg4nbx02a2kckr6p8pqjpv5rmp95bkmglgm1bma6f77s7hkab7q"; + sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index eae2e384df4..749220382c6 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -15,9 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; enableParallelBuilding = true; - preConfigure = '' - cd src - ''; + cmakeDir = "../src"; + + # Running the tests is required to build the *.olean files for the core + # library. + doCheck = true; + + postPatch = "patchShebangs ."; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace $out/bin/leanpkg \ diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index c3e77c1051f..8188c569ff7 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip +{ stdenv, lib, fetchurl, iosevka, unzip , variant ? "" }: @@ -29,17 +29,11 @@ in stdenv.mkDerivation rec { unzip -d $out/share/fonts/truetype $src ''; - meta = with lib; { - homepage = "https://be5invis.github.io/Iosevka/"; - downloadPage = "https://github.com/be5invis/Iosevka/releases"; - description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + meta = iosevka.meta // { + maintainers = with lib.maintainers; [ + cstrahan + ]; }; - passthru.updateScript = ./update.sh; + passthru.updateScript = ./update-bin.sh; } diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 5167c494fa0..3d350796105 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal -, ttfautohint-nox, otfcc +, ttfautohint-nox # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style @@ -27,23 +27,30 @@ assert (privateBuildPlan != null) -> set != null; +let + # We don't know the attribute name for the Iosevka package as it + # changes not when our update script is run (which in turn updates + # node-packages.json, but when node-packages/generate.sh is run + # (which updates node-packages.nix). + # + # Doing it this way ensures that the package can always be built, + # although possibly an older version than ioseva-bin. + nodeIosevka = ( + lib.findSingle + (drv: drv ? packageName && drv.packageName == "iosevka") + (throw "no 'iosevka' package found in nodePackages") + (throw "multiple 'iosevka' packages found in nodePackages") + (lib.attrValues nodePackages) + ).override (drv: { dontNpmInstall = true; }); +in stdenv.mkDerivation rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - - version = "3.2.2"; - - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v${version}"; - sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k"; - }; + inherit (nodeIosevka) version src; nativeBuildInputs = [ nodejs - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" + nodeIosevka remarshal - otfcc ttfautohint-nox ]; @@ -61,9 +68,7 @@ stdenv.mkDerivation rec { echo -e "\n" >> parameters.toml cat "$extraParametersPath" >> parameters.toml ''} - ln -s ${ - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" - }/lib/node_modules/iosevka-build-deps/node_modules . + ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure ''; @@ -74,13 +79,19 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall fontdir="$out/share/fonts/truetype" install -d "$fontdir" install "dist/$pname/ttf"/* "$fontdir" + runHook postInstall ''; enableParallelBuilding = true; + passthru = { + updateScript = ./update-default.sh; + }; + meta = with stdenv.lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; @@ -96,6 +107,7 @@ stdenv.mkDerivation rec { ttuegel babariviere rileyinman + AluisioASG ]; }; } diff --git a/pkgs/data/fonts/iosevka/package.json b/pkgs/data/fonts/iosevka/package.json deleted file mode 100644 index bc772960882..00000000000 --- a/pkgs/data/fonts/iosevka/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "iosevka-build-deps", - "version": "3.2.2", - "scripts": { - "build": "verda -f verdafile.js" - }, - "dependencies": { - "@iarna/toml": "^2.2.5", - "cldr": "^5.5.4", - "ejs": "^3.1.3", - "fs-extra": "^9.0.0", - "object-assign": "^4.1.1", - "otfcc-ttcize": "^0.10.2", - "patel": "^0.33.1", - "prettier": "^2.0.5", - "semver": "^7.1.3", - "spiro": "^2.0.0", - "stylus": "^0.54.7", - "topsort": "^0.0.2", - "ttf2woff": "^2.0.1", - "ttf2woff2": "^3.0.0", - "typo-geom": "^0.8.0", - "unicode-13.0.0": "^0.8.0", - "unorm": "^1.6.0", - "verda": "^1.0.1", - "which": "^2.0.2" - } -} diff --git a/pkgs/data/fonts/iosevka/update.sh b/pkgs/data/fonts/iosevka/update-bin.sh similarity index 70% rename from pkgs/data/fonts/iosevka/update.sh rename to pkgs/data/fonts/iosevka/update-bin.sh index df78c62a6ce..a402f152d8a 100755 --- a/pkgs/data/fonts/iosevka/update.sh +++ b/pkgs/data/fonts/iosevka/update-bin.sh @@ -1,11 +1,12 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl jq -set -e +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest) -oldVersion=$(nix-instantiate --eval -E 'with import ./. {}; lib.getVersion iosevka-bin' | tr -d '"') +oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-bin' | tr -d '"') version=$(echo "$release" | jq -r .tag_name | tr -d v) if test "$oldVersion" = "$version"; then @@ -13,8 +14,7 @@ if test "$oldVersion" = "$version"; then exit 0 fi -file=$(nix-instantiate --eval -A iosevka-bin.meta.position | sed -r 's/^"(.*):[0-9]+"$/\1/') -sed -i "s/$oldVersion/$version/" "$file" +sed -i "s/$oldVersion/$version/" bin.nix { echo '# This file was autogenerated. DO NOT EDIT!' @@ -25,4 +25,4 @@ sed -i "s/$oldVersion/$version/" "$file" $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset") done echo '}' -} >$(dirname "$file")/variants.nix +} >variants.nix diff --git a/pkgs/data/fonts/iosevka/update-default.sh b/pkgs/data/fonts/iosevka/update-default.sh new file mode 100755 index 00000000000..208ea6101ac --- /dev/null +++ b/pkgs/data/fonts/iosevka/update-default.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +nixpkgs=../../../.. +repo=https://github.com/be5invis/Iosevka + +# Discover the latest version. +current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') +new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') +if [[ "$new_version" == "$current_version" ]]; then + echo "iosevka: no update found" + exit +fi + +# Update the source package in nodePackages. +current_source="$repo/archive/v$current_version.tar.gz" +new_source="$repo/archive/v$new_version.tar.gz" +replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json +echo "iosevka: $current_version -> $new_version (after nodePackages update)" diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index 8534fe7a506..c6a6678b98c 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 78b6909f046..e2fb0877ec8 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, @@ -37,6 +37,11 @@ mkDerivation { patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch + (fetchpatch { # included in >= 5.18.6 + name = "EGL_TEXTURE_Y_XUXV_WL.diff"; + url = "https://github.com/KDE/kwin/commit/2c76cc478.diff"; + sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy"; + }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index 3f37cac078f..c2b70a149bf 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 30b56ecba11..92320f5eac0 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "8"; - build = "10"; + update = "9"; + build = "11"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -20,7 +20,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz"; + sha256 = "fc2ee2ee5822f2440e66114c8fa76888fea7ddd351282940c222d34b5f871858"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index bcd3524bb86..a51b765fb60 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -19,8 +19,8 @@ let aarch64-linux = "aarch64"; }.${stdenv.system} or (throw "Unsupported platform"); - update = "265"; - build = if stdenv.isAarch64 then "b01" else "ga"; + update = "272"; + build = if stdenv.isAarch64 then "b10" else "b10"; baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" else "https://hg.openjdk.java.net/jdk8u/jdk8u"; repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" @@ -29,50 +29,50 @@ let jdk8 = fetchurl { name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1a2adw51af064rzlngsdlhs9gl47h3lv6dzvr8swqgl2n93nlbxa" - else "02j1nbf3rxl581fqzc6i3ri6wwxx1dhkmj5klkh5xlp8dkhclr30"; + sha256 = if stdenv.isAarch64 then "db98897d6fddce85996a9b0daf4352abce4578be0b51eada41702ee1469dd415" + else "8f0e8324d3500432e8ed642b4cc7dff90a617dbb2a18a94c07c1020d32f93b7a"; }; langtools = fetchurl { name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0hfrbz7421s2barfrfp0fvmh45iksw2zx1z4ykjg3giv8zbmswfm" - else "1r2adp7sn3y45rb5h059qygz18bgmkqr2g2jc9mpzskl5vwsqiw4"; + sha256 = if stdenv.isAarch64 then "6544c1cc455844bbbb3d2914ffc716b1cee7f19e6aa223764d41a7cddc41322c" + else "632417b0b067c929eda6958341352e29c5810056a5fec138641eb3503f9635b7"; }; hotspot = fetchurl { name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0g5h74snfl2dj2xwlvb5hgfbqmnbhxax68axadz11mq7r2bhd0lk" - else "10xj8qr499r6nla74bjh4dmq7pkj63iircijk1wyv9xz5v777pcc"; + sha256 = if stdenv.isAarch64 then "37abb89e66641607dc6f372946bfc6bd413f23fec0b9c3baf75f41ce517e21d8" + else "2142f3b769800a955613b51ffe192551bab1db95b0c219900cf34febc6f20245"; }; corba = fetchurl { name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0wfqrpr5m4gnavgsl6zcy2l3c7sgn3yl7yhp2crh9icp44ld2cj9" - else "0lk4jimrafgphffsj5yyyhl6pib0y5xxqcr09bgr2w8sjkp4s04s"; + sha256 = if stdenv.isAarch64 then "5da82f7b4aceff32e02d2f559033e3b62b9509d79f1a6891af871502e1d125b1" + else "320098d64c843c1ff2ae62579817f9fb4a81772bc0313a543ce68976ad7a6d98"; }; jdk = fetchurl { name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0ss49bv2dzb9vkabpv1ag04wli5722p0a8gqkzqmzw4nj67snfqw" - else "0anbp4vq8bzhqsqxlgjd0dx0irf57x4i5ddbpljl36vy2pi9xsm7"; + sha256 = if stdenv.isAarch64 then "ee613296d823605dcd1a0fe2f89b4c7393bdb8ae5f2659f48f5cbc0012bb1a47" + else "957c24fc58ac723c8cd808ab60c77d7853710148944c8b9a59f470c4c809e1a0"; }; jaxws = fetchurl { name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1nwn6mz38app6pk5f1x3vya1x9qfckyl7z6bi62k6mj2c72ikfh5" - else "113d5nx2mp30m6xy2m2wh0nixk45q8abimlszkiq09w1w1ckzpba"; + sha256 = if stdenv.isAarch64 then "7c426b85f0d378125fa46e6d1b25ddc27ad29d93514d38c5935c84fc540b26ce" + else "4efb0ee143dfe86c8ee06db2429fb81a0c8c65af9ea8fc18daa05148c8a1162f"; }; jaxp = fetchurl { name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1rhgbwvp7xls7r3f5jm69dw7x521vamchv917dwiz1byvm2bwn7s" - else "0nvqidjssmamcrchq15cg3lfv5v3cnrw05a4h20xmhlpgb9im0vj"; + sha256 = if stdenv.isAarch64 then "928e363877afa7e0ad0c350bb18be6ab056b23708c0624a0bd7f01c4106c2a14" + else "25a651c670d5b036042f7244617a3eb11fec80c07745c1c8181a1cdebeda3d8e"; }; nashorn = fetchurl { name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "14gp8q6jw1hq2wlmcalfwn1kgmnq5w9svqnbjww20f25phxkicij" - else "0fm9ldps7ayk7r3wjqiyxp1s6hvi242kl7f92ydkmlxqyfajx60a"; + sha256 = if stdenv.isAarch64 then "f060e08c5924457d4f5047c02ad6a987bdbdcd1cea53d2208322073ba4f398c3" + else "a28b41d86f0c87ceacd2b686dd31c9bf391d851b1b5187a49ef5e565fc2cbc84"; }; openjdk8 = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index c023aa65fda..22c83f99d5f 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, graalvm8, glibcLocales }: +{ stdenv, fetchurl, graalvm8-ce, glibcLocales }: with stdenv.lib; stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { dontUnpack = true; LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ graalvm8 glibcLocales ]; + nativeBuildInputs = [ graalvm8-ce glibcLocales ]; buildPhase = '' native-image \ @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/borkdude/babashka"; license = licenses.epl10; - platforms = graalvm8.meta.platforms; + platforms = graalvm8-ce.meta.platforms; maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index cb8c0a1cb14..498265a5a2f 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.3.0"; + version = "20.4.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0dy30g32iqyygap3cm1idbhwnm1p3qvf2j2nzcr9n5im287h5gcr"; + sha256 = "0nah3h3s6hqbgz1wqp5j1grzq0q939wbh4b9d27dmb4wy6ma41sl"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 5741a121c46..62034a7bce2 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { runHook preInstallCheck export TZDIR=${tzdata}/share/zoneinfo - ctest --output-on-failure --exclude-regex 'timezones|libical-glib-array|libical-glib-component|libical-glib-timezone' + ctest --output-on-failure --exclude-regex 'regression|recur|timezones|libical-glib-array|libical-glib-component|libical-glib-timezone' runHook postInstallCheck ''; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 09bd7e12091..4072dcd1d25 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; - version = "1.6.3"; - + version = "1.6.3"; # TODO: Check postPatch script on update src = fetchFromGitHub { owner = "linbox-team"; @@ -36,6 +35,20 @@ stdenv.mkDerivation rec { fflas-ffpack ]; + patches = [ + # Remove inappropriate `const &` qualifiers on data members that can be + # modified via member functions. + # See also: https://github.com/linbox-team/linbox/pull/256 + ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update + ]; + + postPatch = '' + # Remove @LINBOXSAGE_LIBS@ that is actually undefined. + # See also: https://github.com/linbox-team/linbox/pull/249 + # TODO: Remove on 1.7.0 update + find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \; + ''; + configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" diff --git a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch new file mode 100644 index 00000000000..ec8571a7d71 --- /dev/null +++ b/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch @@ -0,0 +1,13 @@ +--- a/linbox/algorithms/det-rational.h ++++ b/linbox/algorithms/det-rational.h +@@ -79,8 +79,8 @@ + struct MyRationalModularDet { + const Blackbox &A; + const MyMethod &M; +- const Integer &mul;//multiplicative prec; +- const Integer ÷ ++ Integer mul;//multiplicative prec; ++ Integer div; + + MyRationalModularDet(const Blackbox& b, const MyMethod& n, + const Integer & p1, const Integer & p2) : diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 66ed41e8ead..9efe524b12d 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j"; + sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index d8501428079..f0064dbd362 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102"; + sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg"; }; cmakeFlags = [ diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 479e28cfabe..0e46f65c782 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -100,7 +100,7 @@ , "indium" , "insect" , "ionic" -, { "iosevka-build-deps": "../../data/fonts/iosevka" } +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5797af8215b..dc154881054 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,15 +49,6 @@ let sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA=="; }; }; - "@angular-devkit/core-9.1.12" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "9.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz"; - sha512 = "D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA=="; - }; - }; "@angular-devkit/schematics-10.0.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -76,15 +67,6 @@ let sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww=="; }; }; - "@angular-devkit/schematics-9.1.12" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "9.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.12.tgz"; - sha512 = "+GYnUzmIy1/QpYitCC8mI7jcrViGHTtOKvvDPEFjU2nggjNEQaMmsHcdIsjrqggEc23ZZyebNAIewT8CMkJyrQ=="; - }; - }; "@angular-devkit/schematics-cli-0.1000.7" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -319,15 +301,6 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.12.1" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz"; - sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; - }; - }; "@babel/compat-data-7.12.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; @@ -364,15 +337,6 @@ let sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; - "@babel/generator-7.12.1" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; - sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; - }; - }; "@babel/generator-7.12.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -418,15 +382,6 @@ let sha512 = "AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og=="; }; }; - "@babel/helper-compilation-targets-7.12.1" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz"; - sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g=="; - }; - }; "@babel/helper-compilation-targets-7.12.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; @@ -508,15 +463,6 @@ let sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; }; }; - "@babel/helper-module-imports-7.12.1" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz"; - sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA=="; - }; - }; "@babel/helper-module-imports-7.12.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; @@ -571,15 +517,6 @@ let sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.12.1" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; - sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw=="; - }; - }; "@babel/helper-replace-supers-7.12.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; @@ -643,15 +580,6 @@ let sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; }; }; - "@babel/helpers-7.12.1" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz"; - sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g=="; - }; - }; "@babel/helpers-7.12.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; @@ -670,15 +598,6 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.3" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"; - sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="; - }; - }; "@babel/parser-7.12.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -769,15 +688,6 @@ let sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.1" = { - name = "_at_babel_slash_plugin-proposal-numeric-separator"; - packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz"; - sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA=="; - }; - }; "@babel/plugin-proposal-numeric-separator-7.12.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; @@ -1228,15 +1138,6 @@ let sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.1" = { - name = "_at_babel_slash_plugin-transform-react-jsx"; - packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz"; - sha512 = "RmKejwnT0T0QzQUzcbP5p1VWlpnP8QHtdhEtLG55ZDQnJNalbF3eeDyu3dnGKvGzFIQiBzFhBYTwvv435p9Xpw=="; - }; - }; "@babel/plugin-transform-react-jsx-7.12.5" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; @@ -1426,15 +1327,6 @@ let sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; - "@babel/runtime-7.12.1" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; - sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; - }; - }; "@babel/runtime-7.12.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1462,15 +1354,6 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.12.1" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz"; - sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw=="; - }; - }; "@babel/traverse-7.12.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; @@ -1489,15 +1372,6 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.1" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"; - sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA=="; - }; - }; "@babel/types-7.12.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2317,13 +2191,13 @@ let sha512 = "yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w=="; }; }; - "@graphql-tools/url-loader-6.3.2" = { + "@graphql-tools/url-loader-6.4.0" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.3.2.tgz"; - sha512 = "nrrZD33T7lFeOjIufCrwk2PAHYqFtdFcb1pe1ULWnvuFmFuhZnRCgIsfCsoy+WOMwmZHQ/eXBem//I/bewXlgw=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.4.0.tgz"; + sha512 = "M3mS/VH6vpnai3b3Fa33kYcdCgZvhFh7RqFE1R3NMfhYjphQ10EWwgf31P+VQcBNB2zz+ubxttI6UcJLiGqwuQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2911,15 +2785,6 @@ let sha512 = "UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw=="; }; }; - "@josh-brown/vector-3.4.0" = { - name = "_at_josh-brown_slash_vector"; - packageName = "@josh-brown/vector"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@josh-brown/vector/-/vector-3.4.0.tgz"; - sha512 = "E2FcWwiAMXwr4MUv+SkxmtKsgwgaEaCNK7IlyCfQ1Rz1QzeaV36SooA8/GNkLh0WnlIda59WmDDSL7S1S73lUg=="; - }; - }; "@kwsites/file-exists-1.1.1" = { name = "_at_kwsites_slash_file-exists"; packageName = "@kwsites/file-exists"; @@ -3514,13 +3379,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.1.3" = { + "@nestjs/schematics-7.2.1" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.1.3"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.3.tgz"; - sha512 = "13YU6H8Cw+GwtIfclSBeiswlzdM2Z9tMN4ZWiveyok0Fmi/8t6mxGHDw3bWPv8wGkd1bWz0PVCC2CjUGkHmcGg=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.1.tgz"; + sha512 = "yTIwiclX65HYIeemJ/ih3SVlj3BhUHS5eeGy/6uFy1EiIujNadsgi/RZxFSwlCIDkSrGUykqoZdvzfdnsD1Itw=="; }; }; "@netflix/nerror-1.1.3" = { @@ -4090,6 +3955,312 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; + "@ot-builder/bin-composite-types-0.10.31" = { + name = "_at_ot-builder_slash_bin-composite-types"; + packageName = "@ot-builder/bin-composite-types"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.31.tgz"; + sha512 = "SbyWNIMJZEqPdbJW6P1KaHnLTvTqinm3J9MiNmdOhrEuw1k4jLpatQCYT4jLMDHuD1bRLmzgRshcfbm5Rtb+Kg=="; + }; + }; + "@ot-builder/bin-util-0.10.31" = { + name = "_at_ot-builder_slash_bin-util"; + packageName = "@ot-builder/bin-util"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.31.tgz"; + sha512 = "bbYcQ582m2uNcJajhPB7St2lXvN4hekaNrMVgQREfaDmHcQycV7NaqM3Q333IYbKNSHehSLBcJ3whVyN1oAOvw=="; + }; + }; + "@ot-builder/cli-help-shower-0.10.31" = { + name = "_at_ot-builder_slash_cli-help-shower"; + packageName = "@ot-builder/cli-help-shower"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.31.tgz"; + sha512 = "96SdquA87vuHHuwPuTDKrFoKD7g89SddDsmowjdR57N+9tinbwGxNiz3jCK4DycMIebSRwWIq0ls20Veq0uT3g=="; + }; + }; + "@ot-builder/cli-proc-0.10.31" = { + name = "_at_ot-builder_slash_cli-proc"; + packageName = "@ot-builder/cli-proc"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.31.tgz"; + sha512 = "5rt5zCn681qoz8CwwB8HBrSdHv/axOtmtjOAkFuTm1HEOZeAmJt2nRVQwP+08lQLlPhZyiBM57XDqNgohGu+3A=="; + }; + }; + "@ot-builder/cli-shared-0.10.31" = { + name = "_at_ot-builder_slash_cli-shared"; + packageName = "@ot-builder/cli-shared"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.31.tgz"; + sha512 = "54dJvtBCZ2ELNI38F98blPUURwD/cu09sOC68u7WghDrkmcql9UOjCgVsujoLDS52KdpD7DzOxhTu2j6upAZ2w=="; + }; + }; + "@ot-builder/common-impl-0.10.31" = { + name = "_at_ot-builder_slash_common-impl"; + packageName = "@ot-builder/common-impl"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.31.tgz"; + sha512 = "9cGRXS45fPR9tau81G+zo6J8toEP9ouuE0gTTAL8ZHz84mAeUE3ybTL0pyiBO0fu01LtMgeLxl1w0rBze8T4jw=="; + }; + }; + "@ot-builder/errors-0.10.31" = { + name = "_at_ot-builder_slash_errors"; + packageName = "@ot-builder/errors"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.31.tgz"; + sha512 = "6UvEpFqukndJ2d9T5gvdtMUliK6H8j8g1JrLyG9WNNPMY9NZ7MAHz1vAzR3ZNN9cBZPMy/mYjUf7q1mjs8fiow=="; + }; + }; + "@ot-builder/io-bin-cff-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-cff"; + packageName = "@ot-builder/io-bin-cff"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.31.tgz"; + sha512 = "ypaCkzW/hDvItKwJ6i5JVsG4YxhLP9M3CNUxSOD5FNH8Ld/AvS2Mt8i1fJdj37O2tAJgFLUj3dET0bWL8Czlvg=="; + }; + }; + "@ot-builder/io-bin-encoding-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-encoding"; + packageName = "@ot-builder/io-bin-encoding"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.31.tgz"; + sha512 = "BsU7+eeG+G7TaE1zdmqP2QqQk97KXYpaY08eAwrZBVoOWbOKClg+GKup4+Cbcy+2ckNZtviYnty18iwzfVNXSQ=="; + }; + }; + "@ot-builder/io-bin-ext-private-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-ext-private"; + packageName = "@ot-builder/io-bin-ext-private"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.31.tgz"; + sha512 = "xI/UUgCEfbulXwawyNtPpCNS2cIkDzz81sIK/u83sK7BVUIfrLQmsxX7Qfcnz3fbskbhY0oM2qIbJ5StfbOVHA=="; + }; + }; + "@ot-builder/io-bin-font-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-font"; + packageName = "@ot-builder/io-bin-font"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.31.tgz"; + sha512 = "lcXfk5enFMKNd8tGO5aZFVWDqqaHVDl3q6nSNlcrrYGcAxvuoMfwRExgqxT7WSrEn9RNc4GueKfR3CMz0B0dtg=="; + }; + }; + "@ot-builder/io-bin-glyph-store-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-glyph-store"; + packageName = "@ot-builder/io-bin-glyph-store"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.31.tgz"; + sha512 = "7uL/j0AE+eRE+gdUKVILmRL1lKlBofUk1WQ6JV/HMFI7WcKQNRguifXMUlKARYJLdVJE2XB85q7TejJ8ycPVSA=="; + }; + }; + "@ot-builder/io-bin-layout-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-layout"; + packageName = "@ot-builder/io-bin-layout"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.31.tgz"; + sha512 = "gLrHGKulldU6G5kMlNyMAofBOz/9/Om0RBvkXvt2djp6ndVFvTXGiWqeS0SdU5CJZxAZWGvKARETWQ4d0foz2g=="; + }; + }; + "@ot-builder/io-bin-metadata-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-metadata"; + packageName = "@ot-builder/io-bin-metadata"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.31.tgz"; + sha512 = "fYJlzf7gTGMntv+/OmIS2KlyGJuFwWQX69L1IH4swV1VJXYC9KlA4GojFyZ1oAZLWBORZ0kuUuvjD/4nox4QCA=="; + }; + }; + "@ot-builder/io-bin-metric-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-metric"; + packageName = "@ot-builder/io-bin-metric"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.31.tgz"; + sha512 = "6RueaPhQ2r2dTQ4/vncM1TCYjPpJ+N5vyFT4w0SJP30C46g1kn0bryyrhdpG0jvl+pLkty7MbwKOpBxOQ0RtdA=="; + }; + }; + "@ot-builder/io-bin-name-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-name"; + packageName = "@ot-builder/io-bin-name"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.31.tgz"; + sha512 = "x7aI+idbaNwJf2Ty9RaEOS/E0aEh33QihM2EhrcT20ui67hnx+99aAUXjVwp7puY0zXARy/u0k99r91SATrLqw=="; + }; + }; + "@ot-builder/io-bin-sfnt-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-sfnt"; + packageName = "@ot-builder/io-bin-sfnt"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.31.tgz"; + sha512 = "ssmHoGAuxMe1QkS24+GlxcgjpHoxQDsBQrdTSfh4pkmRP9aSfOrMWLksBgSQCTzRmOwf3lEJH2gz2r3NbsZldw=="; + }; + }; + "@ot-builder/io-bin-ttf-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-ttf"; + packageName = "@ot-builder/io-bin-ttf"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.31.tgz"; + sha512 = "pDWFXlUvguvygBDFpeliDMSKOg/rFprhiyCz6wPokRYwJg8fDS5EDtJOQ6p9/Y0C1V12PWA1O+fucYBfqUmSQw=="; + }; + }; + "@ot-builder/ot-0.10.31" = { + name = "_at_ot-builder_slash_ot"; + packageName = "@ot-builder/ot"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.31.tgz"; + sha512 = "5Cit1J+bxKOgLsB+6jey90eOXLPHiUzJbdNmHrIwUyM5C5ZRXRLg5VRnrYPYZoRCLPaVjG6AXFP+WvALdaLp8A=="; + }; + }; + "@ot-builder/ot-encoding-0.10.31" = { + name = "_at_ot-builder_slash_ot-encoding"; + packageName = "@ot-builder/ot-encoding"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.31.tgz"; + sha512 = "cVQZu7ZxOb/Fq2Ilh6ka7vzHXCVyZYOATFthrsV3uZFF3Iz+xefrrK0eh38UEoRopmbqMiPC9U3IHr6A86h+JA=="; + }; + }; + "@ot-builder/ot-ext-private-0.10.31" = { + name = "_at_ot-builder_slash_ot-ext-private"; + packageName = "@ot-builder/ot-ext-private"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.31.tgz"; + sha512 = "G+TV59TNTa2tKrQ2/wy55dVoOP5uSVv6LfUcM2al5aM6pAjeWMV84BtBzDWH0nPTjlovyEmmiqDoUFgrm2TqYw=="; + }; + }; + "@ot-builder/ot-glyphs-0.10.31" = { + name = "_at_ot-builder_slash_ot-glyphs"; + packageName = "@ot-builder/ot-glyphs"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.31.tgz"; + sha512 = "qY+O9RIXFalVg707swyfRK9beGDHEAKCGd74Rt9HdZIaWWPYfb+CH22zbwI+gVJEV/NRCTMGpZB1WrdLRm4q4w=="; + }; + }; + "@ot-builder/ot-layout-0.10.31" = { + name = "_at_ot-builder_slash_ot-layout"; + packageName = "@ot-builder/ot-layout"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.31.tgz"; + sha512 = "j1WZRr6V48jIvl0VROBbzI1MPNYJUbrjwwiPdzMpi/Moj/k0tMAO5d/3FKhvVMcvpgXtN/Pe2V3yxz9yXD37pw=="; + }; + }; + "@ot-builder/ot-metadata-0.10.31" = { + name = "_at_ot-builder_slash_ot-metadata"; + packageName = "@ot-builder/ot-metadata"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.31.tgz"; + sha512 = "H/Pdmf667+hLQkx7zpBecvwOW8VppxRSLSvKIopd0+TSdiXo9iZrmkkqnIHxA9/KPdvVLh6a/gzfxj5KwMMeDw=="; + }; + }; + "@ot-builder/ot-name-0.10.31" = { + name = "_at_ot-builder_slash_ot-name"; + packageName = "@ot-builder/ot-name"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.31.tgz"; + sha512 = "38oV/H2n9x9DKl44XDdMWf8fY5lsgIlykxMUXT+2XlBS0Fw1u/S4THLXGhRG8nwcM6eJRzF+diL6/yGPCtpYfQ=="; + }; + }; + "@ot-builder/ot-sfnt-0.10.31" = { + name = "_at_ot-builder_slash_ot-sfnt"; + packageName = "@ot-builder/ot-sfnt"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.31.tgz"; + sha512 = "hkTeDmNMZqeWq5OwBPy5zpy6cFecfkT/zO6ZiPyqbo8ND6Qp6WoLvkhIST6Bwesh2mApffTKyePbGnHrfWdnkw=="; + }; + }; + "@ot-builder/ot-standard-glyph-namer-0.10.31" = { + name = "_at_ot-builder_slash_ot-standard-glyph-namer"; + packageName = "@ot-builder/ot-standard-glyph-namer"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.31.tgz"; + sha512 = "at6KH+5XDfi+7buSy1AayHp0C8N8iEql5PO8ZeTry22uE9mI80spqBShdTbYjI4m7S4rgKxK+Mtx5+Iq1pku1Q=="; + }; + }; + "@ot-builder/prelude-0.10.31" = { + name = "_at_ot-builder_slash_prelude"; + packageName = "@ot-builder/prelude"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.31.tgz"; + sha512 = "0GhgWpPaCetCvzJfpC5o11WqEQ0O6ZE5BLyiCC1cLCd2i/4zsyOlXvAUZ2FLvvR8Oz3Q/EtF1uZ12iuIxR75Hw=="; + }; + }; + "@ot-builder/primitive-0.10.31" = { + name = "_at_ot-builder_slash_primitive"; + packageName = "@ot-builder/primitive"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.31.tgz"; + sha512 = "1woeCUkc1BxsBNVGw9ALcR4P0Lk3iTK7LkRnMM2VCP+NhoF6aYM81FK1TYMZbmf21nS6OQtyZaT/+10oaZ1Y2A=="; + }; + }; + "@ot-builder/rectify-0.10.31" = { + name = "_at_ot-builder_slash_rectify"; + packageName = "@ot-builder/rectify"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.31.tgz"; + sha512 = "QpHhRMGu0Hj1eN3nBKm2BYNHb2UOGi+2ZJP/QmH2GXMdE4LFOWmSN9Mvvubfxr23cjt3VtHK1X/5OBmhcEVfyA=="; + }; + }; + "@ot-builder/stat-glyphs-0.10.31" = { + name = "_at_ot-builder_slash_stat-glyphs"; + packageName = "@ot-builder/stat-glyphs"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.31.tgz"; + sha512 = "GxSEEaRstSZV40FkF3SDTZceZN9UboBx3f9Kx2mSW2wfmQk14cCvQszLehXJsXnZ2+h9oVgJ8fpzSU0jY5Ip8g=="; + }; + }; + "@ot-builder/trace-0.10.31" = { + name = "_at_ot-builder_slash_trace"; + packageName = "@ot-builder/trace"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.31.tgz"; + sha512 = "hCeRQp1FusNIU3B5gWL+0E5Ionr8RNF3nFk9wIuqYbgQqeaYpJaEcD4brlGp5BrgCqQA6n9pOTpogPMZOffdFw=="; + }; + }; + "@ot-builder/var-store-0.10.31" = { + name = "_at_ot-builder_slash_var-store"; + packageName = "@ot-builder/var-store"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.31.tgz"; + sha512 = "adpNdlPmVCrBZBbDTPITLGe/EJpdfgoZJ7vTiR6tQ0gfwkD88r/i9I/YovWYi1v0VonXEIH9IyGlH3iU13zXuw=="; + }; + }; + "@ot-builder/variance-0.10.31" = { + name = "_at_ot-builder_slash_variance"; + packageName = "@ot-builder/variance"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.31.tgz"; + sha512 = "3M2HFcPQs2YGsNdx5XuW+s1fwTnWYW2d/FpdLN9VtVa5THeI3GfUtWHlWgHIrYWycakM9+XPTbueQDTCEf26Cg=="; + }; + }; "@parcel/fs-1.11.0" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; @@ -4585,13 +4756,13 @@ let sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ=="; }; }; - "@serverless/utils-china-1.0.9" = { + "@serverless/utils-china-1.0.10" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.9.tgz"; - sha512 = "NUwRAvhVMr9pUwFMNhpb3uxslyCua2ORJH35A/x6OZVKEfGWXvdRU5wUpZvtIIes6qZ4t18plMQi1D0f7Ki8/Q=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.10.tgz"; + sha512 = "pMl6uW672Tll5rjFAYILxu1EwxSaWBE7r/Tr38sCgDOh0t36sRXiI3oCBHIu/C0tqKFfU1s+coRZbZYKkirCiw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -6421,6 +6592,15 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; + "@unicode/unicode-13.0.0-1.0.2" = { + name = "_at_unicode_slash_unicode-13.0.0"; + packageName = "@unicode/unicode-13.0.0"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.2.tgz"; + sha512 = "OKI6clBZqvMBlPKbH1tv3ChmkqRcyCfB6ulHqEX+9asjN5BVXs7tH7aOi+SExCNsmCVB8uJ1ZcvjuwaHsCtUeg=="; + }; + }; "@vue/cli-shared-utils-4.5.8" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -12838,15 +13018,6 @@ let sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; - "child-process-promise-2.2.1" = { - name = "child-process-promise"; - packageName = "child-process-promise"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz"; - sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074"; - }; - }; "chloride-2.3.0" = { name = "chloride"; packageName = "chloride"; @@ -14915,7 +15086,7 @@ let src = fetchgit { url = "https://github.com/wikimedia/content-type.git"; rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; - sha256 = "18eb299165567b0a97e9d5576f7c189fe57072b8b8323ac179571c9e6a10fdd9"; + sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; "content-types-0.1.0" = { @@ -18833,13 +19004,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.586" = { + "electron-to-chromium-1.3.587" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.586"; + version = "1.3.587"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.586.tgz"; - sha512 = "or8FCbQCRlPZHkOoqBULOI9hzTiStVIQqDLgAPt8pzY+swTrW+89vsqd24Zn+Iv4guAJLxRBD6OR5AmbpabGDA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.587.tgz"; + sha512 = "8XFNxzNj0R8HpTQslWAw6UWpGSuOKSP3srhyFHVbGUGb8vTHckZGCyWi+iQlaXJx5DNeTQTQLd6xN11WSckkmA=="; }; }; "elegant-spinner-1.0.1" = { @@ -25538,7 +25709,7 @@ let src = fetchgit { url = "git://github.com/feross/http-node"; rev = "342ef8624495343ffd050bd0808b3750cf0e3974"; - sha256 = "031176ff1f6ceb8f650cbf2c36863f417e699f0610f83fbd94a74159cb8eba8f"; + sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368"; }; }; "http-parser-js-0.4.13" = { @@ -29661,7 +29832,7 @@ let src = fetchgit { url = "https://github.com/wikimedia/kad.git"; rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e"; - sha256 = "801c2201565fb46ad591d4cf717eb30842ca76725c1d19f301418796f39d668e"; + sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea"; }; }; "kad-localstorage-0.0.7" = { @@ -34470,13 +34641,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.0.2" = { + "mobx-6.0.3" = { name = "mobx"; packageName = "mobx"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.0.2.tgz"; - sha512 = "MG+8YbcwJw0tjJ78ujooqE8rxvCIfDaVZbCLfCxQ9S81oNNJb6W4KZVMSR+Y1e5n4z1vh70/vkibv0xEGwuEPQ=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.0.3.tgz"; + sha512 = "DBMd0NXsMn25HJMUAWBndgJ2wRjOJPbpn6wdzUvZW0PVsyTnrw028XwQfzsjnxnKG+bAXGVNb38rvd+1o0G9uQ=="; }; }; "mobx-react-6.3.1" = { @@ -35620,7 +35791,7 @@ let src = fetchgit { url = "https://github.com/arlolra/negotiator.git"; rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; - sha256 = "0cee71d4f5ad49a14f8ff9b33d1e5b1ac9fbcd3866ab7a95068283e1f7d860b6"; + sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; "neo-async-2.6.2" = { @@ -35954,7 +36125,7 @@ let src = fetchgit { url = "https://github.com/laurent22/node-emoji.git"; rev = "9fa01eac463e94dde1316ef8c53089eeef4973b5"; - sha256 = "1499424a28a49687c150369075d5ea3794f18454291078760a6c761e6576d8a3"; + sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; "node-environment-flags-1.0.6" = { @@ -36119,13 +36290,13 @@ let sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; }; - "node-html-parser-1.4.5" = { + "node-html-parser-1.4.6" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.5.tgz"; - sha512 = "sNm4Tdc8zj5HnFtkNEcK/1tpvyfRxEuz1d4rkVceGPeMTfzd2twPTiEo/UbqxOexSt9AzJ/cvQXSTj7fa6Ey1w=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.6.tgz"; + sha512 = "VgX2Bk8dq59yFeNC46LdA6VzRXffOPVNOMoeZquACZVwbC1VYJ3ssd5/mncTBGBrd3M+t6cMD5KQWdK/l+qPFQ=="; }; }; "node-int64-0.4.0" = { @@ -36344,15 +36515,6 @@ let sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; - "node-version-1.2.0" = { - name = "node-version"; - packageName = "node-version"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz"; - sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="; - }; - }; "node-wsfederation-0.1.1" = { name = "node-wsfederation"; packageName = "node-wsfederation"; @@ -36785,6 +36947,15 @@ let sha512 = "yZPNoJK9clx1jhSXU54kU6Aj1SV2p7mXUs1W/6OjQvek3wb1RrjDCrt4iY1+VX9eBQvvSGEpzNmYkRUaTL8rqg=="; }; }; + "npm-registry-fetch-9.0.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz"; + sha512 = "PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA=="; + }; + }; "npm-run-path-2.0.2" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -38055,15 +38226,6 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.0.3" = { - name = "ora"; - packageName = "ora"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz"; - sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg=="; - }; - }; "ora-4.0.4" = { name = "ora"; packageName = "ora"; @@ -38217,13 +38379,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "otfcc-ttcize-0.10.2" = { - name = "otfcc-ttcize"; - packageName = "otfcc-ttcize"; - version = "0.10.2"; + "ot-builder-0.10.31" = { + name = "ot-builder"; + packageName = "ot-builder"; + version = "0.10.31"; src = fetchurl { - url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.10.2.tgz"; - sha512 = "CLMMw6r97AvmK5nOIGpnG4xHVU40gyTzpvn55RPyxZQ3E/UMXG4HnykyTYHlVL7Y46ISr1isPiSN0CvjYpZtgg=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.31.tgz"; + sha512 = "Cj/EsGzPQ4h59OWJJoXi5JEj94ULlxHB0ZwLvaRt6O3kmJ6PvZdp7MyEvi6fF0/BMcjFJOMOkcggbjAOCl/E3g=="; + }; + }; + "otb-ttc-bundle-0.10.31" = { + name = "otb-ttc-bundle"; + packageName = "otb-ttc-bundle"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.31.tgz"; + sha512 = "PHT2rzKRD8QkwD7CrPDuh7tmtnaAVecK6JjALw7d4CajmNBvYbFlnb7fdpF1melyizJgnhigeN3hjHllEuqdMQ=="; }; }; "p-all-2.1.0" = { @@ -38730,13 +38901,13 @@ let sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA=="; }; }; - "pacote-11.1.11" = { + "pacote-11.1.12" = { name = "pacote"; packageName = "pacote"; - version = "11.1.11"; + version = "11.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.11.tgz"; - sha512 = "r6PHtCEhkaGv+QPx1JdE/xRdkSkZUG7dE2oloNk/CGTPGNOtaJyYqZPFeN6d6UcUrTPRvZXFo3IBzJIBopPuSA=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.12.tgz"; + sha512 = "suazooYMzefXr3glexAX4+q+qqH3wrzchtj+EivwiCCr/tsaHe9HtdHSx3R8YPjulAhojBZ2JkAVy13QwA8Jpg=="; }; }; "pacote-9.5.12" = { @@ -40420,7 +40591,7 @@ let src = fetchgit { url = "git://github.com/anmonteiro/node-getopt"; rev = "a3123885e3559c9b70903948d6e5c34852520d74"; - sha256 = "aec063ab02e2782e6587759b4c7dfd8d8e27f174bbc62dd65842658e30e56720"; + sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa"; }; }; "postcss-5.2.18" = { @@ -41584,15 +41755,6 @@ let sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; }; }; - "promise-polyfill-6.1.0" = { - name = "promise-polyfill"; - packageName = "promise-polyfill"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz"; - sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057"; - }; - }; "promise-queue-2.2.5" = { name = "promise-queue"; packageName = "promise-queue"; @@ -42727,6 +42889,15 @@ let sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; }; }; + "qrcode-terminal-0.12.0" = { + name = "qrcode-terminal"; + packageName = "qrcode-terminal"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz"; + sha512 = "EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="; + }; + }; "qs-0.4.2" = { name = "qs"; packageName = "qs"; @@ -45472,15 +45643,6 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.5.4" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; - sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; - }; - }; "rxjs-6.5.5" = { name = "rxjs"; packageName = "rxjs"; @@ -50287,6 +50449,15 @@ let sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; }; + "sync-fetch-0.3.0" = { + name = "sync-fetch"; + packageName = "sync-fetch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.3.0.tgz"; + sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; + }; + }; "syntax-error-1.4.0" = { name = "syntax-error"; packageName = "syntax-error"; @@ -50402,7 +50573,7 @@ let src = fetchgit { url = "https://github.com/mixu/node-tabtab.git"; rev = "94af2b878b174527b6636aec88acd46979247755"; - sha256 = "6e84c406481c826d85e946e9dc09ed1e71ecfa405f60dd6209e5c835aacf32c1"; + sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; }; }; "tabula-1.10.0" = { @@ -51665,13 +51836,13 @@ let sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw=="; }; }; - "topsort-0.0.2" = { - name = "topsort"; - packageName = "topsort"; - version = "0.0.2"; + "toposort-2.0.2" = { + name = "toposort"; + packageName = "toposort"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz"; - sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321"; + url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; + sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; }; }; "torrent-discovery-5.4.0" = { @@ -52610,13 +52781,13 @@ let sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; }; }; - "typo-geom-0.8.4" = { + "typo-geom-0.11.0" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.8.4"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.8.4.tgz"; - sha512 = "n0P1RQidLnjLI2iSUDENiugkABaR+tr/kSIpl040XLKmrfsBZ/weS1OvQ9Mq98CsJlcJDemKdPqldoyYSsVgmQ=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.0.tgz"; + sha512 = "0f7MjfJdUOYCLfUpVegTIukkWd1nkvN6CX6oXF8hcx9Hu04qhQfTC+gOffH8bhSjsSiLhIy7aRuzgIAj4UdyyQ=="; }; }; "ua-parser-js-0.7.21" = { @@ -52934,15 +53105,6 @@ let sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; }; }; - "unicode-13.0.0-0.8.0" = { - name = "unicode-13.0.0"; - packageName = "unicode-13.0.0"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-13.0.0/-/unicode-13.0.0-0.8.0.tgz"; - sha512 = "Ekct2eo5hBIp/29ERCj1ABIBNnrFOAisNHFv8l2KksHJg4PurIN/nGPFItaIpBJHVzlBYuJaVx/bAvmJnFFL/w=="; - }; - }; "unicode-canonical-property-names-ecmascript-1.0.4" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -53949,7 +54111,7 @@ let src = fetchgit { url = "https://github.com/laurent22/uslug.git"; rev = "ba2834d79beb0435318709958b2f5e817d96674d"; - sha256 = "9f64413fac2052a07323c54475be269280ab1c5d174e88bd1542e24091be0259"; + sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489"; }; }; "ut_metadata-3.5.1" = { @@ -58896,12 +59058,12 @@ in sources."chalk-2.4.2" ]; }) - (sources."@nestjs/schematics-7.1.3" // { + (sources."@nestjs/schematics-7.2.1" // { dependencies = [ - sources."@angular-devkit/core-9.1.12" - sources."@angular-devkit/schematics-9.1.12" - sources."ora-4.0.3" - sources."rxjs-6.5.4" + sources."@angular-devkit/core-10.2.0" + sources."@angular-devkit/schematics-10.2.0" + sources."ajv-6.12.4" + sources."rxjs-6.6.2" ]; }) sources."@schematics/schematics-0.1000.7" @@ -59660,22 +59822,22 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" (sources."@babel/core-7.12.3" // { dependencies = [ - sources."@babel/generator-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/generator-7.12.5" + sources."@babel/types-7.12.5" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.11.6" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.1" // { + (sources."@babel/helper-compilation-targets-7.12.5" // { dependencies = [ sources."semver-5.7.1" ]; @@ -59684,12 +59846,12 @@ in sources."@babel/helper-create-regexp-features-plugin-7.12.1" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-explode-assignable-expression-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-function-name-7.10.4" @@ -59697,17 +59859,17 @@ in sources."@babel/helper-hoist-variables-7.10.4" (sources."@babel/helper-member-expression-to-functions-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) - (sources."@babel/helper-module-imports-7.12.1" // { + (sources."@babel/helper-module-imports-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" @@ -59715,39 +59877,39 @@ in sources."@babel/helper-regex-7.10.5" (sources."@babel/helper-remap-async-to-generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) - (sources."@babel/helper-replace-supers-7.12.1" // { + (sources."@babel/helper-replace-supers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-simple-access-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - (sources."@babel/helpers-7.12.1" // { + (sources."@babel/helpers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -59755,7 +59917,7 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -59811,7 +59973,7 @@ in sources."@babel/plugin-transform-unicode-regex-7.12.1" (sources."@babel/preset-env-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."semver-5.7.1" ]; }) @@ -59825,12 +59987,12 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.1" // { + (sources."@babel/traverse-7.12.5" // { dependencies = [ - sources."@babel/generator-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/generator-7.12.5" + sources."@babel/types-7.12.5" ]; }) sources."@babel/types-7.10.4" @@ -59989,14 +60151,14 @@ in sources."@vue/cli-ui-addon-widgets-4.5.8" (sources."@vue/compiler-core-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.2" (sources."@vue/compiler-sfc-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."source-map-0.6.1" ]; }) @@ -60415,7 +60577,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -61616,12 +61778,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -61706,7 +61868,7 @@ in sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.1" // { + (sources."@babel/generator-7.12.5" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -61714,19 +61876,19 @@ in sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -63547,7 +63709,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -64464,27 +64626,27 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -64550,7 +64712,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -68401,33 +68563,33 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" sources."@babel/helper-builder-react-jsx-experimental-7.12.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.12.1" sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.1" + sources."@babel/plugin-transform-react-jsx-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -71648,7 +71810,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72292,7 +72454,7 @@ in sources."which-2.0.2" ]; }) - sources."node-html-parser-1.4.5" + sources."node-html-parser-1.4.6" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" @@ -72421,11 +72583,12 @@ in sources."url-parse-lax-3.0.0" ]; }) - (sources."pacote-11.1.11" // { + (sources."pacote-11.1.12" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" sources."npm-package-arg-8.1.0" + sources."npm-registry-fetch-9.0.0" sources."rimraf-3.0.2" sources."semver-7.3.2" ]; @@ -75431,7 +75594,7 @@ in sources."@graphql-tools/utils-7.0.2" ]; }) - (sources."@graphql-tools/url-loader-6.3.2" // { + (sources."@graphql-tools/url-loader-6.4.0" // { dependencies = [ sources."@graphql-tools/utils-7.0.2" ]; @@ -75474,9 +75637,11 @@ in sources."aws4-1.11.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."buffer-5.7.0" sources."bufferutil-4.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -75623,6 +75788,7 @@ in sources."http-signature-1.2.0" sources."http2-client-1.3.3" sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."ignore-5.1.8" (sources."import-fresh-3.2.2" // { dependencies = [ @@ -75882,6 +76048,7 @@ in ]; }) sources."symbol-observable-1.2.0" + sources."sync-fetch-0.3.0" sources."tar-6.0.5" sources."through-2.3.8" sources."tmp-0.2.1" @@ -78072,19 +78239,83 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-build-deps-../../data/fonts/iosevka" = nodeEnv.buildNodePackage { - name = "iosevka-build-deps"; - packageName = "iosevka-build-deps"; - version = "3.2.2"; - src = ../../data/fonts/iosevka; + "iosevka-https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz" = nodeEnv.buildNodePackage { + name = "iosevka"; + packageName = "iosevka"; + version = "3.7.1"; + src = fetchurl { + name = "iosevka-3.7.1.tar.gz"; + url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1; + sha256 = "ed7aee70af326ef22458f8f7603c599fd2f5164ae8062fbd6fb7d56864d98aca"; + }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@josh-brown/vector-3.4.0" - sources."JSONStream-1.3.5" + sources."@ot-builder/bin-composite-types-0.10.31" + sources."@ot-builder/bin-util-0.10.31" + (sources."@ot-builder/cli-help-shower-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."@ot-builder/cli-proc-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."@ot-builder/cli-shared-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."@ot-builder/common-impl-0.10.31" + sources."@ot-builder/errors-0.10.31" + sources."@ot-builder/io-bin-cff-0.10.31" + sources."@ot-builder/io-bin-encoding-0.10.31" + sources."@ot-builder/io-bin-ext-private-0.10.31" + sources."@ot-builder/io-bin-font-0.10.31" + sources."@ot-builder/io-bin-glyph-store-0.10.31" + sources."@ot-builder/io-bin-layout-0.10.31" + sources."@ot-builder/io-bin-metadata-0.10.31" + sources."@ot-builder/io-bin-metric-0.10.31" + sources."@ot-builder/io-bin-name-0.10.31" + sources."@ot-builder/io-bin-sfnt-0.10.31" + sources."@ot-builder/io-bin-ttf-0.10.31" + sources."@ot-builder/ot-0.10.31" + sources."@ot-builder/ot-encoding-0.10.31" + sources."@ot-builder/ot-ext-private-0.10.31" + sources."@ot-builder/ot-glyphs-0.10.31" + sources."@ot-builder/ot-layout-0.10.31" + sources."@ot-builder/ot-metadata-0.10.31" + sources."@ot-builder/ot-name-0.10.31" + sources."@ot-builder/ot-sfnt-0.10.31" + sources."@ot-builder/ot-standard-glyph-namer-0.10.31" + sources."@ot-builder/prelude-0.10.31" + sources."@ot-builder/primitive-0.10.31" + sources."@ot-builder/rectify-0.10.31" + sources."@ot-builder/stat-glyphs-0.10.31" + sources."@ot-builder/trace-0.10.31" + sources."@ot-builder/var-store-0.10.31" + sources."@ot-builder/variance-0.10.31" + sources."@unicode/unicode-13.0.0-1.0.2" sources."abbrev-1.1.1" sources."ajv-6.12.6" sources."amdefine-1.0.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -78103,16 +78334,15 @@ in sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."bufferstreams-2.0.1" - sources."camelcase-5.3.1" + sources."camelcase-3.0.0" sources."caseless-0.12.0" sources."chainsaw-0.0.9" sources."chalk-2.4.2" - sources."child-process-promise-2.2.1" sources."chownr-1.1.4" sources."cldr-5.7.0" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" - sources."cliui-6.0.0" + sources."cliui-3.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -78120,12 +78350,6 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - (sources."cross-spawn-4.0.2" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."which-1.3.1" - ]; - }) sources."css-2.2.4" sources."css-parse-2.0.0" sources."dashdash-1.14.1" @@ -78173,23 +78397,15 @@ in sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" sources."filelist-1.0.1" - sources."find-up-4.1.0" - sources."first-chunk-stream-3.0.0" + sources."find-up-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-9.0.1" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."get-caller-file-2.0.5" + sources."gauge-2.7.4" + sources."get-caller-file-1.0.3" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -78201,12 +78417,13 @@ in sources."hashish-0.0.4" sources."hosted-git-info-2.8.8" sources."http-signature-1.2.0" + sources."iconv-lite-0.6.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-arrayish-0.2.1" sources."is-core-module-2.0.0" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -78222,7 +78439,6 @@ in sources."universalify-2.0.0" ]; }) - sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -78236,22 +78452,18 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) + sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."nan-2.14.2" (sources."node-gyp-4.0.0" // { dependencies = [ + sources."mkdirp-0.5.5" sources."semver-5.3.0" sources."which-1.3.1" ]; }) - sources."node-version-1.2.0" sources."nopt-3.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -78269,31 +78481,25 @@ in sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."otfcc-ttcize-0.10.2" + sources."ot-builder-0.10.31" + (sources."otb-ttc-bundle-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."pako-1.0.11" sources."parse-json-2.2.0" sources."passerror-1.1.1" - (sources."patel-0.33.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."camelcase-3.0.0" - sources."cliui-3.2.0" - sources."get-caller-file-1.0.3" - sources."is-fullwidth-code-point-1.0.0" - sources."require-main-filename-1.0.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."which-module-1.0.0" - sources."wrap-ansi-2.1.0" - sources."y18n-3.2.1" - sources."yargs-6.6.0" - sources."yargs-parser-4.2.1" - ]; - }) - sources."path-exists-4.0.0" + sources."patel-0.33.1" + sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-type-1.1.0" @@ -78305,29 +78511,21 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."prettier-2.1.2" sources."process-nextick-args-2.0.1" - sources."promise-polyfill-6.1.0" - sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-1.1.0" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - ]; - }) + sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" + sources."require-main-filename-1.0.1" sources."resolve-1.18.1" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -78343,20 +78541,21 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.6" - sources."spiro-2.0.0" + (sources."spiro-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stack-trace-0.0.9" - sources."string-width-4.2.0" + sources."string-width-1.0.2" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" - sources."strip-bom-buf-2.0.0" - sources."strip-bom-stream-4.0.0" (sources."stylus-0.54.8" // { dependencies = [ - sources."mkdirp-1.0.4" sources."semver-6.3.0" sources."source-map-0.7.3" ]; @@ -78364,26 +78563,23 @@ in sources."supports-color-5.5.0" (sources."tar-4.4.13" // { dependencies = [ - sources."yallist-3.1.1" + sources."mkdirp-0.5.5" ]; }) - sources."temp-0.9.2" sources."through-2.3.8" - sources."topsort-0.0.2" + sources."toposort-2.0.2" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."ts-process-promises-1.0.2" - sources."tslib-1.14.1" + sources."tslib-2.0.3" sources."ttf2woff-2.0.2" sources."ttf2woff2-3.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."typo-geom-0.8.4" - sources."unicode-13.0.0-0.8.0" + sources."typo-geom-0.11.0" sources."unicoderegexp-0.4.1" sources."universalify-1.0.0" - sources."unorm-1.6.0" sources."uri-js-4.4.0" sources."urix-0.1.0" sources."util-deprecate-1.0.2" @@ -78391,42 +78587,43 @@ in sources."validate-npm-package-license-3.0.4" (sources."verda-1.1.2" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."chalk-4.1.0" + sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."find-up-4.1.0" + sources."get-caller-file-2.0.5" sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."path-exists-4.0.0" + sources."require-main-filename-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."tslib-2.0.3" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" ]; }) sources."verror-1.10.0" sources."which-2.0.2" - sources."which-module-2.0.0" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."which-module-1.0.0" + sources."wide-align-1.1.3" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."xmldom-0.3.0" sources."xpath-0.0.27" - sources."y18n-4.0.0" - sources."yallist-2.1.2" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + sources."y18n-3.2.1" + sources."yallist-3.1.1" + sources."yargs-6.6.0" + sources."yargs-parser-4.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -82849,7 +83046,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -85376,7 +85573,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -88150,7 +88347,7 @@ in sources."npm-package-arg-8.1.0" sources."npm-packlist-2.1.4" sources."npm-pick-manifest-6.1.0" - sources."npm-registry-fetch-8.1.5" + sources."npm-registry-fetch-9.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -88166,7 +88363,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.11" + sources."pacote-11.1.12" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -88270,7 +88467,7 @@ in src = fetchgit { url = "git://github.com/NixOS/npm2nix.git"; rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5"; - sha256 = "ac58ebe43b62e42cdc1754f4d6c6795de9c33fe12b72a858522c9f0ba10b5cee"; + sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5"; }; dependencies = [ sources."abbrev-1.1.1" @@ -88852,7 +89049,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -91550,10 +91747,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.82"; + version = "1.1.83"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.82.tgz"; - sha512 = "sSYrN9ziOKTLdo7HwP8vlU8pLhY7KDQ9hGK7sW4S2pNn6pAe2ewUjD5Gk4AAbKc13qQ9za9cdthhT0Gk60L7mA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.83.tgz"; + sha512 = "uwaqJsuGxtY94lA8PL3Akp1xkUqUYWEFDLrIdW3FQY6JgFngkAZ51rPyUsuXQjoObm056OZ68wtzUMhDX5P5UA=="; }; buildInputs = globalBuildInputs; meta = { @@ -92062,7 +92259,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.0.2" + sources."mobx-6.0.3" sources."mobx-react-6.3.1" sources."mobx-react-lite-2.2.2" sources."ms-2.1.2" @@ -92966,7 +93163,7 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.9" + sources."@serverless/utils-china-1.0.10" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.5" @@ -93560,6 +93757,7 @@ in sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."qrcode-terminal-0.12.0" sources."qs-6.5.2" sources."query-string-5.1.1" sources."querystring-0.2.0" @@ -94395,10 +94593,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.424.0"; + version = "1.424.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.424.0.tgz"; - sha512 = "mL1uKYBTJND3EKMLaWDnS8n6ggJWwvur3Kz2tCj9cmF++G10FAHA8RyhBKc1jF41lSI0SZKMfh6MXTNvrzfx6g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.424.1.tgz"; + sha512 = "jPfGpI/cCPc1xn335GP7fVVHkqw/ss3W8ie9p+KM748QgZkc5JMuUJKc9lB1y+5+H7wpCnt4wuO1jKkFBpwSUQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -94478,6 +94676,7 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browserify-zlib-0.1.4" sources."buffer-5.7.0" sources."buffer-from-1.1.1" @@ -94568,6 +94767,7 @@ in sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { @@ -94639,6 +94839,7 @@ in sources."is-gzip-1.0.0" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" + sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-stream-1.1.0" @@ -94679,6 +94880,7 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."make-dir-3.1.0" + sources."micromatch-4.0.2" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -94735,6 +94937,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."peek-stream-1.1.3" + sources."picomatch-2.2.2" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -94946,6 +95149,7 @@ in sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."toml-3.0.0" sources."tree-kill-1.2.2" @@ -97688,7 +97892,7 @@ in src = fetchgit { url = "https://github.com/TediCross/TediCross.git"; rev = "80ec2189cbda51eec9f3cd3f7f551b7a71474d38"; - sha256 = "1d3e9fb2a35f366e6fb4cf46699d21a58cbdde3b7a41130d0eb1aa1f4dceabb9"; + sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ sources."ajv-6.12.6" @@ -103697,7 +103901,7 @@ in sources."caniuse-lite-1.0.30001154" sources."chrome-trace-event-1.0.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.586" + sources."electron-to-chromium-1.3.587" sources."enhanced-resolve-5.3.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 47b99234fac..56bc4209c6e 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -2,8 +2,8 @@ buildPecl { pname = "event"; - version = "2.5.7"; - sha256 = "0jkzcm5mmbg101jc7p3aws9qb6l6xbxkfff82mrf7s5fn7xd44im"; + version = "3.0.0"; + sha256 = "1k35qwcf4qz8617b4riy7bp0vna1j3ds0k9j52hlm7qrhww2yxqn"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 48d45cc4ea9..de8e17f8f23 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "php-cs-fixer"; - version = "2.16.4"; + version = "2.16.7"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "05rdvypxc86hjs8b7id2csa7g1rf7dk2swzfvd5768abdgfasvr8"; + sha256 = "1azivqvgqy224g2ch9v9qgi31w4ml7fph3bsk8c304yvbvvfv5nh"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 1e995af3920..fe4e442e308 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.5.3"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5"; + sha256 = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index fe7a2a713cf..9c8440b9f7f 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.22.1"; + version = "4.23.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6e4b66e61876dac90e78b335788a38eaa3625ed9c70d0add261f98ddd128d36a"; + sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index 7370d3db7db..c84ee0f0be7 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "btchip-python"; - version = "0.1.30"; + version = "0.1.31"; src = fetchPypi { inherit pname version; - sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8"; + sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c"; }; propagatedBuildInputs = [ hidapi pyscard ecdsa ]; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 4ee4b8ecb60..08503297d1f 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.1.2"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6"; + sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 5eb65ce2fca..eadc3eb32b1 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.3.0"; + version = "0.4.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc"; + sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"; }; propagatedBuildInputs = [ tinycss2 ]; diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix deleted file mode 100644 index d779a79ed21..00000000000 --- a/pkgs/development/python-modules/smugline/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, fetchFromGitHub -, docopt -, requests -, smugpy -, python -, pkgs -}: - -stdenv.mkDerivation rec { - pname = "smugline"; - version = "20160106"; - - src = fetchFromGitHub { - owner = "gingerlime"; - repo = pname; - rev = "134554c574c2d282112ba60165a8c5ffe0f16fd4"; - sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - buildInputs = [ python pkgs.makeWrapper ]; - propagatedBuildInputs = [ docopt requests smugpy ]; - - installPhase = '' - mkdir -p $out/bin $out/libexec - cp smugline.py $out/libexec - makeWrapper ${python.interpreter} $out/bin/smugline \ - --add-flags "$out/libexec/smugline.py" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/gingerlime/smugline"; - description = "A simple command line tool for smugmug "; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix deleted file mode 100644 index 43ac45b1235..00000000000 --- a/pkgs/development/python-modules/smugpy/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: - -buildPythonPackage rec { - pname = "smugpy"; - version = "20131218"; - - src = fetchFromGitHub { - owner = "chrishoffman"; - repo = pname; - rev = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea"; - sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y"; - }; - - meta = with stdenv.lib; { - description = "Python library for the SmugMug API"; - license = with licenses; [ mit ]; - homepage = "https://github.com/chrishoffman/smugpy"; - }; - - doCheck = false; # Tries to login to Smugmug… -} diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 2ff15d68871..dbace29d7e7 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, jre, autoPatchelfHook, zlib }: +{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript +, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }: stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "1mgfs732w1c1p7dna7h47x8h073lvjs224fqlpkkvq10153mnxxl"; + sha256 = "1dw4l91sw4ybqxjid1hsb6r33ka5bl85rfdrbsr9m5vxl82a3mmc"; }; patchPhase = '' @@ -34,4 +35,35 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nequissimus ]; platforms = platforms.unix; }; + + passthru = { + tests = { inherit (nixosTests) sbt; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + git + nixfmt + nix + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + + if [ ! "$oldVersion" = "$latestTag" ]; then + update-source-version sbt "$latestTag" --version-key=version --print-changes + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix" + nixfmt "$default_nix" + else + echo "sbt is already up-to-date" + fi + ''; + }; } diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index f64041d1be8..92596a068f7 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, graalvm8, fetchurl }: +{ stdenv, lib, graalvm8-ce, fetchurl }: stdenv.mkDerivation rec { pname = "clj-kondo"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ graalvm8 ]; + buildInputs = [ graalvm8-ce ]; buildPhase = '' native-image \ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; - platforms = graalvm8.meta.platforms; + platforms = graalvm8-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; }; } diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 394edcf1953..13bc046e864 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -3,13 +3,13 @@ , pcre, makeWrapper }: let - version = "730-july-preview"; + version = "784-october-preview"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = version; - sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2"; + sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y"; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 01bbd9a9cc1..6314dcea62d 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -25,8 +25,16 @@ stdenv.mkDerivation rec { sed -i 's|/usr|/|' Makefile ''; + installFlags = [ + "install" + "install_systemd" + ]; + postInstall = '' cp usr/iscsistart $out/sbin/ + for f in $out/lib/systemd/system/*; do + substituteInPlace $f --replace /sbin $out/bin + done $out/sbin/iscsistart -v ''; diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/os-specific/linux/pam_gnupg/default.nix index 84135f2492a..50373fe746d 100644 --- a/pkgs/os-specific/linux/pam_gnupg/default.nix +++ b/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pam_gnupg"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "cruegge"; repo = "pam-gnupg"; rev = "v${version}"; - sha256 = "0b70mazyvcbg6xyqllm62rwhbz0y94pcy202db1qyy4w8466bhsw"; + sha256 = "1d8046clv7r3bl77dbpza4f1zlkjffvdczbb5bci3prz7dyfrwsz"; }; configureFlags = [ diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 935993b781f..0bdaede49a5 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -78,13 +78,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.34.16"; + version = "1.34.22"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE="; + sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83"; }; patches = [ diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 54bdf238e3f..528a4467bb8 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "1a28kkxcrdfmrq2mmsfkdxfp3msklwga5nbfhjb7a7s64xh8jmjv"; + sha256 = "0w6a8pfk5s30yi5038kdqh4dncx2pskm7a23z66c4xj3842ci79c"; }; - cargoSha256 = "1xlxjr0pkwlzm7f5xlrsf76in28r9jj41n6gn44vxqbh4x161gs1"; + cargoSha256 = "07fwznx2czk1ibb77xcfhma9dpqps0m7rsmbb90gah6f32gah617"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 426c5f21203..61f6fdde5d3 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F1NbzcMoct0mjWKY2itz4cBqVToY7HpoaRzk3l683fY="; + sha256 = "sha256-KdPr/6wGyoHhEwfPektL+B1khyoRfxDHI4aFcKNU0TM="; }; - cargoSha256 = "sha256-eBY+34VEPEAv5bqerxR3i7cJrVb1GtvmWyrM7uuef2E="; + cargoSha256 = "sha256-MLlGz7Sid0G52//XekqkZgzLqFL7xoUwT6OvpaF4jm0="; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ filalex77 kloenk ]; }; } diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index bea73610dda..520794c5656 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 = "9.8.0"; + version = "10.0.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "05q01cr4a2mmyski50pqna9sgw2jy93fgfpjwkhbkc09na6400sq"; + sha256 = "09wrrcxfvh7pwv0jqpyzjsr0rd7askfr0s2xr1wv9v40znxmsmzz"; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 4af7a0009af..a2048132e07 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 = "3.1.3"; + version = "3.1.5"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "16pajhzr4aahyhdzkp9g3ld2insnlk2z2w2pfab8bghw4f69j5xf"; + sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 60cb3413253..39b361bd302 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.4"; + version = "1.1.6"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "13hlljkqss9abjpwaa5gcn6qnax0ws03zzh45c4rv1if7rwk6nbl"; + sha256 = "1nspvzcpwmaipdq49jm7z3ymdg95zqgcyv1cjfs1zb950knrrggr"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index 987c834f505..2a1ebada002 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "packagekit-qt"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit-Qt"; rev = "v${version}"; - sha256 = "1ls6mn9abpwzw5wjgmslc5h9happj3516y1q67imppczk8g9h2yk"; + sha256 = "1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6"; }; buildInputs = [ packagekit ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index defde7dcc0a..f0150d8fb95 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -65,6 +65,7 @@ mapAliases ({ bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 @@ -540,6 +541,7 @@ mapAliases ({ slurm-llnl-full = slurm-full; # renamed July 2017 slurm-full = slurm; # added 2018-05-1 smbclient = samba; # added 2018-04-25 + smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cacdeb19cc..a76625ab55f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7192,8 +7192,6 @@ in smu = callPackage ../tools/text/smu { }; - smugline = python3Packages.smugline; - sn0int = callPackage ../tools/security/sn0int { }; snabb = callPackage ../tools/networking/snabb { } ; @@ -24835,12 +24833,6 @@ in bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; - btc1 = callPackage ../applications/blockchains/btc1.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - boost = boost165; - }; - btc1d = btc1.override { withGui = false; }; - btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e0b06c92b8..c5fcee60c13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6654,10 +6654,6 @@ in { smpplib = callPackage ../development/python-modules/smpplib { }; - smugline = callPackage ../development/python-modules/smugline { }; - - smugpy = callPackage ../development/python-modules/smugpy { }; - snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); snakebite = callPackage ../development/python-modules/snakebite { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index eacd2f5904c..5fc6e91b311 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -30,7 +30,7 @@ let jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; - #metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; + metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc { inherit pkgs nixpkgs; }; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };