diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a64b6918c499..50263b7ff7f0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -231,3 +231,8 @@
# Cinnamon
/pkgs/desktops/cinnamon @mkg20001
+
+#nim
+/pkgs/development/compilers/nim @ehmry
+/pkgs/development/nim-packages @ehmry
+/pkgs/top-level/nim-packages.nix @ehmry
diff --git a/.github/labeler.yml b/.github/labeler.yml
index ff831042461c..780843a2a553 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -72,6 +72,12 @@
- nixos/**/*
- pkgs/os-specific/linux/nixos-rebuild/**/*
+"6.topic: nim":
+ - doc/languages-frameworks/nim.section.md
+ - pkgs/development/compilers/nim/*
+ - pkgs/development/nim-packages/**/*
+ - pkgs/top-level/nim-packages.nix
+
"6.topic: ocaml":
- doc/languages-frameworks/ocaml.section.md
- pkgs/development/compilers/ocaml/**/*
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 29a1e089692f..b010f27cac02 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -23,6 +23,7 @@
+
diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md
new file mode 100644
index 000000000000..16dce61d71c9
--- /dev/null
+++ b/doc/languages-frameworks/nim.section.md
@@ -0,0 +1,91 @@
+# Nim {#nim}
+
+## Overview {#nim-overview}
+
+The Nim compiler, a builder function, and some packaged libraries are available
+in Nixpkgs. Until now each compiler release has been effectively backwards
+compatible so only the latest version is available.
+
+## Nim program packages in Nixpkgs {#nim-program-packages-in-nixpkgs}
+
+Nim programs can be built using `nimPackages.buildNimPackage`. In the
+case of packages not containing exported library code the attribute
+`nimBinOnly` should be set to `true`.
+
+The following example shows a Nim program that depends only on Nim libraries:
+
+```nix
+{ lib, nimPackages, fetchurl }:
+
+nimPackages.buildNimPackage rec {
+ pname = "hottext";
+ version = "1.4";
+
+ nimBinOnly = true;
+
+ src = fetchurl {
+ url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz";
+ sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY=";
+ };
+
+ buildInputs = with nimPackages; [
+ bumpy
+ chroma
+ flatty
+ nimsimd
+ pixie
+ sdl2
+ typography
+ vmath
+ zippy
+ ];
+}
+
+```
+
+## Nim library packages in Nixpkgs {#nim-library-packages-in-nixpkgs}
+
+
+Nim libraries can also be built using `nimPackages.buildNimPackage`, but
+often the product of a fetcher is sufficient to satisfy a dependency.
+The `fetchgit`, `fetchFromGitHub`, and `fetchNimble` functions yield an
+output that can be discovered during the `configurePhase` of `buildNimPackage`.
+
+Nim library packages are listed in
+[pkgs/top-level/nim-packages.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/nim-packages.nix) and implemented at
+[pkgs/development/nim-packages](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/nim-packages).
+
+The following example shows a Nim library that propagates a dependency on a
+non-Nim package:
+```nix
+{ lib, buildNimPackage, fetchNimble, SDL2 }:
+
+buildNimPackage rec {
+ pname = "sdl2";
+ version = "2.0.4";
+ src = fetchNimble {
+ inherit pname version;
+ hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
+ };
+ propagatedBuildInputs = [ SDL2 ];
+}
+```
+
+## `buildNimPackage` parameters {#buildnimpackage-parameters}
+
+All parameters from `stdenv.mkDerivation` function are still supported. The
+following are specific to `buildNimPackage`:
+
+* `nimBinOnly ? false`: If `true` then build only the programs listed in
+ the Nimble file in the packages sources.
+* `nimbleFile`: Specify the Nimble file location of the package being built
+ rather than discover the file at build-time.
+* `nimRelease ? true`: Build the package in *release* mode.
+* `nimDefines ? []`: A list of Nim defines. Key-value tuples are not supported.
+* `nimFlags ? []`: A list of command line arguments to pass to the Nim compiler.
+ Use this to specify defines with arguments in the form of `-d:${name}=${value}`.
+* `nimDoc` ? false`: Build and install HTML documentation.
+
+* `buildInputs` ? []: The packages listed here will be searched for `*.nimble`
+ files which are used to populate the Nim library path. Otherwise the standard
+ behavior is in effect.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 393be185b05a..9da7544cf944 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2743,6 +2743,12 @@
githubId = 40633781;
name = "Sergei S.";
};
+ dit7ya = {
+ email = "7rat13@gmail.com";
+ github = "dit7ya";
+ githubId = 14034137;
+ name = "Mostly Void";
+ };
dizfer = {
email = "david@izquierdofernandez.com";
github = "dizfer";
@@ -5189,6 +5195,12 @@
githubId = 9866621;
name = "Jack";
};
+ jkarlson = {
+ email = "jekarlson@gmail.com";
+ github = "jkarlson";
+ githubId = 1204734;
+ name = "Emil Karlson";
+ };
jlesquembre = {
email = "jl@lafuente.me";
github = "jlesquembre";
@@ -7667,6 +7679,12 @@
githubId = 6455574;
name = "Matt Votava";
};
+ mvs = {
+ email = "mvs@nya.yt";
+ github = "illdefined";
+ githubId = 772914;
+ name = "Mikael Voss";
+ };
maxwilson = {
email = "nixpkgs@maxwilson.dev";
github = "mwilsoncoding";
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index dc209e8add4e..ef7d53e7d927 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -111,7 +111,7 @@ in {
};
services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail
- security.wrappers.smtpctl // { program = "sendmail"; };
+ (security.wrappers.smtpctl // { program = "sendmail"; });
systemd.tmpfiles.rules = [
"d /var/spool/smtpd 711 root - - -"
diff --git a/nixos/modules/services/misc/safeeyes.nix b/nixos/modules/services/misc/safeeyes.nix
index 1e748195e41a..638218d8bb00 100644
--- a/nixos/modules/services/misc/safeeyes.nix
+++ b/nixos/modules/services/misc/safeeyes.nix
@@ -26,12 +26,16 @@ in
config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.safeeyes ];
+
systemd.user.services.safeeyes = {
description = "Safeeyes";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
+ path = [ pkgs.alsa-utils ];
+
startLimitIntervalSec = 350;
startLimitBurst = 10;
serviceConfig = {
diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix
index 2738a865346e..74ed00dc5aea 100644
--- a/pkgs/applications/audio/ptcollab/default.nix
+++ b/pkgs/applications/audio/ptcollab/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "ptcollab";
- version = "0.4.2";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "yuxshao";
repo = "ptcollab";
rev = "v${version}";
- sha256 = "sha256-AeIjc+FoFsTcyWl261GvyySIHP107rL4JkuMXFhnPbk=";
+ sha256 = "sha256-bFFWPl7yaTwCKz7/f9Vk6mg0roUnig0dFERS4IE4R7g=";
};
nativeBuildInputs = [ qmake pkg-config ];
diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix
index f4d1b0852591..c8068d682237 100644
--- a/pkgs/applications/misc/grsync/default.nix
+++ b/pkgs/applications/misc/grsync/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }:
+{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync }:
stdenv.mkDerivation rec {
- version = "1.2.8";
+ version = "1.3.0";
pname = "grsync";
src = fetchurl {
url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz";
- sha256 = "1c86jch73cy7ig9k4shvcd3jnaxk7jppfcr8nmkz8gbylsn5zsll";
+ sha256 = "sha256-t8fGpi4FMC2DF8OHQefXHvmrRjnuW/8mIqODsgQ6Nfw=";
};
nativeBuildInputs = [
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [
dee
- gtk2
- libdbusmenu-gtk2
+ gtk3
+ libdbusmenu-gtk3
libunity
rsync
];
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index 179ebd33d856..c188e5f78532 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -57,6 +57,9 @@ in buildPythonApplication rec {
# safeeyes images
--prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share"
)
+ mkdir -p $out/share/applications
+ cp -r safeeyes/platform/icons $out/share/
+ cp safeeyes/platform/safeeyes.desktop $out/share/applications/
'';
doCheck = false; # no tests
diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix
index a242a520fc45..7e27acbeff70 100644
--- a/pkgs/applications/misc/skytemple/default.nix
+++ b/pkgs/applications/misc/skytemple/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "skytemple";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "03qmjp257rk4p1zkz89cv26awdgngvakqyg6jc3g6xrhmsvr4r2p";
+ sha256 = "13vvsp47frgq5c2wfllkg4lmsy5vxl53j5rw9c84d5xix5bisk1n";
};
buildInputs = [
@@ -41,6 +41,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://github.com/SkyTemple/skytemple";
description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ xfix ];
+ maintainers = with maintainers; [ xfix marius851000 ];
};
}
diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/networking/browsers/angelfish/default.nix
index 391993617da2..dedc51469670 100644
--- a/pkgs/applications/networking/browsers/angelfish/default.nix
+++ b/pkgs/applications/networking/browsers/angelfish/default.nix
@@ -20,17 +20,17 @@
mkDerivation rec {
pname = "angelfish";
- version = "21.06";
+ version = "21.08";
src = fetchurl {
url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz";
- sha256 = "sha256-iHgmG/DeaUPnRXlVIU8P/oUcYINienYmR2zI9Q4Yd3s=";
+ sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- sha256 = "0zh0kli7kav18v9znq2f5jklhf3m1kyb41jzmivjx70g9xyfzlwk";
+ sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak";
};
nativeBuildInputs = [
@@ -63,7 +63,7 @@ mkDerivation rec {
meta = with lib; {
description = "Web browser for Plasma Mobile";
- homepage = "https://apps.kde.org/en/mobile.angelfish";
+ homepage = "https://invent.kde.org/plasma-mobile/angelfish";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index ea59b5ecf280..a33c261bf245 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -2,24 +2,25 @@
let
version = "0.17.2";
+ sha256 = "0kcdx4ldnshk4pqq37a7p08xr5cpsjrbrifk9fc3jbiw39m09mhf";
+ manifestsSha256 = "1v6md4xh4sq1vmb5a8qvb66l101fq75lmv2s4j2z3walssb5mmgj";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
- sha256 = "1v6md4xh4sq1vmb5a8qvb66l101fq75lmv2s4j2z3walssb5mmgj";
+ sha256 = manifestsSha256;
stripRoot = false;
};
in
buildGoModule rec {
- inherit version;
-
pname = "fluxcd";
+ inherit version;
src = fetchFromGitHub {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
- sha256 = "0kcdx4ldnshk4pqq37a7p08xr5cpsjrbrifk9fc3jbiw39m09mhf";
+ inherit sha256;
};
vendorSha256 = "sha256-glifJ0V3RwS7E6EWZsCa88m0MK883RhPSXCsAmMggVs=";
@@ -50,6 +51,8 @@ buildGoModule rec {
done
'';
+ passthru.updateScript = ./update.sh;
+
meta = with lib; {
description = "Open and extensible continuous delivery solution for Kubernetes";
longDescription = ''
diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh
new file mode 100755
index 000000000000..f463370e669a
--- /dev/null
+++ b/pkgs/applications/networking/cluster/fluxcd/update.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnugrep gnused jq
+
+set -eu -o pipefail
+
+cd $(dirname "${BASH_SOURCE[0]}")
+
+TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
+
+VERSION=$(echo ${TAG} | sed 's/^v//')
+
+SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${TAG}.tar.gz)
+
+SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz)
+
+setKV () {
+ sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix
+}
+
+setKV version ${VERSION}
+setKV sha256 ${SHA256}
+setKV manifestsSha256 ${SPEC_SHA256}
+setKV vendorSha256 ""
+
+cd ../../../../../
+set +e
+VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's/ //g')
+set -e
+
+cd - > /dev/null
+setKV vendorSha256 ${VENDOR_SHA256}
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 07ac0730face..90deecab89ad 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -20,13 +20,13 @@ let
"${electron}/bin/electron";
in nodePackages.deltachat-desktop.override rec {
pname = "deltachat-desktop";
- version = "1.21.1";
+ version = "1.22.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
- sha256 = "0d59z0mvi70i26d79s4h0sssclwcakidhvhq56zi78bkfqlx7xf1";
+ sha256 = "0wrwjblpw3f5ky697b2nhi9lisn4q5bl05086fdkx5v5j2ghz3n9";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
index 19cb53f6daa0..0090bce0fad4 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
@@ -1,6 +1,6 @@
{
"name": "deltachat-desktop",
- "version": "1.21.1",
+ "version": "1.22.1",
"dependencies": {
"@blueprintjs/core": "^3.22.3",
"@mapbox/geojson-extent": "^1.0.0",
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ab1704681299..b499f01d88fd 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,5 +1,4 @@
{ branch ? "stable", pkgs }:
-# Generated by ./update-discord.sh
let
inherit (pkgs) callPackage fetchurl;
in {
@@ -7,30 +6,30 @@ in {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
- version = "0.0.15";
+ version = "0.0.16";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
- sha256 = "0pn2qczim79hqk2limgh88fsn93sa8wvana74mpdk5n6x5afkvdd";
+ sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk=";
};
};
ptb = callPackage ./base.nix rec {
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
- version = "0.0.25";
+ version = "0.0.26";
src = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
- sha256 = "082ygmsycicddpkv5s03vw3rjkrk4lgprq29z8b1hdjifvw93b21";
+ sha256 = "1rlj76yhxjwwfmdln3azjr69hvfx1bjqdg9jhdn4fp6mlirkrcq4";
};
};
canary = callPackage ./base.nix rec {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.130";
+ version = "0.0.131";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "sha256-UamSiwjR68Pfm3uyHaI871VaGwIKJ5DShl8uE3rvX+U=";
+ sha256 = "087rzyivk0grhc73v7ldxxghks0n16ifrvpmk95vzaw99l9xv0v5";
};
};
}.${branch}
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index d8f53f4b2566..299ba0765cde 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
- version = "1.8.15";
+ version = "1.8.16";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "sha256-ImXcY56/Lt8waf/+CjvXZ0n4tY9AAdXN6uGYc5SQmc4=";
+ sha256 = "1n271yr83grpki9szdirnk6wb5rcc319f0gmfabyw3fzyf4msjy0";
};
patches = [
diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/applications/radio/kappanhang/default.nix
new file mode 100644
index 000000000000..a236de8d9468
--- /dev/null
+++ b/pkgs/applications/radio/kappanhang/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub, pkg-config, pulseaudio }:
+
+buildGoModule rec {
+ pname = "kappanhang";
+ version = "1.3";
+
+ src = fetchFromGitHub {
+ owner = "nonoo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ pulseaudio ];
+
+ vendorSha256 = "1srjngcis42wfskwfqxxj101y9xyzrans1smy53bh1c9zm856xha";
+
+ meta = with lib; {
+ homepage = "https://github.com/nonoo/kappanhang";
+ description = "Remote control for Icom radio transceivers";
+ license = licenses.mit;
+ maintainers = with maintainers; [ mvs ];
+ };
+}
diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix
index cf3ea143cedf..c7e76b6ad923 100644
--- a/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/pkgs/applications/science/astronomy/kstars/default.nix
@@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kstars";
- version = "3.5.4";
+ version = "3.5.5";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
- sha256 = "sha256-JCdSYcogvoUmu+vB/vye+6ZMIJqVoScAKreh89dxoDU=";
+ sha256 = "sha256-cD31YFBnKvEPyBQils6qJxNKagDoIi8/Znfxj/Gsa0M=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@@ -33,11 +33,6 @@ mkDerivation rec {
cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver
];
- # See https://bugs.kde.org/show_bug.cgi?id=439541
- preConfigure = ''
- rm po/de/docs/kstars/index.docbook
- '';
-
cmakeFlags = [
"-DINDI_PREFIX=${indi-full}"
"-DXPLANET_PREFIX=${xplanet}"
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 715f2ea313b4..b6cc5e406153 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -1,23 +1,9 @@
-{lib, stdenv, fetchFromGitHub, nim, htslib, pcre}:
+{lib, nimPackages, fetchFromGitHub, pcre}:
-let
- hts-nim = fetchFromGitHub {
- owner = "brentp";
- repo = "hts-nim";
- rev = "v0.3.4";
- sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
- };
-
- docopt = fetchFromGitHub {
- owner = "docopt";
- repo = "docopt.nim";
- rev = "v0.6.7";
- sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37";
- };
-
-in stdenv.mkDerivation rec {
+nimPackages.buildNimPackage rec {
pname = "mosdepth";
version = "0.3.2";
+ nimBinOnly = true;
src = fetchFromGitHub {
owner = "brentp";
@@ -26,15 +12,7 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ=";
};
- nativeBuildInputs = [ nim ];
- buildInputs = [ htslib pcre ];
-
- buildPhase = ''
- HOME=$TMPDIR
- nim -p:${hts-nim}/src -p:${docopt}/src c --nilseqs:on -d:release mosdepth.nim
- '';
-
- installPhase = "install -Dt $out/bin mosdepth";
+ buildInputs = with nimPackages; [ docopt hts-nim pcre ];
meta = with lib; {
description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing";
diff --git a/pkgs/applications/terminal-emulators/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix
index bb09fa776b62..0e0d75ab8012 100644
--- a/pkgs/applications/terminal-emulators/nimmm/default.nix
+++ b/pkgs/applications/terminal-emulators/nimmm/default.nix
@@ -1,30 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, nim, termbox, pcre }:
+{ lib, nimPackages, fetchFromGitHub, nim, termbox, pcre }:
-let
- noise = fetchFromGitHub {
- owner = "jangko";
- repo = "nim-noise";
- rev = "v0.1.14";
- sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449";
- };
-
- nimbox = fetchFromGitHub {
- owner = "dom96";
- repo = "nimbox";
- rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b";
- sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1";
- };
-
- lscolors = fetchFromGitHub {
- owner = "joachimschmidt557";
- repo = "nim-lscolors";
- rev = "v0.3.3";
- sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4";
- };
-
-in stdenv.mkDerivation rec {
+nimPackages.buildNimPackage rec {
pname = "nimmm";
version = "0.2.0";
+ nimBinOnly = true;
src = fetchFromGitHub {
owner = "joachimschmidt557";
@@ -33,17 +12,8 @@ in stdenv.mkDerivation rec {
sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg";
};
- nativeBuildInputs = [ nim ];
- buildInputs = [ termbox pcre ];
-
- buildPhase = ''
- export HOME=$TMPDIR;
- nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim
- '';
-
- installPhase = ''
- install -Dt $out/bin src/nimmm
- '';
+ buildInputs = [ termbox pcre ]
+ ++ (with nimPackages; [ noise nimbox lscolors ]);
meta = with lib; {
description = "Terminal file manager written in nim";
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index b560b02d435c..fbbc59359db8 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -4,23 +4,24 @@
, pkg-config
, glib
, glibc
+, libseccomp
, systemd
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "conmon";
- version = "2.0.29";
+ version = "2.0.30";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Idt+bN9Lf6GEjdGC/sM9Ln1ohXhUy78CrmJxSDA2Y0o=";
+ sha256 = "sha256-NZMuHhQyo+95QTJcR79cyZr86ytkbo4nmaqTF0Bdt+s=";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib systemd ]
+ buildInputs = [ glib libseccomp systemd ]
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
# manpage requires building the vendored go-md2man
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 49e18097ab9a..7434347f2a28 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,8 +1,9 @@
# https://nim-lang.github.io/Nim/packaging.html
# https://nim-lang.org/docs/nimc.html
-{ lib, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub, makeWrapper
-, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped }:
+{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub
+, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped
+, nimble-unwrapped }:
let
parseCpu = platform:
@@ -186,138 +187,141 @@ in {
nim' = buildPackages.nim-unwrapped;
nimble' = buildPackages.nimble-unwrapped;
inherit (stdenv) targetPlatform;
- in stdenv.mkDerivation {
- name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
- inherit (nim') version;
- preferLocalBuild = true;
- strictDeps = true;
+ self = stdenv.mkDerivation {
+ name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
+ inherit (nim') version;
+ preferLocalBuild = true;
+ strictDeps = true;
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
- patches = [
- ./nim.cfg.patch
- # Remove configurations that clash with ours
- ];
+ patches = [
+ ./nim.cfg.patch
+ # Remove configurations that clash with ours
+ ];
- unpackPhase = ''
- runHook preUnpack
- tar xf ${nim'.src} nim-$version/config
- cd nim-$version
- runHook postUnpack
- '';
-
- dontConfigure = true;
-
- buildPhase =
- # Configure the Nim compiler to use $CC and $CXX as backends
- # The compiler is configured by two configuration files, each with
- # a different DSL. The order of evaluation matters and that order
- # is not documented, so duplicate the configuration across both files.
- ''
- runHook preBuild
- cat >> config/config.nims << WTF
-
- switch("os", "${nimTarget.os}")
- switch("cpu", "${nimTarget.cpu}")
- switch("define", "nixbuild")
-
- # Configure the compiler using the $CC set by Nix at build time
- import strutils
- let cc = getEnv"CC"
- if cc.contains("gcc"):
- switch("cc", "gcc")
- elif cc.contains("clang"):
- switch("cc", "clang")
- WTF
-
- mv config/nim.cfg config/nim.cfg.old
- cat > config/nim.cfg << WTF
- os = "${nimTarget.os}"
- cpu = "${nimTarget.cpu}"
- define:"nixbuild"
- WTF
-
- cat >> config/nim.cfg < config/nim.cfg.old
- rm config/nim.cfg.old
-
- cat >> config/nim.cfg << WTF
-
- clang.cpp.exe %= "\$CXX"
- clang.cpp.linkerexe %= "\$CXX"
- clang.exe %= "\$CC"
- clang.linkerexe %= "\$CC"
- gcc.cpp.exe %= "\$CXX"
- gcc.cpp.linkerexe %= "\$CXX"
- gcc.exe %= "\$CC"
- gcc.linkerexe %= "\$CC"
- WTF
-
- runHook postBuild
+ unpackPhase = ''
+ runHook preUnpack
+ tar xf ${nim'.src} nim-$version/config
+ cd nim-$version
+ runHook postUnpack
'';
- wrapperArgs = [
- "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
- placeholder "out"
- }/bin"
- # Used by nim-gdb
+ dontConfigure = true;
- "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
- # These libraries may be referred to by the standard library.
- # This is broken for cross-compilation because the package
- # set will be shifted back by nativeBuildInputs.
+ buildPhase =
+ # Configure the Nim compiler to use $CC and $CXX as backends
+ # The compiler is configured by two configuration files, each with
+ # a different DSL. The order of evaluation matters and that order
+ # is not documented, so duplicate the configuration across both files.
+ ''
+ runHook preBuild
+ cat >> config/config.nims << WTF
- "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
- # Use the custom configuration
+ switch("os", "${nimTarget.os}")
+ switch("cpu", "${nimTarget.cpu}")
+ switch("define", "nixbuild")
- ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
- # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
- ];
+ # Configure the compiler using the $CC set by Nix at build time
+ import strutils
+ let cc = getEnv"CC"
+ if cc.contains("gcc"):
+ switch("cc", "gcc")
+ elif cc.contains("clang"):
+ switch("cc", "clang")
+ WTF
- installPhase = ''
- runHook preInstall
+ mv config/nim.cfg config/nim.cfg.old
+ cat > config/nim.cfg << WTF
+ os = "${nimTarget.os}"
+ cpu = "${nimTarget.cpu}"
+ define:"nixbuild"
+ WTF
- mkdir -p $out/bin $out/etc
+ cat >> config/nim.cfg < config/nim.cfg.old
+ rm config/nim.cfg.old
- cp -r config $out/etc/nim
+ cat >> config/nim.cfg << WTF
+
+ clang.cpp.exe %= "\$CXX"
+ clang.cpp.linkerexe %= "\$CXX"
+ clang.exe %= "\$CC"
+ clang.linkerexe %= "\$CC"
+ gcc.cpp.exe %= "\$CXX"
+ gcc.cpp.linkerexe %= "\$CXX"
+ gcc.exe %= "\$CC"
+ gcc.linkerexe %= "\$CC"
+ WTF
+
+ runHook postBuild
+ '';
+
+ wrapperArgs = [
+ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
+ placeholder "out"
+ }/bin"
+ # Used by nim-gdb
+
+ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
+ # These libraries may be referred to by the standard library.
+ # This is broken for cross-compilation because the package
+ # set will be shifted back by nativeBuildInputs.
+
+ "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
+ # Use the custom configuration
+
+ ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
+ # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/etc
+
+ cp -r config $out/etc/nim
+
+ for binpath in ${nim'}/bin/nim?*; do
+ local binname=`basename $binpath`
+ makeWrapper \
+ $binpath $out/bin/${targetPlatform.config}-$binname \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
+ done
- for binpath in ${nim'}/bin/nim?*; do
- local binname=`basename $binpath`
makeWrapper \
- $binpath $out/bin/${targetPlatform.config}-$binname \
+ ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
+ --set-default CC $(command -v $CC) \
+ --set-default CXX $(command -v $CXX) \
$wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
- done
+ ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
- makeWrapper \
- ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
- --set-default CC $(command -v $CC) \
- --set-default CXX $(command -v $CXX) \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
+ makeWrapper \
+ ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
- makeWrapper \
- ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
+ makeWrapper \
+ ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
+ --suffix PATH : $out/bin
+ ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
- makeWrapper \
- ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
- --suffix PATH : $out/bin
- ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
+ runHook postInstall
+ '';
- runHook postInstall
- '';
+ passthru = {
+ nim = nim';
+ nimble = nimble';
+ };
- passthru = {
- nim = nim';
- nimble = nimble';
- };
-
- meta = nim'.meta // {
- description = nim'.meta.description
- + " (${targetPlatform.config} wrapper)";
- platforms = with lib.platforms; unix ++ genode;
+ meta = nim'.meta // {
+ description = nim'.meta.description
+ + " (${targetPlatform.config} wrapper)";
+ platforms = with lib.platforms; unix ++ genode;
+ };
};
+ in self // {
+ pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; };
};
}
diff --git a/pkgs/development/interpreters/npiet/default.nix b/pkgs/development/interpreters/npiet/default.nix
new file mode 100644
index 000000000000..c0e2c3ade292
--- /dev/null
+++ b/pkgs/development/interpreters/npiet/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, stdenv
+, fetchurl
+, gd
+, giflib
+, groff
+, libpng
+, tk
+}:
+
+stdenv.mkDerivation rec {
+ pname = "npiet";
+ version = "1.3f";
+
+ src = fetchurl {
+ url = "https://www.bertnase.de/npiet/npiet-${version}.tar.gz";
+ sha256 = "sha256-Le2FYGKr1zWZ6F4edozmvGC6LbItx9aptidj3KBLhVo=";
+ };
+
+ buildInputs = [ gd giflib libpng ];
+
+ nativeBuildInputs = [ groff ];
+
+ postPatch = ''
+ # malloc.h is not needed because stdlib.h is already included.
+ # On macOS, malloc.h does not even exist, resulting in an error.
+ substituteInPlace npiet-foogol.c \
+ --replace '#include ' ""
+
+ substituteInPlace npietedit \
+ --replace 'exec wish' 'exec ${tk}/bin/wish'
+ '';
+
+ meta = with lib; {
+ description = "An interpreter for piet programs. Also includes npietedit and npiet-foogol";
+ longDescription = ''
+ npiet is an interpreter for the piet programming language.
+ Instead of text, piet programs are pictures. Commands are determined based on changes in color.
+ '';
+ homepage = "https://www.bertnase.de/npiet/";
+ license = licenses.gpl2Only;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ Luflosi ];
+ };
+}
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index c9ccff7dea63..dcb0fc070475 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation (rec {
pname = "folly";
- version = "2021.09.13.00";
+ version = "2021.09.20.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "sha256-UZfCGvhi6cWUUa56GIYMOgFHn3Ifu9uIHs983SbZCcY=";
+ sha256 = "sha256-aFTFUtRQOGCDR3pbpw1ViuMFm02GSq04u9GgE9pq33A=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 1e2938d3a8e0..45fe337d8588 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped
-, libiberty, zlib
+, libiberty, libintl, zlib
}:
stdenv.mkDerivation {
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
strictDeps = true;
nativeBuildInputs = [ autoreconfHook bison ];
- buildInputs = [ libiberty zlib.dev ];
+ buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ];
configurePlatforms = [ "build" "host" ];
configureFlags = [
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 5a6a0dff5e37..0d82acc70929 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -179,6 +179,7 @@ stdenv.mkDerivation {
''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"''
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
+ ++ lib.optional stdenv.isLinux "-DUSE_X11"
++ lib.optionals withGtk3 [
''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
diff --git a/pkgs/development/nim-packages/astpatternmatching/default.nix b/pkgs/development/nim-packages/astpatternmatching/default.nix
new file mode 100644
index 000000000000..6f1137ac7045
--- /dev/null
+++ b/pkgs/development/nim-packages/astpatternmatching/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "krux02";
+ repo = "ast-pattern-matching";
+ rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96";
+ sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq";
+}
diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix
new file mode 100644
index 000000000000..6c7aafd22c81
--- /dev/null
+++ b/pkgs/development/nim-packages/build-nim-package/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, nim, nim_builder }:
+
+{ strictDeps ? true, nativeBuildInputs ? [ ], configurePhase ? null
+, buildPhase ? null, checkPhase ? null, installPhase ? null, meta ? { }, ...
+}@attrs:
+
+stdenv.mkDerivation (attrs // {
+ inherit strictDeps;
+ nativeBuildInputs = [ nim nim_builder ] ++ nativeBuildInputs;
+
+ configurePhase = if isNull configurePhase then ''
+ runHook preConfigure
+ find $NIX_BUILD_TOP -name .attrs.json
+ nim_builder --phase:configure
+ runHook postConfigure
+ '' else
+ buildPhase;
+
+ buildPhase = if isNull buildPhase then ''
+ runHook preBuild
+ nim_builder --phase:build
+ runHook postBuild
+ '' else
+ buildPhase;
+
+ checkPhase = if isNull checkPhase then ''
+ runHook preCheck
+ nim_builder --phase:check
+ runHook postCheck
+ '' else
+ checkPhase;
+
+ installPhase = if isNull installPhase then ''
+ runHook preInstall
+ nim_builder --phase:install
+ runHook postInstall
+ '' else
+ installPhase;
+
+ meta = meta // {
+ maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ];
+ };
+})
diff --git a/pkgs/development/nim-packages/bumpy/default.nix b/pkgs/development/nim-packages/bumpy/default.nix
new file mode 100644
index 000000000000..9579d87d9d5d
--- /dev/null
+++ b/pkgs/development/nim-packages/bumpy/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "bumpy";
+ version = "1.0.3";
+ hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0=";
+}
diff --git a/pkgs/development/nim-packages/c2nim/default.nix b/pkgs/development/nim-packages/c2nim/default.nix
new file mode 100644
index 000000000000..408e4fbee96e
--- /dev/null
+++ b/pkgs/development/nim-packages/c2nim/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildNimPackage, fetchFromGitHub, SDL2 }:
+
+buildNimPackage rec {
+ pname = "c2nim";
+ version = "0.9.18";
+ nimBinOnly = true;
+ src = fetchFromGitHub {
+ owner = "nim-lang";
+ repo = pname;
+ rev = version;
+ hash = "sha256-127ux36mfC+PnS2HIQffw+z0TSvzdQXnKRxqYV3XahU=";
+ };
+ meta = with lib;
+ src.meta // {
+ description = "Tool to translate Ansi C code to Nim";
+ license = licenses.mit;
+ maintainers = [ maintainers.ehmry ];
+ };
+}
diff --git a/pkgs/development/nim-packages/chroma/default.nix b/pkgs/development/nim-packages/chroma/default.nix
new file mode 100644
index 000000000000..266cd0645f36
--- /dev/null
+++ b/pkgs/development/nim-packages/chroma/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "chroma";
+ version = "0.2.5";
+ hash = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8=";
+}
diff --git a/pkgs/development/nim-packages/docopt/default.nix b/pkgs/development/nim-packages/docopt/default.nix
new file mode 100644
index 000000000000..38465384fbde
--- /dev/null
+++ b/pkgs/development/nim-packages/docopt/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "docopt";
+ repo = "docopt.nim";
+ rev = "v0.6.7";
+ sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37";
+}
diff --git a/pkgs/development/nim-packages/fetch-nimble/builder.sh b/pkgs/development/nim-packages/fetch-nimble/builder.sh
new file mode 100644
index 000000000000..693ab339408e
--- /dev/null
+++ b/pkgs/development/nim-packages/fetch-nimble/builder.sh
@@ -0,0 +1,12 @@
+source $stdenv/setup
+export HOME=$NIX_BUILD_TOP
+
+nimble --accept --noSSLCheck develop "${pkgname}@${version}"
+# TODO: bring in the certificates for Nimble to verify the fetch of
+# the package list.
+
+pkgdir=${NIX_BUILD_TOP}/${pkgname}
+
+find "$pkgdir" -name .git -print0 | xargs -0 rm -rf
+
+cp -a "$pkgdir" "$out"
diff --git a/pkgs/development/nim-packages/fetch-nimble/default.nix b/pkgs/development/nim-packages/fetch-nimble/default.nix
new file mode 100644
index 000000000000..ccdacc8e27b9
--- /dev/null
+++ b/pkgs/development/nim-packages/fetch-nimble/default.nix
@@ -0,0 +1,20 @@
+{ lib, makeOverridable, stdenv, gitMinimal, nim, cacert }:
+
+makeOverridable (
+
+ { pname, version, hash ? lib.fakeHash,
+
+ meta ? { }, passthru ? { }, preferLocalBuild ? true }:
+ stdenv.mkDerivation {
+ inherit version meta passthru preferLocalBuild;
+ pname = pname + "-src";
+ pkgname = pname;
+ builder = ./builder.sh;
+ nativeBuildInputs = [ gitMinimal nim ];
+ outputHash = hash;
+ outputHashAlgo = null;
+ outputHashMode = "recursive";
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars
+ ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ];
+ GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ })
diff --git a/pkgs/development/nim-packages/flatty/default.nix b/pkgs/development/nim-packages/flatty/default.nix
new file mode 100644
index 000000000000..241b59f8230f
--- /dev/null
+++ b/pkgs/development/nim-packages/flatty/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "flatty";
+ version = "0.2.1";
+ hash = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0=";
+}
diff --git a/pkgs/development/nim-packages/frosty/default.nix b/pkgs/development/nim-packages/frosty/default.nix
new file mode 100644
index 000000000000..6394c455d07f
--- /dev/null
+++ b/pkgs/development/nim-packages/frosty/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "disruptek";
+ repo = "frosty";
+ rev = "0.3.1";
+ sha256 = "0hd6484ihjgl57gmqyp5xfq5prycb49k0313fqky600mhz71nmyz";
+}
diff --git a/pkgs/development/nim-packages/hts-nim/default.nix b/pkgs/development/nim-packages/hts-nim/default.nix
new file mode 100644
index 000000000000..960a9e63d215
--- /dev/null
+++ b/pkgs/development/nim-packages/hts-nim/default.nix
@@ -0,0 +1,13 @@
+{ buildNimPackage, fetchFromGitHub, htslib }:
+
+buildNimPackage rec {
+ pname = "hts-nim";
+ version = "0.3.4";
+ src = fetchFromGitHub {
+ owner = "brentp";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
+ };
+ propagatedBuildInputs = [ htslib ];
+}
diff --git a/pkgs/development/nim-packages/jester/default.nix b/pkgs/development/nim-packages/jester/default.nix
new file mode 100644
index 000000000000..21646f3667f0
--- /dev/null
+++ b/pkgs/development/nim-packages/jester/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "dom96";
+ repo = "jester";
+ rev = "v0.5.0";
+ sha256 = "0m8a4ss4460jd2lcbqcbdd68jhcy35xg7qdyr95mh8rflwvmcvhk";
+}
diff --git a/pkgs/development/nim-packages/jsonschema/default.nix b/pkgs/development/nim-packages/jsonschema/default.nix
new file mode 100644
index 000000000000..8dc195b8b822
--- /dev/null
+++ b/pkgs/development/nim-packages/jsonschema/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "PMunch";
+ repo = "jsonschema";
+ rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf";
+ sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz";
+}
diff --git a/pkgs/development/nim-packages/karax/default.nix b/pkgs/development/nim-packages/karax/default.nix
new file mode 100644
index 000000000000..35a5c78ee56a
--- /dev/null
+++ b/pkgs/development/nim-packages/karax/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "karaxnim";
+ repo = "karax";
+ rev = "1.1.2";
+ sha256 = "07ykrd21hd76vlmkqpvv5xvaxw6aaq87bky47p2420ni85a6d94j";
+}
diff --git a/pkgs/development/nim-packages/lscolors/default.nix b/pkgs/development/nim-packages/lscolors/default.nix
new file mode 100644
index 000000000000..5a72c46e4c50
--- /dev/null
+++ b/pkgs/development/nim-packages/lscolors/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "joachimschmidt557";
+ repo = "nim-lscolors";
+ rev = "v0.3.3";
+ sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4";
+}
diff --git a/pkgs/development/nim-packages/markdown/default.nix b/pkgs/development/nim-packages/markdown/default.nix
new file mode 100644
index 000000000000..c893ff0e4148
--- /dev/null
+++ b/pkgs/development/nim-packages/markdown/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "soasme";
+ repo = "nim-markdown";
+ rev = "abdbe5e";
+ sha256 = "0f3c1sxvhbbds43c9l8cz69pfpf984msj1lv4pb7bzpxb5zil2wy";
+}
diff --git a/pkgs/development/nim-packages/nim_builder/default.nix b/pkgs/development/nim-packages/nim_builder/default.nix
new file mode 100644
index 000000000000..34da4dfa61a0
--- /dev/null
+++ b/pkgs/development/nim-packages/nim_builder/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, nim }:
+
+stdenv.mkDerivation {
+ pname = "nim_builder";
+ inherit (nim) version;
+ dontUnpack = true;
+ nativeBuildInputs = [ nim ];
+ buildPhase = ''
+ cp ${./nim_builder.nim} nim_builder.nim
+ nim c --nimcache:$TMPDIR nim_builder
+ '';
+ installPhase = ''
+ install -Dt $out/bin nim_builder
+ '';
+ meta = {
+ description = "Internal Nixpkgs utility for buildNimPackage.";
+ maintainers = [ lib.maintainers.ehmry ];
+ };
+}
diff --git a/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/pkgs/development/nim-packages/nim_builder/nim_builder.nim
new file mode 100644
index 000000000000..b8881b700047
--- /dev/null
+++ b/pkgs/development/nim-packages/nim_builder/nim_builder.nim
@@ -0,0 +1,166 @@
+# SPDX-FileCopyrightText: 2021 Nixpkgs/NixOS contributors
+## Custom Nim builder for Nixpkgs.
+
+import std/[os, osproc, parseutils, sequtils, streams, strutils]
+
+proc findNimbleFile(): string =
+ ## Copied from Nimble.
+ ## Copyright (c) 2015, Dominik Picheta
+ ## BSD3
+ let dir = getCurrentDir()
+ result = ""
+ var hits = 0
+ for kind, path in walkDir(dir):
+ if kind in {pcFile, pcLinkToFile}:
+ let ext = path.splitFile.ext
+ if ext == ".nimble":
+ result = path
+ inc hits
+ if hits >= 2:
+ quit("Only one .nimble file should be present in " & dir)
+ elif hits == 0:
+ quit("Could not find a file with a .nimble extension in " & dir)
+
+proc getEnvBool(key: string; default = false): bool =
+ ## Parse a boolean environmental variable.
+ let val = getEnv(key)
+ if val == "": default
+ else: parseBool(val)
+
+proc getNimbleFilePath(): string =
+ ## Get the Nimble file for the current package.
+ if existsEnv"nimbleFile":
+ getEnv"nimbleFile"
+ else:
+ findNimbleFile()
+
+proc getNimbleValue(filePath, key: string; default = ""): string =
+ ## Extract a string value from the Nimble file at ``filePath``.
+ var
+ fs = newFileStream(filePath, fmRead)
+ line: string
+ if fs.isNil:
+ quit("could not open " & filePath)
+ while fs.readline(line):
+ if line.startsWith(key):
+ var i = key.len
+ i.inc skipWhile(line, Whitespace, i)
+ if line[i] == '=':
+ inc i
+ i.inc skipWhile(line, Whitespace, i)
+ discard parseUntil(line, result, Newlines, i)
+ if result.len > 0 and result[0] == '"':
+ result = result.unescape
+ return
+ default
+
+proc getNimbleValues(filePath, key: string): seq[string] =
+ ## Extract a string sequence from the Nimble file at ``filePath``.
+ var gunk = getNimbleValue(filePath, key)
+ result = gunk.strip(chars = {'@', '[', ']'}).split(',')
+ if result == @[""]: reset result
+ apply(result) do (s: var string):
+ s = s.strip()
+ if s.len > 0 and s[0] == '"':
+ s = s.unescape()
+
+proc configurePhase*() =
+ ## Generate "config.nims" which will be read by the Nim
+ ## compiler during later phases.
+ const configFilePath = "config.nims"
+ echo "generating ", configFilePath
+ let
+ nf = getNimbleFilePath()
+ mode =
+ if fileExists configFilePath: fmAppend
+ else: fmWrite
+ var cfg = newFileStream(configFilePath, mode)
+ proc switch(key, val: string) =
+ cfg.writeLine("switch(", key.escape, ",", val.escape, ")")
+ switch("backend", nf.getNimbleValue("backend", "c"))
+ switch("nimcache", getEnv("NIX_BUILD_TOP", ".") / "nimcache")
+ if getEnvBool("nimRelease", true):
+ switch("define", "release")
+ for def in getEnv("nimDefines").split:
+ if def != "":
+ switch("define", def)
+ for input in getEnv("buildInputs").split:
+ if input != "":
+ for nimbleFile in walkFiles(input / "*.nimble"):
+ let inputSrc = normalizedPath(
+ input / nimbleFile.getNimbleValue("srcDir", "."))
+ echo "found nimble input ", inputSrc
+ switch("path", inputSrc)
+ close(cfg)
+
+proc buildPhase*() =
+ ## Build the programs listed in the Nimble file and
+ ## optionally some documentation.
+ var cmds: seq[string]
+ proc before(idx: int) =
+ echo "build job ", idx, ": ", cmds[idx]
+ let
+ nf = getNimbleFilePath()
+ bins = nf.getNimbleValues("bin")
+ srcDir = nf.getNimbleValue("srcDir", ".")
+ binDir = getenv("outputBin", getenv("out", "/dev/null")) / "bin"
+ if bins != @[]:
+ for bin in bins:
+ cmds.add("nim compile $# --outdir:$# $#" %
+ [getenv"nimFlags", binDir, normalizedPath(srcDir / bin)])
+ if getEnvBool"nimDoc":
+ echo "generating documentation"
+ let docDir = getenv("outputDoc", (getenv("out", "/dev/null") / "doc"))
+ for path in walkFiles(srcDir / "*.nim"):
+ cmds.add("nim doc --outdir:$# $#" % [docDir, path])
+ if cmds.len > 0:
+ let err = execProcesses(
+ cmds, n = 1,
+ beforeRunEvent = before)
+ if err != 0: quit("build phase failed", err)
+
+proc installPhase*() =
+ ## Install the Nim sources if ``nimBinOnly`` is not
+ ## set in the environment.
+ if not getEnvBool"nimBinOnly":
+ let
+ nf = getNimbleFilePath()
+ srcDir = nf.getNimbleValue("srcDir", ".")
+ devDir = getenv("outputDev", getenv("out", "/dev/null"))
+ echo "Install ", srcDir, " to ", devDir
+ copyDir(normalizedPath(srcDir), normalizedPath(devDir / srcDir))
+ copyFile(nf, devDir / nf.extractFilename)
+
+proc checkPhase*() =
+ ## Build and run the tests in ``tests``.
+ var cmds: seq[string]
+ proc before(idx: int) =
+ echo "check job ", idx, ": ", cmds[idx]
+ for path in walkPattern("tests/t*.nim"):
+ cmds.add("nim r $#" % [path])
+ let err = execProcesses(
+ cmds, n = 1,
+ beforeRunEvent = before)
+ if err != 0: quit("check phase failed", err)
+
+when isMainModule:
+ import std/parseopt
+ var phase: string
+
+ for kind, key, val in getopt():
+ case kind
+ of cmdLongOption:
+ case key.toLowerAscii
+ of "phase":
+ if phase != "": quit("only a single phase may be specified")
+ phase = val
+ else: quit("unhandled argument " & key)
+ of cmdEnd: discard
+ else: quit("unhandled argument " & key)
+
+ case phase
+ of "configure": configurePhase()
+ of "build": buildPhase()
+ of "install": installPhase()
+ of "check": checkPhase()
+ else: quit("unhandled phase " & phase)
diff --git a/pkgs/development/nim-packages/nimbox/default.nix b/pkgs/development/nim-packages/nimbox/default.nix
new file mode 100644
index 000000000000..53663c642810
--- /dev/null
+++ b/pkgs/development/nim-packages/nimbox/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "dom96";
+ repo = "nimbox";
+ rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b";
+ sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1";
+}
diff --git a/pkgs/development/nim-packages/nimcrypto/default.nix b/pkgs/development/nim-packages/nimcrypto/default.nix
new file mode 100644
index 000000000000..6c212ef45f1a
--- /dev/null
+++ b/pkgs/development/nim-packages/nimcrypto/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "cheatfate";
+ repo = "nimcrypto";
+ rev = "a5742a9a214ac33f91615f3862c7b099aec43b00";
+ sha256 = "0al0jsaicm8vyr63n909dq1glhvpra1n9sllmj0r7lsjsdb59wsz";
+}
diff --git a/pkgs/development/nim-packages/nimsimd/default.nix b/pkgs/development/nim-packages/nimsimd/default.nix
new file mode 100644
index 000000000000..9ccd96453572
--- /dev/null
+++ b/pkgs/development/nim-packages/nimsimd/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "nimsimd";
+ version = "1.0.0";
+ hash = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo=";
+}
diff --git a/pkgs/development/nim-packages/noise/default.nix b/pkgs/development/nim-packages/noise/default.nix
new file mode 100644
index 000000000000..7931467dbbd5
--- /dev/null
+++ b/pkgs/development/nim-packages/noise/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "jangko";
+ repo = "nim-noise";
+ rev = "v0.1.14";
+ sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449";
+}
diff --git a/pkgs/development/nim-packages/packedjson/default.nix b/pkgs/development/nim-packages/packedjson/default.nix
new file mode 100644
index 000000000000..9edad962d589
--- /dev/null
+++ b/pkgs/development/nim-packages/packedjson/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "Araq";
+ repo = "packedjson";
+ rev = "7198cc8";
+ sha256 = "1ay2zd88q8hvpvigsg8h0y5vc65hk3lk0d48fy9hwg4lcng19mp1";
+}
diff --git a/pkgs/development/nim-packages/pixie/default.nix b/pkgs/development/nim-packages/pixie/default.nix
new file mode 100644
index 000000000000..2262ccf23721
--- /dev/null
+++ b/pkgs/development/nim-packages/pixie/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "pixie";
+ version = "1.1.3";
+ hash = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA=";
+}
diff --git a/pkgs/development/nim-packages/redis/default.nix b/pkgs/development/nim-packages/redis/default.nix
new file mode 100644
index 000000000000..1768bf1976f5
--- /dev/null
+++ b/pkgs/development/nim-packages/redis/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "zedeus";
+ repo = "redis";
+ rev = "94bcbf1";
+ sha256 = "1p9zv4f4lqrjqa8fk98cb89b9fzlf866jc584ll9sws14904i80j";
+}
diff --git a/pkgs/development/nim-packages/redpool/default.nix b/pkgs/development/nim-packages/redpool/default.nix
new file mode 100644
index 000000000000..ef14854b32dc
--- /dev/null
+++ b/pkgs/development/nim-packages/redpool/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "zedeus";
+ repo = "redpool";
+ rev = "57aeb25";
+ sha256 = "0fph7qlia6fvya1zqzbgvww2hk5pd0vq1wlf9ij9jyn655mg0w3q";
+}
diff --git a/pkgs/development/nim-packages/regex/default.nix b/pkgs/development/nim-packages/regex/default.nix
new file mode 100644
index 000000000000..d89fbdd60538
--- /dev/null
+++ b/pkgs/development/nim-packages/regex/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "nitely";
+ repo = "nim-regex";
+ rev = "2e32fdc";
+ sha256 = "1hrl40mwql7nh4wc7sdhmk8bj5728b93v5a93j49v660l0rn4qx8";
+}
diff --git a/pkgs/development/nim-packages/sass/default.nix b/pkgs/development/nim-packages/sass/default.nix
new file mode 100644
index 000000000000..79885ed9ec5a
--- /dev/null
+++ b/pkgs/development/nim-packages/sass/default.nix
@@ -0,0 +1,13 @@
+{ buildNimPackage, fetchFromGitHub, libsass }:
+
+buildNimPackage rec {
+ pname = "sass";
+ version = "e683aa1";
+ src = fetchFromGitHub {
+ owner = "dom96";
+ repo = pname;
+ rev = version;
+ sha256 = "0qvly5rilsqqsyvr67pqhglm55ndc4nd6v90jwswbnigxiqf79lc";
+ };
+ propagatedBuildInputs = [ libsass ];
+}
diff --git a/pkgs/development/nim-packages/sdl2/default.nix b/pkgs/development/nim-packages/sdl2/default.nix
new file mode 100644
index 000000000000..ddcdf072c6b4
--- /dev/null
+++ b/pkgs/development/nim-packages/sdl2/default.nix
@@ -0,0 +1,17 @@
+{ lib, buildNimPackage, fetchNimble, SDL2 }:
+
+buildNimPackage rec {
+ pname = "sdl2";
+ version = "2.0.4";
+ src = fetchNimble {
+ inherit pname version;
+ hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
+ };
+ propagatedBuildInputs = [ SDL2 ];
+ doCheck = true;
+ meta = {
+ description = "Nim wrapper for SDL 2.x";
+ platforms = lib.platforms.linux; # Problems with Darwin.
+ license = [ lib.licenses.mit ];
+ };
+}
diff --git a/pkgs/development/nim-packages/segmentation/default.nix b/pkgs/development/nim-packages/segmentation/default.nix
new file mode 100644
index 000000000000..c695cd00ca92
--- /dev/null
+++ b/pkgs/development/nim-packages/segmentation/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "nitely";
+ repo = "nim-segmentation";
+ rev = "v0.1.0";
+ sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh";
+}
diff --git a/pkgs/development/nim-packages/supersnappy/default.nix b/pkgs/development/nim-packages/supersnappy/default.nix
new file mode 100644
index 000000000000..471543eca411
--- /dev/null
+++ b/pkgs/development/nim-packages/supersnappy/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "guzba";
+ repo = "supersnappy";
+ rev = "1.1.5";
+ sha256 = "1y26sgnszvdf5sn7j0jx2dpd4i03mvbk9i9ni9kbyrs798bjwi6z";
+}
diff --git a/pkgs/development/nim-packages/typography/default.nix b/pkgs/development/nim-packages/typography/default.nix
new file mode 100644
index 000000000000..59037cbd9dd3
--- /dev/null
+++ b/pkgs/development/nim-packages/typography/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "typography";
+ version = "0.7.9";
+ hash = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU=";
+}
diff --git a/pkgs/development/nim-packages/unicodedb/default.nix b/pkgs/development/nim-packages/unicodedb/default.nix
new file mode 100644
index 000000000000..8b60710e8210
--- /dev/null
+++ b/pkgs/development/nim-packages/unicodedb/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "nitely";
+ repo = "nim-unicodedb";
+ rev = "v0.9.0";
+ sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq";
+}
diff --git a/pkgs/development/nim-packages/unicodeplus/default.nix b/pkgs/development/nim-packages/unicodeplus/default.nix
new file mode 100644
index 000000000000..772524eaf94b
--- /dev/null
+++ b/pkgs/development/nim-packages/unicodeplus/default.nix
@@ -0,0 +1,8 @@
+{ fetchFromGitHub }:
+
+fetchFromGitHub {
+ owner = "nitely";
+ repo = "nim-unicodeplus";
+ rev = "v0.8.0";
+ sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk";
+}
diff --git a/pkgs/development/nim-packages/vmath/default.nix b/pkgs/development/nim-packages/vmath/default.nix
new file mode 100644
index 000000000000..9ca48c43d7f4
--- /dev/null
+++ b/pkgs/development/nim-packages/vmath/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "vmath";
+ version = "1.0.3";
+ hash = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0=";
+}
diff --git a/pkgs/development/nim-packages/zippy/default.nix b/pkgs/development/nim-packages/zippy/default.nix
new file mode 100644
index 000000000000..230892b68899
--- /dev/null
+++ b/pkgs/development/nim-packages/zippy/default.nix
@@ -0,0 +1,7 @@
+{ fetchNimble }:
+
+fetchNimble {
+ pname = "zippy";
+ version = "0.5.6";
+ hash = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4=";
+}
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 2feb1c772237..8f23587bb642 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2209,22 +2209,22 @@ let
sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==";
};
};
- "@expo/config-5.0.9" = {
+ "@expo/config-6.0.0" = {
name = "_at_expo_slash_config";
packageName = "@expo/config";
- version = "5.0.9";
+ version = "6.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/config/-/config-5.0.9.tgz";
- sha512 = "eZj+cf03wkQQdHSpYvrmiqAsn2dJV10uhHIwXyeFBaFvhds0NgThOldJZfOppQ4QUaGobB/vaJ7UqUa3B0PCMw==";
+ url = "https://registry.npmjs.org/@expo/config/-/config-6.0.0.tgz";
+ sha512 = "pL4ZZbue6oU4Prcxew96Vpg2OApD5IE8Otk+eIKZKo0aS5BGnWEic/GszXLOAhPgGiHyP/jmylQ+GPNztz1TUA==";
};
};
- "@expo/config-plugins-3.1.0" = {
+ "@expo/config-plugins-4.0.0" = {
name = "_at_expo_slash_config-plugins";
packageName = "@expo/config-plugins";
- version = "3.1.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.1.0.tgz";
- sha512 = "V5qxaxCAExBM0TXmbU1QKiZcAGP3ecu7KXede8vByT15cro5PkcWu2sSdJCYbHQ/gw6Vf/i8sr8gKlN8V8TSLg==";
+ url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.0.tgz";
+ sha512 = "6pNLI8L8oV4MfyM/w2DDx9zvzO258Jl2QfDdHI+T1QAAShupqzXdqjkRMj6+6n3CrUaeqUadSMnjqSTUF9XZlQ==";
};
};
"@expo/config-types-42.0.0" = {
@@ -2236,22 +2236,22 @@ let
sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w==";
};
};
- "@expo/dev-server-0.1.84" = {
+ "@expo/dev-server-0.1.85" = {
name = "_at_expo_slash_dev-server";
packageName = "@expo/dev-server";
- version = "0.1.84";
+ version = "0.1.85";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.84.tgz";
- sha512 = "6N5Vw8PZgnXvjdXm0Lo7v68nIeoPtIV8+G2YGtImaIw4SRshLaTidKefkJNH+JmvXMyEwqLG02xFAQa/I2v3jA==";
+ url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.85.tgz";
+ sha512 = "Jz8kqbpdBBx01Pu00eXy/ZfEz7hTeaQRwRsyQndVdDIUYddb0R/NI/m1aCk+JdnIZv1Et5krgw/ADdDUwWz6kQ==";
};
};
- "@expo/dev-tools-0.13.115" = {
+ "@expo/dev-tools-0.13.116" = {
name = "_at_expo_slash_dev-tools";
packageName = "@expo/dev-tools";
- version = "0.13.115";
+ version = "0.13.116";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.115.tgz";
- sha512 = "wxA7SuWXEHrQDn/9Z8E3JnLicUSZvdSMtq++5KAFIKndOlTZ6KC9oGwlsgXzBPktQUHUMglaRxgSmx5fOKPJGQ==";
+ url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.116.tgz";
+ sha512 = "n+H/2JgFmYxPxiJJcpzKJDziJJ3omj0rROJAVrfMaZSHvrL6qf/nFDXm4UDaFQvw+oHSkrz9vJaSIKVYm6Gwow==";
};
};
"@expo/devcert-1.0.0" = {
@@ -2281,13 +2281,13 @@ let
sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg==";
};
};
- "@expo/metro-config-0.1.84" = {
+ "@expo/metro-config-0.2.0" = {
name = "_at_expo_slash_metro-config";
packageName = "@expo/metro-config";
- version = "0.1.84";
+ version = "0.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.84.tgz";
- sha512 = "xWSfM0+AxcKw0H8mc1RuKs4Yy4JT4SJfn4yDnGLAlKkHlEC+D2seZvb/Tdd173e/LANmcarNd+OcDYu03AmVWA==";
+ url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.2.0.tgz";
+ sha512 = "p2N8V/zByM1e7YmBSWQ7eUAs6ALYFMjSa2ebMwJUr2i63b1p9A7aInGOP3rCgEiroRcwdyTIq/tUQC4rlsNRWw==";
};
};
"@expo/osascript-2.0.30" = {
@@ -2308,22 +2308,22 @@ let
sha512 = "guFnGAiNLW/JsienEq3NkZk5khTP+RdT/czk/teJUiYLkBy0hLmMTJsNXurGgFwI33+ScEbDvFmN5IOEBGpUDQ==";
};
};
- "@expo/plist-0.0.14" = {
+ "@expo/plist-0.0.15" = {
name = "_at_expo_slash_plist";
packageName = "@expo/plist";
- version = "0.0.14";
+ version = "0.0.15";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.14.tgz";
- sha512 = "bb4Ua1M/OdNgS8KiGdSDUjZ/bbPfv3xdPY/lz8Ctp/adlj/QgB8xA7tVPeqSSfJPZqFRwU0qLCnRhpUOnP51VQ==";
+ url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.15.tgz";
+ sha512 = "LDxiS0KNZAGJu4fIJhbEKczmb+zeftl1NU0LE0tj0mozoMI5HSKdMUchgvnBm35bwBl8ekKkAfJJ0ONxljWQjQ==";
};
};
- "@expo/prebuild-config-2.1.0" = {
+ "@expo/prebuild-config-3.0.0" = {
name = "_at_expo_slash_prebuild-config";
packageName = "@expo/prebuild-config";
- version = "2.1.0";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.1.0.tgz";
- sha512 = "obpbnV0+Otv7Dbx8kkbSd62xL9HYZRDPdmdcVWuML7lv7Zo4r+OyS6vYpUmln9htp0gtjuc6+X9FiC74bbGkVA==";
+ url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.0.tgz";
+ sha512 = "/6Un2nN9oiL2IVGDin00wwJfEGZbG4IRe/ycBeZbCIA5xux+ovVaiuGNJklTvlUVRxSboG5mXWt+drfa0GUwtw==";
};
};
"@expo/results-1.0.0" = {
@@ -2371,13 +2371,13 @@ let
sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==";
};
};
- "@expo/webpack-config-0.15.0" = {
+ "@expo/webpack-config-0.16.0" = {
name = "_at_expo_slash_webpack-config";
packageName = "@expo/webpack-config";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.15.0.tgz";
- sha512 = "AcZiRs+7RwHM05uR4qdTGAU6kpQRPZ3U0yedtVe391i4NRM80sBe+sIc7LuhFN9aZL89+ZjqN3fDoA0ZNIgIfQ==";
+ url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.0.tgz";
+ sha512 = "IwzXvzvjd5+Zc10+3K6fvjY3d5ECEH81fukka0qRyIHgCtxivl2tBlJftAQB3tfN3L32xeNTbj6iKXtAolCDvQ==";
};
};
"@expo/xcpretty-3.1.4" = {
@@ -2569,13 +2569,13 @@ let
sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ==";
};
};
- "@graphql-tools/import-6.4.0" = {
+ "@graphql-tools/import-6.4.1" = {
name = "_at_graphql-tools_slash_import";
packageName = "@graphql-tools/import";
- version = "6.4.0";
+ version = "6.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.4.0.tgz";
- sha512 = "jfE01oPcmc4vzAcYLs6xT7XC4jJWrM1HNtIwc7HyyHTxrC3nf36XrF3txEZ2l20GT53+OWnMgYx1HhauLGdJmA==";
+ url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.4.1.tgz";
+ sha512 = "nFWo2dI9XXs0hsBscHnTSJNfgFq2gA1bw0qbCXyQga1PJclZViO8SxcHqCf2JmShRpTFsyzsDjKA8xGKDDs8PQ==";
};
};
"@graphql-tools/json-file-loader-6.2.6" = {
@@ -2623,13 +2623,13 @@ let
sha512 = "kFLd4kKNJXYXnKIhM8q9zgGAtbLmsy3WmGdDxYq3YHBJUogucAxnivQYyRIseUq37KGmSAIWu3pBQ23TKGsGOw==";
};
};
- "@graphql-tools/mock-8.3.1" = {
+ "@graphql-tools/mock-8.4.0" = {
name = "_at_graphql-tools_slash_mock";
packageName = "@graphql-tools/mock";
- version = "8.3.1";
+ version = "8.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.3.1.tgz";
- sha512 = "iJ3GeQ10Vqa0Tg4QJHiulxUUI4r84RAvltM3Sc+XPj07QlrLzMHOHO/goO7FC4TN2/HVncj7pWHwrmLPT9du/Q==";
+ url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.4.0.tgz";
+ sha512 = "RKcqmw7P5pC2ULh2/kg/erxxsd7lEV/wnI5jNgahkCw8wiSC8OI3SwNMwjfrlpYogs7eEhiXi7Ix6abCiFUURw==";
};
};
"@graphql-tools/schema-7.1.5" = {
@@ -2686,13 +2686,13 @@ let
sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==";
};
};
- "@graphql-tools/utils-8.2.2" = {
+ "@graphql-tools/utils-8.2.3" = {
name = "_at_graphql-tools_slash_utils";
packageName = "@graphql-tools/utils";
- version = "8.2.2";
+ version = "8.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.2.2.tgz";
- sha512 = "29FFY5U4lpXuBiW9dRvuWnBVwGhWbGLa2leZcAMU/Pz47Cr/QLZGVgpLBV9rt+Gbs7wyIJM7t7EuksPs0RDm3g==";
+ url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.2.3.tgz";
+ sha512 = "RR+aiusf2gIfnPmrDIH1uA45QuPiHB54RD+BmWyMcl88tWAjeJtqZeWPqUTq/1EXrNeocJAJQqogHV4Fbbzx3A==";
};
};
"@graphql-tools/wrap-7.0.8" = {
@@ -3991,13 +3991,13 @@ let
sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==";
};
};
- "@microsoft/load-themed-styles-1.10.212" = {
+ "@microsoft/load-themed-styles-1.10.214" = {
name = "_at_microsoft_slash_load-themed-styles";
packageName = "@microsoft/load-themed-styles";
- version = "1.10.212";
+ version = "1.10.214";
src = fetchurl {
- url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.212.tgz";
- sha512 = "92kEfM+8eFg35DNnlxumrscxctwCM9aXExIha4WbAm03k7C69rFer3e7op5cszWBHTwbw9LZJLqQ165pPlWgCQ==";
+ url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.214.tgz";
+ sha512 = "Bv3nSwBF0po+VbmFfbHzkCectTW9bjd1Pi6jq8WPNI83w7dgfMcPj18npfZGM2UqKNeykW7Sb/Y2Lr718dy4FQ==";
};
};
"@mitmaro/errors-1.0.0" = {
@@ -4072,13 +4072,13 @@ let
sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
};
};
- "@netlify/build-18.11.2" = {
+ "@netlify/build-18.12.0" = {
name = "_at_netlify_slash_build";
packageName = "@netlify/build";
- version = "18.11.2";
+ version = "18.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/build/-/build-18.11.2.tgz";
- sha512 = "YwqABbzBZ0eSbltdDYXvyp6YoZxh4KoMCayxiOQvRUTGFDVky8EBZkR9Fcvvcb14TIaYQd8PK3xV7SJk2QKtzQ==";
+ url = "https://registry.npmjs.org/@netlify/build/-/build-18.12.0.tgz";
+ sha512 = "PkITXAq3l5pyL5bG6JLGnwYPOi5SIr+n/9YbOcZZdoUIiLa4mTBUjee3y3lcsNUOLduMVkF4PTVLHz6F/6tyNA==";
};
};
"@netlify/cache-utils-2.0.3" = {
@@ -4666,13 +4666,22 @@ let
sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==";
};
};
- "@octokit/openapi-types-10.2.2" = {
+ "@octokit/openapi-types-10.3.0" = {
name = "_at_octokit_slash_openapi-types";
packageName = "@octokit/openapi-types";
- version = "10.2.2";
+ version = "10.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.2.2.tgz";
- sha512 = "EVcXQ+ZrC04cg17AMg1ofocWMxHDn17cB66ZHgYc0eUwjFtxS0oBzkyw2VqIrHBwVgtfoYrq1WMQfQmMjUwthw==";
+ url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.3.0.tgz";
+ sha512 = "mThN3aLK9BXPKdVUNxmQLv6nCJMmp7mrfTNvw9NevzvXhM3ObGg6NWsAfCtP6t3fCcpNhkL1fwbbm4pF55DmXg==";
+ };
+ };
+ "@octokit/openapi-types-10.4.0" = {
+ name = "_at_octokit_slash_openapi-types";
+ packageName = "@octokit/openapi-types";
+ version = "10.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.4.0.tgz";
+ sha512 = "iA88Ke8FKnQ/HdAJ8J5X2mSwkp6zKCyKqXC161z7Xgnh0kJWWXXcDr8MNxkkGfPkaZ9RhnlDjKCoAasAvTTb1A==";
};
};
"@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -4702,13 +4711,13 @@ let
sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==";
};
};
- "@octokit/plugin-rest-endpoint-methods-5.10.4" = {
+ "@octokit/plugin-rest-endpoint-methods-5.11.0" = {
name = "_at_octokit_slash_plugin-rest-endpoint-methods";
packageName = "@octokit/plugin-rest-endpoint-methods";
- version = "5.10.4";
+ version = "5.11.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.10.4.tgz";
- sha512 = "Dh+EAMCYR9RUHwQChH94Skl0lM8Fh99auT8ggck/xTzjJrwVzvsd0YH68oRPqp/HxICzmUjLfaQ9sy1o1sfIiA==";
+ url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.11.0.tgz";
+ sha512 = "K7kbhfv7ZBMQK7j/3wEA0Sr/aic2OZr6XB2qQvmJzgP0eSPsAHUxEtiYFzHuCBgtQKoygylofhv/6Q+Hw5colw==";
};
};
"@octokit/plugin-retry-3.0.9" = {
@@ -4747,13 +4756,22 @@ let
sha512 = "esHR5OKy38bccL/sajHqZudZCvmv4yjovMJzyXlphaUo7xykmtOdILGJ3aAm0mFHmMLmPFmDMJXf39cAjNJsrw==";
};
};
- "@octokit/types-6.28.1" = {
+ "@octokit/types-6.29.0" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "6.28.1";
+ version = "6.29.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-6.28.1.tgz";
- sha512 = "XlxDoQLFO5JnFZgKVQTYTvXRsQFfr/GwDUU108NJ9R5yFPkA2qXhTJjYuul3vE4eLXP40FA2nysOu2zd6boE+w==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-6.29.0.tgz";
+ sha512 = "+6DczLm2ryGbMmJspCA26gt0OGonhCwVrp9wqku486SCo6/SjbI2ipbJm8TSKWuQ6LJgftRC+Q236v6tVgaa1w==";
+ };
+ };
+ "@octokit/types-6.30.0" = {
+ name = "_at_octokit_slash_types";
+ packageName = "@octokit/types";
+ version = "6.30.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/types/-/types-6.30.0.tgz";
+ sha512 = "aQ8kUJLOwbIXP9Sz1fDGsdNf9cLiOmvim3gUgRmDOJVwTV3/JfKawQi2W2csku9mAzaalER+DYhsjyaqnmVcSw==";
};
};
"@opencensus/core-0.0.8" = {
@@ -5152,13 +5170,13 @@ let
sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ==";
};
};
- "@pm2/agent-2.0.0" = {
+ "@pm2/agent-2.0.1" = {
name = "_at_pm2_slash_agent";
packageName = "@pm2/agent";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.0.tgz";
- sha512 = "W1LvdyF1tGaVU5f/hV8DjpI5joI7MEgXiQMLZnTwZlFwDVP00O9s86571Q8xSiweTcFZFyye0F4wORN/PjSgGA==";
+ url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.1.tgz";
+ sha512 = "QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw==";
};
};
"@pm2/io-5.0.0" = {
@@ -5296,13 +5314,13 @@ let
sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570";
};
};
- "@putdotio/api-client-8.17.0" = {
+ "@putdotio/api-client-8.18.0" = {
name = "_at_putdotio_slash_api-client";
packageName = "@putdotio/api-client";
- version = "8.17.0";
+ version = "8.18.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.17.0.tgz";
- sha512 = "iLLe3tgQd9W8ZMbfaMXIzoWj/wc5xg5cwys5WEV39RDRL5x7uP6YvELJ0QDNxQTX9S+bT6SzwJiBEmX8DADPHA==";
+ url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.18.0.tgz";
+ sha512 = "EpIGWaGI6t3uy3hP1XUUURCZ5ma+9fiknqFu1IL7wemJoBLz0wVpAmZxv+sKo32RtI+qfQwrA3ZKoCNFPaEGXA==";
};
};
"@reach/router-1.3.4" = {
@@ -5341,6 +5359,15 @@ let
sha512 = "XOX5w98oSE8+KnkMZZPMRT7I5TaP8fLbDl0tCu40S7Epz+Zz924n80fmdu6nUDIfPT1nV6yH1hmHmWAWTDOR+Q==";
};
};
+ "@react-native/normalize-color-2.0.0" = {
+ name = "_at_react-native_slash_normalize-color";
+ packageName = "@react-native/normalize-color";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@react-native/normalize-color/-/normalize-color-2.0.0.tgz";
+ sha512 = "Wip/xsc5lw8vsBlmY2MO/gFLp3MvuZ2baBZjDeTjjndMgM0h5sxz7AZR62RDPGgstp8Np7JzjvVqVT7tpFZqsw==";
+ };
+ };
"@redocly/ajv-8.6.2" = {
name = "_at_redocly_slash_ajv";
packageName = "@redocly/ajv";
@@ -5350,13 +5377,13 @@ let
sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w==";
};
};
- "@redocly/openapi-core-1.0.0-beta.60" = {
+ "@redocly/openapi-core-1.0.0-beta.61" = {
name = "_at_redocly_slash_openapi-core";
packageName = "@redocly/openapi-core";
- version = "1.0.0-beta.60";
+ version = "1.0.0-beta.61";
src = fetchurl {
- url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.60.tgz";
- sha512 = "XxpHcdIc50f/yqNu9zObo/gF2QVkWe1QqC6l7ju05bj35fhf2fUcx+XAroPeyJpEePCeT6FeM/rID40dM1c5Nw==";
+ url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.61.tgz";
+ sha512 = "/OgtozUxy7SvHVBZ3Iygu6brDTOFTOlkzpDQyykpa0lK2cPBeYjkJP5foBlHKeHl+TvxfPuzh1CSGSShSc+IBg==";
};
};
"@redocly/react-dropdown-aria-2.0.12" = {
@@ -5485,13 +5512,13 @@ let
sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
};
};
- "@serverless/components-3.17.0" = {
+ "@serverless/components-3.17.1" = {
name = "_at_serverless_slash_components";
packageName = "@serverless/components";
- version = "3.17.0";
+ version = "3.17.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.0.tgz";
- sha512 = "F0ReVFmwnbSDyH9PaifjrxvR0HvnKS37VyoEOCagj/31vGrksyrvuwI8BxC0YwPReRDb4n99+CtGkDsdGb9AQg==";
+ url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.1.tgz";
+ sha512 = "Ra0VVpivEWB816ZAca4UCNzOxQqxveEp4h+RzUX5vaAsZrxpotPUFZi96w9yZGQk3OTxxscRqrsBLxGDtOu8SA==";
};
};
"@serverless/core-1.1.2" = {
@@ -5566,13 +5593,13 @@ let
sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog==";
};
};
- "@serverless/utils-5.14.0" = {
+ "@serverless/utils-5.15.0" = {
name = "_at_serverless_slash_utils";
packageName = "@serverless/utils";
- version = "5.14.0";
+ version = "5.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.14.0.tgz";
- sha512 = "70DGJLQuPOxCP0sTqI0qqH1wJ3Zk7/D7OXZ+0ABMBeu+S/L5ZVF1/ZijauemxIA80TVOM9CeOuc/bUyfIFjP2g==";
+ url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.15.0.tgz";
+ sha512 = "KH7sHbTRWCPNewp3Jg+CmmDox82L1xqr18byex3R6s0nAHSNmNwKJl30fIS1Co4u9qKOLCl4/rWjtofKJTFbCg==";
};
};
"@serverless/utils-china-1.1.4" = {
@@ -6385,13 +6412,13 @@ let
sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A==";
};
};
- "@types/emoji-mart-3.0.5" = {
+ "@types/emoji-mart-3.0.6" = {
name = "_at_types_slash_emoji-mart";
packageName = "@types/emoji-mart";
- version = "3.0.5";
+ version = "3.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.5.tgz";
- sha512 = "bsMEXVPrasIJ03u61msIKMMiL7Hh6dGQ3Gcz3CjytTxTQKQRdf/g0owWTSSL5mvKNgu9UfgornrF6qqClPk1Jw==";
+ url = "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.6.tgz";
+ sha512 = "TbFLFkWvhZUeYkII94fB8bplhtRTUxekBjZehcKu7leq9gvg8IG7F9NBh0YJdH3XRiu+uk0Drviy+GzfcMkMCw==";
};
};
"@types/engine.io-3.1.7" = {
@@ -6511,13 +6538,13 @@ let
sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==";
};
};
- "@types/fs-extra-9.0.12" = {
+ "@types/fs-extra-9.0.13" = {
name = "_at_types_slash_fs-extra";
packageName = "@types/fs-extra";
- version = "9.0.12";
+ version = "9.0.13";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz";
- sha512 = "I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==";
+ url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz";
+ sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==";
};
};
"@types/geojson-7946.0.8" = {
@@ -6925,13 +6952,13 @@ let
sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==";
};
};
- "@types/node-12.20.25" = {
+ "@types/node-12.20.26" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "12.20.25";
+ version = "12.20.26";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-12.20.25.tgz";
- sha512 = "hcTWqk7DR/HrN9Xe7AlJwuCaL13Vcd9/g/T54YrJz4Q3ESM5mr33YCzW2bOfzSIc3aZMeGBvbLGvgN6mIJ0I5Q==";
+ url = "https://registry.npmjs.org/@types/node/-/node-12.20.26.tgz";
+ sha512 = "gIt+h4u2uTho2bsH1K250fUv5fHU71ET1yWT7bM4523zV/XrFb9jlWBOV4DO8FpscY+Sz/WEr1EEjIP2H4yumQ==";
};
};
"@types/node-14.11.1" = {
@@ -6943,13 +6970,13 @@ let
sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
};
};
- "@types/node-14.17.17" = {
+ "@types/node-14.17.18" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "14.17.17";
+ version = "14.17.18";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-14.17.17.tgz";
- sha512 = "niAjcewgEYvSPCZm3OaM9y6YQrL2SEPH9PymtE6fuZAvFiP6ereCcvApGl2jKTq7copTIguX3PBvfP08LN4LvQ==";
+ url = "https://registry.npmjs.org/@types/node/-/node-14.17.18.tgz";
+ sha512 = "haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA==";
};
};
"@types/node-15.14.9" = {
@@ -6997,13 +7024,13 @@ let
sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==";
};
};
- "@types/node-16.9.4" = {
+ "@types/node-16.9.6" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "16.9.4";
+ version = "16.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-16.9.4.tgz";
- sha512 = "KDazLNYAGIuJugdbULwFZULF9qQ13yNWEBFnfVpqlpgAAo6H/qnM9RjBgh0A0kmHf3XxAKLdN5mTIng9iUvVLA==";
+ url = "https://registry.npmjs.org/@types/node/-/node-16.9.6.tgz";
+ sha512 = "YHUZhBOMTM3mjFkXVcK+WwAcYmyhe1wL4lfqNtzI0b3qAy7yuSetnM7QJazgE5PFmgVTNGiLOgRFfJMqW7XpSQ==";
};
};
"@types/node-6.14.13" = {
@@ -7825,31 +7852,31 @@ let
sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA==";
};
};
- "@vue/compiler-core-3.2.12" = {
+ "@vue/compiler-core-3.2.13" = {
name = "_at_vue_slash_compiler-core";
packageName = "@vue/compiler-core";
- version = "3.2.12";
+ version = "3.2.13";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.12.tgz";
- sha512 = "IGJ0JmrAaAl5KBBegPAKkoXvsfDFgN/h7K1t/+0MxqpZF1fTDVUOp3tG7q9gWa7fwzGEaIsPhjtT5C3qztdLKg==";
+ url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.13.tgz";
+ sha512 = "H8MUuKVCfAT6C0vth/+1LAriKnM+RTFo/5MoFycwRPwworTvkpWq/EuGoIXdLBblo8Y2/bNsOmIBEEoOtrb/bQ==";
};
};
- "@vue/compiler-dom-3.2.12" = {
+ "@vue/compiler-dom-3.2.13" = {
name = "_at_vue_slash_compiler-dom";
packageName = "@vue/compiler-dom";
- version = "3.2.12";
+ version = "3.2.13";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.12.tgz";
- sha512 = "MulvKilA2USm8ubPfvXvNY55HVTn+zHERsXeNg437TXrmM4FRCis6zjWW47QZ3ZyxEkCdqOmuiFCtXbpnuthyw==";
+ url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.13.tgz";
+ sha512 = "5+2dYgQyNzM97EEgbdAusUpLjulcKkvLM26jOGpd14+qwEcW/KCnns5DGjlZD/tsdEwToOoTDCm+mjx7cO/G1Q==";
};
};
- "@vue/shared-3.2.12" = {
+ "@vue/shared-3.2.13" = {
name = "_at_vue_slash_shared";
packageName = "@vue/shared";
- version = "3.2.12";
+ version = "3.2.13";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.12.tgz";
- sha512 = "5CkaifUCJwcTuru7FDwKFacPJuEoGUTw0LKSa5bw40B23s0TS+MGlYR1285nbV/ju3QUGlA6d6PD+GJkWy7uFg==";
+ url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz";
+ sha512 = "F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==";
};
};
"@webassemblyjs/ast-1.11.1" = {
@@ -9490,15 +9517,6 @@ let
sha1 = "a78f1c98995087ad36192a41298e4db49e3dfc45";
};
};
- "analytics-node-3.5.0" = {
- name = "analytics-node";
- packageName = "analytics-node";
- version = "3.5.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/analytics-node/-/analytics-node-3.5.0.tgz";
- sha512 = "XgQq6ejZHCehUSnZS4V7QJPLIP7S9OAWwQDYl4WTLtsRvc5fCxIwzK/yihzmIW51v9PnyBmrl9dMcqvwfOE8WA==";
- };
- };
"anchor-markdown-header-0.5.7" = {
name = "anchor-markdown-header";
packageName = "anchor-markdown-header";
@@ -11191,13 +11209,13 @@ let
sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==";
};
};
- "async-append-only-log-3.0.11" = {
+ "async-append-only-log-3.1.0" = {
name = "async-append-only-log";
packageName = "async-append-only-log";
- version = "3.0.11";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.11.tgz";
- sha512 = "wAPal2HNuPe1UVkXl4DnHXjjFmBpdvuam98qNnN4F7OS4yppGIZrJEoqul0DMyd9g4LIGvhlgwfSI/wTi9zy8w==";
+ url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.0.tgz";
+ sha512 = "vEnzpbpfnMvWK7xweZ4mX+Y4H6eYMtEvVLctsLleXjN3lWewCcGxPxSAscBq05MxH3Veh7q9JHnOfuOIoeJYVw==";
};
};
"async-done-1.3.2" = {
@@ -11524,13 +11542,13 @@ let
sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg==";
};
};
- "aws-sdk-2.991.0" = {
+ "aws-sdk-2.992.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.991.0";
+ version = "2.992.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.991.0.tgz";
- sha512 = "TybluMJhRBZ0h5HGupHPTfamwtsJlW56HddJpMbsIjvmh4LGupajrkEwLQYW7osFXQ1S/xuE+0QIy6vWgOpT0g==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.992.0.tgz";
+ sha512 = "FP/AOu1nxfaPJ6to05eHriBUzvPiNapEwy96sm5GNOL8/T38k9//H6UhxLJ/46CzxFMH/Mo/WFp0qwpS39ev5A==";
};
};
"aws-sign2-0.6.0" = {
@@ -11884,13 +11902,13 @@ let
sha512 = "kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==";
};
};
- "babel-plugin-polyfill-corejs3-0.2.4" = {
+ "babel-plugin-polyfill-corejs3-0.2.5" = {
name = "babel-plugin-polyfill-corejs3";
packageName = "babel-plugin-polyfill-corejs3";
- version = "0.2.4";
+ version = "0.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz";
- sha512 = "z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==";
+ url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz";
+ sha512 = "ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==";
};
};
"babel-plugin-polyfill-regenerator-0.2.2" = {
@@ -13927,13 +13945,13 @@ let
sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
};
};
- "browserslist-4.17.0" = {
+ "browserslist-4.17.1" = {
name = "browserslist";
packageName = "browserslist";
- version = "4.17.0";
+ version = "4.17.1";
src = fetchurl {
- url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz";
- sha512 = "g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==";
+ url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.1.tgz";
+ sha512 = "aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ==";
};
};
"brq-0.1.8" = {
@@ -15134,13 +15152,13 @@ let
sha512 = "mThFg5t92Vu/pSpZVXppaokkSVIdFFnIN8pUoojIaiYL5gD1mG37IY1xt2+FDM6nncl1q6IzjKWipnGOoJYlcQ==";
};
};
- "cdk8s-plus-17-1.0.0-beta.74" = {
- name = "cdk8s-plus-17";
- packageName = "cdk8s-plus-17";
- version = "1.0.0-beta.74";
+ "cdk8s-plus-22-1.0.0-beta.1" = {
+ name = "cdk8s-plus-22";
+ packageName = "cdk8s-plus-22";
+ version = "1.0.0-beta.1";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.74.tgz";
- sha512 = "+7+iKqt9Ump9DUm91VouW2H9R7H7cBvbb/hPu8zRflC4OwvSZJb1ONzdUDLahqzFp+l2VQ0zcGMFfD8ONlFMjA==";
+ url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.1.tgz";
+ sha512 = "5wqpvujwBRwyCretKQGbhvBfuGWsxdKSZXavpTyNak2TMXPY/1voiUHcg8mDIbdmlgK7Nq5SIk0j9G3mV1BJ0A==";
};
};
"cdktf-0.6.2" = {
@@ -16070,13 +16088,13 @@ let
sha512 = "AXxiCe2a0Lm0VN+9L0jzmfQSkcZm5EYspfqXKaSIQKqIk+0hnkZ3/v1E9B39mkD6vYhKih3c/RPsJBSwq9O99Q==";
};
};
- "cli-progress-footer-2.0.2" = {
+ "cli-progress-footer-2.1.1" = {
name = "cli-progress-footer";
packageName = "cli-progress-footer";
- version = "2.0.2";
+ version = "2.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.0.2.tgz";
- sha512 = "FQbhQKqyRG463NbIj+XOIODJYNAf6juqIzZ5YvN1+25mvfWw+gdLzN/a64hYLlxr8OUlA5gzgxoqQTyKemko7g==";
+ url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.1.1.tgz";
+ sha512 = "fBEAKLDp/CCMzQSeEbvz4POvomCekmT0LodI/mchzrjIPeLXQHJ9Gb28leAqEjdc9wyV40cjsB2aWpvO5MA7Pw==";
};
};
"cli-spinner-0.2.10" = {
@@ -17645,15 +17663,6 @@ let
sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad";
};
};
- "consola-2.15.3" = {
- name = "consola";
- packageName = "consola";
- version = "2.15.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz";
- sha512 = "9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==";
- };
- };
"console-browserify-1.1.0" = {
name = "console-browserify";
packageName = "console-browserify";
@@ -17726,13 +17735,13 @@ let
sha512 = "IwOwekzrASFC3qt4ozCtV09rteAIAesuCGsW0p+uBfqHd2XcvA5CXqJjgf4eUqm6g8e/noXlVCMDWwC8GaLtrg==";
};
};
- "constructs-3.3.149" = {
+ "constructs-3.3.150" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.149";
+ version = "3.3.150";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.149.tgz";
- sha512 = "3xs+rn1+dd/HFERX3zhcJgY/acW/phSZba3Uxw3DVHDKIRT3qc2pE14GaPFTqstr41NkQfGnUvZwcqUgC8q/+Q==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.150.tgz";
+ sha512 = "i++Z38CgBF7kDsKJ2PtdRpXbqL4vwule8tSxcI/PkCbj6LXmokyr7givjzPavgfMhYncDB6J4RoBjfLFMOKRxA==";
};
};
"consume-http-header-1.0.0" = {
@@ -22110,31 +22119,31 @@ let
sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ==";
};
};
- "dockerfile-ast-0.3.2" = {
+ "dockerfile-ast-0.3.4" = {
name = "dockerfile-ast";
packageName = "dockerfile-ast";
- version = "0.3.2";
+ version = "0.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.2.tgz";
- sha512 = "xh5xPW7YohEr/NjqkQ4IW6hjzqlTh0GIwgNZ1ezwCWyU3IJgOaN2z5Vyh9rLMGfdY+5fQF38gkj8+y9l7I11VA==";
+ url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.4.tgz";
+ sha512 = "QjNH/VnTrWjlDekJtk5GBKbypcFUBdGexd+eOAeivwwSWky6bIJps1cw/qw1jU5K3TDMgtufAHaBh7OV5X/EqA==";
};
};
- "dockerfile-language-service-0.7.1" = {
+ "dockerfile-language-service-0.7.2" = {
name = "dockerfile-language-service";
packageName = "dockerfile-language-service";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.7.1.tgz";
- sha512 = "10utkoAyysjMJQaIGBE61qA1DRbm/+pwQfy/HzfHVgTY66JjbRKMrvW+qvHFhjC7nL/A2zMs90dvSOCMxIVD6w==";
+ url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.7.2.tgz";
+ sha512 = "kG2/HrdNz4Hp6O9F2akKSODufQ0BTwXE4hd4kCUOp99de47+r8GpWKOyqpJswr+kbvttPmxcnVdV8wT77c2p5g==";
};
};
- "dockerfile-utils-0.9.0" = {
+ "dockerfile-utils-0.9.2" = {
name = "dockerfile-utils";
packageName = "dockerfile-utils";
- version = "0.9.0";
+ version = "0.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.0.tgz";
- sha512 = "DIZO2fRVbRx5C9LcDZcF1FSFwMYYxQJ6NjLNlKtatQXO79+dAaWW+bvtBuiaUkhVgmWbkSfs0rpv/yr2X37cJw==";
+ url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.2.tgz";
+ sha512 = "QgcYXSZFBBbPuiQskEAVnW3qSShSCSisLNt2wQZXupBQ/x1lFIyvVfWXk4OQqWoatHyAfUBiXDNx9eRXkmSALQ==";
};
};
"doctoc-2.0.1" = {
@@ -22920,13 +22929,13 @@ let
sha512 = "9oxNmKlDCaf651c+yJWCDIBpF6A9aY+wQtasLEeR5AsPYPuOKEX6xHnC2+WgCLOC94JEpCZznecyC84fbwZq4A==";
};
};
- "electron-to-chromium-1.3.845" = {
+ "electron-to-chromium-1.3.846" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.845";
+ version = "1.3.846";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.845.tgz";
- sha512 = "y0RorqmExFDI4RjLEC6j365bIT5UAXf9WIRcknvSFHVhbC/dRnCgJnPA3DUUW6SCC85QGKEafgqcHJ6uPdEP1Q==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.846.tgz";
+ sha512 = "2jtSwgyiRzybHRxrc2nKI+39wH3AwQgn+sogQ+q814gv8hIFwrcZbV07Ea9f8AmK0ufPVZUvvAG1uZJ+obV4Jw==";
};
};
"electrum-client-git://github.com/janoside/electrum-client" = {
@@ -24857,13 +24866,13 @@ let
sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
};
};
- "expo-pwa-0.0.94" = {
+ "expo-pwa-0.0.95" = {
name = "expo-pwa";
packageName = "expo-pwa";
- version = "0.0.94";
+ version = "0.0.95";
src = fetchurl {
- url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.94.tgz";
- sha512 = "r/AYEtdRMrvPafgFxxIv7FXQQYgYFFm2YzxOVFBX2/ODs4HU/fNcxZ77kICn2jY9SHSmXps4TluHLpkr76Paxg==";
+ url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.95.tgz";
+ sha512 = "GV9rnBQ1HBwT2jPif11BoFdP9QXd0fFGq0QJd49U2/3UDT8IZIHj7np3StpbA6cz6h+l1aPo3jwXBB+kb/7xFQ==";
};
};
"express-2.5.11" = {
@@ -34183,13 +34192,13 @@ let
sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==";
};
};
- "js-base64-3.7.1" = {
+ "js-base64-3.7.2" = {
name = "js-base64";
packageName = "js-base64";
- version = "3.7.1";
+ version = "3.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.1.tgz";
- sha512 = "XyYXEUTP3ykPPnGPoesMr4yBygopit99iXW52yT1EWrkzwzvtAor/pbf+EBuDkwqSty7K10LeTjCkUn8c166aQ==";
+ url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz";
+ sha512 = "NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==";
};
};
"js-beautify-1.14.0" = {
@@ -34498,13 +34507,13 @@ let
sha512 = "GOGAy5b+zCGeyYziBoNVXgamL2CEZKMj5moeemkyN4AUHUqugNk3fSul2Zdbxs2S13Suk0D9iYAgChDxew0bOw==";
};
};
- "jsii-srcmak-0.1.350" = {
+ "jsii-srcmak-0.1.351" = {
name = "jsii-srcmak";
packageName = "jsii-srcmak";
- version = "0.1.350";
+ version = "0.1.351";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.350.tgz";
- sha512 = "SVrE9jpwomQc6S+nk0aETasXIrcH6vfORCgU6ROhUhsLzOMch00tOcE/HYcnCCOpIMqFfPPg77rzzT3c0bBJ0g==";
+ url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.351.tgz";
+ sha512 = "ZiXB7nvNrxylnbf8gUWgcHwciizWLGrVlO9xVdqoAOqAxSEwLPZk721nYwp7LHTi6c4HAiBtAHsNZC4Dd4As5Q==";
};
};
"json-bigint-1.0.0" = {
@@ -34795,13 +34804,13 @@ let
sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
};
};
- "json2jsii-0.2.26" = {
+ "json2jsii-0.2.27" = {
name = "json2jsii";
packageName = "json2jsii";
- version = "0.2.26";
+ version = "0.2.27";
src = fetchurl {
- url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.26.tgz";
- sha512 = "Xz6y4Ss4UG37rIjrYSWVjmhTCGoR6oIbCrD2Jn9KPccjCncz9upi5U11z4i4JUKu9DcYp8hfEgq0DQbw0YvLIA==";
+ url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.27.tgz";
+ sha512 = "dl1jji4Z+YHm08ckQdW2f6gS7WF+f4UEEqPbduFpP8wTAxBvKnYFxuzPEUQCONi2MjSLBBPHgmtisUYqCONTYw==";
};
};
"json3-3.2.6" = {
@@ -37981,13 +37990,13 @@ let
sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==";
};
};
- "logform-2.2.0" = {
+ "logform-2.3.0" = {
name = "logform";
packageName = "logform";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz";
- sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
+ url = "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz";
+ sha512 = "graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ==";
};
};
"logidrom-0.3.1" = {
@@ -41636,6 +41645,15 @@ let
sha512 = "7sBZo9wthqNJ7QXnfVXZL7fkKJLN55GLOdX+RyZT34UOvxxnFtJe/c7K0ZRLAKOvaY1xJThFFn0Usw2H9R6Frg==";
};
};
+ "nanocolors-0.1.6" = {
+ name = "nanocolors";
+ packageName = "nanocolors";
+ version = "0.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.6.tgz";
+ sha512 = "2pvTw6vYRaBLGir2xR7MxaJtyWkrn+C53EpW8yPotG+pdAwBvt0Xwk4VJ6VHLY0aLthVZPvDfm9TdZvrvAm5UQ==";
+ };
+ };
"nanoguard-1.3.0" = {
name = "nanoguard";
packageName = "nanoguard";
@@ -42529,13 +42547,13 @@ let
sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==";
};
};
- "node-fetch-2.6.4" = {
+ "node-fetch-2.6.5" = {
name = "node-fetch";
packageName = "node-fetch";
- version = "2.6.4";
+ version = "2.6.5";
src = fetchurl {
- url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.4.tgz";
- sha512 = "aD1fO+xtLiSCc9vuD+sYMxpIuQyhHscGSkBEo2o5LTV/3bTEAYvdUii29n8LlO5uLCmWdGP7uVUVXFo5SRdkLA==";
+ url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz";
+ sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==";
};
};
"node-fetch-h2-2.3.0" = {
@@ -47238,6 +47256,15 @@ let
sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==";
};
};
+ "postcss-8.3.7" = {
+ name = "postcss";
+ packageName = "postcss";
+ version = "8.3.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.3.7.tgz";
+ sha512 = "9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ==";
+ };
+ };
"postcss-calc-7.0.5" = {
name = "postcss-calc";
packageName = "postcss-calc";
@@ -48192,15 +48219,6 @@ let
sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==";
};
};
- "pretty-time-1.1.0" = {
- name = "pretty-time";
- packageName = "pretty-time";
- version = "1.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz";
- sha512 = "28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==";
- };
- };
"prettyjson-1.2.1" = {
name = "prettyjson";
packageName = "prettyjson";
@@ -53394,13 +53412,13 @@ let
sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
};
};
- "rollup-2.56.3" = {
+ "rollup-2.57.0" = {
name = "rollup";
packageName = "rollup";
- version = "2.56.3";
+ version = "2.57.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz";
- sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz";
+ sha512 = "bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg==";
};
};
"rollup-plugin-babel-4.4.0" = {
@@ -53871,6 +53889,15 @@ let
sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
};
};
+ "safe-stable-stringify-1.1.1" = {
+ name = "safe-stable-stringify";
+ packageName = "safe-stable-stringify";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz";
+ sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==";
+ };
+ };
"safer-buffer-2.1.2" = {
name = "safer-buffer";
packageName = "safer-buffer";
@@ -53952,13 +53979,13 @@ let
sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182";
};
};
- "sass-1.42.0" = {
+ "sass-1.42.1" = {
name = "sass";
packageName = "sass";
- version = "1.42.0";
+ version = "1.42.1";
src = fetchurl {
- url = "https://registry.npmjs.org/sass/-/sass-1.42.0.tgz";
- sha512 = "kcjxsemgaOnfl43oZgO/IePLvXQI0ZKzo0/xbCt6uyrg3FY/FF8hVK9YoO8GiZBcEG2Ebl79EKnUc+aiE4f2Vw==";
+ url = "https://registry.npmjs.org/sass/-/sass-1.42.1.tgz";
+ sha512 = "/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg==";
};
};
"sax-0.5.8" = {
@@ -56967,13 +56994,13 @@ let
sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
};
};
- "sscaff-1.2.72" = {
+ "sscaff-1.2.73" = {
name = "sscaff";
packageName = "sscaff";
- version = "1.2.72";
+ version = "1.2.73";
src = fetchurl {
- url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.72.tgz";
- sha512 = "+EVS+sM+3xDVFc7jIb8A44vnExYtpdfCRkPzCKFomGJXFuDoo52Dg3eIu9S6ueNSm2BLc9SM15/MGRpCtiXJYw==";
+ url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.73.tgz";
+ sha512 = "mOFmcSfJq6Ck4G+qE3CcZzNFUhYsG9aonMN4fNY65aiiLQL9pufMVj/s85BjMrLmdVavnh7/CZ/FXYldPeBUjA==";
};
};
"ssh-config-1.1.6" = {
@@ -57255,15 +57282,6 @@ let
sha1 = "161c7dac177659fd9811f43771fa99381478628c";
};
};
- "std-env-2.3.0" = {
- name = "std-env";
- packageName = "std-env";
- version = "2.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/std-env/-/std-env-2.3.0.tgz";
- sha512 = "4qT5B45+Kjef2Z6pE0BkskzsH0GO7GrND0wGlTM1ioUe3v0dGYx9ZJH0Aro/YyA8fqQ5EyIKDRjZojJYMFTflw==";
- };
- };
"stealthy-require-1.1.1" = {
name = "stealthy-require";
packageName = "stealthy-require";
@@ -57615,13 +57633,13 @@ let
sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
};
};
- "streamx-2.11.1" = {
+ "streamx-2.11.2" = {
name = "streamx";
packageName = "streamx";
- version = "2.11.1";
+ version = "2.11.2";
src = fetchurl {
- url = "https://registry.npmjs.org/streamx/-/streamx-2.11.1.tgz";
- sha512 = "GG/cBcuwhKEu2MxJIdlFnrstgtwERx0yX0tjZUVFHmmq65ROrCEAVrfoYbNQnXdq76rH0Y/SuO9VcgW+ZPkeMQ==";
+ url = "https://registry.npmjs.org/streamx/-/streamx-2.11.2.tgz";
+ sha512 = "CoIBTrCoMKzhTMXZlMwlkjxCH+8e5H5C7WeuWKSlY5ldtCUMkkrLh5UT2+2OHAnpTPrjTimKQl/aXxgbhZtH5Q==";
};
};
"strftime-0.10.0" = {
@@ -63611,13 +63629,13 @@ let
sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b";
};
};
- "vega-5.20.2" = {
+ "vega-5.21.0" = {
name = "vega";
packageName = "vega";
- version = "5.20.2";
+ version = "5.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega/-/vega-5.20.2.tgz";
- sha512 = "qmH7aD9GGPpssVdxL1xgcdxTbQzyRUeRR16Os385ymvQhiwCYQNA6+eXUPAZDTVLfk0RXu6Jzj6kUE5jQ80EVw==";
+ url = "https://registry.npmjs.org/vega/-/vega-5.21.0.tgz";
+ sha512 = "yqqRa9nAqYoAxe7sVhRpsh0b001fly7Yx05klPkXmrvzjxXd07gClW1mOuGgSnVQqo7jTp/LYgbO1bD37FbEig==";
};
};
"vega-canvas-1.2.6" = {
@@ -63665,6 +63683,15 @@ let
sha512 = "UwCu50Sqd8kNZ1X/XgiAY+QAyQUmGFAwyDu7y0T5fs6/TPQnDo/Bo346NgSgINBEhEKOAMY1Nd/rPOk4UEm/ew==";
};
};
+ "vega-event-selector-3.0.0" = {
+ name = "vega-event-selector";
+ packageName = "vega-event-selector";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.0.tgz";
+ sha512 = "Gls93/+7tEJGE3kUuUnxrBIxtvaNeF01VIFB2Q2Of2hBIBvtHX74jcAdDtkh5UhhoYGD8Q1J30P5cqEBEwtPoQ==";
+ };
+ };
"vega-expression-4.0.1" = {
name = "vega-expression";
packageName = "vega-expression";
@@ -63674,6 +63701,15 @@ let
sha512 = "ZrDj0hP8NmrCpdLFf7Rd/xMUHGoSYsAOTaYp7uXZ2dkEH5x0uPy5laECMc8TiQvL8W+8IrN2HAWCMRthTSRe2Q==";
};
};
+ "vega-expression-5.0.0" = {
+ name = "vega-expression";
+ packageName = "vega-expression";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.0.tgz";
+ sha512 = "y5+c2frq0tGwJ7vYXzZcfVcIRF/QGfhf2e+bV1Z0iQs+M2lI1II1GPDdmOcMKimpoCVp/D61KUJDIGE1DSmk2w==";
+ };
+ };
"vega-force-4.0.7" = {
name = "vega-force";
packageName = "vega-force";
@@ -63692,13 +63728,13 @@ let
sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A==";
};
};
- "vega-functions-5.12.0" = {
+ "vega-functions-5.12.1" = {
name = "vega-functions";
packageName = "vega-functions";
- version = "5.12.0";
+ version = "5.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.0.tgz";
- sha512 = "3hljmGs+gR7TbO/yYuvAP9P5laKISf1GKk4yRHLNdM61fWgKm8pI3f6LY2Hvq9cHQFTiJ3/5/Bx2p1SX5R4quQ==";
+ url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.1.tgz";
+ sha512 = "7cHfcjXOj27qEbh2FTzWDl7FJK4xGcMFF7+oiyqa0fp7BU/wNT5YdNV0t5kCX9WjV7mfJWACKV74usLJbyM6GA==";
};
};
"vega-geo-4.3.8" = {
@@ -63719,31 +63755,31 @@ let
sha512 = "4XaWK6V38/QOZ+vllKKTafiwL25m8Kd+ebHmDV+Q236ONHmqc/gv82wwn9nBeXPEfPv4FyJw2SRoqa2Jol6fug==";
};
};
- "vega-label-1.0.0" = {
+ "vega-label-1.1.0" = {
name = "vega-label";
packageName = "vega-label";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-label/-/vega-label-1.0.0.tgz";
- sha512 = "hCdm2pcHgkKgxnzW9GvX5JmYNiUMlOXOibtMmBzvFBQHX3NiV9giQ5nsPiQiFbV08VxEPtM+VYXr2HyrIcq5zQ==";
+ url = "https://registry.npmjs.org/vega-label/-/vega-label-1.1.0.tgz";
+ sha512 = "LAThIiDEsZxYvbSkvPLJ93eJF+Ts8RXv1IpBh8gmew8XGmaLJvVkzdsMe7WJJwuaVEsK7ZZFyB/Inkp842GW6w==";
};
};
- "vega-loader-4.4.0" = {
+ "vega-loader-4.4.1" = {
name = "vega-loader";
packageName = "vega-loader";
- version = "4.4.0";
+ version = "4.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.4.0.tgz";
- sha512 = "e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA==";
+ url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.4.1.tgz";
+ sha512 = "dj65i4qlNhK0mOmjuchHgUrF5YUaWrYpx0A8kXA68lBk5Hkx8FNRztkcl07CZJ1+8V81ymEyJii9jzGbhEX0ag==";
};
};
- "vega-parser-6.1.3" = {
+ "vega-parser-6.1.4" = {
name = "vega-parser";
packageName = "vega-parser";
- version = "6.1.3";
+ version = "6.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.3.tgz";
- sha512 = "8oiVhhW26GQ4GZBvolId8FVFvhn3s1KGgPlD7Z+4P2wkV+xe5Nqu0TEJ20F/cn3b88fd0Vj48X3BH3dlSeKNFg==";
+ url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.4.tgz";
+ sha512 = "tORdpWXiH/kkXcpNdbSVEvtaxBuuDtgYp9rBunVW9oLsjFvFXbSWlM1wvJ9ZFSaTfx6CqyTyGMiJemmr1QnTjQ==";
};
};
"vega-projection-1.4.5" = {
@@ -63791,22 +63827,22 @@ let
sha512 = "QaegQzbFE2yhYLNWAmHwAuguW3yTtQrmwvfxYT8tk0g+KKodrQ5WSmNrphWXhqwtsgVSvtdZkfp2IPeumcOQJg==";
};
};
- "vega-selections-5.3.0" = {
+ "vega-selections-5.3.1" = {
name = "vega-selections";
packageName = "vega-selections";
- version = "5.3.0";
+ version = "5.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.0.tgz";
- sha512 = "vC4NPsuN+IffruFXfH0L3i2A51RgG4PqpLv85TvrEAIYnSkyKDE4bf+wVraR3aPdnLLkc3+tYuMi6le5FmThIA==";
+ url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.1.tgz";
+ sha512 = "cm4Srw1WHjcLGXX7GpxiUlfESv8XPu5b6Vh3mqMDPU94P2FO91SR9gei+EtRdt+KCFgIjr//MnRUjg/hAWwjkQ==";
};
};
- "vega-statistics-1.7.9" = {
+ "vega-statistics-1.7.10" = {
name = "vega-statistics";
packageName = "vega-statistics";
- version = "1.7.9";
+ version = "1.7.10";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.9.tgz";
- sha512 = "T0sd2Z08k/mHxr1Vb4ajLWytPluLFYnsYqyk4SIS5czzUs4errpP2gUu63QJ0B7CKNu33vnS9WdOMOo/Eprr/Q==";
+ url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.10.tgz";
+ sha512 = "QLb12gcfpDZ9K5h3TLGrlz4UXDH9wSPyg9LLfOJZacxvvJEPohacUQNrGEAVtFO9ccUCerRfH9cs25ZtHsOZrw==";
};
};
"vega-time-2.0.4" = {
@@ -63827,13 +63863,13 @@ let
sha512 = "JGBhm5Bf6fiGTUSB5Qr5ckw/KU9FJcSV5xIe/y4IobM/i/KNwI1i1fP45LzP4F4yZc0DMTwJod2UvFHGk9plKA==";
};
};
- "vega-typings-0.21.0" = {
+ "vega-typings-0.22.0" = {
name = "vega-typings";
packageName = "vega-typings";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.21.0.tgz";
- sha512 = "dG0RtnJUn3+BQMO4NjjTdcp5UTBR56yQsLXPPCAFUHeLuycEVKlyhBa/kbvAZv2r+QxdeEYwKUNYy9CQotF5KA==";
+ url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.22.0.tgz";
+ sha512 = "TgBGRkZHQgcduGsoFKq3Scpn6eNY4L3p0YKRhgCPVU3HEaCeYkPFGaR8ynK+XrKmvrqpDv0YHIOwCt7Gn3RpCA==";
};
};
"vega-util-1.16.1" = {
@@ -63845,6 +63881,15 @@ let
sha512 = "FdgD72fmZMPJE99FxvFXth0IL4BbLA93WmBg/lvcJmfkK4Uf90WIlvGwaIUdSePIsdpkZjBPyQcHMQ8OcS8Smg==";
};
};
+ "vega-util-1.17.0" = {
+ name = "vega-util";
+ packageName = "vega-util";
+ version = "1.17.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vega-util/-/vega-util-1.17.0.tgz";
+ sha512 = "HTaydZd9De3yf+8jH66zL4dXJ1d1p5OIFyoBzFiOli4IJbwkL1jrefCKz6AHDm1kYBzDJ0X4bN+CzZSCTvNk1w==";
+ };
+ };
"vega-view-5.10.1" = {
name = "vega-view";
packageName = "vega-view";
@@ -64259,13 +64304,13 @@ let
sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09";
};
};
- "vsce-1.99.0" = {
+ "vsce-1.100.0" = {
name = "vsce";
packageName = "vsce";
- version = "1.99.0";
+ version = "1.100.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vsce/-/vsce-1.99.0.tgz";
- sha512 = "fyzOLcmcgBmA+CYg0NyYU3JMmcOBcf94ZzZZYi83mIoXBRU391mYByoJEPnkl8xZGa3/OW5lH438/JOThlYPNA==";
+ url = "https://registry.npmjs.org/vsce/-/vsce-1.100.0.tgz";
+ sha512 = "sY1NVSZkesioir/1w04igdSPKKHb4QAn7AngOQIKvNTvtFUFuEE/KrcURcld9Gai9W5167zaeifW5rWUsX3rLg==";
};
};
"vscode-css-languageservice-3.0.13" = {
@@ -64979,13 +65024,13 @@ let
sha512 = "hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ==";
};
};
- "walk-2.3.14" = {
+ "walk-2.3.15" = {
name = "walk";
packageName = "walk";
- version = "2.3.14";
+ version = "2.3.15";
src = fetchurl {
- url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz";
- sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==";
+ url = "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz";
+ sha512 = "4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg==";
};
};
"walk-sync-0.3.4" = {
@@ -65186,13 +65231,13 @@ let
sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg==";
};
};
- "web3-utils-1.5.2" = {
+ "web3-utils-1.5.3" = {
name = "web3-utils";
packageName = "web3-utils";
- version = "1.5.2";
+ version = "1.5.3";
src = fetchurl {
- url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.2.tgz";
- sha512 = "quTtTeQJHYSxAwIBOCGEcQtqdVcFWX6mCFNoqnp+mRbq+Hxbs8CGgO/6oqfBx4OvxIOfCpgJWYVHswRXnbEu9Q==";
+ url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz";
+ sha512 = "56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==";
};
};
"webassemblyjs-1.11.1" = {
@@ -65465,15 +65510,6 @@ let
sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ==";
};
};
- "webpackbar-4.0.0" = {
- name = "webpackbar";
- packageName = "webpackbar";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/webpackbar/-/webpackbar-4.0.0.tgz";
- sha512 = "k1qRoSL/3BVuINzngj09nIwreD8wxV4grcuhHTD8VJgUbGcy8lQSPqv+bM00B7F+PffwIsQ8ISd4mIwRbr23eQ==";
- };
- };
"webrtc-adapter-7.7.1" = {
name = "webrtc-adapter";
packageName = "webrtc-adapter";
@@ -66455,13 +66491,13 @@ let
sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ==";
};
};
- "xdl-59.1.0" = {
+ "xdl-59.2.0" = {
name = "xdl";
packageName = "xdl";
- version = "59.1.0";
+ version = "59.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/xdl/-/xdl-59.1.0.tgz";
- sha512 = "kEkXVds9GWYBV/oIPHvdhoTCQcP8bFG2H+OV6qfytw66gnGLrj0qYSfEvlg+0U0GLChONR37iukGCj19oFnYig==";
+ url = "https://registry.npmjs.org/xdl/-/xdl-59.2.0.tgz";
+ sha512 = "jeG34Ul/cHtMv8ZTcRd5Hvgs6Udj83VVlJWodb+sH/K/arG8zKKW9/JhJqBrcI9paxB0Fn/1osFsvv4akKYsrg==";
};
};
"xenvar-0.5.1" = {
@@ -68232,10 +68268,10 @@ in
"@bitwarden/cli" = nodeEnv.buildNodePackage {
name = "_at_bitwarden_slash_cli";
packageName = "@bitwarden/cli";
- version = "1.18.0";
+ version = "1.18.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.18.0.tgz";
- sha512 = "U3d1PHdlBE68r2t0p3GS+IA9BzrZXl7haTCiTwHBOoxKY5gL4Frm//duwCxfT1d8p9ucCiuAW6tDQsldSI5xhg==";
+ url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.18.1.tgz";
+ sha512 = "se1jAVO97eBE8JqBsqmFsUVaDL9h0eR45mra+Y5ebj5dXogfu9tMfLMqJ7O6/cC6fECgDuJF3hOZZ+99L7xk1A==";
};
dependencies = [
sources."@tootallnate/once-1.1.2"
@@ -68316,7 +68352,7 @@ in
sources."mimic-fn-2.1.0"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
- (sources."node-fetch-2.6.4" // {
+ (sources."node-fetch-2.6.5" // {
dependencies = [
sources."tr46-0.0.3"
sources."webidl-conversions-3.0.1"
@@ -68622,7 +68658,7 @@ in
sources."@hyperswarm/hypersign-2.1.1"
sources."@hyperswarm/network-2.1.0"
sources."@leichtgewicht/ip-codec-2.0.3"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."abstract-extension-3.1.1"
sources."abstract-leveldown-6.2.3"
sources."ansi-colors-3.2.3"
@@ -69012,7 +69048,7 @@ in
sources."stream-collector-1.0.1"
sources."stream-equal-1.1.1"
sources."stream-shift-1.0.1"
- sources."streamx-2.11.1"
+ sources."streamx-2.11.2"
(sources."string-width-2.1.1" // {
dependencies = [
sources."ansi-regex-3.0.0"
@@ -69131,15 +69167,15 @@ in
sources."@octokit/core-3.5.1"
sources."@octokit/endpoint-6.0.12"
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-10.2.2"
+ sources."@octokit/openapi-types-10.3.0"
sources."@octokit/plugin-paginate-rest-2.16.3"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.10.4"
+ sources."@octokit/plugin-rest-endpoint-methods-5.11.0"
sources."@octokit/plugin-retry-3.0.9"
sources."@octokit/request-5.6.1"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.10.0"
- sources."@octokit/types-6.28.1"
+ sources."@octokit/types-6.29.0"
sources."@sideway/address-4.1.2"
sources."@sideway/formula-3.0.0"
sources."@sideway/pinpoint-2.0.0"
@@ -69184,7 +69220,7 @@ in
sources."mimic-fn-2.1.0"
sources."ms-2.1.2"
sources."netrc-0.1.4"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-version-1.2.0"
sources."once-1.4.0"
sources."onetime-5.1.2"
@@ -69266,7 +69302,7 @@ in
sources."@types/eslint-scope-3.7.1"
sources."@types/estree-0.0.50"
sources."@types/json-schema-7.0.9"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/parse-json-4.0.0"
sources."@webassemblyjs/ast-1.11.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
@@ -69301,7 +69337,7 @@ in
sources."bl-4.1.0"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-5.7.1"
sources."buffer-from-1.1.2"
sources."callsites-3.1.0"
@@ -69324,7 +69360,6 @@ in
sources."clone-1.0.4"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."colorette-1.4.0"
sources."colors-1.4.0"
sources."commander-4.1.1"
sources."concat-map-0.0.1"
@@ -69332,7 +69367,7 @@ in
sources."cross-spawn-7.0.3"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
(sources."enhanced-resolve-5.8.3" // {
@@ -69431,6 +69466,7 @@ in
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mute-stream-0.0.8"
+ sources."nanocolors-0.1.6"
sources."neo-async-2.6.2"
sources."node-emoji-1.10.0"
sources."node-releases-1.1.76"
@@ -69803,7 +69839,7 @@ in
sources."@types/long-4.0.1"
sources."@types/mime-1.3.2"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/normalize-package-data-2.4.1"
sources."@types/qs-6.9.7"
sources."@types/range-parser-1.2.4"
@@ -69818,13 +69854,13 @@ in
})
sources."@vue/cli-ui-addon-webpack-4.5.13"
sources."@vue/cli-ui-addon-widgets-4.5.13"
- (sources."@vue/compiler-core-3.2.12" // {
+ (sources."@vue/compiler-core-3.2.13" // {
dependencies = [
sources."source-map-0.6.1"
];
})
- sources."@vue/compiler-dom-3.2.12"
- sources."@vue/shared-3.2.12"
+ sources."@vue/compiler-dom-3.2.13"
+ sources."@vue/shared-3.2.13"
sources."@wry/equality-0.1.11"
sources."accepts-1.3.7"
sources."aggregate-error-3.1.0"
@@ -69892,7 +69928,7 @@ in
sources."babel-core-7.0.0-bridge.0"
sources."babel-plugin-dynamic-import-node-2.3.3"
sources."babel-plugin-polyfill-corejs2-0.2.2"
- sources."babel-plugin-polyfill-corejs3-0.2.4"
+ sources."babel-plugin-polyfill-corejs3-0.2.5"
sources."babel-plugin-polyfill-regenerator-0.2.2"
sources."backo2-1.0.2"
sources."balanced-match-1.0.2"
@@ -69926,7 +69962,7 @@ in
})
sources."brace-expansion-1.1.11"
sources."braces-2.3.2"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-5.7.1"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
@@ -69981,7 +70017,6 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
@@ -70074,7 +70109,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.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -70382,6 +70417,7 @@ in
sources."mkdirp-0.5.5"
sources."ms-2.0.0"
sources."mute-stream-0.0.8"
+ sources."nanocolors-0.1.6"
sources."nanoid-2.1.11"
(sources."nanomatch-1.2.13" // {
dependencies = [
@@ -70399,7 +70435,7 @@ in
sources."neo-async-2.6.2"
sources."nice-try-1.0.5"
sources."node-dir-0.1.17"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-ipc-9.2.1"
sources."node-modules-regexp-1.0.0"
(sources."node-notifier-9.0.1" // {
@@ -71090,19 +71126,18 @@ in
sources."async-3.2.1"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."caniuse-lite-1.0.30001259"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."colors-1.4.0"
sources."commander-8.2.0"
sources."concat-map-0.0.1"
sources."convert-source-map-1.8.0"
sources."debug-4.3.2"
sources."ejs-3.1.6"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."ensure-posix-path-1.1.1"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
@@ -71148,6 +71183,7 @@ in
sources."minimist-1.2.5"
sources."moment-2.29.1"
sources."ms-2.1.2"
+ sources."nanocolors-0.1.6"
sources."node-releases-1.1.76"
sources."node.extend-2.0.2"
(sources."nomnom-1.8.1" // {
@@ -71196,7 +71232,7 @@ in
dependencies = [
sources."@types/glob-7.1.4"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."chromium-pickle-js-0.2.0"
@@ -71224,18 +71260,18 @@ in
autoprefixer = nodeEnv.buildNodePackage {
name = "autoprefixer";
packageName = "autoprefixer";
- version = "10.3.4";
+ version = "10.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz";
- sha512 = "EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw==";
+ url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.5.tgz";
+ sha512 = "2H5kQSsyoOMdIehTzIt/sC9ZDIgWqlkG/dbevm9B9xQZ1TDPBHpNUDW5ENqqQQzuaBWEo75JkV0LJe+o5Lnr5g==";
};
dependencies = [
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."caniuse-lite-1.0.30001259"
- sources."colorette-1.4.0"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."escalade-3.1.1"
sources."fraction.js-4.1.1"
+ sources."nanocolors-0.1.6"
sources."node-releases-1.1.76"
sources."normalize-range-0.1.2"
sources."postcss-value-parser-4.1.0"
@@ -71260,14 +71296,14 @@ in
};
dependencies = [
sources."@tootallnate/once-1.1.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/yauzl-2.9.2"
sources."agent-base-6.0.2"
sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."ast-types-0.13.4"
- (sources."aws-sdk-2.991.0" // {
+ (sources."aws-sdk-2.992.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -71483,7 +71519,7 @@ in
sources."@cto.af/textdecoder-0.0.0"
(sources."@grpc/grpc-js-1.3.7" // {
dependencies = [
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
];
})
sources."@grpc/proto-loader-0.6.4"
@@ -71970,7 +72006,7 @@ in
sources."process-nextick-args-2.0.1"
(sources."protobufjs-6.11.2" // {
dependencies = [
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
];
})
sources."proxy-addr-2.0.7"
@@ -73311,7 +73347,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."addr-to-ip-port-1.5.4"
sources."airplay-js-0.2.16"
sources."ajv-6.12.6"
@@ -73716,15 +73752,15 @@ in
cdk8s-cli = nodeEnv.buildNodePackage {
name = "cdk8s-cli";
packageName = "cdk8s-cli";
- version = "1.0.0-beta.52";
+ version = "1.0.0-beta.53";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.52.tgz";
- sha512 = "fpmL+BLmLgsNcgf7Nv/zBMZqnk0A2s64ij2Ets/CNplXuP2H+ZK8T7pWKGRPIC1smNQngHkz89RyeK7TQuX8bg==";
+ url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.53.tgz";
+ sha512 = "capf4GLjMJ0LDCI/AwmhTGjlNvw4ZPSR+jOxwSY3LazA7GuQMpPGAhaLqVVafZSXtlpdTKetnNnQexDbDh1Y3A==";
};
dependencies = [
sources."@jsii/check-node-1.34.0"
sources."@jsii/spec-1.34.0"
- sources."@types/node-12.20.25"
+ sources."@types/node-12.20.26"
sources."@xmldom/xmldom-0.7.5"
sources."ajv-8.6.3"
sources."ansi-regex-5.0.1"
@@ -73735,7 +73771,7 @@ in
sources."camelcase-6.2.0"
sources."case-1.6.3"
sources."cdk8s-1.0.0-beta.46"
- sources."cdk8s-plus-17-1.0.0-beta.74"
+ sources."cdk8s-plus-22-1.0.0-beta.1"
sources."chalk-4.1.2"
sources."cliui-7.0.4"
sources."clone-2.1.2"
@@ -73748,7 +73784,7 @@ in
sources."color-name-1.1.4"
sources."colors-1.4.0"
sources."commonmark-0.30.0"
- sources."constructs-3.3.149"
+ sources."constructs-3.3.150"
sources."date-format-3.0.0"
sources."debug-4.3.2"
sources."decamelize-5.0.0"
@@ -73826,14 +73862,14 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.350" // {
+ (sources."jsii-srcmak-0.1.351" // {
dependencies = [
sources."fs-extra-9.1.0"
];
})
sources."json-schema-0.3.0"
sources."json-schema-traverse-1.0.0"
- sources."json2jsii-0.2.26"
+ sources."json2jsii-0.2.27"
sources."jsonfile-6.1.0"
sources."jsonschema-1.4.0"
sources."locate-path-5.0.0"
@@ -73871,7 +73907,7 @@ in
sources."snake-case-3.0.4"
sources."sort-json-2.0.0"
sources."spdx-license-list-6.4.0"
- sources."sscaff-1.2.72"
+ sources."sscaff-1.2.73"
(sources."streamroller-2.2.4" // {
dependencies = [
sources."date-format-2.1.0"
@@ -73958,7 +73994,7 @@ in
sources."tslib-2.1.0"
];
})
- sources."@graphql-tools/import-6.4.0"
+ sources."@graphql-tools/import-6.4.1"
(sources."@graphql-tools/load-6.2.8" // {
dependencies = [
sources."tslib-2.2.0"
@@ -73969,15 +74005,15 @@ in
sources."@graphql-tools/utils-8.0.2"
];
})
- (sources."@graphql-tools/mock-8.3.1" // {
+ (sources."@graphql-tools/mock-8.4.0" // {
dependencies = [
- sources."@graphql-tools/utils-8.2.2"
+ sources."@graphql-tools/utils-8.2.3"
];
})
(sources."@graphql-tools/schema-8.2.0" // {
dependencies = [
sources."@graphql-tools/merge-8.1.2"
- sources."@graphql-tools/utils-8.2.2"
+ sources."@graphql-tools/utils-8.2.3"
];
})
(sources."@graphql-tools/utils-7.10.0" // {
@@ -74013,7 +74049,7 @@ in
sources."@types/express-serve-static-core-4.17.24"
sources."@types/long-4.0.1"
sources."@types/mime-1.3.2"
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
sources."@types/node-fetch-2.5.12"
sources."@types/qs-6.9.7"
sources."@types/range-parser-1.2.4"
@@ -74045,7 +74081,7 @@ in
sources."apollo-server-caching-3.1.0"
(sources."apollo-server-core-3.3.0" // {
dependencies = [
- sources."@graphql-tools/utils-8.2.2"
+ sources."@graphql-tools/utils-8.2.3"
];
})
sources."apollo-server-env-4.0.3"
@@ -74338,7 +74374,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.350" // {
+ (sources."jsii-srcmak-0.1.351" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."camelcase-5.3.1"
@@ -74400,7 +74436,7 @@ in
sources."ncp-2.0.0"
sources."negotiator-0.6.2"
sources."no-case-3.0.4"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."normalize-path-2.1.1"
sources."npm-run-path-4.0.1"
sources."object-assign-4.1.1"
@@ -74505,7 +74541,7 @@ in
sources."sort-json-2.0.0"
sources."source-map-0.5.7"
sources."spdx-license-list-6.4.0"
- sources."sscaff-1.2.72"
+ sources."sscaff-1.2.73"
(sources."stack-utils-2.0.5" // {
dependencies = [
sources."escape-string-regexp-2.0.0"
@@ -75026,7 +75062,7 @@ in
};
dependencies = [
sources."isexe-2.0.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."tr46-0.0.3"
sources."tslib-2.3.1"
sources."vscode-languageserver-textdocument-1.0.1"
@@ -75336,7 +75372,7 @@ in
})
sources."ncp-2.0.0"
sources."nice-try-1.0.5"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-int64-0.4.0"
sources."npm-run-path-2.0.2"
sources."object-inspect-1.11.0"
@@ -75612,7 +75648,7 @@ in
sources."domutils-1.7.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enquirer-2.3.6"
@@ -76411,10 +76447,10 @@ in
coc-pyright = nodeEnv.buildNodePackage {
name = "coc-pyright";
packageName = "coc-pyright";
- version = "1.1.168";
+ version = "1.1.170";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.168.tgz";
- sha512 = "kxOGpkN7YmdFOgmBzWnkHcqFdsQN448iIGGfHAvbicpQVal2a7vOYLUuzeoDGqmdKugWWig8TotfMs5EZ5BKHQ==";
+ url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.170.tgz";
+ sha512 = "s1ZMe4l790xph8cu+/nkoIpi2WVQibR8tFVpcDnT5EP2Hy7esFvjgz9NAHg+gFilQXVFg2d7Tm2+J1V+A7cZfw==";
};
dependencies = [
sources."pyright-1.1.170"
@@ -76619,7 +76655,7 @@ in
];
})
sources."braces-3.0.2"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
@@ -76661,7 +76697,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -76758,6 +76794,7 @@ in
];
})
sources."ms-2.1.2"
+ sources."nanocolors-0.1.6"
sources."node-releases-1.1.76"
(sources."normalize-package-data-3.0.3" // {
dependencies = [
@@ -77633,7 +77670,6 @@ in
sources."core-util-is-1.0.3"
sources."enabled-2.0.0"
sources."eventemitter3-4.0.7"
- sources."fast-safe-stringify-2.1.1"
sources."fecha-4.2.1"
sources."fn.name-1.1.0"
sources."follow-redirects-1.14.4"
@@ -77643,7 +77679,7 @@ in
sources."is-stream-2.0.1"
sources."isarray-1.0.0"
sources."kuler-2.0.0"
- sources."logform-2.2.0"
+ sources."logform-2.3.0"
sources."ms-2.1.3"
sources."one-time-1.0.0"
sources."process-nextick-args-2.0.1"
@@ -77651,6 +77687,7 @@ in
sources."readable-stream-3.6.0"
sources."requires-port-1.0.0"
sources."safe-buffer-5.2.1"
+ sources."safe-stable-stringify-1.1.1"
sources."simple-swizzle-0.2.2"
sources."stack-trace-0.0.10"
sources."strftime-0.10.0"
@@ -78522,7 +78559,7 @@ in
sources."@types/glob-7.1.4"
sources."@types/minimatch-3.0.5"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/normalize-package-data-2.4.1"
sources."aggregate-error-3.1.0"
sources."ansi-styles-3.2.1"
@@ -78893,7 +78930,7 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
@@ -79867,7 +79904,7 @@ in
"deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage {
name = "deltachat-desktop";
packageName = "deltachat-desktop";
- version = "1.21.1";
+ version = "1.22.1";
src = ../../applications/networking/instant-messengers/deltachat-desktop;
dependencies = [
sources."@babel/code-frame-7.14.5"
@@ -80004,11 +80041,11 @@ in
sources."@szmarczak/http-timer-1.1.2"
sources."@types/debounce-1.2.1"
sources."@types/dom4-2.0.2"
- sources."@types/emoji-mart-3.0.5"
+ sources."@types/emoji-mart-3.0.6"
sources."@types/geojson-7946.0.8"
sources."@types/mapbox-gl-0.54.5"
sources."@types/mime-types-2.1.1"
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
sources."@types/node-fetch-2.5.12"
sources."@types/prop-types-15.7.4"
sources."@types/rc-1.2.0"
@@ -80039,7 +80076,7 @@ in
sources."atob-2.1.2"
sources."babel-plugin-dynamic-import-node-2.3.3"
sources."babel-plugin-polyfill-corejs2-0.2.2"
- sources."babel-plugin-polyfill-corejs3-0.2.4"
+ sources."babel-plugin-polyfill-corejs3-0.2.5"
sources."babel-plugin-polyfill-regenerator-0.2.2"
(sources."base-0.11.2" // {
dependencies = [
@@ -80054,7 +80091,7 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-crc32-0.2.13"
sources."buffer-from-1.1.2"
sources."cache-base-1.0.1"
@@ -80090,7 +80127,6 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."combined-stream-1.0.8"
sources."component-emitter-1.3.0"
(sources."concat-stream-1.6.2" // {
@@ -80134,7 +80170,7 @@ in
sources."duplexer3-0.1.4"
sources."earcut-2.2.3"
sources."electron-13.4.0"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-js-clean-4.0.0"
sources."emoji-mart-3.0.1"
sources."emoji-regex-9.2.2"
@@ -80309,9 +80345,10 @@ in
sources."ms-2.1.2"
sources."murmurhash-js-1.0.0"
sources."nan-2.15.0"
+ sources."nanocolors-0.1.6"
sources."nanomatch-1.2.13"
sources."napi-macros-2.0.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-gyp-build-4.3.0"
sources."node-releases-1.1.76"
sources."normalize-path-3.0.0"
@@ -80412,7 +80449,7 @@ in
sources."rw-0.1.4"
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
- (sources."sass-1.42.0" // {
+ (sources."sass-1.42.1" // {
dependencies = [
sources."anymatch-3.1.2"
sources."binary-extensions-2.2.0"
@@ -80676,15 +80713,15 @@ in
dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
name = "dockerfile-language-server-nodejs";
packageName = "dockerfile-language-server-nodejs";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.7.0.tgz";
- sha512 = "45XvooVfz1e8dUSGo1Nuyb61meY2nV+8lRBRp90T3I0nZGcAh5DJ9ioKsBhvsesBG+2rXwl5WK4OviFLlyyfDA==";
+ url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.7.1.tgz";
+ sha512 = "mk1FkdckiNi0gxm/KIsgOJRpPROOqq27fF90f8CtetbaqRvL/mwKDTN2umLeRenJ4ayxdz/Gpf7gWOOQz1kZ1Q==";
};
dependencies = [
- sources."dockerfile-ast-0.3.2"
- sources."dockerfile-language-service-0.7.1"
- sources."dockerfile-utils-0.9.0"
+ sources."dockerfile-ast-0.3.4"
+ sources."dockerfile-language-service-0.7.2"
+ sources."dockerfile-utils-0.9.2"
sources."vscode-jsonrpc-8.0.0-next.2"
sources."vscode-languageserver-8.0.0-next.2"
sources."vscode-languageserver-protocol-3.17.0-next.8"
@@ -80712,7 +80749,7 @@ in
dependencies = [
sources."@fast-csv/format-4.3.5"
sources."@fast-csv/parse-4.3.6"
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
sources."JSONStream-1.3.5"
sources."ajv-6.12.6"
sources."asn1-0.2.4"
@@ -80915,7 +80952,7 @@ in
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.3"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/responselike-1.0.0"
sources."@types/yauzl-2.9.2"
sources."abbrev-1.1.1"
@@ -81259,7 +81296,7 @@ in
})
sources."node-addon-api-3.2.1"
sources."node-api-version-0.1.4"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-gyp-8.2.0"
sources."node-gyp-build-4.3.0"
sources."nopt-5.0.0"
@@ -81576,7 +81613,7 @@ in
sources."auto-bind-4.0.0"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."caller-callsite-2.0.0"
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
@@ -81592,7 +81629,6 @@ in
sources."code-excerpt-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."commondir-1.0.1"
sources."concat-map-0.0.1"
(sources."conf-7.1.2" // {
@@ -81612,7 +81648,7 @@ in
];
})
sources."dot-prop-5.3.0"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."emojilib-2.4.0"
sources."end-of-stream-1.4.4"
@@ -81701,6 +81737,7 @@ in
sources."minimist-1.2.5"
sources."minimist-options-4.1.0"
sources."ms-2.1.2"
+ sources."nanocolors-0.1.6"
sources."nice-try-1.0.5"
sources."node-releases-1.1.76"
sources."normalize-package-data-2.5.0"
@@ -81870,7 +81907,7 @@ in
sources."normalize-path-2.1.1"
];
})
- sources."@microsoft/load-themed-styles-1.10.212"
+ sources."@microsoft/load-themed-styles-1.10.214"
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
@@ -83125,7 +83162,7 @@ in
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
- (sources."sass-1.42.0" // {
+ (sources."sass-1.42.1" // {
dependencies = [
sources."anymatch-3.1.2"
sources."binary-extensions-2.2.0"
@@ -83889,10 +83926,10 @@ in
expo-cli = nodeEnv.buildNodePackage {
name = "expo-cli";
packageName = "expo-cli";
- version = "4.11.0";
+ version = "4.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.11.0.tgz";
- sha512 = "yGe0VODAZSgkXdENysg5bupr0xe2r4Uap4OlnnVM39AnT1NBzzRy+JZT8skHVa395ZHMou8ThTKlfd29Bj9rOQ==";
+ url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.12.0.tgz";
+ sha512 = "cDRfs9blUWPPicoWQ9FCGn7XPzuHfz6oQ63KIpDLMBnerMxNqwEjSQ9jvH5RbclRgKFIQcbDiaBagSIkn07g5g==";
};
dependencies = [
sources."@babel/code-frame-7.10.4"
@@ -83909,7 +83946,7 @@ in
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4"
(sources."@babel/helper-compilation-targets-7.15.4" // {
dependencies = [
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."semver-6.3.0"
];
})
@@ -84006,14 +84043,14 @@ in
sources."@dabh/diagnostics-2.0.2"
sources."@expo/apple-utils-0.0.0-alpha.25"
sources."@expo/bunyan-4.0.0"
- sources."@expo/config-5.0.9"
- (sources."@expo/config-plugins-3.1.0" // {
+ sources."@expo/config-6.0.0"
+ (sources."@expo/config-plugins-4.0.0" // {
dependencies = [
sources."semver-7.3.5"
];
})
sources."@expo/config-types-42.0.0"
- (sources."@expo/dev-server-0.1.84" // {
+ (sources."@expo/dev-server-0.1.85" // {
dependencies = [
sources."body-parser-1.19.0"
sources."bytes-3.1.0"
@@ -84030,7 +84067,7 @@ in
sources."temp-dir-2.0.0"
];
})
- sources."@expo/dev-tools-0.13.115"
+ sources."@expo/dev-tools-0.13.116"
(sources."@expo/devcert-1.0.0" // {
dependencies = [
sources."debug-3.2.7"
@@ -84045,7 +84082,7 @@ in
];
})
sources."@expo/json-file-8.2.33"
- sources."@expo/metro-config-0.1.84"
+ sources."@expo/metro-config-0.2.0"
sources."@expo/osascript-2.0.30"
(sources."@expo/package-manager-0.0.47" // {
dependencies = [
@@ -84054,12 +84091,12 @@ in
sources."semver-5.7.1"
];
})
- (sources."@expo/plist-0.0.14" // {
+ (sources."@expo/plist-0.0.15" // {
dependencies = [
sources."xmlbuilder-14.0.0"
];
})
- sources."@expo/prebuild-config-2.1.0"
+ sources."@expo/prebuild-config-3.0.0"
sources."@expo/results-1.0.0"
(sources."@expo/rudder-sdk-node-1.0.7" // {
dependencies = [
@@ -84075,7 +84112,7 @@ in
})
sources."@expo/sdk-runtime-versions-1.0.0"
sources."@expo/spawn-async-1.5.0"
- (sources."@expo/webpack-config-0.15.0" // {
+ (sources."@expo/webpack-config-0.16.0" // {
dependencies = [
(sources."@babel/core-7.9.0" // {
dependencies = [
@@ -84140,6 +84177,7 @@ in
sources."supports-color-7.2.0"
];
})
+ sources."@react-native/normalize-color-2.0.0"
sources."@segment/loosely-validate-event-2.0.0"
sources."@sideway/address-4.1.2"
sources."@sideway/formula-3.0.0"
@@ -84213,11 +84251,6 @@ in
sources."ajv-errors-1.0.1"
sources."ajv-keywords-3.5.2"
sources."alphanum-sort-1.0.2"
- (sources."analytics-node-3.5.0" // {
- dependencies = [
- sources."uuid-3.4.0"
- ];
- })
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
@@ -84286,6 +84319,7 @@ in
(sources."babel-loader-8.1.0" // {
dependencies = [
sources."loader-utils-1.4.0"
+ sources."schema-utils-2.7.1"
];
})
sources."babel-plugin-dynamic-import-node-2.3.3"
@@ -84294,7 +84328,7 @@ in
sources."semver-6.3.0"
];
})
- sources."babel-plugin-polyfill-corejs3-0.2.4"
+ sources."babel-plugin-polyfill-corejs3-0.2.5"
sources."babel-plugin-polyfill-regenerator-0.2.2"
sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0"
sources."babel-preset-fbjs-3.4.0"
@@ -84400,7 +84434,6 @@ in
sources."chokidar-3.5.2"
sources."chownr-2.0.0"
sources."chrome-trace-event-1.0.3"
- sources."ci-info-3.2.0"
sources."cipher-base-1.0.4"
(sources."class-utils-0.3.6" // {
dependencies = [
@@ -84462,7 +84495,6 @@ in
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."color-string-1.6.0"
- sources."colorette-1.4.0"
sources."colors-1.4.0"
sources."colorspace-1.1.2"
sources."combined-stream-1.0.8"
@@ -84489,7 +84521,6 @@ in
];
})
sources."connect-history-api-fallback-1.6.0"
- sources."consola-2.15.3"
sources."console-browserify-1.2.0"
sources."console-control-strings-1.1.0"
sources."constants-browserify-1.0.0"
@@ -84516,6 +84547,7 @@ in
];
})
sources."pkg-dir-4.2.0"
+ sources."schema-utils-2.7.1"
sources."semver-6.3.0"
sources."serialize-javascript-4.0.0"
];
@@ -84523,7 +84555,7 @@ in
sources."core-js-3.18.0"
(sources."core-js-compat-3.18.0" // {
dependencies = [
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."semver-7.0.0"
];
})
@@ -84551,6 +84583,7 @@ in
dependencies = [
sources."camelcase-5.3.1"
sources."loader-utils-1.4.0"
+ sources."schema-utils-2.7.1"
sources."semver-6.3.0"
];
})
@@ -84657,7 +84690,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.845"
+ sources."electron-to-chromium-1.3.846"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -84736,7 +84769,7 @@ in
sources."ms-2.0.0"
];
})
- (sources."expo-pwa-0.0.94" // {
+ (sources."expo-pwa-0.0.95" // {
dependencies = [
sources."commander-2.20.0"
];
@@ -84763,13 +84796,15 @@ in
sources."fast-deep-equal-3.1.3"
sources."fast-glob-3.2.7"
sources."fast-json-stable-stringify-2.1.0"
- sources."fast-safe-stringify-2.1.1"
sources."fastq-1.13.0"
sources."faye-websocket-0.10.0"
sources."fecha-4.2.1"
sources."figgy-pudding-3.5.2"
- sources."figures-3.2.0"
- sources."file-loader-6.0.0"
+ (sources."file-loader-6.0.0" // {
+ dependencies = [
+ sources."schema-utils-2.7.1"
+ ];
+ })
sources."file-uri-to-path-1.0.0"
sources."filesize-6.1.0"
sources."fill-range-7.0.1"
@@ -84905,7 +84940,11 @@ in
sources."hsl-regex-1.0.0"
sources."hsla-regex-1.0.0"
sources."html-entities-1.4.0"
- sources."html-loader-1.1.0"
+ (sources."html-loader-1.1.0" // {
+ dependencies = [
+ sources."schema-utils-2.7.1"
+ ];
+ })
(sources."html-minifier-terser-5.1.1" // {
dependencies = [
sources."commander-4.1.1"
@@ -84953,6 +84992,7 @@ in
sources."iferr-0.1.5"
sources."ignore-5.1.8"
sources."ignore-walk-3.0.4"
+ sources."image-size-1.0.0"
sources."immer-8.0.1"
(sources."import-fresh-2.0.0" // {
dependencies = [
@@ -85130,7 +85170,7 @@ in
sources."chalk-2.4.2"
];
})
- sources."logform-2.2.0"
+ sources."logform-2.3.0"
sources."loglevel-1.7.1"
sources."loose-envify-1.4.0"
(sources."lower-case-2.0.2" // {
@@ -85251,6 +85291,7 @@ in
sources."mv-2.1.1"
sources."mz-2.7.0"
sources."nan-2.15.0"
+ sources."nanocolors-0.1.6"
sources."nanomatch-1.2.13"
sources."ncp-2.0.0"
(sources."needle-2.9.1" // {
@@ -85268,7 +85309,7 @@ in
];
})
sources."nocache-2.1.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-forge-0.10.0"
(sources."node-gyp-7.1.2" // {
dependencies = [
@@ -85612,7 +85653,6 @@ in
sources."color-name-1.1.4"
];
})
- sources."pretty-time-1.1.0"
sources."probe-image-size-6.0.0"
sources."process-0.11.10"
sources."process-nextick-args-2.0.1"
@@ -85642,6 +85682,7 @@ in
sources."querystring-0.2.0"
sources."querystring-es3-0.2.1"
sources."querystringify-2.2.0"
+ sources."queue-6.0.2"
sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."randombytes-2.1.0"
@@ -85757,9 +85798,10 @@ in
sources."safe-buffer-5.1.2"
sources."safe-json-stringify-1.2.0"
sources."safe-regex-1.1.0"
+ sources."safe-stable-stringify-1.1.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
- sources."schema-utils-2.7.1"
+ sources."schema-utils-3.1.1"
sources."select-hose-2.0.0"
sources."selfsigned-1.10.11"
sources."semver-7.3.2"
@@ -85886,7 +85928,6 @@ in
];
})
sources."statuses-1.4.0"
- sources."std-env-2.3.0"
sources."stream-browserify-2.0.2"
sources."stream-buffers-2.2.0"
sources."stream-each-1.2.3"
@@ -85910,7 +85951,11 @@ in
sources."strip-ansi-6.0.0"
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
- sources."style-loader-1.2.1"
+ (sources."style-loader-1.2.1" // {
+ dependencies = [
+ sources."schema-utils-2.7.1"
+ ];
+ })
(sources."stylehacks-4.0.3" // {
dependencies = [
sources."postcss-selector-parser-3.1.2"
@@ -85983,6 +86028,7 @@ in
];
})
sources."pkg-dir-4.2.0"
+ sources."schema-utils-2.7.1"
sources."semver-6.3.0"
sources."serialize-javascript-4.0.0"
sources."source-map-0.6.1"
@@ -86063,11 +86109,7 @@ in
];
})
sources."url-join-4.0.0"
- (sources."url-loader-4.1.1" // {
- dependencies = [
- sources."schema-utils-3.1.1"
- ];
- })
+ sources."url-loader-4.1.1"
sources."url-parse-1.5.3"
(sources."url-parse-lax-3.0.0" // {
dependencies = [
@@ -86237,15 +86279,6 @@ in
sources."source-map-0.6.1"
];
})
- (sources."webpackbar-4.0.0" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."chalk-2.4.2"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."wrap-ansi-6.2.0"
- ];
- })
sources."websocket-driver-0.6.5"
sources."websocket-extensions-0.1.4"
sources."whatwg-url-5.0.0"
@@ -86285,7 +86318,7 @@ in
sources."uuid-7.0.3"
];
})
- (sources."xdl-59.1.0" // {
+ (sources."xdl-59.2.0" // {
dependencies = [
sources."bplist-parser-0.3.0"
sources."chownr-1.1.4"
@@ -86378,7 +86411,7 @@ in
sources."@babel/traverse-7.15.4"
sources."@babel/types-7.15.6"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/normalize-package-data-2.4.1"
sources."@types/yauzl-2.9.2"
sources."@types/yoga-layout-1.9.2"
@@ -86397,7 +86430,7 @@ in
sources."base64-js-1.5.1"
sources."bl-4.1.0"
sources."brace-expansion-1.1.11"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-5.7.1"
sources."buffer-crc32-0.2.13"
sources."caller-callsite-2.0.0"
@@ -86416,7 +86449,6 @@ in
sources."code-excerpt-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."commondir-1.0.1"
sources."concat-map-0.0.1"
sources."convert-source-map-1.8.0"
@@ -86430,7 +86462,7 @@ in
})
sources."delay-5.0.0"
sources."devtools-protocol-0.0.869402"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."error-ex-1.3.2"
@@ -86497,7 +86529,8 @@ in
sources."minimist-options-4.1.0"
sources."mkdirp-classic-0.5.3"
sources."ms-2.1.2"
- sources."node-fetch-2.6.4"
+ sources."nanocolors-0.1.6"
+ sources."node-fetch-2.6.5"
sources."node-releases-1.1.76"
(sources."normalize-package-data-3.0.3" // {
dependencies = [
@@ -87071,7 +87104,7 @@ in
];
})
sources."nice-try-1.0.5"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."normalize-url-2.0.1"
sources."npm-run-path-2.0.2"
sources."oauth-sign-0.9.0"
@@ -87361,7 +87394,7 @@ in
sources."@types/json-schema-7.0.9"
sources."@types/long-4.0.1"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
sources."abort-controller-3.0.0"
@@ -87635,7 +87668,6 @@ in
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
- sources."fast-safe-stringify-2.1.1"
sources."fast-text-encoding-1.0.3"
(sources."fast-url-parser-1.1.3" // {
dependencies = [
@@ -87853,7 +87885,7 @@ in
sources."lodash.union-4.6.0"
sources."lodash.values-2.4.1"
sources."log-symbols-2.2.0"
- (sources."logform-2.2.0" // {
+ (sources."logform-2.3.0" // {
dependencies = [
sources."colors-1.4.0"
];
@@ -87913,7 +87945,7 @@ in
sources."next-tick-1.0.0"
sources."nice-try-1.0.5"
sources."node-emoji-1.11.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-forge-0.10.0"
(sources."node-gyp-8.2.0" // {
dependencies = [
@@ -88028,6 +88060,7 @@ in
];
})
sources."safe-buffer-5.2.1"
+ sources."safe-stable-stringify-1.1.1"
sources."safer-buffer-2.1.2"
sources."semver-5.7.1"
(sources."semver-diff-3.1.1" // {
@@ -88474,7 +88507,7 @@ in
dependencies = [
sources."@types/atob-2.1.2"
sources."@types/inquirer-6.5.0"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/through-0.0.30"
sources."ajv-6.12.6"
sources."ansi-escapes-4.3.2"
@@ -88583,7 +88616,7 @@ in
sources."mkdirp-0.5.5"
sources."mute-stream-0.0.8"
sources."nedb-1.8.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
(sources."number-to-bn-1.7.0" // {
dependencies = [
sources."bn.js-4.11.6"
@@ -88648,7 +88681,7 @@ in
sources."utf8-3.0.0"
sources."uuid-3.4.0"
sources."verror-1.10.0"
- sources."web3-utils-1.5.2"
+ sources."web3-utils-1.5.3"
sources."webidl-conversions-3.0.1"
sources."whatwg-url-5.0.0"
sources."which-module-2.0.0"
@@ -89264,7 +89297,7 @@ in
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-patch-0.0.30"
sources."@types/keyv-3.1.3"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/node-fetch-2.5.12"
sources."@types/responselike-1.0.0"
sources."@types/unist-2.0.6"
@@ -89316,7 +89349,7 @@ in
})
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."bytes-3.1.0"
sources."cacheable-lookup-5.0.4"
(sources."cacheable-request-7.0.2" // {
@@ -89366,7 +89399,6 @@ in
sources."collapse-white-space-1.0.6"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."combined-stream-1.0.8"
sources."common-tags-1.8.0"
sources."concat-map-0.0.1"
@@ -89427,7 +89459,7 @@ in
sources."dotenv-8.6.0"
sources."duplexer3-0.1.4"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -89659,11 +89691,12 @@ in
sources."mkdirp-0.5.5"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
+ sources."nanocolors-0.1.6"
sources."negotiator-0.6.2"
sources."nice-try-1.0.5"
sources."no-case-3.0.4"
sources."node-eta-0.9.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-object-hash-2.3.10"
sources."node-releases-1.1.76"
sources."normalize-path-3.0.0"
@@ -89948,10 +89981,10 @@ in
generator-code = nodeEnv.buildNodePackage {
name = "generator-code";
packageName = "generator-code";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.0.tgz";
- sha512 = "AZQg3krSIoySkTfHUhcWdDAALT5rIRvlFI8EcbrFMjIgedYZk04HdxYtq8FGdsWD9D/3F2zQN++iuWXowQw8Ig==";
+ url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.1.tgz";
+ sha512 = "zTahNxes6nu0P0sXb1nQY7G30zYxEEEpI3z5TaWfn5T1jLY5Ui0ZAoRv6ry0exWpUK1DxoCTXWPskIuCcvk1tQ==";
};
dependencies = [
sources."@babel/code-frame-7.14.5"
@@ -89970,14 +90003,14 @@ in
sources."@octokit/core-3.5.1"
sources."@octokit/endpoint-6.0.12"
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-10.2.2"
+ sources."@octokit/openapi-types-10.3.0"
sources."@octokit/plugin-paginate-rest-2.16.3"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.10.4"
+ sources."@octokit/plugin-rest-endpoint-methods-5.11.0"
sources."@octokit/request-5.6.1"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.10.0"
- sources."@octokit/types-6.28.1"
+ sources."@octokit/types-6.29.0"
sources."@types/normalize-package-data-2.4.1"
sources."ansi-regex-2.1.1"
sources."ansi-styles-4.3.0"
@@ -90031,7 +90064,7 @@ in
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."ms-2.1.2"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
(sources."normalize-package-data-2.5.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -90142,7 +90175,7 @@ in
sources."has-flag-3.0.0"
sources."iterall-1.3.0"
sources."minimist-1.2.5"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."supports-color-5.5.0"
sources."tr46-0.0.3"
sources."webidl-conversions-3.0.1"
@@ -90605,7 +90638,7 @@ in
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
sources."netmask-2.0.2"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."normalize-package-data-3.0.3"
sources."normalize-url-4.5.1"
sources."npm-run-path-4.0.1"
@@ -90833,7 +90866,7 @@ in
sources."tslib-2.1.0"
];
})
- (sources."@graphql-tools/import-6.4.0" // {
+ (sources."@graphql-tools/import-6.4.1" // {
dependencies = [
sources."tslib-2.3.1"
];
@@ -90862,7 +90895,7 @@ in
(sources."@graphql-tools/schema-8.2.0" // {
dependencies = [
sources."@graphql-tools/merge-8.1.2"
- sources."@graphql-tools/utils-8.2.2"
+ sources."@graphql-tools/utils-8.2.3"
sources."tslib-2.3.1"
];
})
@@ -90893,7 +90926,7 @@ in
sources."@nodelib/fs.walk-1.2.8"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/parse-json-4.0.0"
sources."@types/websocket-1.0.2"
sources."abort-controller-3.0.0"
@@ -92567,7 +92600,7 @@ in
sha512 = "ciCpeMEGZ7CbfK+MgK8ykV+wzUHz5he06mAiq8OQLuYN6pxFxZDAhwPwByirOYwdF3GV2M4s7spq2A/g/XMncQ==";
};
dependencies = [
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/node-fetch-2.5.12"
sources."ansi-styles-4.3.0"
sources."async-3.2.0"
@@ -92595,7 +92628,7 @@ in
sources."mime-db-1.49.0"
sources."mime-types-2.1.32"
sources."minimatch-3.0.4"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."once-1.4.0"
sources."parse-glob-3.0.4"
sources."path-is-absolute-1.0.1"
@@ -92838,7 +92871,7 @@ in
dependencies = [
sources."@fast-csv/format-4.3.5"
sources."@fast-csv/parse-4.3.6"
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
sources."ajv-6.12.6"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
@@ -92847,7 +92880,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.991.0"
+ sources."aws-sdk-2.992.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."base64-js-1.5.1"
@@ -93357,7 +93390,7 @@ in
sources."async-limiter-1.0.1"
sources."chrome-remote-interface-0.27.2"
sources."commander-2.11.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."semver-5.7.1"
sources."source-map-0.7.3"
sources."tr46-0.0.3"
@@ -94161,7 +94194,7 @@ in
sources."async-mutex-0.1.4"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.991.0" // {
+ (sources."aws-sdk-2.992.0" // {
dependencies = [
sources."sax-1.2.1"
sources."uuid-3.3.2"
@@ -95939,7 +95972,7 @@ in
})
sources."@oclif/plugin-help-3.3.0"
sources."@oclif/screen-1.0.4"
- (sources."@putdotio/api-client-8.17.0" // {
+ (sources."@putdotio/api-client-8.18.0" // {
dependencies = [
sources."axios-0.21.4"
];
@@ -96186,7 +96219,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.1"
sources."@types/cors-2.8.12"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."accepts-1.3.7"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
@@ -96444,7 +96477,7 @@ in
sources."brace-expansion-1.1.11"
sources."browser-or-node-1.3.0"
sources."browser-process-hrtime-1.0.0"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-from-1.1.2"
sources."bytes-3.1.0"
sources."bytesish-0.4.4"
@@ -96458,7 +96491,6 @@ in
sources."clone-deep-4.0.1"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."combined-stream-1.0.8"
sources."commander-4.1.1"
sources."commondir-1.0.1"
@@ -96501,7 +96533,7 @@ in
})
sources."dotenv-8.6.0"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."encodeurl-1.0.2"
sources."enquirer-2.3.6"
@@ -96626,9 +96658,10 @@ in
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."ms-2.1.2"
+ sources."nanocolors-0.1.6"
sources."negotiator-0.6.2"
sources."node-environment-flags-1.0.6"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-localstorage-1.3.1"
sources."node-modules-regexp-1.0.0"
sources."node-releases-1.1.76"
@@ -97496,11 +97529,11 @@ in
];
})
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-10.2.2"
+ sources."@octokit/openapi-types-10.4.0"
sources."@octokit/plugin-enterprise-rest-6.0.1"
sources."@octokit/plugin-paginate-rest-2.16.3"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.10.4"
+ sources."@octokit/plugin-rest-endpoint-methods-5.11.0"
(sources."@octokit/request-5.6.1" // {
dependencies = [
sources."is-plain-object-5.0.0"
@@ -97508,7 +97541,7 @@ in
})
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.10.0"
- sources."@octokit/types-6.28.1"
+ sources."@octokit/types-6.30.0"
sources."@tootallnate/once-1.1.2"
sources."@types/minimatch-3.0.5"
sources."@types/minimist-1.2.2"
@@ -97867,7 +97900,7 @@ in
sources."mute-stream-0.0.8"
sources."negotiator-0.6.2"
sources."neo-async-2.6.2"
- (sources."node-fetch-2.6.4" // {
+ (sources."node-fetch-2.6.5" // {
dependencies = [
sources."tr46-0.0.3"
sources."webidl-conversions-3.0.1"
@@ -99180,7 +99213,7 @@ in
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-schema-7.0.9"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/normalize-package-data-2.4.1"
sources."@types/resolve-0.0.8"
sources."@types/yargs-15.0.14"
@@ -99270,7 +99303,7 @@ in
sources."babel-plugin-minify-simplify-0.5.1"
sources."babel-plugin-minify-type-constructors-0.4.3"
sources."babel-plugin-polyfill-corejs2-0.2.2"
- sources."babel-plugin-polyfill-corejs3-0.2.4"
+ sources."babel-plugin-polyfill-corejs3-0.2.5"
sources."babel-plugin-polyfill-regenerator-0.2.2"
sources."babel-plugin-syntax-flow-6.18.0"
sources."babel-plugin-transform-flow-strip-types-6.22.0"
@@ -99337,7 +99370,7 @@ in
];
})
sources."browserify-zlib-0.2.0"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."bser-2.1.1"
sources."buffer-5.2.1"
sources."buffer-from-1.1.2"
@@ -99402,7 +99435,6 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.4.0"
sources."colors-1.4.0"
(sources."combine-source-map-0.8.0" // {
dependencies = [
@@ -99477,7 +99509,7 @@ in
sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -99761,11 +99793,12 @@ in
})
sources."ms-2.1.2"
sources."nan-2.15.0"
+ sources."nanocolors-0.1.6"
sources."nanomatch-1.2.13"
sources."ncp-2.0.0"
sources."neo-async-2.6.2"
sources."nice-try-1.0.5"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-int64-0.4.0"
(sources."node-libs-browser-2.2.1" // {
dependencies = [
@@ -100736,7 +100769,7 @@ in
};
dependencies = [
sources."@braintree/sanitize-url-3.1.0"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/yauzl-2.9.2"
sources."agent-base-6.0.2"
sources."ansi-styles-4.3.0"
@@ -101094,7 +101127,7 @@ in
sources."log-symbols-4.1.0"
sources."mimic-fn-2.1.0"
sources."mute-stream-0.0.8"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."onetime-5.1.2"
sources."ora-5.4.1"
sources."os-tmpdir-1.0.2"
@@ -101193,10 +101226,10 @@ in
netlify-cli = nodeEnv.buildNodePackage {
name = "netlify-cli";
packageName = "netlify-cli";
- version = "6.9.11";
+ version = "6.9.12";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.11.tgz";
- sha512 = "73w6wTAwzuJ0eL7dS0kuO3eHHOB6SoAcvqxjM2+zjlKHnFq1Tpy6EBP9NvCAqk589g30tpnrMvmewU2t+bwKtw==";
+ url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.12.tgz";
+ sha512 = "FSzZxQk0yaWMvsnrBqHkIiJ1V/wikNDk1SdlnM8NBuNdlDvH4FuuTa7qfO5CjTMq/T21o9ga69qMZZ8tOvi7lA==";
};
dependencies = [
sources."@babel/code-frame-7.14.5"
@@ -101331,7 +101364,7 @@ in
sources."@dabh/diagnostics-2.0.2"
sources."@jest/types-26.6.2"
sources."@mrmlnc/readdir-enhanced-2.2.1"
- (sources."@netlify/build-18.11.2" // {
+ (sources."@netlify/build-18.12.0" // {
dependencies = [
sources."resolve-2.0.0-next.3"
];
@@ -101376,7 +101409,7 @@ in
sources."@netlify/open-api-2.5.0"
(sources."@netlify/plugin-edge-handlers-1.11.22" // {
dependencies = [
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
];
})
sources."@netlify/plugins-list-3.6.0"
@@ -101520,10 +101553,10 @@ in
];
})
sources."@octokit/graphql-4.8.0"
- sources."@octokit/openapi-types-10.2.2"
+ sources."@octokit/openapi-types-10.4.0"
sources."@octokit/plugin-paginate-rest-2.16.3"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.10.4"
+ sources."@octokit/plugin-rest-endpoint-methods-5.11.0"
(sources."@octokit/request-5.6.1" // {
dependencies = [
sources."is-plain-object-5.0.0"
@@ -101531,7 +101564,7 @@ in
})
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.10.0"
- sources."@octokit/types-6.28.1"
+ sources."@octokit/types-6.30.0"
sources."@rollup/plugin-babel-5.3.0"
(sources."@rollup/plugin-commonjs-18.1.0" // {
dependencies = [
@@ -101564,7 +101597,7 @@ in
sources."@types/istanbul-reports-3.0.1"
sources."@types/keyv-3.1.3"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/node-fetch-2.5.12"
sources."@types/normalize-package-data-2.4.1"
sources."@types/resolve-1.17.1"
@@ -101666,7 +101699,7 @@ in
sources."semver-6.3.0"
];
})
- sources."babel-plugin-polyfill-corejs3-0.2.4"
+ sources."babel-plugin-polyfill-corejs3-0.2.5"
sources."babel-plugin-polyfill-regenerator-0.2.2"
sources."backoff-2.5.0"
sources."balanced-match-1.0.2"
@@ -101700,7 +101733,7 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-5.7.1"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
@@ -101809,7 +101842,6 @@ in
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."color-string-1.6.0"
- sources."colorette-1.4.0"
sources."colors-1.4.0"
sources."colorspace-1.1.2"
sources."combined-stream-1.0.8"
@@ -101988,7 +102020,7 @@ in
})
sources."duplexer3-0.1.4"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."elegant-spinner-1.0.1"
sources."elf-cam-0.1.1"
sources."emoji-regex-8.0.0"
@@ -102435,7 +102467,7 @@ in
sources."wrap-ansi-3.0.1"
];
})
- (sources."logform-2.2.0" // {
+ (sources."logform-2.3.0" // {
dependencies = [
sources."ms-2.1.3"
];
@@ -102498,6 +102530,7 @@ in
];
})
sources."mute-stream-0.0.7"
+ sources."nanocolors-0.1.6"
sources."nanoid-3.1.25"
sources."nanomatch-1.2.13"
sources."natural-orderby-2.0.3"
@@ -102512,7 +102545,7 @@ in
sources."netlify-redirect-parser-11.0.2"
sources."netlify-redirector-0.2.1"
sources."nice-try-1.0.5"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-releases-1.1.76"
sources."node-source-walk-4.2.0"
(sources."node-version-alias-1.0.1" // {
@@ -102701,7 +102734,7 @@ in
sources."pinkie-promise-2.0.1"
sources."pkg-dir-5.0.0"
sources."posix-character-classes-0.1.1"
- sources."postcss-8.3.6"
+ sources."postcss-8.3.7"
sources."postcss-values-parser-2.0.1"
sources."precinct-8.1.0"
sources."precond-0.2.3"
@@ -102789,7 +102822,7 @@ in
sources."reusify-1.0.4"
sources."rfdc-1.3.0"
sources."rimraf-3.0.2"
- sources."rollup-2.56.3"
+ sources."rollup-2.57.0"
(sources."rollup-plugin-inject-3.0.2" // {
dependencies = [
sources."estree-walker-0.6.1"
@@ -102808,6 +102841,7 @@ in
sources."safe-buffer-5.1.2"
sources."safe-json-stringify-1.2.0"
sources."safe-regex-1.1.0"
+ sources."safe-stable-stringify-1.1.1"
sources."safer-buffer-2.1.2"
sources."seek-bzip-1.0.6"
sources."semver-7.3.5"
@@ -103698,7 +103732,7 @@ in
sources."@types/cacheable-request-6.0.2"
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.3"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
@@ -103951,7 +103985,7 @@ in
sources."mute-stream-0.0.8"
sources."negotiator-0.6.2"
sources."node-addon-api-3.2.1"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-red-admin-2.2.0"
sources."nopt-5.0.0"
sources."normalize-url-6.1.0"
@@ -104251,7 +104285,7 @@ in
sources."core-util-is-1.0.2"
];
})
- sources."walk-2.3.14"
+ sources."walk-2.3.15"
sources."wide-align-1.1.3"
sources."wrappy-1.0.2"
sources."yallist-4.0.0"
@@ -104465,7 +104499,7 @@ in
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.3"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/normalize-package-data-2.4.1"
sources."@types/parse-json-4.0.0"
sources."@types/responselike-1.0.0"
@@ -105512,7 +105546,7 @@ in
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
sources."verror-1.10.0"
- sources."walk-2.3.14"
+ sources."walk-2.3.15"
sources."wide-align-1.1.3"
sources."wrappy-1.0.2"
];
@@ -105759,7 +105793,7 @@ in
sources."semver-6.3.0"
];
})
- sources."babel-plugin-polyfill-corejs3-0.2.4"
+ sources."babel-plugin-polyfill-corejs3-0.2.5"
sources."babel-plugin-polyfill-regenerator-0.2.2"
(sources."babel-runtime-6.26.0" // {
dependencies = [
@@ -105804,7 +105838,7 @@ in
sources."pako-1.0.11"
];
})
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
(sources."buffer-4.9.2" // {
dependencies = [
sources."isarray-1.0.0"
@@ -105836,7 +105870,6 @@ in
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."color-string-1.6.0"
- sources."colorette-1.4.0"
sources."combined-stream-1.0.8"
sources."command-exists-1.2.9"
sources."commander-2.20.3"
@@ -105959,7 +105992,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.845"
+ sources."electron-to-chromium-1.3.846"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -106208,6 +106241,7 @@ in
sources."mkdirp-0.5.5"
sources."ms-2.1.2"
sources."nan-2.15.0"
+ sources."nanocolors-0.1.6"
(sources."nanomatch-1.2.13" // {
dependencies = [
sources."define-property-2.0.2"
@@ -107743,7 +107777,7 @@ in
sources."semver-5.7.1"
];
})
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."noop-logger-0.1.1"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
@@ -107844,7 +107878,7 @@ in
sources."semver-5.7.1"
];
})
- (sources."@pm2/agent-2.0.0" // {
+ (sources."@pm2/agent-2.0.1" // {
dependencies = [
sources."semver-7.2.3"
];
@@ -107908,7 +107942,7 @@ in
sources."dayjs-1.8.36"
sources."debug-4.3.2"
sources."deep-is-0.1.4"
- sources."degenerator-2.2.0"
+ sources."degenerator-3.0.1"
sources."depd-1.1.2"
sources."emitter-listener-1.1.2"
sources."enquirer-2.3.6"
@@ -107980,8 +108014,8 @@ in
})
sources."once-1.4.0"
sources."optionator-0.8.3"
- sources."pac-proxy-agent-4.1.0"
- sources."pac-resolver-4.2.0"
+ sources."pac-proxy-agent-5.0.0"
+ sources."pac-resolver-5.0.0"
sources."pako-0.2.9"
sources."path-is-absolute-1.0.1"
sources."path-parse-1.0.7"
@@ -107994,7 +108028,7 @@ in
sources."pm2-sysmonit-1.2.8"
sources."prelude-ls-1.1.2"
sources."promptly-2.2.0"
- sources."proxy-agent-4.0.1"
+ sources."proxy-agent-5.0.0"
sources."proxy-from-env-1.1.0"
sources."raw-body-2.4.1"
sources."read-1.0.7"
@@ -108039,6 +108073,7 @@ in
sources."async-2.6.3"
];
})
+ sources."vm2-3.9.3"
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
sources."ws-7.4.6"
@@ -108105,13 +108140,13 @@ in
postcss = nodeEnv.buildNodePackage {
name = "postcss";
packageName = "postcss";
- version = "8.3.6";
+ version = "8.3.7";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz";
- sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==";
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.3.7.tgz";
+ sha512 = "9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ==";
};
dependencies = [
- sources."colorette-1.4.0"
+ sources."nanocolors-0.1.6"
sources."nanoid-3.1.25"
sources."source-map-js-0.6.2"
];
@@ -108868,7 +108903,7 @@ in
sources."ip-1.1.5"
sources."is-docker-2.2.1"
sources."is-wsl-2.2.0"
- sources."js-base64-3.7.1"
+ sources."js-base64-3.7.2"
sources."json-buffer-3.0.0"
sources."jsonfile-6.1.0"
sources."keyv-3.1.0"
@@ -109039,7 +109074,7 @@ in
sources."minimist-1.2.5"
sources."moment-2.29.1"
sources."nice-try-1.0.5"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."npm-run-path-2.0.2"
sources."number-is-nan-1.0.1"
sources."object-inspect-1.4.1"
@@ -109415,7 +109450,7 @@ in
sources."@types/glob-7.1.4"
sources."@types/json-schema-7.0.9"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/parse-json-4.0.0"
sources."@types/q-1.5.5"
sources."@webassemblyjs/ast-1.9.0"
@@ -109509,7 +109544,7 @@ in
sources."semver-6.3.0"
];
})
- sources."babel-plugin-polyfill-corejs3-0.2.4"
+ sources."babel-plugin-polyfill-corejs3-0.2.5"
sources."babel-plugin-polyfill-regenerator-0.2.2"
sources."babel-plugin-transform-react-remove-prop-types-0.4.24"
sources."babel-plugin-universal-import-4.0.2"
@@ -109569,7 +109604,7 @@ in
];
})
sources."browserify-zlib-0.1.4"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-5.7.1"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
@@ -109832,7 +109867,7 @@ in
sources."duplexify-3.7.1"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -110264,6 +110299,7 @@ in
sources."mutation-observer-1.0.3"
sources."mute-stream-0.0.7"
sources."nan-2.15.0"
+ sources."nanocolors-0.1.6"
sources."nanomatch-1.2.13"
sources."negotiator-0.6.2"
sources."neo-async-2.6.2"
@@ -111227,9 +111263,9 @@ in
sources."@emotion/unitless-0.7.5"
sources."@exodus/schemasafe-1.0.0-rc.6"
sources."@redocly/ajv-8.6.2"
- (sources."@redocly/openapi-core-1.0.0-beta.60" // {
+ (sources."@redocly/openapi-core-1.0.0-beta.61" // {
dependencies = [
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
];
})
sources."@redocly/react-dropdown-aria-2.0.12"
@@ -111387,7 +111423,7 @@ in
sources."mobx-react-lite-3.2.1"
sources."ms-2.1.2"
sources."neo-async-2.6.2"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."node-fetch-h2-2.3.0"
sources."node-libs-browser-2.2.1"
sources."node-readfiles-0.2.0"
@@ -111713,10 +111749,10 @@ in
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.56.3";
+ version = "2.57.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz";
- sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz";
+ sha512 = "bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg==";
};
dependencies = [
sources."fsevents-2.3.2"
@@ -111761,7 +111797,7 @@ in
sources."@types/json-schema-7.0.9"
sources."@types/minimatch-3.0.5"
sources."@types/mocha-8.2.3"
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
sources."@types/node-fetch-2.5.12"
sources."@types/vscode-1.60.0"
sources."@typescript-eslint/eslint-plugin-4.31.2"
@@ -112029,7 +112065,7 @@ in
sources."mute-stream-0.0.8"
sources."nanoid-3.1.23"
sources."natural-compare-1.4.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."normalize-path-3.0.0"
sources."nth-check-2.0.1"
sources."object-inspect-1.11.0"
@@ -112136,7 +112172,7 @@ in
sources."url-join-1.1.0"
sources."util-deprecate-1.0.2"
sources."v8-compile-cache-2.3.0"
- (sources."vsce-1.99.0" // {
+ (sources."vsce-1.100.0" // {
dependencies = [
sources."chalk-2.4.2"
sources."commander-6.2.1"
@@ -112287,10 +112323,10 @@ in
sass = nodeEnv.buildNodePackage {
name = "sass";
packageName = "sass";
- version = "1.42.0";
+ version = "1.42.1";
src = fetchurl {
- url = "https://registry.npmjs.org/sass/-/sass-1.42.0.tgz";
- sha512 = "kcjxsemgaOnfl43oZgO/IePLvXQI0ZKzo0/xbCt6uyrg3FY/FF8hVK9YoO8GiZBcEG2Ebl79EKnUc+aiE4f2Vw==";
+ url = "https://registry.npmjs.org/sass/-/sass-1.42.1.tgz";
+ sha512 = "/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg==";
};
dependencies = [
sources."anymatch-3.1.2"
@@ -112496,7 +112532,7 @@ in
];
})
sources."@serverless/component-metrics-1.0.8"
- (sources."@serverless/components-3.17.0" // {
+ (sources."@serverless/components-3.17.1" // {
dependencies = [
(sources."@serverless/utils-4.1.0" // {
dependencies = [
@@ -112538,7 +112574,7 @@ in
];
})
sources."@serverless/template-1.1.4"
- (sources."@serverless/utils-5.14.0" // {
+ (sources."@serverless/utils-5.15.0" // {
dependencies = [
sources."get-stream-6.0.1"
sources."has-flag-4.0.0"
@@ -112557,7 +112593,7 @@ in
sources."@types/keyv-3.1.3"
sources."@types/lodash-4.14.173"
sources."@types/long-4.0.1"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/request-2.48.7"
sources."@types/request-promise-native-1.0.18"
sources."@types/responselike-1.0.0"
@@ -112618,7 +112654,7 @@ in
sources."async-2.6.3"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- (sources."aws-sdk-2.991.0" // {
+ (sources."aws-sdk-2.992.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -112708,7 +112744,7 @@ in
];
})
sources."cli-cursor-3.1.0"
- sources."cli-progress-footer-2.0.2"
+ sources."cli-progress-footer-2.1.1"
(sources."cli-sprintf-format-1.1.0" // {
dependencies = [
sources."ansi-regex-2.1.1"
@@ -112841,7 +112877,6 @@ in
sources."fast-deep-equal-3.1.3"
sources."fast-glob-3.2.7"
sources."fast-json-stable-stringify-2.1.0"
- sources."fast-safe-stringify-2.1.1"
sources."fastest-levenshtein-1.0.12"
sources."fastq-1.13.0"
sources."fd-slicer-1.1.0"
@@ -113013,7 +113048,7 @@ in
sources."supports-color-8.1.1"
];
})
- (sources."logform-2.2.0" // {
+ (sources."logform-2.3.0" // {
dependencies = [
sources."ms-2.1.3"
];
@@ -113062,7 +113097,7 @@ in
];
})
sources."node-dir-0.1.17"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."noop-logger-0.1.1"
sources."normalize-path-3.0.0"
sources."normalize-url-4.5.1"
@@ -113154,6 +113189,7 @@ in
sources."run-parallel-limit-1.1.0"
sources."rxjs-6.6.7"
sources."safe-buffer-5.2.1"
+ sources."safe-stable-stringify-1.1.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.1"
sources."seek-bzip-1.0.6"
@@ -113983,10 +114019,10 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.717.0";
+ version = "1.720.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.717.0.tgz";
- sha512 = "OWVUEr1F24isElAGG7nxjEQnE6xaxpmgj3vDGLLz3ma2mvtgaUxjWT2fx5EopeEhe9tSk7uF6SUrgudCzrjUgQ==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.720.0.tgz";
+ sha512 = "NCy+57lvoggyM4WIzsNQyf2+fX6eZAqu2nznGq+RVfYBcwLgiDpg76oafrmp/rUtSIM1E+68cm1bJWSiNZqf7w==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -114010,7 +114046,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.1"
sources."@types/cors-2.8.12"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."accepts-1.3.7"
sources."base64-arraybuffer-0.1.4"
sources."base64id-2.0.0"
@@ -114266,7 +114302,7 @@ in
sources."array-unique-0.2.1"
sources."arrify-1.0.1"
sources."assign-symbols-1.0.0"
- (sources."async-append-only-log-3.0.11" // {
+ (sources."async-append-only-log-3.1.0" // {
dependencies = [
sources."push-stream-11.0.1"
];
@@ -115250,7 +115286,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.991.0" // {
+ (sources."aws-sdk-2.992.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -116085,7 +116121,7 @@ in
];
})
sources."braces-3.0.2"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
@@ -116127,7 +116163,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -116223,6 +116259,7 @@ in
];
})
sources."ms-2.1.2"
+ sources."nanocolors-0.1.6"
sources."node-releases-1.1.76"
(sources."normalize-package-data-3.0.3" // {
dependencies = [
@@ -116369,7 +116406,7 @@ in
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/pug-2.0.5"
sources."@types/sass-1.16.1"
sources."ansi-styles-4.3.0"
@@ -116459,7 +116496,7 @@ in
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/pug-2.0.5"
sources."@types/sass-1.16.1"
sources."anymatch-3.1.2"
@@ -117276,7 +117313,7 @@ in
sources."module-alias-2.2.2"
sources."moment-2.29.1"
sources."ms-2.1.2"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."oauth-sign-0.9.0"
sources."p-limit-2.3.0"
sources."p-locate-3.0.0"
@@ -118625,7 +118662,7 @@ in
sources."@types/cacheable-request-6.0.2"
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.3"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."abstract-logging-2.0.1"
@@ -119640,7 +119677,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.1"
sources."@types/cors-2.8.12"
- sources."@types/node-14.17.17"
+ sources."@types/node-14.17.18"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."ansi-regex-5.0.1"
@@ -119721,7 +119758,6 @@ in
sources."safe-buffer-5.2.1"
];
})
- sources."fast-safe-stringify-2.1.1"
sources."fecha-4.2.1"
sources."finalhandler-1.1.2"
sources."fn.name-1.1.0"
@@ -119763,7 +119799,7 @@ in
sources."latest-version-5.1.0"
sources."locks-0.2.2"
sources."lodash-4.17.21"
- (sources."logform-2.2.0" // {
+ (sources."logform-2.3.0" // {
dependencies = [
sources."ms-2.1.3"
];
@@ -119830,6 +119866,7 @@ in
sources."responselike-1.0.2"
sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
+ sources."safe-stable-stringify-1.1.1"
sources."safer-buffer-2.1.2"
(sources."semver-7.3.5" // {
dependencies = [
@@ -119921,7 +119958,7 @@ in
sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w==";
};
dependencies = [
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/unist-2.0.6"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -120066,13 +120103,14 @@ in
vega-cli = nodeEnv.buildNodePackage {
name = "vega-cli";
packageName = "vega-cli";
- version = "5.20.2";
+ version = "5.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.20.2.tgz";
- sha512 = "dp7CncooBn6zSacyoSRdlm+fS1mQ6PsCT2pFILUgsDzn3e/e56iQA2mjmob8DOqM1n/0xbVziVelH31M8fcYXw==";
+ url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.21.0.tgz";
+ sha512 = "UuxW79x2n0bYBexa3vblI2o4CPhIJTBGvA0remuNm74RjkjMkDHMXDriCs5sYQ7jYyekvROmvmC9t/Pn0g0+6Q==";
};
dependencies = [
sources."@mapbox/node-pre-gyp-1.0.5"
+ sources."@types/estree-0.0.50"
sources."abbrev-1.1.1"
sources."agent-base-6.0.2"
sources."ansi-regex-2.1.1"
@@ -120152,7 +120190,7 @@ in
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
sources."nan-2.15.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."nopt-5.0.0"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
@@ -120180,32 +120218,32 @@ in
sources."topojson-client-3.1.0"
sources."tr46-0.0.3"
sources."util-deprecate-1.0.2"
- sources."vega-5.20.2"
+ sources."vega-5.21.0"
sources."vega-canvas-1.2.6"
sources."vega-crossfilter-4.0.5"
sources."vega-dataflow-5.7.4"
sources."vega-encode-4.8.3"
- sources."vega-event-selector-2.0.6"
- sources."vega-expression-4.0.1"
+ sources."vega-event-selector-3.0.0"
+ sources."vega-expression-5.0.0"
sources."vega-force-4.0.7"
sources."vega-format-1.0.4"
- sources."vega-functions-5.12.0"
+ sources."vega-functions-5.12.1"
sources."vega-geo-4.3.8"
sources."vega-hierarchy-4.0.9"
- sources."vega-label-1.0.0"
- sources."vega-loader-4.4.0"
- sources."vega-parser-6.1.3"
+ sources."vega-label-1.1.0"
+ sources."vega-loader-4.4.1"
+ sources."vega-parser-6.1.4"
sources."vega-projection-1.4.5"
sources."vega-regression-1.0.9"
sources."vega-runtime-6.1.3"
sources."vega-scale-7.1.1"
sources."vega-scenegraph-4.9.4"
- sources."vega-selections-5.3.0"
- sources."vega-statistics-1.7.9"
+ sources."vega-selections-5.3.1"
+ sources."vega-statistics-1.7.10"
sources."vega-time-2.0.4"
sources."vega-transforms-4.9.4"
- sources."vega-typings-0.21.0"
- sources."vega-util-1.16.1"
+ sources."vega-typings-0.22.0"
+ sources."vega-util-1.17.0"
sources."vega-view-5.10.1"
sources."vega-view-transforms-4.5.8"
sources."vega-voronoi-4.1.5"
@@ -120224,7 +120262,7 @@ in
sources."wrappy-1.0.2"
sources."y18n-5.0.8"
sources."yallist-4.0.0"
- (sources."yargs-16.2.0" // {
+ (sources."yargs-17.1.1" // {
dependencies = [
sources."ansi-regex-5.0.1"
sources."is-fullwidth-code-point-3.0.0"
@@ -120301,7 +120339,7 @@ in
dependencies = [
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@vercel/build-utils-2.12.2"
sources."@vercel/go-1.2.3"
sources."@vercel/node-1.12.1"
@@ -120887,7 +120925,7 @@ in
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."browser-stdout-1.3.1"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-crc32-0.2.13"
sources."buffer-from-1.1.2"
sources."call-bind-1.0.2"
@@ -120932,7 +120970,7 @@ in
sources."domelementtype-2.2.0"
sources."domhandler-4.2.2"
sources."domutils-2.8.0"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."emoji-regex-8.0.0"
sources."emojis-list-3.0.0"
sources."enhanced-resolve-5.8.3"
@@ -121033,6 +121071,7 @@ in
sources."mocha-8.4.0"
sources."ms-2.1.3"
sources."mute-stream-0.0.8"
+ sources."nanocolors-0.1.6"
sources."nanoid-3.1.20"
sources."neo-async-2.6.2"
sources."node-releases-1.1.76"
@@ -121130,7 +121169,7 @@ in
sources."url-join-1.1.0"
sources."util-deprecate-1.0.2"
sources."v8-compile-cache-2.3.0"
- (sources."vsce-1.99.0" // {
+ (sources."vsce-1.100.0" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -121507,7 +121546,7 @@ in
sources."@starptech/rehype-webparser-0.10.0"
sources."@starptech/webparser-0.10.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/unist-2.0.6"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -122562,7 +122601,7 @@ in
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
sources."nan-2.15.0"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."nopt-5.0.0"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
@@ -122700,7 +122739,7 @@ in
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/yauzl-2.9.2"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.2"
@@ -123272,7 +123311,7 @@ in
sources."@types/eslint-scope-3.7.1"
sources."@types/estree-0.0.50"
sources."@types/json-schema-7.0.9"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@webassemblyjs/ast-1.11.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
sources."@webassemblyjs/helper-api-error-1.11.1"
@@ -123294,13 +123333,12 @@ in
sources."acorn-import-assertions-1.7.6"
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
- sources."browserslist-4.17.0"
+ sources."browserslist-4.17.1"
sources."buffer-from-1.1.2"
sources."caniuse-lite-1.0.30001259"
sources."chrome-trace-event-1.0.3"
- sources."colorette-1.4.0"
sources."commander-2.20.3"
- sources."electron-to-chromium-1.3.845"
+ sources."electron-to-chromium-1.3.846"
sources."enhanced-resolve-5.8.3"
sources."es-module-lexer-0.7.1"
sources."escalade-3.1.1"
@@ -123324,6 +123362,7 @@ in
sources."merge-stream-2.0.0"
sources."mime-db-1.49.0"
sources."mime-types-2.1.32"
+ sources."nanocolors-0.1.6"
sources."neo-async-2.6.2"
sources."node-releases-1.1.76"
sources."p-limit-3.1.0"
@@ -123440,7 +123479,7 @@ in
sources."@nodelib/fs.walk-1.2.8"
sources."@types/http-proxy-1.17.7"
sources."@types/json-schema-7.0.9"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/retry-0.12.1"
sources."accepts-1.3.7"
sources."aggregate-error-3.1.0"
@@ -123816,7 +123855,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."addr-to-ip-port-1.5.4"
sources."airplay-js-0.3.0"
sources."ansi-regex-5.0.1"
@@ -124072,7 +124111,7 @@ in
sources."stream-to-blob-2.0.1"
sources."stream-to-blob-url-3.0.2"
sources."stream-with-known-length-to-buffer-1.0.4"
- sources."streamx-2.11.1"
+ sources."streamx-2.11.2"
sources."string-width-4.2.2"
sources."string2compact-1.3.2"
sources."string_decoder-1.3.0"
@@ -125128,7 +125167,7 @@ in
sources."pify-2.3.0"
];
})
- sources."walk-2.3.14"
+ sources."walk-2.3.15"
sources."walk-up-path-1.0.0"
sources."wcwidth-1.0.1"
sources."which-1.3.1"
@@ -125255,9 +125294,9 @@ in
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
- sources."@types/fs-extra-9.0.12"
+ sources."@types/fs-extra-9.0.13"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.9.4"
+ sources."@types/node-16.9.6"
sources."@types/node-fetch-2.5.12"
sources."ansi-styles-4.3.0"
sources."array-union-3.0.1"
@@ -125293,7 +125332,7 @@ in
sources."mime-db-1.49.0"
sources."mime-types-2.1.32"
sources."minimist-1.2.5"
- sources."node-fetch-2.6.4"
+ sources."node-fetch-2.6.5"
sources."path-type-4.0.0"
sources."pause-stream-0.0.11"
sources."picomatch-2.3.0"
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 44284ef78b12..372865e69ddc 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "9.1.0";
+ version = "9.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MuQQ9IpLjsAStpdG8Q0uOzLQl02afStVb52/Rtd+IIs=";
+ sha256 = "1bkk6mj1h1zhhp4s1ps6g950vzgfbxdj9pw762fz238p48ccw90b";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index 9d83e092f5d8..45158b8015d5 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerinstance";
- version = "8.0.0";
+ version = "9.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "7aeb380af71fc35a71d6752fa25eb5b95fdb2a0027fa32e6f50bce87e2622916";
+ sha256 = "041431c5a768ac652aac318a17f2a53b90db968494c79abbafec441d0be387ff";
};
propagatedBuildInputs = [
@@ -31,6 +31,8 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
+ pythonImportsCheck = [ "azure.mgmt.containerinstance" ];
+
meta = with lib; {
description = "This is the Microsoft Azure Container Instance Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 47a6a48eaca7..d88a431bc6f2 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -4,6 +4,7 @@
, simpleeval
, isPy27
, coveralls
+, wcmatch
}:
buildPythonPackage rec {
@@ -21,6 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
simpleeval
+ wcmatch
];
checkInputs = [
@@ -31,10 +33,14 @@ buildPythonPackage rec {
coverage run -m unittest discover -s tests -t tests
'';
+ pythonImportsCheck = [
+ "casbin"
+ ];
+
meta = with lib; {
description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python";
homepage = "https://github.com/casbin/pycasbin";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index de833e18be8e..608f3a0cac68 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "check-manifest";
- version = "0.46";
+ version = "0.47";
src = fetchPypi {
inherit pname version;
- sha256 = "5895e42a012989bdc51854a02c82c8d6898112a4ab11f2d7878200520b49d428";
+ sha256 = "56dadd260a9c7d550b159796d2894b6d0bcc176a94cbc426d9bb93e5e48d12ce";
};
# Test requires filesystem access
diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix
index 7ee41a962c73..48ed4d6d0e1c 100644
--- a/pkgs/development/python-modules/django/3.nix
+++ b/pkgs/development/python-modules/django/3.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "3.2.5";
+ version = "3.2.7";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x";
+ sha256 = "95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2";
};
patches = lib.optional withGdal
diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix
new file mode 100644
index 000000000000..3b6b42a7678e
--- /dev/null
+++ b/pkgs/development/python-modules/faraday-plugins/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, beautifulsoup4
+, buildPythonPackage
+, click
+, colorama
+, fetchFromGitHub
+, html2text
+, lxml
+, pytestCheckHook
+, python-dateutil
+, pytz
+, requests
+, simplejson
+, tabulate
+}:
+
+buildPythonPackage rec {
+ pname = "faraday-plugins";
+ version = "1.5.3";
+
+ src = fetchFromGitHub {
+ owner = "infobyte";
+ repo = "faraday_plugins";
+ rev = "v${version}";
+ sha256 = "0nyywpsyw7akwdah75s9mz5nz11y1hbynp08pvqifwdw49crih02";
+ };
+
+ propagatedBuildInputs = [
+ beautifulsoup4
+ click
+ colorama
+ html2text
+ lxml
+ python-dateutil
+ pytz
+ requests
+ simplejson
+ tabulate
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTestPaths = [
+ # faraday itself is currently not available
+ "tests/test_report_collection.py"
+ ];
+
+ disabledTests = [
+ # Fail because of missing faraday
+ "test_detect_report"
+ "test_process_report_summary"
+ ];
+
+ pythonImportsCheck = [ "faraday_plugins" ];
+
+ meta = with lib; {
+ description = "Security tools report parsers for Faraday";
+ homepage = "https://github.com/infobyte/faraday_plugins";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
new file mode 100644
index 000000000000..0bc1246eb326
--- /dev/null
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -0,0 +1,59 @@
+{ buildPythonPackage
+, cython
+, fetchFromGitHub
+, isPy38
+, lib
+, lz4
+, numpy
+, pandas
+, pytestCheckHook
+, python-dateutil
+, python-snappy
+, pythonOlder
+, zstandard
+}:
+
+buildPythonPackage rec {
+ pname = "fastavro";
+ version = "1.4.4";
+
+ disabled = pythonOlder "3.6";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = version;
+ sha256 = "1sf8nqifwp0cggk59s22ygj3rm1nysa8b91xl8bpv2knqyjy1q32";
+ };
+
+ preBuild = ''
+ export FASTAVRO_USE_CYTHON=1
+ '';
+
+ nativeBuildInputs = [ cython ];
+
+ checkInputs = [
+ lz4
+ numpy
+ pandas
+ pytestCheckHook
+ python-dateutil
+ python-snappy
+ zstandard
+ ];
+
+ # Fails with "AttributeError: module 'fastavro._read_py' has no attribute
+ # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676.
+ disabledTests = [ "test_cython_python" ];
+
+ # CLI tests are broken on Python 3.8. See https://github.com/fastavro/fastavro/issues/558.
+ disabledTestPaths = lib.optionals isPy38 [ "tests/test_main_cli.py" ];
+
+ pythonImportsCheck = [ "fastavro" ];
+
+ meta = with lib; {
+ description = "Fast read/write of AVRO files";
+ homepage = "https://github.com/fastavro/fastavro";
+ license = licenses.mit;
+ maintainers = with maintainers; [ samuela ];
+ };
+}
diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 437c10c3d849..6d2f9f30a4e5 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.20.0";
+ version = "1.21.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "sha256-VBKGzoLn71BQ5drbdiDjbpfHuYKGqHhuSwq0iNwdfh4=";
+ sha256 = "081pwd3aa7kbgxqcl1hfi2ny4iapnxkcp9ypsfslr69d0khvfc4s";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix
index d101cdfd0c2e..f33e63db02fe 100644
--- a/pkgs/development/python-modules/maxminddb/default.nix
+++ b/pkgs/development/python-modules/maxminddb/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "2.0.3";
+ version = "2.1.0";
pname = "maxminddb";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "47e86a084dd814fac88c99ea34ba3278a74bc9de5a25f4b815b608798747c7dc";
+ sha256 = "c47b8acba98d03b8c762684d899623c257976f3eb0c9d557ff865d20cddc9d6b";
};
buildInputs = [ libmaxminddb ];
diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix
new file mode 100644
index 000000000000..4ef79bc90716
--- /dev/null
+++ b/pkgs/development/python-modules/pyp/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, coreutils
+, pythonOlder
+, astunparse
+, jq
+, bc
+}:
+
+buildPythonPackage rec {
+ pname = "pyp";
+ version = "0.3.4";
+
+ src = fetchFromGitHub {
+ owner = "hauntsaninja";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-K9dGmvy4siurmhqwNfg1dT0TWc6tCSaxfPyaJkYM2Vw=";
+ };
+
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
+ astunparse
+ ];
+
+ preCheck = ''
+ export PATH=$out/bin:$PATH
+ '';
+ checkInputs = [
+ pytestCheckHook
+ coreutils
+ jq
+ bc
+ ];
+
+ meta = with lib; {
+ description = "Easily run Python at the shell! Magical, but never mysterious.";
+ homepage = "https://github.com/hauntsaninja/pyp";
+ license = licenses.mit;
+ maintainers = with maintainers; [ rmcgibbo ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-status/default.nix b/pkgs/development/python-modules/python-status/default.nix
new file mode 100644
index 000000000000..2633d93c312f
--- /dev/null
+++ b/pkgs/development/python-modules/python-status/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "python-status";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0lryrvmi04g7d38ilm4wfw717m0ddhylrzb5cm59lrp3ai3q572f";
+ };
+
+ # Project doesn't ship tests yet
+ doCheck = false;
+
+ pythonImportsCheck = [ "status" ];
+
+ meta = with lib; {
+ description = "HTTP Status for Humans";
+ homepage = "https://github.com/avinassh/status/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index 787e9a6e279c..ca6cb7d23075 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -1,6 +1,8 @@
{ lib
+, appdirs
, attrs
, buildPythonPackage
+, bson
, cattrs
, fetchFromGitHub
, itsdangerous
@@ -18,15 +20,16 @@
buildPythonPackage rec {
pname = "requests-cache";
- version = "0.7.4";
- disabled = pythonOlder "3.6";
+ version = "0.8.1";
format = "pyproject";
+ disabled = pythonOlder "3.7";
+
src = fetchFromGitHub {
owner = "reclosedev";
repo = "requests-cache";
rev = "v${version}";
- sha256 = "sha256-FndKFdmEsp3TF2W4b7nhARi9ZOutlE43vvzYxiwbL08=";
+ sha256 = "sha256-HzOcPWmvUhqPtb/7Mnw6wWY7a4CwGRwPgq+7QoHJAc8=";
};
nativeBuildInputs = [
@@ -34,7 +37,9 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
+ appdirs
attrs
+ bson
cattrs
itsdangerous
pyyaml
diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix
new file mode 100644
index 000000000000..a91f4ed74f17
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, numpy
+, cython
+, scipy
+, scikit-learn
+, matplotlib
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "scikit-learn-extra";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "scikit-learn-contrib";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "09v7a9jdycdrlqq349m1gbn8ppzv1bl5g3l72k6ywsx2xb01qw13";
+ };
+
+ nativeBuildInputs = [ numpy cython ];
+ propagatedBuildInputs = [ numpy scipy scikit-learn ];
+ checkInputs = [ matplotlib pytestCheckHook ];
+
+ preCheck = ''
+ # Remove the package in the build dir, because Python defaults to it and
+ # ignores the one in Nix store with cythonized modules.
+ rm -r sklearn_extra
+ '';
+
+ pytestFlagsArray = [ "--pyargs sklearn_extra" ];
+ disabledTestPaths = [
+ "benchmarks"
+ "examples"
+ "doc"
+ ];
+ disabledTests = [
+ "build" # needs network connection
+ ];
+
+ # Check packages with cythonized modules
+ pythonImportsCheck = [
+ "sklearn_extra"
+ "sklearn_extra.cluster"
+ "sklearn_extra.robust"
+ "sklearn_extra.utils"
+ ];
+
+ meta = {
+ description = "A set of tools for scikit-learn";
+ homepage = "https://github.com/scikit-learn-contrib/scikit-learn-extra";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ yl3dy ];
+ };
+}
diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix
new file mode 100644
index 000000000000..b9b1cbe7b058
--- /dev/null
+++ b/pkgs/development/python-modules/simple-rest-client/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, httpx
+, pytest-asyncio
+, pytest-httpserver
+, pytestCheckHook
+, python-slugify
+, python-status
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "simple-rest-client";
+ version = "1.0.8";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "allisson";
+ repo = "python-simple-rest-client";
+ rev = version;
+ sha256 = "12qxhrjhlbyyr1pkvwfkcxbsmyns5b0mfdn42vz310za5x76ldj3";
+ };
+
+ propagatedBuildInputs = [
+ httpx
+ python-slugify
+ python-status
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-asyncio
+ pytest-httpserver
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pytest-runner" ""
+ substituteInPlace pytest.ini \
+ --replace " --cov=simple_rest_client --cov-report=term-missing" ""
+ '';
+
+ pythonImportsCheck = [ "simple_rest_client" ];
+
+ meta = with lib; {
+ description = "Simple REST client for Python";
+ homepage = "https://github.com/allisson/python-simple-rest-client";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index d1ea00b7f3e5..f1be3dad3fb1 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "skytemple-files";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "1gpmgdas7x1zmszs9hlxjb6nk683901cy1kc0gyhz0rzdn5jg3lb";
+ sha256 = "04n2g2lbff0fr3mkqma39j6acpbj73dbizz9hw5m15110idc577h";
fetchSubmodules = true;
};
diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix
index 93f158508eb6..05825c6c9640 100644
--- a/pkgs/development/python-modules/smbprotocol/default.nix
+++ b/pkgs/development/python-modules/smbprotocol/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "smbprotocol";
- version = "1.6.2";
+ version = "1.7.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nSWZfhZD++I5hM2ijqft2U95kyEe3h/nrSfiT3sQiKE=";
+ sha256 = "sha256-4nhgt9/LgoGucNehZkgs4XcneCq+fihWQHtwMbuSp2s=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index 2d7ccc052287..798dbd6c42de 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.25.6";
+ version = "2.25.8";
src = fetchPypi {
inherit pname version;
- sha256 = "1vh203dppi6457lwv7z46dc8rpanjlahk4v3394nq1jwyp0425g2";
+ sha256 = "sha256-IlrC6GVJtu86ikS/lV+AtJVYVXBKFdKIPYRFyN9jckI=";
};
# Modules doesn't have tests
diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix
index e7fc0f62d5e3..d4ddd6fa3cc8 100644
--- a/pkgs/development/python-modules/velbus-aio/default.nix
+++ b/pkgs/development/python-modules/velbus-aio/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
- version = "2021.9.1";
+ version = "2021.9.2";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = pname;
rev = version;
- sha256 = "0q7jrjljp65lrazv2yjsiw69240vmhcss3dqrgxhq79dpyck6zfl";
+ sha256 = "sha256-pFVhWrMygCwAsAYPnqtoaPcgh6y0Tf9vROYfn0M+g2E=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/wsgiprox/default.nix b/pkgs/development/python-modules/wsgiprox/default.nix
new file mode 100644
index 000000000000..af35c23e455f
--- /dev/null
+++ b/pkgs/development/python-modules/wsgiprox/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, six
+, certauth
+}:
+
+buildPythonPackage rec {
+ pname = "wsgiprox";
+ version = "1.5.2";
+
+ src = fetchFromGitHub {
+ owner = "webrecorder";
+ repo = "wsgiprox";
+ # https://github.com/webrecorder/wsgiprox/issues/8
+ rev = "004870a87959e68ff28ff4362e4f0df28ec22030";
+ sha256 = "sha256-EquddaNrVceyJHuQMCajKHGZX2Q7ebR0Zhvi2pl2WEw=";
+ };
+
+ propagatedBuildInputs = [
+ six
+ certauth
+ ];
+
+ pythonImportsCheck = [ "wsgiprox" ];
+
+ # See https://github.com/webrecorder/wsgiprox/issues/6
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Python WSGI Middleware for adding HTTP/S proxy support to any WSGI Application";
+ homepage = "https://github.com/webrecorder/wsgiprox";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ Luflosi ];
+ };
+}
diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix
index efbc46448259..75541dc112a8 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/pkgs/development/tools/analysis/sparse/default.nix
@@ -1,27 +1,36 @@
-{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm, perl }:
+{ callPackage, fetchurl, lib, stdenv, gtk3, pkg-config, libxml2, llvm, perl, sqlite }:
-stdenv.mkDerivation rec {
+let
+ GCC_BASE = "${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.uname.processor}-unknown-linux-gnu/${stdenv.cc.cc.version}";
+in stdenv.mkDerivation rec {
pname = "sparse";
- version = "0.5.0";
+ version = "0.6.3";
src = fetchurl {
url = "mirror://kernel/software/devel/sparse/dist/${pname}-${version}.tar.xz";
- sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj";
+ sha256 = "16d8c4dhipjzjf8z4z7pix1pdpqydz0v4r7i345f5s09hjnxpxnl";
};
preConfigure = ''
- sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g"
+ sed -i 's|"/usr/include"|"${stdenv.cc.libc.dev}/include"|' pre-process.c
+ sed -i 's|qx(\$ccom -print-file-name=)|"${GCC_BASE}"|' cgcc
+ makeFlags+=" PREFIX=$out"
'';
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libxml2 llvm perl ];
+ buildInputs = [ gtk3 libxml2 llvm perl sqlite ];
doCheck = true;
+ buildFlags = "GCC_BASE:=${GCC_BASE}";
- meta = {
+ passthru.tests = {
+ simple-execution = callPackage ./tests.nix { };
+ };
+
+ meta = with lib; {
description = "Semantic parser for C";
homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/";
- license = lib.licenses.mit;
- platforms = lib.platforms.linux;
- maintainers = [ lib.maintainers.thoughtpolice ];
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ thoughtpolice jkarlson ];
};
}
diff --git a/pkgs/development/tools/analysis/sparse/tests.nix b/pkgs/development/tools/analysis/sparse/tests.nix
new file mode 100644
index 000000000000..5eba254e537a
--- /dev/null
+++ b/pkgs/development/tools/analysis/sparse/tests.nix
@@ -0,0 +1,24 @@
+{ runCommand, gcc, sparse, writeText }:
+let
+ src = writeText "CODE.c" ''
+ #include
+ #include
+ #include
+
+ int main(int argc, char *argv[]) {
+ return EXIT_SUCCESS;
+ }
+ '';
+in
+ runCommand "${sparse.pname}-tests" { buildInputs = [ gcc sparse ]; meta.timeout = 3; }
+''
+ set -eu
+ ${sparse}/bin/cgcc ${src} > output 2>&1 || ret=$?
+ if [[ -z $( requireFile != null && writeText != null
let
videos = import ./3dovideo.nix {
- inherit stdenv lib requireFile writeText fetchurl haskellPackages;
+ inherit stdenv lib requireFile writeText fetchFromGitHub haskellPackages;
};
remixPacks = lib.imap1 (num: sha256: fetchurl rec {
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 8b1e7fe8fc70..911892cb728e 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
-, mupdf
+, mupdf, dejavu_fonts, liblouis
}:
let
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "cups-filters";
- version = "1.25.12";
+ version = "1.28.10";
src = fetchurl {
url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
- sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn";
+ sha256 = "sha256-z4yQRpTETPaJtXJORtI9qa5RJdVDdLNAxkIHfMKcqDc=";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
@@ -21,6 +21,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
cups poppler poppler_utils fontconfig libjpeg libpng perl
ijs qpdf dbus avahi ghostscript mupdf
+ liblouis # braille embosser support
];
configureFlags = [
@@ -33,7 +34,7 @@ in stdenv.mkDerivation rec {
"--enable-imagefilters"
"--with-rcdir=no"
"--with-shell=${stdenv.shell}"
- "--with-test-font-path=/path-does-not-exist"
+ "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf"
];
makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ];
@@ -60,7 +61,7 @@ in stdenv.mkDerivation rec {
'';
enableParallelBuilding = true;
- doCheck = false; # fails 4 out of 6 tests
+ doCheck = true;
meta = {
homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters";
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 38bb2c4ebd07..717fdaee72a5 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -40,7 +40,7 @@ let
(whenOlder "5.2" (if (features.debug or false) then yes else no))
(whenAtLeast "5.2" yes)
];
- DEBUG_INFO_BTF = whenAtLeast "5.2" yes;
+ DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes);
DEBUG_KERNEL = yes;
DEBUG_DEVRES = no;
DYNAMIC_DEBUG = yes;
diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix
index 9bfe3182d653..71966a32cf0f 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/pkgs/servers/beanstalkd/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, installShellFiles, nixosTests }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, nixosTests }:
stdenv.mkDerivation rec {
version = "1.12";
pname = "beanstalkd";
- src = fetchurl {
- url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz";
- sha256 = "0gw8aygysnjzzfjgfzivy5vajla9adg2zcr4h8rrdf0xyykpwfpl";
+ src = fetchFromGitHub {
+ owner = "kr";
+ repo = "beanstalkd";
+ rev = "v${version}";
+ hash = "sha256-HChpVZ02l08CObrb4+ZEjBiXeQMMYi6zhSWUTDxuEao=";
};
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix
index 40941123ebc4..d276c02487df 100644
--- a/pkgs/servers/couchpotato/default.nix
+++ b/pkgs/servers/couchpotato/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, python2Packages, lib }:
+{ fetchFromGitHub, python2Packages, lib }:
with python2Packages;
@@ -7,9 +7,11 @@ buildPythonApplication rec {
version = "3.0.1";
disabled = isPy3k;
- src = fetchurl {
- url = "https://github.com/CouchPotato/CouchPotatoServer/archive/build/${version}.tar.gz";
- sha256 = "1xwjis3ijh1rff32mpdsphmsclf0lkpd3phpgxkccrigq1m9r3zh";
+ src = fetchFromGitHub {
+ owner = "CouchPotato";
+ repo = "CouchPotatoServer";
+ rev = "build/${version}";
+ hash = "sha256-0k8MqLnqYjhHPE9/jncTFIj1T4F2aXU4mXdeEimDB7M=";
};
format = "other";
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 3e0a4e5d9940..eee65c3a5d1f 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, systemd, fcgi, autoreconfHook, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcgiwrap";
version = "1.1.0";
- src = fetchurl {
- url = "https://github.com/gnosek/fcgiwrap/archive/${version}.tar.gz";
- sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac";
+ src = fetchFromGitHub {
+ owner = "gnosek";
+ repo = "fcgiwrap";
+ rev = version;
+ hash = "sha256-znAsZk+aB2XO2NK8Mjc+DLwykYKHolnVQPErlaAx3Oc=";
};
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index eeabbc1f30dc..39f21b189378 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, apacheHttpd }:
+{ lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }:
let
apache-24-patch = fetchurl {
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
pname = "mod_fastcgi";
version = "2.4.7.1";
- src = fetchurl {
- url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
- sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55";
+ src = fetchFromGitHub {
+ owner = "FastCGI-Archives";
+ repo = "mod_fastcgi";
+ rev = version;
+ hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg=";
};
patches = [ apache-24-patch ];
@@ -42,5 +44,6 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.peti ];
+ broken = true; # patch 'compile-against-apache24.diff' no longer works
};
}
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 6a029ce1dccd..945f34ac9161 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, apacheHttpd, python, ncurses }:
+{ lib, stdenv, fetchFromGitHub, apacheHttpd, python, ncurses }:
stdenv.mkDerivation rec {
pname = "mod_wsgi";
version = "4.9.0";
- src = fetchurl {
- url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
- sha256 = "sha256-Cm84CvhUuFoxUeVKPDO1IMSm4hqZvK165d37/jGnS1A=";
+ src = fetchFromGitHub {
+ owner = "GrahamDumpleton";
+ repo = "mod_wsgi";
+ rev = version;
+ hash = "sha256-gaWA6m4ENYtm88hCaoqrcIooA0TBI7Kj6fU6pPShoo4=";
};
buildInputs = [ apacheHttpd python ncurses ];
diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix
index b5137c92b450..36bffaa3ec61 100644
--- a/pkgs/servers/nitter/default.nix
+++ b/pkgs/servers/nitter/default.nix
@@ -1,99 +1,9 @@
-{ lib
-, stdenv
-, nixosTests
-, fetchFromGitHub
-, nim
-, libsass
-}:
+{ lib, nimPackages, nixosTests, fetchFromGitHub, libsass }:
-let
- jester = fetchFromGitHub {
- owner = "dom96";
- repo = "jester";
- rev = "v0.5.0";
- sha256 = "0m8a4ss4460jd2lcbqcbdd68jhcy35xg7qdyr95mh8rflwvmcvhk";
- };
- karax = fetchFromGitHub {
- owner = "karaxnim";
- repo = "karax";
- rev = "1.1.2";
- sha256 = "07ykrd21hd76vlmkqpvv5xvaxw6aaq87bky47p2420ni85a6d94j";
- };
- sass = fetchFromGitHub {
- owner = "dom96";
- repo = "sass";
- rev = "e683aa1";
- sha256 = "0qvly5rilsqqsyvr67pqhglm55ndc4nd6v90jwswbnigxiqf79lc";
- };
- regex = fetchFromGitHub {
- owner = "nitely";
- repo = "nim-regex";
- rev = "2e32fdc";
- sha256 = "1hrl40mwql7nh4wc7sdhmk8bj5728b93v5a93j49v660l0rn4qx8";
- };
- unicodedb = fetchFromGitHub {
- owner = "nitely";
- repo = "nim-unicodedb";
- rev = "v0.9.0";
- sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq";
- };
- unicodeplus= fetchFromGitHub {
- owner = "nitely";
- repo = "nim-unicodeplus";
- rev = "v0.8.0";
- sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk";
- };
- segmentation = fetchFromGitHub {
- owner = "nitely";
- repo = "nim-segmentation";
- rev = "v0.1.0";
- sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh";
- };
- nimcrypto = fetchFromGitHub {
- owner = "cheatfate";
- repo = "nimcrypto";
- rev = "a5742a9a214ac33f91615f3862c7b099aec43b00";
- sha256 = "0al0jsaicm8vyr63n909dq1glhvpra1n9sllmj0r7lsjsdb59wsz";
- };
- markdown = fetchFromGitHub {
- owner = "soasme";
- repo = "nim-markdown";
- rev = "abdbe5e";
- sha256 = "0f3c1sxvhbbds43c9l8cz69pfpf984msj1lv4pb7bzpxb5zil2wy";
- };
- packedjson = fetchFromGitHub {
- owner = "Araq";
- repo = "packedjson";
- rev = "7198cc8";
- sha256 = "1ay2zd88q8hvpvigsg8h0y5vc65hk3lk0d48fy9hwg4lcng19mp1";
- };
- supersnappy = fetchFromGitHub {
- owner = "guzba";
- repo = "supersnappy";
- rev = "1.1.5";
- sha256 = "1y26sgnszvdf5sn7j0jx2dpd4i03mvbk9i9ni9kbyrs798bjwi6z";
- };
- redpool = fetchFromGitHub {
- owner = "zedeus";
- repo = "redpool";
- rev = "57aeb25";
- sha256 = "0fph7qlia6fvya1zqzbgvww2hk5pd0vq1wlf9ij9jyn655mg0w3q";
- };
- frosty = fetchFromGitHub {
- owner = "disruptek";
- repo = "frosty";
- rev = "0.3.1";
- sha256 = "0hd6484ihjgl57gmqyp5xfq5prycb49k0313fqky600mhz71nmyz";
- };
- redis = fetchFromGitHub {
- owner = "zedeus";
- repo = "redis";
- rev = "94bcbf1";
- sha256 = "1p9zv4f4lqrjqa8fk98cb89b9fzlf866jc584ll9sws14904i80j";
- };
-in stdenv.mkDerivation rec {
+nimPackages.buildNimPackage rec {
pname = "nitter";
version = "unstable-2021-07-18";
+ nimBinOnly = true;
src = fetchFromGitHub {
owner = "zedeus";
@@ -102,28 +12,33 @@ in stdenv.mkDerivation rec {
sha256 = "1dl8ndyv8m1hnydrp5xilcpp2cfbp02d5jap3y42i4nazc9ar6p4";
};
- nativeBuildInputs = [ nim ];
- buildInputs = [ libsass ];
+ buildInputs = with nimPackages; [
+ jester
+ karax
+ sass
+ regex
+ unicodedb
+ unicodeplus
+ segmentation
+ nimcrypto
+ markdown
+ packedjson
+ supersnappy
+ redpool
+ frosty
+ redis
+ ];
- buildPhase = ''
- runHook preBuild
- export HOME=$TMPDIR
- nim -d:release -p:${jester} -p:${karax} -p:${sass}/src -p:${regex}/src -p:${unicodedb}/src -p:${unicodeplus}/src -p:${segmentation}/src -p:${nimcrypto} -p:${markdown}/src -p:${packedjson} -p:${supersnappy}/src -p:${redpool}/src -p:${frosty} -p:${redis}/src c src/$pname
- nim -p:${sass}/src c --hint[Processing]:off -r tools/gencss
- runHook postBuild
+ postBuild = ''
+ nim c --hint[Processing]:off -r tools/gencss
'';
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin src/$pname
+ postInstall = ''
mkdir -p $out/share/nitter
cp -r public $out/share/nitter/public
- runHook postInstall
'';
- passthru.tests = {
- inherit (nixosTests) nitter;
- };
+ passthru.tests = { inherit (nixosTests) nitter; };
meta = with lib; {
description = "Alternative Twitter front-end";
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 187a4c4adb11..ed163f2547df 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "osrm-backend";
- version = "5.25.0";
+ version = "5.26.0";
src = fetchFromGitHub {
owner = "Project-OSRM";
repo = "osrm-backend";
rev = "v${version}";
- sha256 = "sha256-wmhm3q93HTv4+VMlF9rhms4uw4LJBozOKTtHpDgAbrU=";
+ sha256 = "sha256-kqRYE26aeq7nCen56TJo3BlyLFWn4NMltsq+re64/VQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index d7d545f19c61..8248becd3e42 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -45,11 +45,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "samba";
- version = "4.14.7";
+ version = "4.15.0";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
- sha256 = "sha256-b1A1P5YCqiAkXrGM6wDn5ex5PfCXSuvVJUw48W2PGQY=";
+ sha256 = "0h26s9lfdl8mccs9rfv1gr5f8snd95gjkrik6wl5ccb27044gwxi";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch
index b8636958ee27..ff264fe1c0af 100644
--- a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch
+++ b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch
@@ -1,6 +1,6 @@
-From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001
-From: Uri Simchoni
-Date: Sun, 20 Oct 2019 00:03:14 +0300
+From f3f98c6ecc6febd8e79696672668e33d11fc19cb Mon Sep 17 00:00:00 2001
+From: Pascal Bach
+Date: Wed, 22 Sep 2021 09:42:42 +0200
Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded
heimdal
@@ -33,17 +33,22 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164
Signed-off-by: Uri Simchoni
Signed-off-by: Bernd Kuhls
-[Bernd: rebased for version 4.11.13]
+[Bachp: rebased for version 4.15.0]
+
+# Conflicts:
+# wscript_configure_system_heimdal
---
wscript_configure_embedded_heimdal | 11 +++++++++++
wscript_configure_system_heimdal | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
-index 8c55ae2a938..4fdae8062c5 100644
+index 1c7801f705e..edcab15a88e 100644
--- a/wscript_configure_embedded_heimdal
+++ b/wscript_configure_embedded_heimdal
-@@ -1 +1,12 @@
+@@ -6,3 +6,14 @@ if not conf.env['BISON']:
+
+ conf.define('USING_EMBEDDED_HEIMDAL', 1)
conf.RECURSE('source4/heimdal_build')
+
+def check_system_heimdal_binary(name):
@@ -57,13 +62,13 @@ index 8c55ae2a938..4fdae8062c5 100644
+check_system_heimdal_binary("compile_et")
+check_system_heimdal_binary("asn1_compile")
diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal
-index 0ff6dad2f55..f77c177442f 100644
+index 67d8804d0ff..20aee31aac7 100644
--- a/wscript_configure_system_heimdal
+++ b/wscript_configure_system_heimdal
@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None):
conf.define('USING_SYSTEM_%s' % name.upper(), 1)
return True
-
+
-def check_system_heimdal_binary(name):
- if conf.LIB_MAY_BE_BUNDLED(name):
- return False
@@ -73,15 +78,18 @@ index 0ff6dad2f55..f77c177442f 100644
- return True
-
check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h")
-
+
if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"):
-@@ -96,7 +96,4 @@
+@@ -96,9 +88,6 @@ finally:
#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
# conf.define('USING_SYSTEM_TOMMATH', 1)
-
+
-check_system_heimdal_binary("compile_et")
-check_system_heimdal_binary("asn1_compile")
-
+ conf.env.KRB5_VENDOR = 'heimdal'
conf.define('USING_SYSTEM_KRB5', 1)
---
-2.20.1
+ conf.define('USING_SYSTEM_HEIMDAL', 1)
+--
+2.33.0
+
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 3e28f5010499..7296635c7ddc 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,13 +1,24 @@
-{ lib, fetchurl, makeWrapper
-, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:
+{ lib
+, fetchFromGitHub
+, makeWrapper
+, perlPackages
+, flac
+, faad2
+, sox
+, lame
+, monkeysAudio
+, wavpack
+}:
perlPackages.buildPerlPackage rec {
pname = "slimserver";
version = "7.9.2";
- src = fetchurl {
- url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz";
- sha256 = "1rn9y7xvg5aqmgcbfpi7lcqy8d7hgwqx8b2llzpzrv7854zm1wcw";
+ src = fetchFromGitHub {
+ owner = "Logitech";
+ repo = "slimserver";
+ rev = version;
+ hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y=";
};
buildInputs = [
@@ -73,7 +84,7 @@ perlPackages.buildPerlPackage rec {
# relax audio scan version constraints
substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01"
substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93"
- '';
+ '';
preConfigurePhase = "";
diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix
index 5c699e5dfd28..836a5934d96b 100644
--- a/pkgs/servers/ursadb/default.nix
+++ b/pkgs/servers/ursadb/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, cmake, zeromq, cppzmq }:
+{ lib, stdenv, fetchFromGitHub, cmake, zeromq, cppzmq }:
stdenv.mkDerivation rec {
pname = "ursadb";
version = "1.2.0";
- src = fetchurl {
- url = "https://github.com/CERT-Polska/ursadb/archive/v${version}.tar.gz";
- sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym";
+ src = fetchFromGitHub {
+ owner = "CERT-Polska";
+ repo = "ursadb";
+ rev = "v${version}";
+ hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U=";
};
installPhase = ''
diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix
index d23c334ad62f..c9729fa43d87 100644
--- a/pkgs/tools/audio/dir2opus/default.nix
+++ b/pkgs/tools/audio/dir2opus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }:
+{ lib, stdenv, fetchFromGitHub, python, mutagen, wrapPython, opusTools, mpg123 }:
let version = "0.12.2"; in
stdenv.mkDerivation rec {
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
buildInputs = [ wrapPython ];
propagatedBuildInputs = [ opusTools mpg123 ];
- src = fetchurl {
- url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz";
- name = "${pname}-${version}.tar.gz";
- sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d";
+ src = fetchFromGitHub {
+ owner = "ehmry";
+ repo = "dir2opus";
+ rev = version;
+ hash = "sha256-ZEsXwqxikWxFOz99wTI3rEK/rEYA+BSWGrCwW4q+FFc=";
};
postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus";
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index 8e54b58e2017..544f61918de9 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, python3Packages, lzop, postgresql, pv }:
+{ lib, fetchFromGitHub, python3Packages, lzop, postgresql, pv }:
python3Packages.buildPythonApplication rec {
pname = "wal-e";
@@ -6,9 +6,11 @@ python3Packages.buildPythonApplication rec {
namePrefix = "";
- src = fetchurl {
- url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz";
- sha256 = "5TTd7NTO73+MCJf3dHIcNojjHdoaKJ1T051iW7Kt9Ow=";
+ src = fetchFromGitHub {
+ owner = "wal-e";
+ repo = "wal-e";
+ rev = "v${version}";
+ hash = "sha256-I6suHkAYzDtlNFNPH4SziY93Ryp+NTHkCBuojDvv+U4=";
};
# needs tox
@@ -27,7 +29,7 @@ python3Packages.buildPythonApplication rec {
meta = {
description = "A Postgres WAL-shipping disaster recovery and replication toolkit";
homepage = "https://github.com/wal-e/wal-e";
- maintainers = [];
+ maintainers = [ ];
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
};
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index 12913ed62225..795a45f8864d 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -1,13 +1,18 @@
-{ lib, stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
-stdenv.mkDerivation {
+{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind }:
+stdenv.mkDerivation rec {
pname = "zbackup";
version = "1.4.4";
- src = fetchurl {
- url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz";
- sha256 = "11csla7n44lg7x6yqg9frb21vnkr8cvnh6ardibr3nj5l39crk7g";
+
+ src = fetchFromGitHub {
+ owner = "zbackup";
+ repo = "zbackup";
+ rev = version;
+ hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI=";
};
+
buildInputs = [ zlib openssl protobuf lzo libunwind ];
nativeBuildInputs = [ cmake protobufc ];
+
meta = {
description = "A versatile deduplicating backup tool";
homepage = "http://zbackup.org/";
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index ba6cb79fbd57..f6dfdd84d8c4 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchurl, pkg-config, util-linux, bash }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }:
stdenv.mkDerivation rec {
pname = "bcache-tools";
version = "1.0.7";
- src = fetchurl {
- name = "${pname}-${version}.tar.gz";
- url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
- sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
+ src = fetchFromGitHub {
+ owner = "g2p";
+ repo = "bcache-tools";
+ rev = "v${version}";
+ hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index a4117790a148..ceca22eca35d 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -4,24 +4,22 @@
stdenv.mkDerivation rec {
pname = "argyllcms";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchzip {
# Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
# while on me. It might be good to find a mirror
url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
- sha256 = "sha256-EcVwYJfJbWWXl58O3ulsrWgUYTgR4uWdMgb0Z140Pu4=";
+ sha256 = "sha256-umY3wQfG26Okqnw+MCUnlwWTAyJ6MR/FHe5oe61KBh0=";
};
- patches = [ ./gcc5.patch ];
-
# The contents of this file comes from the Jamtop file from the
# root of the ArgyllCMS distribution, rewritten to pick up Nixpkgs
# library paths. When ArgyllCMS is updated, make sure that changes
# in that file is reflected here.
jamTop = writeText "argyllcms_jamtop" ''
DESTDIR = "/" ;
- REFSUBDIR = "ref" ;
+ REFSUBDIR = "share/argyllcms" ;
# Keep this DESTDIR anchored to Jamtop. PREFIX is used literally
ANCHORED_PATH_VARS = DESTDIR ;
@@ -41,11 +39,21 @@ stdenv.mkDerivation rec {
# enable dummy Demo Instrument (only if code is available)
USE_DEMOINST = true ;
+ # enable Video Test Patch Generator and 3DLUT device support
+ # (V2.0.0 and above)
+ USE_VTPGLUT = false ;
+
+ # enable Printer device support
+ USE_PRINTER = false ;
+
+ # enable CMF Measurement device and accessory support (if present)
+ USE_CMFM = false ;
+
# Use ArgyllCMS version of libusb (deprecated - don't use)
USE_LIBUSB = false ;
- # For testing CCast
- DEFINES += CCTEST_PATTERN ;
+ # Compile in graph plotting code (Not fully implemented)
+ USE_PLOT = true ; # [true]
JPEGLIB = ;
JPEGINC = ;
@@ -97,16 +105,11 @@ stdenv.mkDerivation rec {
# Install udev rules, but remove lines that set up the udev-acl
# stuff, since that is handled by udev's own rules (70-udev-acl.rules)
- #
- # Move ref to a better place (there must be a way to make the install target
- # do that for us)
postInstall = ''
rm -v $out/bin/License.txt
mkdir -p $out/etc/udev/rules.d
sed -i '/udev-acl/d' usb/55-Argyll.rules
cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/
- mkdir -p $out/share/
- mv $out/ref $out/share/argyllcms
'';
meta = with lib; {
diff --git a/pkgs/tools/graphics/argyllcms/gcc5.patch b/pkgs/tools/graphics/argyllcms/gcc5.patch
deleted file mode 100644
index 28067455c33e..000000000000
--- a/pkgs/tools/graphics/argyllcms/gcc5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix FTBFS with GCC 5
-Author: James Cowgill
-Bug-Debian: https://bugs.debian.org/777779
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/icc/icc.h
-+++ b/icc/icc.h
-@@ -100,7 +100,11 @@
- #define CF64PREC "LL" /* Constant precision specifier */
-
- #ifndef ATTRIBUTE_NORETURN
-+#ifdef _MSC_VER
- # define ATTRIBUTE_NORETURN __declspec(noreturn)
-+#else
-+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
-+#endif
- #endif
-
- #else /* !__STDC_VERSION__ */
diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix
index c04862610b69..ea5008dcf5cb 100644
--- a/pkgs/tools/graphics/jbig2enc/default.nix
+++ b/pkgs/tools/graphics/jbig2enc/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
+{ lib, stdenv, fetchFromGitHub, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
stdenv.mkDerivation rec {
pname = "jbig2enc";
version = "0.28";
- src = fetchurl {
- url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz";
- sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3";
+ src = fetchFromGitHub {
+ owner = "agl";
+ repo = "jbig2enc";
+ rev = "${version}-dist";
+ hash = "sha256-Y3IVTjvO5tqn/O076y/llnTyenKpbx1WyT/JFZ/s0VY=";
};
propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ];
diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix
index 503edb910f0c..230e5c629fbe 100644
--- a/pkgs/tools/misc/kalker/default.nix
+++ b/pkgs/tools/misc/kalker/default.nix
@@ -1,6 +1,7 @@
{ lib
, fetchFromGitHub
-, m4
+, gcc
+, gmp, mpfr, libmpc
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
@@ -16,7 +17,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58=";
- nativeBuildInputs = [ m4 ];
+ # https://gitlab.com/tspiteri/gmp-mpfr-sys/-/issues/20
+ nativeBuildInputs = [ gcc ];
+ buildInputs = [ gmp mpfr libmpc ];
outputs = [ "out" "lib" ];
@@ -24,6 +27,8 @@ rustPlatform.buildRustPackage rec {
moveToOutput "lib" "$lib"
'';
+ CARGO_FEATURE_USE_SYSTEM_LIBS = "1";
+
meta = with lib; {
homepage = "https://kalker.strct.net";
changelog = "https://github.com/PaddiM8/kalker/releases/tag/v${version}";
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 8060df5bdcc1..fc1280be6c78 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,34 +1,4 @@
-{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
-
-let wrapper = stdenv.mkDerivation rec {
- pname = "wrapper";
- version = "3.5.46";
-
- src = fetchurl {
- url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
- sha256 = "sha256-guHQyFSI0TidAuOr4zWaf3WRGeNW4+Or1sbWdhWuWtg=";
- };
-
- buildInputs = [ jdk ];
-
- buildPhase = ''
- export ANT_HOME=${ant}
- export JAVA_HOME=${jdk}/lib/openjdk/jre/
- export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
- export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
- sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
- ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
- '';
-
- installPhase = ''
- mkdir -p $out/{bin,lib}
- cp bin/wrapper $out/bin/wrapper
- cp lib/wrapper.jar $out/lib/wrapper.jar
- cp lib/libwrapper.so $out/lib/libwrapper.so
- '';
-};
-
-in
+{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which, java-service-wrapper }:
stdenv.mkDerivation rec {
pname = "i2p";
@@ -52,9 +22,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,share}
cp -r pkg-temp/* $out
- cp ${wrapper}/bin/wrapper $out/i2psvc
- cp ${wrapper}/lib/wrapper.jar $out/lib
- cp ${wrapper}/lib/libwrapper.so $out/lib
+ cp ${java-service-wrapper}/bin/wrapper $out/i2psvc
+ cp ${java-service-wrapper}/lib/wrapper.jar $out/lib
+ cp ${java-service-wrapper}/lib/libwrapper.so $out/lib
sed -i $out/i2prouter -i $out/runplain.sh \
-e "s#uname#${coreutils}/bin/uname#" \
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 0126219042c8..b57633b750f8 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,7 +1,8 @@
-{ callPackage, fetchurl, fetchpatch, autoreconfHook }:
+{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }:
let
- common = opts: callPackage (import ./common.nix opts) {};
-in {
+ common = opts: callPackage (import ./common.nix opts) { };
+in
+{
openssh = common rec {
pname = "openssh";
@@ -20,9 +21,11 @@ in {
version = "8.4p1";
extraDesc = " with high performance networking patches";
- src = fetchurl {
- url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
- sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540";
+ src = fetchFromGitHub {
+ owner = "rapier1";
+ repo = "openssh-portable";
+ rev = "hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}";
+ hash = "sha256-SYQPDGxZR41m4g603RaZaOYm4vCr9uZnFnZoKhruueY=";
};
extraPatches = [
diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix
index 556204972860..a55a32c21a9a 100644
--- a/pkgs/tools/networking/sipsak/default.nix
+++ b/pkgs/tools/networking/sipsak/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, c-ares, openssl ? null }:
stdenv.mkDerivation rec {
pname = "sipsak";
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "--std=gnu89";
- src = fetchurl {
- url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz";
- sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374";
+ src = fetchFromGitHub {
+ owner = "sipwise";
+ repo = "sipsak";
+ rev = "mr${version}";
+ hash = "sha256-y9P6t3xjazRNT6lDZAx+CttdyXruC6Q14b8XF9loeU4=";
};
meta = with lib; {
diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix
index 1eacd685463e..379caedaaf1b 100644
--- a/pkgs/tools/networking/tcptraceroute/default.nix
+++ b/pkgs/tools/networking/tcptraceroute/default.nix
@@ -1,28 +1,34 @@
-{ lib, stdenv , fetchurl, libpcap, libnet
+{ lib
+, stdenv
+, fetchFromGitHub
+, libpcap
+, libnet
}:
stdenv.mkDerivation rec {
- pkgname = "tcptraceroute";
- name = "${pkgname}-${version}";
- version = "1.5beta7";
+ pname = "tcptraceroute";
+ version = "1.5beta7";
- src = fetchurl {
- url = "https://github.com/mct/${pkgname}/archive/${name}.tar.gz";
- sha256 = "1rz8bgc6r1isb40awv1siirpr2i1paa2jc1cd3l5pg1m9522xzap";
- };
+ src = fetchFromGitHub {
+ owner = "mct";
+ repo = "tcptraceroute";
+ rev = "${pname}-${version}";
+ hash = "sha256-KU4MLWtOFzzNr+I99fRbhBokhS1JUNL+OgVltkOGav4=";
+ };
- # for reasons unknown --disable-static configure flag doesn't disable static
- # linking.. we instead override CFLAGS with -static omitted
- preBuild = ''
- makeFlagsArray=(CFLAGS=" -g -O2 -Wall")
- '';
- buildInputs = [ libpcap libnet ];
+ # for reasons unknown --disable-static configure flag doesn't disable static
+ # linking.. we instead override CFLAGS with -static omitted
+ preBuild = ''
+ makeFlagsArray=(CFLAGS=" -g -O2 -Wall")
+ '';
- meta = {
- description = "A traceroute implementation using TCP packets";
- homepage = "https://github.com/mct/tcptraceroute";
- license = lib.licenses.gpl2;
- maintainers = [ ];
- };
+ buildInputs = [ libpcap libnet ];
+
+ meta = {
+ description = "A traceroute implementation using TCP packets";
+ homepage = "https://github.com/mct/tcptraceroute";
+ license = lib.licenses.gpl2;
+ maintainers = [ ];
+ };
}
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix
index 3d50b11f8e1a..79efc95036d9 100644
--- a/pkgs/tools/networking/tracebox/default.nix
+++ b/pkgs/tools/networking/tracebox/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcrafter, libpcap, lua }:
stdenv.mkDerivation rec {
pname = "tracebox";
version = "0.2";
- src = fetchzip {
- url = "https://github.com/tracebox/tracebox/archive/v${version}.zip";
- sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns";
+ src = fetchFromGitHub {
+ owner = "tracebox";
+ repo = "tracebox";
+ rev = "v${version}";
+ hash = "sha256-2r503xEF3/F9QQCEaSnd4Hw/RbbAhVj9C0SVZepVrT8=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix
new file mode 100644
index 000000000000..c220fe4ded0f
--- /dev/null
+++ b/pkgs/tools/security/faraday-cli/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "faraday-cli";
+ version = "2.0.2";
+
+ disabled = python3.pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "infobyte";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1jq8sim0b6k830lv1qzbrd1mx0nc2x1jq24fbama76gzqlb2axi7";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ click
+ colorama
+ faraday-plugins
+ jsonschema
+ pyyaml
+ simple-rest-client
+ tabulate
+ validators
+ spinners
+ termcolor
+ cmd2
+ log-symbols
+ arrow
+ ];
+
+ # Tests requires credentials
+ doCheck = false;
+
+ pythonImportsCheck = [ "faraday_cli" ];
+
+ meta = with lib; {
+ description = "Command Line Interface for Faraday";
+ homepage = "https://github.com/infobyte/faraday-cli";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/text/fst/0001-cargo-lockfile.patch b/pkgs/tools/text/fst/0001-cargo-lockfile.patch
index c8c56ffdb622..eb5ec5748553 100644
--- a/pkgs/tools/text/fst/0001-cargo-lockfile.patch
+++ b/pkgs/tools/text/fst/0001-cargo-lockfile.patch
@@ -1,26 +1,26 @@
-From 84797e8fb8ead8822ebfd251b47c72433555860e Mon Sep 17 00:00:00 2001
+From 99bfed6f7278ae9b5edfc42644e57eb0ae7669e1 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon"
-Date: Fri, 5 Mar 2021 16:59:41 -0500
-Subject: [PATCH 1/1] Create cargo lock file for 0.4.5
+Date: Wed, 22 Sep 2021 16:00:13 -0400
+Subject: [PATCH 1/1] Create cargo lock file for 0.4.7
---
- Cargo.lock | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 916 insertions(+)
+ Cargo.lock | 881 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 881 insertions(+)
create mode 100644 Cargo.lock
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 0000000..136677d
+index 0000000..37e9c5f
--- /dev/null
+++ b/Cargo.lock
-@@ -0,0 +1,916 @@
+@@ -0,0 +1,881 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "anyhow"
-+version = "1.0.38"
++version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
++checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1"
+
+[[package]]
+name = "atty"
@@ -56,15 +56,15 @@ index 0000000..136677d
+
+[[package]]
+name = "bitflags"
-+version = "1.2.1"
++version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bstr"
-+version = "0.2.15"
++version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+dependencies = [
+ "lazy_static",
+ "memchr",
@@ -74,21 +74,15 @@ index 0000000..136677d
+
+[[package]]
+name = "bumpalo"
-+version = "3.6.1"
++version = "3.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
-+
-+[[package]]
-+name = "byteorder"
-+version = "1.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
++checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538"
+
+[[package]]
+name = "cast"
-+version = "0.2.3"
++version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
++checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
+dependencies = [
+ "rustc_version",
+]
@@ -118,16 +112,16 @@ index 0000000..136677d
+
+[[package]]
+name = "criterion"
-+version = "0.3.4"
++version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
++checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
+dependencies = [
+ "atty",
+ "cast",
+ "clap",
+ "criterion-plot",
+ "csv",
-+ "itertools 0.10.0",
++ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
@@ -144,12 +138,12 @@ index 0000000..136677d
+
+[[package]]
+name = "criterion-plot"
-+version = "0.4.3"
++version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
++checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
+dependencies = [
+ "cast",
-+ "itertools 0.9.0",
++ "itertools",
+]
+
+[[package]]
@@ -164,33 +158,33 @@ index 0000000..136677d
+
+[[package]]
+name = "crossbeam-channel"
-+version = "0.5.0"
++version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+dependencies = [
+ "cfg-if 1.0.0",
-+ "crossbeam-utils 0.8.3",
++ "crossbeam-utils 0.8.5",
+]
+
+[[package]]
+name = "crossbeam-deque"
-+version = "0.8.0"
++version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch",
-+ "crossbeam-utils 0.8.3",
++ "crossbeam-utils 0.8.5",
+]
+
+[[package]]
+name = "crossbeam-epoch"
-+version = "0.9.3"
++version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
++checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+dependencies = [
+ "cfg-if 1.0.0",
-+ "crossbeam-utils 0.8.3",
++ "crossbeam-utils 0.8.5",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
@@ -209,20 +203,19 @@ index 0000000..136677d
+
+[[package]]
+name = "crossbeam-utils"
-+version = "0.8.3"
++version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+dependencies = [
-+ "autocfg",
+ "cfg-if 1.0.0",
+ "lazy_static",
+]
+
+[[package]]
+name = "csv"
-+version = "1.1.5"
++version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97"
++checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+dependencies = [
+ "bstr",
+ "csv-core",
@@ -260,7 +253,7 @@ index 0000000..136677d
+
+[[package]]
+name = "fst"
-+version = "0.4.5"
++version = "0.4.7"
+dependencies = [
+ "doc-comment",
+ "fnv",
@@ -271,21 +264,12 @@ index 0000000..136677d
+]
+
+[[package]]
-+name = "fst"
-+version = "0.4.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f"
-+dependencies = [
-+ "utf8-ranges",
-+]
-+
-+[[package]]
+name = "fst-bench"
+version = "0.0.1"
+dependencies = [
+ "criterion",
+ "fnv",
-+ "fst 0.4.5",
++ "fst",
+]
+
+[[package]]
@@ -298,7 +282,7 @@ index 0000000..136677d
+ "clap",
+ "crossbeam-channel 0.4.4",
+ "csv",
-+ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fst",
+ "memmap",
+ "num_cpus",
+ "regex-automata",
@@ -319,9 +303,9 @@ index 0000000..136677d
+
+[[package]]
+name = "getrandom"
-+version = "0.2.2"
++version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
@@ -336,42 +320,33 @@ index 0000000..136677d
+
+[[package]]
+name = "hermit-abi"
-+version = "0.1.18"
++version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itertools"
-+version = "0.9.0"
++version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-+dependencies = [
-+ "either",
-+]
-+
-+[[package]]
-+name = "itertools"
-+version = "0.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
++checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
-+version = "0.4.7"
++version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "js-sys"
-+version = "0.3.48"
++version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78"
++checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+dependencies = [
+ "wasm-bindgen",
+]
@@ -384,9 +359,9 @@ index 0000000..136677d
+
+[[package]]
+name = "libc"
-+version = "0.2.88"
++version = "0.2.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a"
++checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103"
+
+[[package]]
+name = "log"
@@ -405,9 +380,9 @@ index 0000000..136677d
+
+[[package]]
+name = "memchr"
-+version = "2.3.4"
++version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+
+[[package]]
+name = "memmap"
@@ -421,9 +396,9 @@ index 0000000..136677d
+
+[[package]]
+name = "memoffset"
-+version = "0.6.1"
++version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
++checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+dependencies = [
+ "autocfg",
+]
@@ -455,9 +430,9 @@ index 0000000..136677d
+
+[[package]]
+name = "plotters"
-+version = "0.3.0"
++version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
++checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
@@ -468,15 +443,15 @@ index 0000000..136677d
+
+[[package]]
+name = "plotters-backend"
-+version = "0.3.0"
++version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
++checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
+
+[[package]]
+name = "plotters-svg"
-+version = "0.3.0"
++version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
++checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
+dependencies = [
+ "plotters-backend",
+]
@@ -489,9 +464,9 @@ index 0000000..136677d
+
+[[package]]
+name = "proc-macro2"
-+version = "1.0.24"
++version = "1.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
+dependencies = [
+ "unicode-xid",
+]
@@ -530,14 +505,14 @@ index 0000000..136677d
+
+[[package]]
+name = "rand"
-+version = "0.8.3"
++version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+dependencies = [
+ "libc",
-+ "rand_chacha 0.3.0",
-+ "rand_core 0.6.2",
-+ "rand_hc 0.3.0",
++ "rand_chacha 0.3.1",
++ "rand_core 0.6.3",
++ "rand_hc 0.3.1",
+]
+
+[[package]]
@@ -552,12 +527,12 @@ index 0000000..136677d
+
+[[package]]
+name = "rand_chacha"
-+version = "0.3.0"
++version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
-+ "rand_core 0.6.2",
++ "rand_core 0.6.3",
+]
+
+[[package]]
@@ -571,11 +546,11 @@ index 0000000..136677d
+
+[[package]]
+name = "rand_core"
-+version = "0.6.2"
++version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
-+ "getrandom 0.2.2",
++ "getrandom 0.2.3",
+]
+
+[[package]]
@@ -589,18 +564,18 @@ index 0000000..136677d
+
+[[package]]
+name = "rand_hc"
-+version = "0.3.0"
++version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
++checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
+dependencies = [
-+ "rand_core 0.6.2",
++ "rand_core 0.6.3",
+]
+
+[[package]]
+name = "rayon"
-+version = "1.5.0"
++version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
++checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
@@ -610,51 +585,50 @@ index 0000000..136677d
+
+[[package]]
+name = "rayon-core"
-+version = "1.9.0"
++version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
++checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+dependencies = [
-+ "crossbeam-channel 0.5.0",
++ "crossbeam-channel 0.5.1",
+ "crossbeam-deque",
-+ "crossbeam-utils 0.8.3",
++ "crossbeam-utils 0.8.5",
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "redox_syscall"
-+version = "0.2.5"
++version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
-+version = "1.4.3"
++version = "1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
-+version = "0.1.9"
++version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
++checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
-+ "byteorder",
-+ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fst",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
-+version = "0.6.22"
++version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
+name = "remove_dir_all"
@@ -667,9 +641,9 @@ index 0000000..136677d
+
+[[package]]
+name = "rustc_version"
-+version = "0.2.3"
++version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
@@ -697,33 +671,24 @@ index 0000000..136677d
+
+[[package]]
+name = "semver"
-+version = "0.9.0"
++version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+dependencies = [
-+ "semver-parser",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
+
+[[package]]
+name = "serde"
-+version = "1.0.123"
++version = "1.0.130"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_cbor"
-+version = "0.11.1"
++version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
++checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half",
+ "serde",
@@ -731,9 +696,9 @@ index 0000000..136677d
+
+[[package]]
+name = "serde_derive"
-+version = "1.0.123"
++version = "1.0.130"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
++checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -742,9 +707,9 @@ index 0000000..136677d
+
+[[package]]
+name = "serde_json"
-+version = "1.0.64"
++version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
++checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+dependencies = [
+ "itoa",
+ "ryu",
@@ -753,9 +718,9 @@ index 0000000..136677d
+
+[[package]]
+name = "syn"
-+version = "1.0.61"
++version = "1.0.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5"
++checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -770,7 +735,7 @@ index 0000000..136677d
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
-+ "rand 0.8.3",
++ "rand 0.8.4",
+ "redox_syscall",
+ "remove_dir_all",
+ "winapi",
@@ -797,15 +762,15 @@ index 0000000..136677d
+
+[[package]]
+name = "unicode-width"
-+version = "0.1.8"
++version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
++checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+
+[[package]]
+name = "unicode-xid"
-+version = "0.2.1"
++version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "utf8-ranges"
@@ -815,9 +780,9 @@ index 0000000..136677d
+
+[[package]]
+name = "walkdir"
-+version = "2.3.1"
++version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+dependencies = [
+ "same-file",
+ "winapi",
@@ -838,9 +803,9 @@ index 0000000..136677d
+
+[[package]]
+name = "wasm-bindgen"
-+version = "0.2.71"
++version = "0.2.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
++checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+dependencies = [
+ "cfg-if 1.0.0",
+ "wasm-bindgen-macro",
@@ -848,9 +813,9 @@ index 0000000..136677d
+
+[[package]]
+name = "wasm-bindgen-backend"
-+version = "0.2.71"
++version = "0.2.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
++checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
@@ -863,9 +828,9 @@ index 0000000..136677d
+
+[[package]]
+name = "wasm-bindgen-macro"
-+version = "0.2.71"
++version = "0.2.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
++checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
@@ -873,9 +838,9 @@ index 0000000..136677d
+
+[[package]]
+name = "wasm-bindgen-macro-support"
-+version = "0.2.71"
++version = "0.2.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
++checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -886,15 +851,15 @@ index 0000000..136677d
+
+[[package]]
+name = "wasm-bindgen-shared"
-+version = "0.2.71"
++version = "0.2.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
++checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+
+[[package]]
+name = "web-sys"
-+version = "0.3.48"
++version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b"
++checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
@@ -931,5 +896,5 @@ index 0000000..136677d
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--
-2.29.2
+2.29.3
diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix
index 99c904005220..1e3759c6a578 100644
--- a/pkgs/tools/text/fst/default.nix
+++ b/pkgs/tools/text/fst/default.nix
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "fst";
- version = "0.4.5";
+ version = "0.4.7";
src = fetchFromGitHub {
owner = "BurntSushi";
repo = pname;
rev = version;
- sha256 = "01qdj7zzgwb1zqcznfmnks3dnl6hnf8ib0sm0sgimsbcvajmhab3";
+ sha256 = "sha256-fXbX6idoGBtQiKM37C0z89OH/5H2PkZdwYLksXbbakE=";
};
cargoPatches = [
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
];
cargoBuildFlags = [ "--workspace" ];
- cargoSha256 = "0440p0hb3nlq9wwk3zac9dldanslrddvqn4gib0vl7aikxkcvh4l";
+ cargoSha256 = "sha256-2gy4i4CwZP6LB5ea1LBSfeAV6bNnsvDbxw0Unur0Hm4=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/tools/text/hottext/default.nix b/pkgs/tools/text/hottext/default.nix
index ca0cbf9d1a09..6fe7a686c100 100644
--- a/pkgs/tools/text/hottext/default.nix
+++ b/pkgs/tools/text/hottext/default.nix
@@ -1,81 +1,30 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, nim, gentium, SDL2, makeDesktopItem }:
+{ lib, nimPackages, fetchurl, gentium, makeDesktopItem }:
-let
- treeformLibs = lib.attrsets.mapAttrsToList (repo: args:
- fetchFromGitHub ({
- inherit repo;
- owner = "treeform";
- } // args)) {
- bumpy = {
- rev = "1.0.3";
- sha256 = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0=";
- };
- chroma = {
- rev = "0.2.5";
- sha256 = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8=";
- };
- flatty = {
- rev = "0.2.1";
- sha256 = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0=";
- };
- pixie = {
- rev = "1.1.3";
- sha256 = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA=";
- };
- typography = {
- rev = "0.7.9";
- sha256 = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU=";
- };
- vmath = {
- rev = "1.0.3";
- sha256 = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0=";
- };
- };
-
- nimLibs = treeformLibs ++ [
- (fetchFromGitHub {
- owner = "nim-lang";
- repo = "sdl2";
- rev = "v2.0.2";
- sha256 = "sha256-Ivx/gxDa2HVDjCVrJVu23i4d0pDzzv+ThmwqNjtkjsA=";
- })
- (fetchFromGitHub {
- owner = "guzba";
- repo = "nimsimd";
- rev = "1.0.0";
- sha256 = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo=";
- })
- (fetchFromGitHub {
- owner = "guzba";
- repo = "zippy";
- rev = "0.5.6";
- sha256 = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4=";
- })
- ];
-
-in stdenv.mkDerivation rec {
+nimPackages.buildNimPackage rec {
pname = "hottext";
version = "1.4";
+ nimBinOnly = true;
+
src = fetchurl {
url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz";
sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY=";
};
- nativeBuildInputs = [ nim ];
- buildInputs = [ SDL2 ];
-
- nimFlags = [ "-d:release" ] ++ map (lib: "--path:${lib}/src") nimLibs;
+ buildInputs = with nimPackages; [
+ bumpy
+ chroma
+ flatty
+ nimsimd
+ pixie
+ sdl2
+ typography
+ vmath
+ zippy
+ ];
HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
- buildPhase = ''
- runHook preBuild
- HOME=$TMPDIR
- nim $nimFlags compile src/$pname
- runHook postBuild
- '';
-
desktopItem = makeDesktopItem {
categories = "Utility;";
comment = meta.description;
@@ -84,11 +33,8 @@ in stdenv.mkDerivation rec {
name = pname;
};
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin src/$pname
+ postInstall = ''
cp -r $desktopItem/* $out
- runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index 1a3de2604257..eef08eec0a1f 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -11,11 +11,13 @@
}:
let
+ sha256 = "08j7j9fpxh08vkczjqahb8r55bwks8p3ykrv6a2kfi309629nm96";
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
specVersion = "4.104.0";
+ specSha256 = "0lbky0djqsndp33067q6yir5525m3zcgkpvf1z16mkspkixzadqs";
spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
- sha256 = "0lbky0djqsndp33067q6yir5525m3zcgkpvf1z16mkspkixzadqs";
+ sha256 = specSha256;
};
in
@@ -28,7 +30,7 @@ buildPythonApplication rec {
owner = "linode";
repo = pname;
rev = version;
- sha256 = "08j7j9fpxh08vkczjqahb8r55bwks8p3ykrv6a2kfi309629nm96";
+ inherit sha256;
};
# remove need for git history
@@ -60,6 +62,8 @@ buildPythonApplication rec {
installShellCompletion --cmd linode-cli --bash <($out/bin/linode-cli --skip-config completion bash)
'';
+ passthru.updateScript = ./update.sh;
+
meta = with lib; {
description = "The Linode Command Line Interface";
homepage = "https://github.com/linode/linode-cli";
diff --git a/pkgs/tools/virtualization/linode-cli/update.sh b/pkgs/tools/virtualization/linode-cli/update.sh
new file mode 100755
index 000000000000..281d0e1df970
--- /dev/null
+++ b/pkgs/tools/virtualization/linode-cli/update.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnugrep gnused jq yq-go
+
+set -eu -o pipefail
+
+cd $(dirname "${BASH_SOURCE[0]}")
+
+SPEC_VERSION=$(curl -s https://www.linode.com/docs/api/openapi.yaml | yq eval '.info.version' -)
+
+SPEC_SHA256=$(nix-prefetch-url --quiet https://raw.githubusercontent.com/linode/linode-api-docs/v${SPEC_VERSION}/openapi.yaml)
+
+VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
+ -H "Accept: application/vnd.github.v3+json" \
+ "https://api.github.com/repos/linode/linode-cli/tags" \
+ | jq 'map(.name)' \
+ | grep '"' \
+ | sed 's/[ ",(^v)]//g' \
+ | grep -v -e rc -e list \
+ | cut -d '"' -f4 | sort -rV | head -n 1)
+
+SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz)
+
+setKV () {
+ sed -i "s/$1 = \".*\"/$1 = \"$2\"/" default.nix
+}
+
+setKV specVersion ${SPEC_VERSION}
+setKV specSha256 ${SPEC_SHA256}
+setKV version ${VERSION}
+setKV sha256 ${SHA256}
diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/tools/wayland/cliphist/default.nix
new file mode 100644
index 000000000000..44a870db387c
--- /dev/null
+++ b/pkgs/tools/wayland/cliphist/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "cliphist";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "sentriz";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-CZW7dhOd7E74VNjnvhxvSSUZQtbkGi4uRUM9YQCuJZw=";
+ };
+
+ vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M=";
+
+ meta = with lib; {
+ description = "Wayland clipboard manager";
+ homepage = "https://github.com/sentriz/cliphist";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ dit7ya ];
+ };
+}
diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix
index 36e223f8d4ca..401144f74d2a 100644
--- a/pkgs/tools/wayland/swaycwd/default.nix
+++ b/pkgs/tools/wayland/swaycwd/default.nix
@@ -1,8 +1,8 @@
-{ lib, nim, stdenv, fetchFromGitLab
+{ lib, nimPackages, fetchFromGitLab
, enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ]
}:
-stdenv.mkDerivation {
+nimPackages.buildNimPackage {
name = "swaycwd";
version = "0.0.1";
@@ -13,27 +13,18 @@ stdenv.mkDerivation {
hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4=";
};
- configurePhase = ''
- runHook preConfigure
+ preConfigure = ''
{
echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}'
echo 'export enabledShells'
} > shells.nim
- runHook postConfigure
+ cat << EOF > swaycwd.nimble
+ srcDir = "."
+ bin = "swaycwd"
+ EOF
'';
- nativeBuildInputs = [ nim ];
-
- buildPhase = ''
- export HOME=$TMPDIR
- nim c --opt:speed -d:release swaycwd.nim
- '';
-
- installPhase = ''
- runHook preInstall
- install -D -m555 -t $out/bin swaycwd
- runHook postInstall
- '';
+ nimFlags = [ "--opt:speed" ];
meta = with lib; {
homepage = "https://gitlab.com/cab404/swaycwd";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7b1f0f60c27..bd7909d20ae5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2395,6 +2395,8 @@ with pkgs;
chntpw = callPackage ../tools/security/chntpw { };
+ cliphist = callPackage ../tools/wayland/cliphist { };
+
clipman = callPackage ../tools/wayland/clipman { };
kanshi = callPackage ../tools/wayland/kanshi { };
@@ -5013,6 +5015,8 @@ with pkgs;
fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
+ faraday-cli = callPackage ../tools/security/faraday-cli { };
+
fastlane = callPackage ../tools/admin/fastlane { };
fatresize = callPackage ../tools/filesystems/fatresize {};
@@ -7675,6 +7679,8 @@ with pkgs;
npapi_sdk = callPackage ../development/libraries/npapi-sdk {};
+ npiet = callPackage ../development/interpreters/npiet { };
+
npth = callPackage ../development/libraries/npth {};
nmap = callPackage ../tools/security/nmap { };
@@ -8845,6 +8851,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
+ rust-code-analysis = callPackage ../development/tools/rust-code-analysis { };
+
rust-petname = callPackage ../tools/text/rust-petname { };
rustscan = callPackage ../tools/security/rustscan {
@@ -12213,6 +12221,7 @@ with pkgs;
inherit (callPackages ../development/compilers/nim { })
nim-unwrapped nimble-unwrapped nim;
+ nimPackages = recurseIntoAttrs nim.pkgs;
nrpl = callPackage ../development/tools/nrpl { };
@@ -21520,6 +21529,8 @@ with pkgs;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_13_hardened = linuxKernel.packages.linux_5_13_hardened;
linux_5_13_hardened = linuxKernel.kernels.linux_5_13_hardened;
+ linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;
+ linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;
# Hardkernel (Odroid) kernels.
linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;
@@ -25401,6 +25412,8 @@ with pkgs;
kapow = libsForQt5.callPackage ../applications/misc/kapow { };
+ kappanhang = callPackage ../applications/radio/kappanhang { };
+
okteta = libsForQt5.callPackage ../applications/editors/okteta { };
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index eb75ec193c93..82ad3ed0ff0b 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -221,6 +221,7 @@ in {
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { };
+ linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };
}));
/* Linux kernel modules are inherently tied to a specific kernel. So
@@ -489,6 +490,7 @@ in {
linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_13_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_13 { });
+ linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix
new file mode 100644
index 000000000000..5d45b0c5eca9
--- /dev/null
+++ b/pkgs/top-level/nim-packages.nix
@@ -0,0 +1,75 @@
+{ lib, pkgs, stdenv, newScope, nim, fetchFromGitHub }:
+
+lib.makeScope newScope (self:
+ let callPackage = self.callPackage;
+ in {
+ inherit nim;
+ nim_builder = callPackage ../development/nim-packages/nim_builder { };
+ buildNimPackage =
+ callPackage ../development/nim-packages/build-nim-package { };
+ fetchNimble = callPackage ../development/nim-packages/fetch-nimble { };
+
+ astpatternmatching =
+ callPackage ../development/nim-packages/astpatternmatching { };
+
+ bumpy = callPackage ../development/nim-packages/bumpy { };
+
+ chroma = callPackage ../development/nim-packages/chroma { };
+
+ c2nim = callPackage ../development/nim-packages/c2nim { };
+
+ docopt = callPackage ../development/nim-packages/docopt { };
+
+ flatty = callPackage ../development/nim-packages/flatty { };
+
+ frosty = callPackage ../development/nim-packages/frosty { };
+
+ hts-nim = callPackage ../development/nim-packages/hts-nim { };
+
+ jester = callPackage ../development/nim-packages/jester { };
+
+ jsonschema = callPackage ../development/nim-packages/jsonschema { };
+
+ karax = callPackage ../development/nim-packages/karax { };
+
+ lscolors = callPackage ../development/nim-packages/lscolors { };
+
+ markdown = callPackage ../development/nim-packages/markdown { };
+
+ nimcrypto = callPackage ../development/nim-packages/nimcrypto { };
+
+ nimbox = callPackage ../development/nim-packages/nimbox { };
+
+ nimsimd = callPackage ../development/nim-packages/nimsimd { };
+
+ noise = callPackage ../development/nim-packages/noise { };
+
+ packedjson = callPackage ../development/nim-packages/packedjson { };
+
+ pixie = callPackage ../development/nim-packages/pixie { };
+
+ redis = callPackage ../development/nim-packages/redis { };
+
+ redpool = callPackage ../development/nim-packages/redpool { };
+
+ regex = callPackage ../development/nim-packages/regex { };
+
+ sass = callPackage ../development/nim-packages/sass { };
+
+ sdl2 = callPackage ../development/nim-packages/sdl2 { };
+
+ segmentation = callPackage ../development/nim-packages/segmentation { };
+
+ supersnappy = callPackage ../development/nim-packages/supersnappy { };
+
+ typography = callPackage ../development/nim-packages/typography { };
+
+ unicodedb = callPackage ../development/nim-packages/unicodedb { };
+
+ unicodeplus = callPackage ../development/nim-packages/unicodeplus { };
+
+ vmath = callPackage ../development/nim-packages/vmath { };
+
+ zippy = callPackage ../development/nim-packages/zippy { };
+
+ })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74d681d7b911..2529e2815009 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2506,8 +2506,12 @@ in {
falcon = callPackage ../development/python-modules/falcon { };
+ faraday-plugins = callPackage ../development/python-modules/faraday-plugins { };
+
fastapi = callPackage ../development/python-modules/fastapi { };
+ fastavro = callPackage ../development/python-modules/fastavro { };
+
fastcache = callPackage ../development/python-modules/fastcache { };
fastdiff = callPackage ../development/python-modules/fastdiff { };
@@ -6551,6 +6555,10 @@ in {
pyomo = callPackage ../development/python-modules/pyomo { };
+ pyp = callPackage ../development/python-modules/pyp {
+ inherit (pkgs) jq;
+ };
+
phonemizer = callPackage ../development/python-modules/phonemizer { };
pyopencl = callPackage ../development/python-modules/pyopencl {
@@ -7134,6 +7142,8 @@ in {
pytest-shutil = callPackage ../development/python-modules/pytest-shutil { };
+ python-status = callPackage ../development/python-modules/python-status { };
+
python-string-utils = callPackage ../development/python-modules/python-string-utils { };
pytest-socket = callPackage ../development/python-modules/pytest-socket { };
@@ -8087,6 +8097,8 @@ in {
inherit (pkgs) gfortran glibcLocales;
};
+ scikit-learn-extra = callPackage ../development/python-modules/scikit-learn-extra { };
+
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
scikits-odes = callPackage ../development/python-modules/scikits-odes { };
@@ -8262,6 +8274,8 @@ in {
simplekml = callPackage ../development/python-modules/simplekml { };
+ simple-rest-client = callPackage ../development/python-modules/simple-rest-client { };
+
simple-salesforce = callPackage ../development/python-modules/simple-salesforce { };
simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { };
@@ -9579,6 +9593,8 @@ in {
wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { };
+ wsgiprox = callPackage ../development/python-modules/wsgiprox { };
+
wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };
wsgitools = callPackage ../development/python-modules/wsgitools { };