diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 168d40f16a91..f7d16df87249 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,7 +26,7 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests) - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test) - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages -- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` +- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) - [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e4b21699d1e9..4dbc5909a8f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2810,6 +2810,12 @@ githubId = 2439413; name = "Derek Gonyeo"; }; + dguenther = { + email = "dguenther9@gmail.com"; + github = "dguenther"; + githubId = 767083; + name = "Derek Guenther"; + }; dhkl = { email = "david@davidslab.com"; github = "dhl"; @@ -9648,6 +9654,16 @@ githubId = 500703; name = "Tadas Barzdžius"; }; + revol-xut = { + email = "revol-xut@protonmail.com"; + name = "Tassilo Tanneberger"; + github = "revol-xut"; + githubId = 32239737; + keys = [{ + longkeyid = "rsa4096/B966009D57E69CC6"; + fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; + }]; + }; rexim = { email = "reximkut@gmail.com"; github = "rexim"; @@ -13150,4 +13166,10 @@ github = "zupo"; githubId = 311580; }; + sei40kr = { + name = "Seong Yong-ju"; + email = "sei40kr@gmail.com"; + github = "sei40kr"; + githubId = 11665236; + }; } diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index e355cfb86de0..3676697f16e8 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "mpdevil"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "SoongNoonien"; repo = pname; rev = "v${version}"; - sha256 = "1zx129zl6bjb0j3f81yx2641nsj6ck04q5f0v0g8f08xgdwsyv3b"; + sha256 = "1a5nhlbgi3ahnkcq16c2vgiaghgswy5lxg64pcrlbqssg1pj5gma"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index cf4a752b1bd0..ee22c591ad77 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.2.1"; + version = "6.5"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "1s9jvxwzsl32clp78g92nq9p2byf08libr5widl1jnkv1cpkbvh9"; + sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU="; }; dontBuild = true; diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index c949b8e6b4d0..2204ebc745ee 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -1,10 +1,10 @@ { stdenv , lib -, fetchFromSourcehut +, fetchFromGitLab +, glib , meson , ninja , pkg-config -, glib , wrapGAppsHook , epoxy , gtk4 @@ -27,20 +27,20 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.3.0"; + version = "1.4.0"; - src = fetchFromSourcehut { - owner = "~martijnbraam"; + src = fetchFromGitLab { + owner = "postmarketOS"; repo = "megapixels"; rev = version; - sha256 = "0dagp1sh5whnnllrydk7ijjid0hmvcbdm8kkzq2g168khdfn80jm"; + sha256 = "sha256-I7eevbIg+DEY9hnvat65J4Kem1FFNZc4XzaQQaewP/4="; }; nativeBuildInputs = [ + glib meson ninja pkg-config - glib wrapGAppsHook ]; @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK4 camera application that knows how to deal with the media request api"; - homepage = "https://sr.ht/~martijnbraam/Megapixels"; - changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}"; + homepage = "https://gitlab.com/postmarketOS/megapixels"; + changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ OPNA2608 dotlambda ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 49cf93835b10..f78220d2f401 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config -, leptonica, libpng, libtiff, icu, pango, opencl-headers }: +, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: stdenv.mkDerivation rec { pname = "tesseract"; @@ -12,6 +12,18 @@ stdenv.mkDerivation rec { sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; }; + patches = [ + # https://github.com/tesseract-ocr/tesseract/issues/3447 + (fetchpatch { + url = "https://github.com/tesseract-ocr/tesseract/commit/dbc79b09d195490dfa3f7d338eadac07ad6683f7.patch"; + sha256 = "sha256-lGlg0etuU4RXfdq1QH2bYObdeGrFHKf9O8zMUAbfNIQ="; + }) + (fetchpatch { + url = "https://github.com/tesseract-ocr/tesseract/commit/6dc4b184b1ebf2e68461f6b63f63a033bc7245f7.patch"; + sha256 = "sha256-DwIX3r5NmeajI6WgIVHDbkhLH/ygJIjPO5XrbzWQhSw="; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index c88ac932e4f9..29c0dce205d0 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4810"; + version = "4813"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "j21WTEu+MTmnFrRH5B8Eb1tS2elFR715R8jhgKZ5Gmw="; + sha256 = "Zx3j3ITsL3eOMVYxKLnfzwPMkr+BQ+soK+zhzYbnnak="; }; patches = [ diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 1bd8b5899240..1684003fb760 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "642"; + version = "643"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "zMuMutkk0RsbEH+5undcMmZRCGYJ7LRvdK1pxAgQRYk="; + sha256 = "gyMCQAKnP4FDcHEgJiiftKhBEG9N92etpwKBnmIbzhU="; }; patches = [ diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 76a583fc8fdf..41467e0c58de 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.0.0"; + version = "1.0.1"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "1mr0rmm7hcyn8qr485h1ihbb5f581sab4fgvs7lhwy9lxsqk0r0l"; + sha256 = "sha256-8q5cEpQRnevY98PKaTUW10bqRAr5NVG/rU24+nx27rw="; }; postPatch = '' diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 043ea23e3a73..770227186ff6 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LkAB0MrwQxP3X7glfSnI0GZMv8tjaeSOz7WSOW33wuo="; + sha256 = "0xkxyfbj8zljx7k5wbniz3x9jg0l4jnbbjv8hy5y5p4l10m0vpjs"; }; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 0fe3ac021232..3ff2621e29f3 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.21.1"; - sha256 = "1sb3912h28z097n7mn3hlh33hnxr9978h04py2m7gh27hmygscj3"; - manifestsSha256 = "1rrnz50jfn3zgaz5hn7ghmgc31ahm4q49f0rxfagfygvks1h4910"; + version = "0.23.0"; + sha256 = "15j4r43hy3slyahx4am7lj7jns4x3axrcbr9qwiznmk8qbvrzrdy"; + manifestsSha256 = "10rh0q1la5dq6n9y1yvw9ilj5lhzx8vh1zi2lznfjsvc5niwx7wf"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -23,7 +23,7 @@ buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-m0uVatnV4GIyllZTOkLxXGEiAWXGloFfxSJn51y0AQo="; + vendorSha256 = "sha256-vFm9ai+VWOPLRckKJ7gfD/0iQ8b4o5HNQE4cekb0vA0="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index a41c3c0ad35b..411efb6e527e 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo="; + sha256 = "sha256-nuSx+JKXBgkVwuy6RMZc8pxDv5WjXN3+5pIudazTttc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 910317bd9673..e70856ef9d90 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; + sha256 = "sha256-uGy2BbZS4SGT0w9ICYPUIfFawSvIVMsEezPfPAPQU/Q="; }; ldflags = [ @@ -21,6 +21,11 @@ buildGoModule rec { doCheck = true; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/popeye version | grep ${version} > /dev/null + ''; + meta = with lib; { description = "A Kubernetes cluster resource sanitizer"; homepage = "https://github.com/derailed/popeye"; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index c4f54a756b76..fb4570f20642 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.150"; + version = "3.1.152"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "sha256-tSA1pDGzIX2uIEWM0xV53jj1vBcJFMNCRakczs7Hue4="; + sha256 = "0xm6aib22frq8bq0ihjgihiw8dj6ymjxszklbz59yrz5rgzlaw81"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index fae4eff734e2..b8ee5182c26b 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -40,43 +40,15 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation { +mkDerivation rec { pname = "psi-plus"; - - # Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi - # and “-R” ending is optional revision number. - # - # The “psi-plus-snapshots” generally provides snapshots of these separate - # repositories glued together (there are also dependencies/libraries): - # - # 1. Psi - # 2. Plugins pack for Psi - # 3. “psimedia” plugin - # 4. Resources for Psi (icons, skins, sounds) - # - # “X.X.XXXX” is literally a version of Psi. - # So often when for instance plugins are updated separately a new snapshot is - # created. And that snapshot would also be linked to “X.X.XXXX” version. - # So many commits may have the same associated version of the snapshot. - # But mind that only one Git tag is created for “X.X.XXXX” version. - # - # It’s not yet defined in the Psi+ project what value to use as a version for - # any further releases that don’t change Psi version. - # - # Let’s do what Debian does for instance (appends “-R” where “R” is a revision - # number). - # E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/ - # - # This has been communicated with the Psi+ main devs in this XMPP MUC chat: - # psi-dev@conference.jabber.ru - # - version = "1.5.1556-2"; + version = "1.5.1576"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; - sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; + rev = version; + sha256 = "15iqa8hd4p968sp79zsi32g7bhamgg267pk2bxspl646viv91f6g"; }; cmakeFlags = [ diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 7d90dca46f59..74927dd434d0 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, python3 +{ stdenv, fetchFromGitHub, lib, python3, fetchpatch , cmake, lingeling, btor2tools, gtest, gmp }: @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z"; }; + patches = [ + # present in master - remove after 3.2.2 + (fetchpatch { + name = "fix-parser-getc-char-casts.patch"; + url = "https://github.com/Boolector/boolector/commit/cc3a70918538c1e71ea5e7273fa1ac098da37c1b.patch"; + sha256 = "0pjvagcy74vxa2q75zbshcz8j7rvhl98549xfcf5y8yyxf5h8hyq"; + }) + ]; + postPatch = '' sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 ''; diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix index 08bd0e4d6375..1abf38b49cf8 100644 --- a/pkgs/applications/science/logic/lingeling/default.nix +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -4,15 +4,14 @@ stdenv.mkDerivation { pname = "lingeling"; - # This is the version used in satcomp2018, which was - # relicensed, and also known as version 'bcj' - version = "pre1_03b4860d"; + # This is the version used in satcomp2020 + version = "pre1_708beb26"; src = fetchFromGitHub { owner = "arminbiere"; repo = "lingeling"; - rev = "03b4860d14016f42213ea271014f2f13d181f504"; - sha256 = "1lw1yfy219p7rrk88sbq4zl24b70040zapbjdrpv5a6i0jsblksx"; + rev = "708beb26a7d5b5d5e7abd88d6f552fb1946b07c1"; + sha256 = "1lb2g37nd8qq5hw5g6l691nx5095336yb2zlbaw43mg56hkj8357"; }; configurePhase = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 97b96f7461f6..f08a74bd3401 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4="; + sha256 = "sha256-kR37TClFMkoe4e46g/omfwZCrQFr7gukW7I70WI9+dw="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 4b1b4c2f0b4a..7b19d754a720 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-esrN6VH+ayc9DIhOLGR5oOaMjSBAc7u7fr8L1kSh4Gk="; + sha256 = "sha256-SJp/iRF5os0f+WsHnLtcqmj0uD7fe8iODJ4F+gpWtJo="; }; - cargoSha256 = "sha256-0ugr9HcJLsV34kKJs1E+n10tdOv09wkaYmkIodLhyLk="; + cargoSha256 = "sha256-CVqLwXgoHQjJ6NMyiZkxVaTO6qgzBQz8mH/6dsyhhYY="; # tests require it to be in a git repository preCheck = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index d719edb64cb7..118d9887ffbc 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,114 +3,141 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid -, e2fsprogs, krb5, libdrm, mesa +, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems }: with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; -in -stdenv.mkDerivation rec { pname = "gitkraken"; version = "8.1.0"; - src = fetchzip { - url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1115616d642chnisil7gv6fxw699sryphrfrp92cq3vi6lcwqbn8"; + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + srcs = { + x86_64-linux = fetchzip { + + url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; + sha256 = "sha256-yC7MGTVxD8xEutlleH3WKRnendnv0KijhUwQ00wwJYQ"; + }; + + x86_64-darwin = fetchzip { + url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; + sha256 = "sha256-SP+LCsxjl5YNOu4rDZOiDIqkynGE+iiLJtxi8tFugKM="; + }; + + aarch64-darwin = srcs.x86_64-darwin; }; - dontBuild = true; - dontConfigure = true; - - libPath = makeLibraryPath [ - stdenv.cc.cc.lib - curlWithGnuTls - udev - libX11 - libXext - libXcursor - libXi - libxcb - glib - libXScrnSaver - libxkbfile - libXtst - nss - nspr - cups - alsa-lib - expat - gdk-pixbuf - dbus - libXdamage - libXrandr - atk - pango - cairo - freetype - fontconfig - libXcomposite - libXfixes - libXrender - gtk3 - libgnome-keyring - openssl - at-spi2-atk - at-spi2-core - libuuid - e2fsprogs - krb5 - libdrm - mesa - ]; - - desktopItem = makeDesktopItem { - name = pname; - exec = "gitkraken"; - icon = "gitkraken"; - desktopName = "GitKraken"; - genericName = "Git Client"; - categories = "Development;"; - comment = "Graphical Git client from Axosoft"; - }; - - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/gitkraken/ - cp -R $src/* $out/share/gitkraken/ - - mkdir -p $out/bin - ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken - - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications - - mkdir -p $out/share/pixmaps - cp gitkraken.png $out/share/pixmaps/gitkraken.png - - runHook postInstall - ''; - - postFixup = '' - pushd $out/share/gitkraken - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" gitkraken - - for file in $(find . -type f \( -name \*.node -o -name gitkraken -o -name \*.so\* \) ); do - patchelf --set-rpath ${libPath}:$out/share/gitkraken $file || true - done - popd - ''; + src = srcs.${stdenv.hostPlatform.system} or throwSystem; meta = { homepage = "https://www.gitkraken.com/"; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ xnwdd evanjs ]; + platforms = builtins.attrNames srcs; + maintainers = with maintainers; [ xnwdd evanjs arkivm ]; }; -} + + linux = stdenv.mkDerivation rec { + inherit pname version src meta; + + dontBuild = true; + dontConfigure = true; + + libPath = makeLibraryPath [ + stdenv.cc.cc.lib + curlWithGnuTls + udev + libX11 + libXext + libXcursor + libXi + libxcb + glib + libXScrnSaver + libxkbfile + libXtst + nss + nspr + cups + alsa-lib + expat + gdk-pixbuf + dbus + libXdamage + libXrandr + atk + pango + cairo + freetype + fontconfig + libXcomposite + libXfixes + libXrender + gtk3 + libgnome-keyring + openssl + at-spi2-atk + at-spi2-core + libuuid + e2fsprogs + krb5 + libdrm + mesa + ]; + + desktopItems = [ (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "GitKraken"; + genericName = "Git Client"; + categories = "Development;"; + comment = "Graphical Git client from Axosoft"; + }) ]; + + nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/${pname}/ + cp -R $src/* $out/share/${pname} + + mkdir -p $out/bin + ln -s $out/share/${pname}/${pname} $out/bin/ + + mkdir -p $out/share/pixmaps + cp ${pname}.png $out/share/pixmaps/${pname}.png + + runHook postInstall + ''; + + postFixup = '' + pushd $out/share/${pname} + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ${pname} + + for file in $(find . -type f \( -name \*.node -o -name ${pname} -o -name \*.so\* \) ); do + patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true + done + popd + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications/GitKraken.app + cp -R . $out/Applications/GitKraken.app + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 95f3169718d9..165cb4ab4d63 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg_3, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: let - binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg_3 imagemagick lame mjpegtools sox transcode vorbis-tools ]; + binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' #!${runtimeShell} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 85a072547714..31f478c47c0b 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -21,16 +21,14 @@ , curl , wayland , xorg -, makeWrapper , pkg-config , libvlc , mbedtls - +, wrapGAppsHook , scriptingSupport ? true , luajit , swig , python3 - , alsaSupport ? stdenv.isLinux , alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux @@ -68,7 +66,7 @@ mkDerivation rec { addOpenGLRunpath cmake pkg-config - makeWrapper + wrapGAppsHook ] ++ optional scriptingSupport swig; @@ -121,9 +119,13 @@ mkDerivation rec { "-DCEF_ROOT_DIR=../../cef" ]; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" - ]; + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" + ''${gappsWrapperArgs[@]} + ) + ''; postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index d694ad8004e0..96b3733b02d6 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub -, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 +, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let @@ -52,7 +52,7 @@ in { version = "20190525"; buildInputs = [ - vdr libxcb xcbutilwm ffmpeg_3 + vdr libxcb xcbutilwm ffmpeg alsa-lib libvdpau # vdpau libva # va-api diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 5e67fdc9cc93..04e1bce12750 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }: stdenv.mkDerivation rec { pname = "moka-icon-theme"; - version = "5.4.0"; + version = "unstable-2019-05-29"; src = fetchFromGitHub { owner = "snwh"; repo = pname; - rev = "v${version}"; - sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"; + rev = "c0355ea31e5cfdb6b44d8108f602d66817546a09"; + sha256 = "0m4kfarkl94wdhsds2q1l9x5hfa9l3117l8j6j7qm7sf7yzr90c8"; }; nativeBuildInputs = [ @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { ninja gtk3 python3 + jdupes ]; propagatedBuildInputs = [ @@ -25,14 +26,23 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; + # These fixup steps are slow and unnecessary for this package + dontPatchELF = true; + dontRewriteSymlinks = true; + postPatch = '' patchShebangs meson/post_install.py ''; + postInstall = '' + # replace duplicate files with symlinks + jdupes -l -r $out/share/icons + ''; + meta = with lib; { - description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; + description = "Icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = "https://snwh.org/moka"; - license = with licenses; [ cc-by-sa-40 gpl3 ]; + license = with licenses; [ cc-by-sa-40 gpl3Only ]; # darwin cannot deal with file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index a8eb1a8736d6..fc541f6e5b72 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; - version = "2018-06-24"; + version = "unstable-2020-03-12"; src = fetchFromGitHub { owner = "snwh"; repo = pname; - rev = "c7cd013fba06dd8fd5cdff9f885520e2923266b8"; - sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v"; + rev = "aa3e8af7a1f0831a51fd7e638a4acb077a1e5188"; + sha256 = "0x6qzch4rrc8firb1dcf926j93gpqxvd7h6dj5wwczxbvxi5bd77"; }; nativeBuildInputs = [ meson ninja gtk3 - python3 + jdupes ]; propagatedBuildInputs = [ @@ -26,13 +26,16 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - postPatch = '' - patchShebangs meson/post_install.py - ''; + # These fixup steps are slow and unnecessary for this package + dontPatchELF = true; + dontRewriteSymlinks = true; postInstall = '' # The cache for Paper-Mono-Dark is missing gtk-update-icon-cache "$out"/share/icons/Paper-Mono-Dark; + + # replace duplicate files with symlinks + jdupes -l -r $out/share/icons ''; meta = with lib; { diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index c8c2853203ce..89b6b1e384c3 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "41.0"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k"; + sha256 = "m1EmsjPhuPic9MIyYIlXHYKakwPsieplz2IWTmp0IuE="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix index 6abff2c7b411..0d1f8df4f275 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-panel"; - version = "43"; + version = "45"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "08n6lwcj943p0vzi2vif7j3nza6xg5z1yka68vwc34ia9ys352m7"; + sha256 = "05bfd3b1g9zd86pl1rpgfqsmip271lasyfj8phpqf1gdds5yz6f6"; }; buildInputs = [ diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index cea9ea37b4e5..2e6b0d3f68f1 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -13,9 +13,17 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + # Parallel builds are not supported due to build process structure: + # tools are built sequentially in submakefiles and are reusing the + # same targets as dependencies. Building dependencies in parallel + # from different submakes is not synchronized and fails: + # make[3]: Entering directory '/build/dev86-0.16.21/libc' + # Unable to execute as86. + enableParallelBuilding = false; + meta = { description = "Linux 8086 development environment"; - homepage = "http://v3.sk/~lkundrak/dev86/"; + homepage = "https://github.com/lkundrak/dev86"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index a673276239a2..c0f42680bb87 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, autoSignDarwinBinariesHook , bash , libiconv ? null, ncurses @@ -243,6 +244,8 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx ]; diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 90dea665e6d6..e43dea9cffb7 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -2,7 +2,8 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx, xattr +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook , bash , libiconv ? null, ncurses @@ -43,7 +44,7 @@ enableDocs ? ( # Docs disabled for musl and cross because it's a large task to keep # all `sphinx` dependencies building in those environments. - # `sphinx` pullls in among others: + # `sphinx` pulls in among others: # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. (stdenv.targetPlatform == stdenv.hostPlatform) && !stdenv.hostPlatform.isMusl @@ -242,6 +243,8 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 9cca803ab279..9c0dd63f1b9d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -2,7 +2,8 @@ # build-tools , bootPkgs -, autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx, xattr +, autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook , bash , libiconv ? null, ncurses @@ -263,6 +264,8 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoconf autoreconfHook automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx ]; diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix new file mode 100644 index 000000000000..b843fd5e850f --- /dev/null +++ b/pkgs/development/compilers/lingua-franca/default.nix @@ -0,0 +1,41 @@ +{ lib, pkgs, stdenv, fetchFromGitHub, jdk11_headless }: + +stdenv.mkDerivation { + pname = "lfc"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "revol-xut"; + repo = "lingua-franca-nix-releases"; + rev = "11c6d5297cd63bf0b365a68c5ca31ec80083bd05"; + sha256 = "DgxunzC8Ep0WdwChDHWgG5QJbJZ8UgQRXtP1HZqL9Jg="; + }; + + buildInputs = [ jdk11_headless ]; + + _JAVA_HOME = "${jdk11_headless}/"; + + postPatch = '' + substituteInPlace bin/lfc \ + --replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \ + --replace "run_lfc_with_args" "${jdk11_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-0.1.0-SNAPSHOT-all.jar" + ''; + + installPhase = '' + cp -r ./ $out/ + chmod +x $out/bin/lfc + ''; + + meta = with lib; { + description = "Polyglot coordination language"; + longDescription = '' + Lingua Franca (LF) is a polyglot coordination language for concurrent + and possibly time-sensitive applications ranging from low-level + embedded code to distributed cloud and edge applications. + ''; + homepage = "https://github.com/lf-lang/lingua-franca"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ revol-xut ]; + }; +} diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index c0a9e948440e..606b4b11f44f 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,15 +6,23 @@ with lib; mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70"; release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; releaseRev = v: "iris-${v}"; propagatedBuildInputs = [ stdpp ]; + preBuild = '' + if [[ -f coq-lint.sh ]] + then patchShebangs coq-lint.sh + fi + ''; + meta = { description = "The Coq development of the Iris Project"; license = licenses.bsd3; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index d49892e3396e..0c9c4fb49c8e 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,13 +6,21 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v"; release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; releaseRev = v: "coq-stdpp-${v}"; + preBuild = '' + if [[ -f coq-lint.sh ]] + then patchShebangs coq-lint.sh + fi + ''; + meta = { description = "An extended “Standard Library” for Coq"; license = licenses.bsd3; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 10eeb32906f1..44c6d7d97f19 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1498,14 +1498,13 @@ self: super: { hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; - hercules-ci-cli = generateOptparseApplicativeCompletion "hci" ( + hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [ + unmarkBroken + (overrideCabal (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })) # See hercules-ci-optparse-applicative in non-hackage-packages.nix. - addBuildDepend - super.hercules-ci-optparse-applicative - (overrideCabal - (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; }) - (unmarkBroken super.hercules-ci-cli)) - ); + (addBuildDepend super.hercules-ci-optparse-applicative) + (generateOptparseApplicativeCompletion "hci") + ]; # Readline uses Distribution.Simple from Cabal 2, in a way that is not # compatible with Cabal 3. No upstream repository found so far diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3283cd398b5c..fb08481a39de 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -936,11 +936,11 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_3; }); + cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; }); - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nix_2_3; }; - hercules-ci-cnix-expr = super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_3; }; - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_3; }; + hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }); + hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }); + hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }); # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 93176fb230f1..ab2805a15e72 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -29,5 +29,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ thesola10 Yumasi ]; platforms = platforms.unix; + # Upstream currently broken for macOS https://cirrus-ci.com/build/5624937369042944 + broken = stdenv.targetPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 87997cead43f..2b4b174ca31b 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation { --replace "pkg-config" "$PKG_CONFIG" substituteInPlace Makefile.gnu \ --replace "pkg-config" "$PKG_CONFIG" + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # Upstream Makefile hardcodes i386 and x86_64 architectures only + substituteInPlace Makefile.osx --replace "x86_64" "arm64" ''; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index d4998b51592f..2c19c4ae7d01 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr"; + sha256 = "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb"; }; PREFIX = "\${out}"; diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index 8936d6c5f3be..87243def1796 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "isl-0.14.1"; src = fetchurl { - url = "http://isl.gforge.inria.fr/${name}.tar.xz"; + urls = [ + "mirror://sourceforge/libisl/${name}.tar.xz" + "https://libisl.sourceforge.io/${name}.tar.xz" + ]; sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8"; }; diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix index a823b69fa27b..a066655d4a05 100644 --- a/pkgs/development/libraries/isl/0.17.1.nix +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "isl-0.17.1"; src = fetchurl { - url = "http://isl.gforge.inria.fr/${name}.tar.xz"; + urls = [ + "mirror://sourceforge/libisl/${name}.tar.xz" + "https://libisl.sourceforge.io/${name}.tar.xz" + ]; sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647"; }; diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix index c40b3d7be0b4..d68637ddbcde 100644 --- a/pkgs/development/libraries/isl/0.20.0.nix +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -4,7 +4,11 @@ stdenv.mkDerivation rec { name = "isl-0.20"; src = fetchurl { - url = "http://isl.gforge.inria.fr/${name}.tar.xz"; + urls = [ + "mirror://sourceforge/libisl/${name}.tar.xz" + "https://libisl.sourceforge.io/${name}.tar.xz" + ]; + sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5"; }; diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix new file mode 100644 index 000000000000..f206f68de42a --- /dev/null +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, substituteAll +, pname +, version +, url +, sha256 +, homepage +}: + +stdenv.mkDerivation rec { + inherit pname version; + + src = fetchurl { + inherit url sha256; + }; + + patches = [ + # Fix buidling on platforms other than x86 + (substituteAll { + src = ./configure.patch; + msse = lib.optionalString stdenv.isx86_64 "-msse"; + }) + ]; + + doCheck = true; + + meta = { + inherit homepage; + description = "Subband sinusoidal modeling library for time stretching and pitch scaling audio"; + maintainers = with lib.maintainers; [ yuu ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libsbsms/configure.patch b/pkgs/development/libraries/libsbsms/configure.patch new file mode 100644 index 000000000000..cfb9d2d08e6b --- /dev/null +++ b/pkgs/development/libraries/libsbsms/configure.patch @@ -0,0 +1,22 @@ +diff --git a/configure b/configure +index 3d40335..faa3ac6 100755 +--- a/configure ++++ b/configure +@@ -14722,7 +14722,7 @@ if ${ax_cv_cxx_flags__msse+:} false; then : + else + + ax_save_FLAGS=$CXXFLAGS +- CXXFLAGS="-msse" ++ CXXFLAGS="@msse@" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14747,7 +14747,7 @@ eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 + $as_echo "$ax_check_compiler_flags" >&6; } + if test "x$ax_check_compiler_flags" = xyes; then +- SBSMS_CFLAGS="$SBSMS_CFLAGS -msse" ++ SBSMS_CFLAGS="$SBSMS_CFLAGS @msse@" + else + as_fn_error $? "Need a version of gcc with -msse" "$LINENO" 5 + fi diff --git a/pkgs/development/libraries/libsbsms/default.nix b/pkgs/development/libraries/libsbsms/default.nix new file mode 100644 index 000000000000..6c014ea6223c --- /dev/null +++ b/pkgs/development/libraries/libsbsms/default.nix @@ -0,0 +1,22 @@ +let + pname = "libsbsms"; +in +pkgs: rec { + libsbsms_2_0_2 = pkgs.callPackage ./common.nix rec { + inherit pname; + version = "2.0.2"; + url = "mirror://sourceforge/sbsms/${pname}-${version}.tar.gz"; + sha256 = "sha256-zqs9lwZkszcFe0a89VKD1Q0ynaY2v4PQ7nw24iNBru4="; + homepage = "https://sourceforge.net/projects/sbsms/files/sbsms"; + }; + + libsbsms_2_3_0 = pkgs.callPackage ./common.nix rec { + inherit pname; + version = "2.3.0"; + url = "https://github.com/claytonotey/${pname}/archive/refs/tags/${version}.tar.gz"; + sha256 = "sha256-T4jRUrwG/tvanV1lUX1AJUpzEMkFBgGpMSIwnUWv0sk="; + homepage = "https://github.com/claytonotey/libsbsms"; + }; + + libsbsms = libsbsms_2_0_2; +} diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index 849db216b921..616792787818 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation { sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; }; + # fix for ARM. sys/sysctl.h has moved in later glibcs, and + # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't + # needed anyway. + postPatch = '' + substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ + --replace '#include ' "" + ''; + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 30d1dd185547..7548ed48e7ae 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { sha256 = "11lfgzqaps3728dswrq3cbwk7aicigyz08q4hfyy6ikc6m35r4wg"; }; + # fix for ARM. sys/sysctl.h has moved in later glibcs, and + # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't + # needed anyway. + postPatch = '' + substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ + --replace '#include ' "" + ''; + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index e5e6f5f7ce71..e93dfdfb144e 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -40,6 +40,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM="; }; + # fix for ARM. sys/sysctl.h has moved in later glibcs, and + # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't + # needed anyway. + postPatch = '' + substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ + --replace '#include ' "" + ''; + cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 03247487749a..b49efa600fa5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -239,5 +239,6 @@ qtModule { platforms = platforms.unix; # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; + broken = stdenv.isDarwin && (lib.versionAtLeast qtCompatVersion "5.14"); # requires a newer SDK }; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index af67ffadf763..ce30a571d86d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -72,6 +72,7 @@ , "coc-tslint" , "coc-tslint-plugin" , "coc-tsserver" +, "coc-ultisnips" , "coc-vetur" , "coc-vimlsp" , "coc-vimtex" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d3ebbad6d341..368ff2647358 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3073,24 +3073,6 @@ let sha512 = "wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg=="; }; }; - "@grpc/grpc-js-1.3.7" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"; - sha512 = "CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA=="; - }; - }; - "@grpc/grpc-js-1.4.2" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.2.tgz"; - sha512 = "aUN6oGk9un8rfYWz73nQgFxPCYJQYd8LpIGguZHBsNduBMyqG6EWANrsVBuTG+nl/l4dKb3x+qi1l9+oxDxqGg=="; - }; - }; "@grpc/grpc-js-1.4.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -3100,24 +3082,6 @@ let sha512 = "a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA=="; }; }; - "@grpc/proto-loader-0.6.4" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"; - sha512 = "7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="; - }; - }; - "@grpc/proto-loader-0.6.5" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.5.tgz"; - sha512 = "GZdzyVQI1Bln/kCzIYgTKu+rQJ5dno0gVrfmLe4jqQu7T2e7svSwJzpCBqVU5hhBSJP3peuPjOMWsj5GR61YmQ=="; - }; - }; "@grpc/proto-loader-0.6.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -5089,328 +5053,328 @@ let sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; }; }; - "@ot-builder/bin-composite-types-1.3.0" = { + "@ot-builder/bin-composite-types-1.3.1" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.3.0.tgz"; - sha512 = "GWjLQGjwCzWyFjeTRsY4nrw7odSA23j/jDB6rTYiFPd2XQ+TDTtsYGAWBWP30llE9Et07bjBHQAYfpJmRcnNYg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.3.1.tgz"; + sha512 = "ienMPhQZNLqHmdriCS+vilh/6eRMGMMqrqsjjrI09MxftNPKmVoIv3nzEHgJE6fIMluX8c+cNfUuaWZaaqpiYg=="; }; }; - "@ot-builder/bin-util-1.3.0" = { + "@ot-builder/bin-util-1.3.1" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.3.0.tgz"; - sha512 = "y4kBgfAZfjeOU8rxnCvnlpjoVdydzjvo+PCnY+KaQ5h+naSDUHfvHdQfg6TALW2iyK2VbXYT013SAU4EK/nwng=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.3.1.tgz"; + sha512 = "HbHBWypPP+bUuCn/JUwmRDizRB8Q+AgW7+QKhBx8MfASR3OLCXDLFSwjW+uI95XkDEimryb4DmQ6AXRS1VtTtQ=="; }; }; - "@ot-builder/cli-help-shower-1.3.0" = { + "@ot-builder/cli-help-shower-1.3.1" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.3.0.tgz"; - sha512 = "t67lnwK1muzmcsj9ytG9xvYsRhnnomfJU8VPh4Mm9N1bjUAmdfkV/PWKrHtXebCpm2bDc+5L/D+fgA0EZ5qgtg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.3.1.tgz"; + sha512 = "PO40RTulmPRHwNigxDszJURSC+gMWeV9F2EuRNSmdnoFxCmZgFgKla7waGawIMaUWAFxMfM54R2uyQgkdOt9SQ=="; }; }; - "@ot-builder/cli-proc-1.3.0" = { + "@ot-builder/cli-proc-1.3.1" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.3.0.tgz"; - sha512 = "205Vn44R2qQrloAuA4YvrdYMIBxxk/PHRFQICnzP+fyOI01B3yPFUQpKfCNX6l+BzbEfDXJNN6Z/d6WqQuGrJw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.3.1.tgz"; + sha512 = "FbffCJpLKFJ/f7vhs0vW85/fMO4j+tI13zv+vFf92udIZCPBxzacWU65HVdD+8BGjoDdKkGFCujRnx80BONVvg=="; }; }; - "@ot-builder/cli-shared-1.3.0" = { + "@ot-builder/cli-shared-1.3.1" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.3.0.tgz"; - sha512 = "pW26ckQ2KngS56uyNjQ9rUYUP0shKzFXu/8JqdlmgxSXbs5M9RTWEHKUIHN/QkDCj7hebmKkDxhqlDFJJWFI+A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.3.1.tgz"; + sha512 = "BCbTyVlWkvRML0PqseA9RRlBl5mCKDMr51k6F4d10LZXRdMi3KobtiHTYh9R+dN63KhyooSrfi810RJYau7bBg=="; }; }; - "@ot-builder/common-impl-1.3.0" = { + "@ot-builder/common-impl-1.3.1" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.3.0.tgz"; - sha512 = "Io96P5AyVF2T44buNevoHDdu0zhGr/buFyKaPBYZ37RdUtTF8B5f7k74I07LWqi9wa0npE3qXQ9GXz3aMrO0IA=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.3.1.tgz"; + sha512 = "COHVcH3naONXd5SeSUgpo58k03Y4W+aEo6VKt36kVFfVOkhnR9htOc7HUy7+UBk0MhRQ9/WSA5BmLC+ZkFRDYw=="; }; }; - "@ot-builder/errors-1.3.0" = { + "@ot-builder/errors-1.3.1" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.3.0.tgz"; - sha512 = "pUtbx4ut02Qpy+W3uLblLvZQDH+kZw+i0/IjKyWxSRuzhPrqvV0VjxOoiQFrcDltHg5m2aUsEZFwepiqP7CkJA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.3.1.tgz"; + sha512 = "NVbpMCFrKLOAIMdk6fIsqHhHCrP8o54HOJd0dnpGmydhDXRns+ju8y28dKctnhqgbwBOaVJnRsqhzvgUX2OyFA=="; }; }; - "@ot-builder/io-bin-cff-1.3.0" = { + "@ot-builder/io-bin-cff-1.3.1" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.3.0.tgz"; - sha512 = "DvZYigOGZJLnVdO6qJTgCUiInBf1BRspWACWwVNGPCmdbgW5TUR4IQtibV374y8sJp/4AHxORqUefFn6PhG1/A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.3.1.tgz"; + sha512 = "BHyDiQsBPQzF4AzK1spyHM/Jaw7OnI2UPEK6N+2ah7I5HcJO8TWq6MbNSFnnKgjdw6Iiz/sSXZgPYy7cVNLRYA=="; }; }; - "@ot-builder/io-bin-encoding-1.3.0" = { + "@ot-builder/io-bin-encoding-1.3.1" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.3.0.tgz"; - sha512 = "0xbnGCtCU7kW20bMA01e1fm0/f4mXsiORHvGd9MtYXxfVfOSqa7s/KFaG7GcjzqNmMAAXHjtrRy0sh8g7bo5CQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.3.1.tgz"; + sha512 = "SPXxoPNE/wMcCK/ktY42bvksrBFTwbrDokydFs7m7RdEwn9fdhF0jYV/HSwwbTfrKdnr8SMeEPTHCx/1fRuivQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.3.0" = { + "@ot-builder/io-bin-ext-private-1.3.1" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.3.0.tgz"; - sha512 = "CQHIr0d4fczqvDPJRJkl5tnjKXmj7iktcxBnZTiF8plbFtLjmswv8EZnwyP04BhT3ZgpVZNDANBFb13mO3Sd4g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.3.1.tgz"; + sha512 = "fMcJbWRBe+ms7ED/6zjQZAVEcRREx88EHBUQsvzV02ydL0iUHWdy0uB7GpzcjqP1JWIPmC3Kk5leYjqgy/X4VQ=="; }; }; - "@ot-builder/io-bin-font-1.3.0" = { + "@ot-builder/io-bin-font-1.3.1" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.3.0.tgz"; - sha512 = "H8g2kmk0rNTOKQSXbQraOPUxt21Cxjs2uDL+oioth6YpxTOTlL67rOUcx1k32VyaVv/9buLGe0AD/S6qxzrl4g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.3.1.tgz"; + sha512 = "3u8bQDw7yvywBhkrtnnUXzPqSo/wLmifJxg+AKomifKEws4aTmlrslDrpg8B8Vip2wPmY/ta6qsu6QywSTjgEQ=="; }; }; - "@ot-builder/io-bin-glyph-store-1.3.0" = { + "@ot-builder/io-bin-glyph-store-1.3.1" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.3.0.tgz"; - sha512 = "ni127weqUSy2f20V5d21XMNBAavW1ioOwIWRVSVrHQnO4YA+X+SxWy6b48MLa1BlvfQ1vJV0NIvBZ+2jD0PQig=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.3.1.tgz"; + sha512 = "oO86B63BhkF2CCbIAroUxhyKdeeQiH4Q+BQH74Z9WxK0nMlpM/OhqzAqAhlNUzzwYpqa05fJgigqNCXyQncJbg=="; }; }; - "@ot-builder/io-bin-layout-1.3.0" = { + "@ot-builder/io-bin-layout-1.3.1" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.3.0.tgz"; - sha512 = "lrBlkmaOretCG1zQarLNW9Us8tZ2L1RI2DPYW5oidRzbGRV7NxhScgUGCbPi+AWYCX+2paCiiy/6XLARsq2XCA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.3.1.tgz"; + sha512 = "BGThzzwMMBi0XwV0Tw97JxKyglsm9KEoY05T0L4RYmtqNxHi5K+BWBrqScspmBVq7ai+pHCiMvh+JlP3Tfq/oA=="; }; }; - "@ot-builder/io-bin-metadata-1.3.0" = { + "@ot-builder/io-bin-metadata-1.3.1" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.3.0.tgz"; - sha512 = "KLQdLISXLB5RzVZJYS7Qp9B3IQkGkjAXvgLD+A8ekfuG+0oc/D2ss9QAeCoikOTJ/g86WODZpIRdP8pAgTj9LA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.3.1.tgz"; + sha512 = "hrBDfxXu6oBWvhgXqiomHwjsr+X0BYB+WqT/W5LxntdUpheGFEU/UXYlMHAidZRg7++KjjkU0q2vRqKiUe+7wg=="; }; }; - "@ot-builder/io-bin-metric-1.3.0" = { + "@ot-builder/io-bin-metric-1.3.1" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.3.0.tgz"; - sha512 = "/t85ePUtsud1eUAwNbT5rEaB3vnOseTgTxmYTkFu/WNPJYhSLAtPi4K3SP6vLwALlNlVRMXiNIcaETDsIaNt3g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.3.1.tgz"; + sha512 = "vq6y9K8vUIfQ3EHYZeQ2e6T1UTznFPNDo/tkAK9lmwC0QhEBAIt/qIR8ntXd6I5gvDJt9JcO3GtsvD4nJW3/fA=="; }; }; - "@ot-builder/io-bin-name-1.3.0" = { + "@ot-builder/io-bin-name-1.3.1" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.3.0.tgz"; - sha512 = "04lTnQa1Eg6maFyP0WuUTkSLzU4QdcAvh7PYyGDZSdIyg/RPl1g7ymzOyi7P3DGdkH4FNORyS2DJ778v9J5OgA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.3.1.tgz"; + sha512 = "rzbZoPm4Wxk6nLdeipRhZHgSOjP0WDMEZCTYsFsL8ttlthtwSWH1/FVGe3z0yxgL3W9MVtTRWZNyiaT3/DOKrA=="; }; }; - "@ot-builder/io-bin-sfnt-1.3.0" = { + "@ot-builder/io-bin-sfnt-1.3.1" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.3.0.tgz"; - sha512 = "9a/VKD5JlRGEDsM1I0boismi27TrSl8sHJXoPoBh3EFtatLRbbgcYp4fs2UJYp/pvpIT4k0Ti0gp5e4Q7z08eA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.3.1.tgz"; + sha512 = "CzGr3sd3hmC66+gMDslBSwAvBjsqoJ/I8LIzz/YbCLOulC1dNKMqfkTHD9kmK26OYTD3ZlPn0f19vXwtkZ70AQ=="; }; }; - "@ot-builder/io-bin-ttf-1.3.0" = { + "@ot-builder/io-bin-ttf-1.3.1" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.3.0.tgz"; - sha512 = "RLvDBBTVkInXtC9hpl8oi30DudL4oy41FUEMOoCYyWpw8tvcSOpEyqHtf46X3ehC8IdPQIsGMRRchyZFOUclZw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.3.1.tgz"; + sha512 = "kVLoeI4l14gMR3uMiNVpP/MN0VXxR/rUyMZGKKALq1DmwjKUdIb0drbXOUXUw4lNnkc4jq/82wM+vyVIkPS9zw=="; }; }; - "@ot-builder/io-bin-vtt-private-1.3.0" = { + "@ot-builder/io-bin-vtt-private-1.3.1" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.3.0.tgz"; - sha512 = "ZLUmXlwX3Oc83QPUUCLMlnnhyEMmN+iscyagA1fWGYyPqjagRpTAet5PVSpSkdIqosT3QZw2eZBxzrXUHB4eqw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.3.1.tgz"; + sha512 = "mkh/lYFJWM9bm5wA5xiH0AXG1imWsDJR5/7Diwyq0C0lurzwNfGeDlCMG3TPc+NRA598dWX9rHkYu/v8pVkgBg=="; }; }; - "@ot-builder/ot-1.3.0" = { + "@ot-builder/ot-1.3.1" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.3.0.tgz"; - sha512 = "8tnizbMO9o905/SLC1eEr8VQBKssGDDPiSSiUCA8f00gzLkrrTjpV4zgv9LSEY5YL260e0yEbg4IlZcJwtGBJA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.3.1.tgz"; + sha512 = "kdWupASaMG2AbBl9c9+QQ/mFKaNu+oTCUVfAvBIjf370Q+oR5A0Ri+4MqVRB5Aspls250l6WoNMElaceL1QjNw=="; }; }; - "@ot-builder/ot-encoding-1.3.0" = { + "@ot-builder/ot-encoding-1.3.1" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.3.0.tgz"; - sha512 = "rLndCSJj11TsOvlPumcwfJKqJCyx4FEV+rn6rjKGXCpSeeSrNWhLIyCBZThXwJwCNY2OdqZtl8My3/xefS3H7g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.3.1.tgz"; + sha512 = "oQ8chRnkdnYZh+s9w+ToLkjNUtqxUma3uLY7a6AdFsV91YugIr5kAFTIokBp7Mo4mqdWcE93HooAryaEulPEJg=="; }; }; - "@ot-builder/ot-ext-private-1.3.0" = { + "@ot-builder/ot-ext-private-1.3.1" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.3.0.tgz"; - sha512 = "Tiie59wQvM8ZRtTrprjuHrrsQ2YBI2mTMFzzro6L+q4glMqzFi2nkGrBapd6Z9dx8x7TI8NGiEjlbjefEhx0RQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.3.1.tgz"; + sha512 = "ZIkGHqGu4+flRAntXgdHVApVbBVvzjI0nyRr+31/JVvC4h1ZLO+okBnCfTvUcGsfqRwSE1p4htWpKEWf+0AK3A=="; }; }; - "@ot-builder/ot-glyphs-1.3.0" = { + "@ot-builder/ot-glyphs-1.3.1" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.3.0.tgz"; - sha512 = "NXXcqydqoZ2+9fvam/5ybWdWAXL6JIyCQQluMuRMYvtT0GrZE/D7q2C/h0wiDI2PWljMS1wRl855A8fryHIOfg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.3.1.tgz"; + sha512 = "1/I5qFAeVMh2G9XlYplgmQGHZIvlm+wI51RyCyUiISCtk7LLYtfwD5iw3BvG20FhVH5VMlkdsmDrqDjENuSnSQ=="; }; }; - "@ot-builder/ot-layout-1.3.0" = { + "@ot-builder/ot-layout-1.3.1" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.3.0.tgz"; - sha512 = "Cifx79+3GjtFouzwL6IlEMMDIk5n2KmSNeNi2ZSy9mIpHmu6MU62UTQZGs2WmTIuLcRv2CQuQnN/kLlNHt9d4A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.3.1.tgz"; + sha512 = "70U5lSA0rzq+1KfUZxrKIUG+PI6reH/5hXRG+4y57vypsV2DDfuCgDAfGxwRo6yyi/2+RLQfqm35oRVQbqjFnw=="; }; }; - "@ot-builder/ot-metadata-1.3.0" = { + "@ot-builder/ot-metadata-1.3.1" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.3.0.tgz"; - sha512 = "Qxb+vKKKmlnlIujvp/0ag1P4zqW3lFZ2D/WXbUJWunf2vQMLAkcPWI7qJy7ZNHDIcvT0Nva/JuXpbuKiQWarwg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.3.1.tgz"; + sha512 = "XIkF8N3YgI7aAfLzJpQUPuhCBRlf6sb6q3vME+xcaZsvv4dsT24Zi11ICQW/dxTcQDA2h8Rj7OnFg2O2I7JDzw=="; }; }; - "@ot-builder/ot-name-1.3.0" = { + "@ot-builder/ot-name-1.3.1" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.3.0.tgz"; - sha512 = "EKLpWujBo5Gg8SM6ENzXmsezGSMAyKRTBucdYwM8Dkt41q1rnTJiZKkF7clC2uBO2jCeTIxRlan9yergdaPWzg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.3.1.tgz"; + sha512 = "CPbbNSgiy1YohipP638AEzrCGxZn8HOYtR17VIUbGE4DTToaFgGNbzuXnHxo2Gujvsk3PvFTC4Yu6VjYg3R8vw=="; }; }; - "@ot-builder/ot-sfnt-1.3.0" = { + "@ot-builder/ot-sfnt-1.3.1" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.3.0.tgz"; - sha512 = "8ZQUlp/ox5OKrpCgueTfplag2bw4GQ9qqrsC/hGxXwFzcJxS/o1OIwfpkV/Rx7A4Edx4jn/Ts8Y/C67AGYPlpQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.3.1.tgz"; + sha512 = "RxzBnK3S1Lh+fWW23jLss22S5hH8RBIpQTgbujR5B2DgoXvcawGlIFjNiI18YOuApJySicEnCzbV3rnVY3u4sA=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.3.0" = { + "@ot-builder/ot-standard-glyph-namer-1.3.1" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.3.0.tgz"; - sha512 = "tKYXVcpaGTZSGypiqnYIZASzDrQhh6AVmu7fN1AUfGYmI8AMnPVC4osdksRpCTmi4HcgfMp4osichTGSJVpCWw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.3.1.tgz"; + sha512 = "QgcdlBV/G5Faf17OTjTcv5QcHhvwI2UE2YU+LmZbruozsloBR3hodliovS9iOUL5oRjolSce8Yk4hKd5zhcldg=="; }; }; - "@ot-builder/ot-vtt-private-1.3.0" = { + "@ot-builder/ot-vtt-private-1.3.1" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.3.0.tgz"; - sha512 = "RdhTIYoDUjkyZk7ZmMjRx0rT0KrcdHedmLvLQtmB3tYD+0NQlNLJuLkKDBbcTHZwW05aY/gdN0Yv2wbxfQaryg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.3.1.tgz"; + sha512 = "JbWU6WMzvjL9XRZNE2hzqC1DlunOMZy7fzW0YXcCmIfc8++gn2KaIZJ9PVjpoEXpILTPY+QtIr1R2x8Apjn2qg=="; }; }; - "@ot-builder/prelude-1.3.0" = { + "@ot-builder/prelude-1.3.1" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.3.0.tgz"; - sha512 = "E4LvaFA74YEKNFkzmbCyiooV31e1p/16Ajr8/Pvf8OlQGSGf0UkbZVOikpdJZBTr4kL6mpQsGRAo+xJHmeIviw=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.3.1.tgz"; + sha512 = "uF0nQ9wIzlZ8zxrLqqU3vHPnDxMxzGsdmJrFY1AhtRsc4W8zJg5aPMC+Lpf1eIXVnAJUpolOLIILapNs+UMs1Q=="; }; }; - "@ot-builder/primitive-1.3.0" = { + "@ot-builder/primitive-1.3.1" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.3.0.tgz"; - sha512 = "KqVxt5YdH/1gusrUAenytoo+MtzSg2YyXHXBfdP9YLL5HE72gG6irVJy1eQFXr4RsZ8GVhhguIrvRZ0gMbnAPw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.3.1.tgz"; + sha512 = "ZH/nn4MpX2OSvbbb0Ag0F/23EwiA3vtmFcoVUV5ouip47mZyx0Uc4s/YWjKlD1B5wjQl2s2Aa+bgswO1DiMefw=="; }; }; - "@ot-builder/rectify-1.3.0" = { + "@ot-builder/rectify-1.3.1" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.3.0.tgz"; - sha512 = "b3xNK7gTwNa5AFoiFL3cjLcqBk0vHfGrkKcbApImSM74KDUkAGK9ZeefrI1snFzIFmnWFWu5o86+DB2u/1PV8Q=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.3.1.tgz"; + sha512 = "VlBwTQq4magiorU4DAWSZc+Ee4JzfNoUHoC1tIc62Qa0sEE0q3cTIwX8gwr7Gb/AIB7gYra6b0GzNymzOtFTow=="; }; }; - "@ot-builder/stat-glyphs-1.3.0" = { + "@ot-builder/stat-glyphs-1.3.1" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.3.0.tgz"; - sha512 = "TQqinShddh7lBkQMQxZV9Ry4HJGsFUThgIWanh1ztVp9wJjPiXuJN+G8d/ryQflO5syGGioAMQjMsojLIQDG1g=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.3.1.tgz"; + sha512 = "pRMLK4PFhJan4FJgTYnWXdvgDAprwHN18TGZvmoij0fwEtbGbptG639fT0NsdlOOn0U+FSanVU+pHAqvibyHIw=="; }; }; - "@ot-builder/trace-1.3.0" = { + "@ot-builder/trace-1.3.1" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.3.0.tgz"; - sha512 = "EPHE78+L9mH4rBMkA/Ac+qMW/xLYTpNonxeMHzT+AxZ4ixz1gTY0LU9JtkkG+sdby3sLSLwAKPDaqFYQCQ1B3Q=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.3.1.tgz"; + sha512 = "N3DO0OPkZFlqhj0ncjiZCLym+wsr5AuN1k+Se5lOfad2fwzuWi/eWbSxrgFcd4ENfhFj5p+f2P5plygQEFWGQA=="; }; }; - "@ot-builder/var-store-1.3.0" = { + "@ot-builder/var-store-1.3.1" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.3.0.tgz"; - sha512 = "7wuUX8GlosMhOU92xClWBUELkKtpszsouuPAZQsbHIoz4WaUUEYfVwpTB1Xcj3UA0M/eTSmM1rIlB0SFJ2jywQ=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.3.1.tgz"; + sha512 = "8/OfcmSoMyOojFGFdRJXMeFDs2MbWQkeq3mMIOReMJ4Eai0tM5mv/Iz+ml9P1soCb6H5vHJGHPvz2jSVH/k0xA=="; }; }; - "@ot-builder/variance-1.3.0" = { + "@ot-builder/variance-1.3.1" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.3.0.tgz"; - sha512 = "snCKMC8X/HIJVmcqAiRSmA7LtJyDFxaBshIzqOxWYC4X8rLwcMOzpiKLGCdxIpJq38vbmb3QS9WZmjrzgKMN8w=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.3.1.tgz"; + sha512 = "b/XIQjy72e0R0v1OQVzEVDfX/tt+L7toVpborgqbWEW+Cl43ZlBFXBgQQ/8FkWSWkbrNjNrVuI36WkvvIJDbzA=="; }; }; "@parcel/fs-1.11.0" = { @@ -7321,24 +7285,6 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.10.4" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.10.4.tgz"; - sha512 = "EITwVTX5B4nDjXjGeQAfXOrm+Jn+qNjDmyDRtWoD+wZsl/RDPRTFRKivs4Mt74iOFlLOrE5+Kf+p5yjyhm3+cA=="; - }; - }; - "@types/node-16.11.6" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz"; - sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; - }; - }; "@types/node-16.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7348,24 +7294,6 @@ let sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; }; }; - "@types/node-16.7.3" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.7.3.tgz"; - sha512 = "S6gm2sm9xIRWTxD7Ttj8N1ZrYfqdqZEU38Nwnrhd6krk7zf8vdgMgzz8hpAX9CfmXaJfP+Vqy2EhJpVavNEocg=="; - }; - }; - "@types/node-16.9.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz"; - sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; - }; - }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -9715,13 +9643,13 @@ let sha512 = "SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw=="; }; }; - "ajv-8.7.1" = { + "ajv-8.8.0" = { name = "ajv"; packageName = "ajv"; - version = "8.7.1"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.7.1.tgz"; - sha512 = "gPpOObTO1QjbnN1sVMjJcp1TF9nggMfO4MBR5uQl6ZVTOaEPq5i4oq/6R9q2alMMPB3eg53wFv1RuJBLuxf3Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.8.0.tgz"; + sha512 = "L+cJ/+pkdICMueKR6wIx3VP2fjIx3yAhuvadUv/osv9yFD7OVZy442xFF+Oeu3ZvmhBGQzoF6mTSt+LUWBmGQg=="; }; }; "ajv-errors-1.0.1" = { @@ -11596,15 +11524,6 @@ let sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; - "async-3.2.1" = { - name = "async"; - packageName = "async"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.1.tgz"; - sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="; - }; - }; "async-3.2.2" = { name = "async"; packageName = "async"; @@ -11758,15 +11677,6 @@ let sha1 = "1e762817d849ce44bfac07925a42036787061b15"; }; }; - "asyncjs-util-1.2.6" = { - name = "asyncjs-util"; - packageName = "asyncjs-util"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.6.tgz"; - sha512 = "PxQ2drzeOUe20HsjIXOlfw76Ci8RQkF2B95arcQap02jJ3lByNKkC3MtVFhIWF+FYl738tD/tZHOlUuYfamFvw=="; - }; - }; "asyncjs-util-1.2.7" = { name = "asyncjs-util"; packageName = "asyncjs-util"; @@ -11956,13 +11866,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1027.0" = { + "aws-sdk-2.1028.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1027.0"; + version = "2.1028.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1027.0.tgz"; - sha512 = "j3UjPV9hzyCvkmfcbhRscMggdmrPqlhvo8QzkXCGFfPXjZMh1OJd4HkCEH2NaunzLOyF2Y3QzxKrGOLMT7sNzg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1028.0.tgz"; + sha512 = "OmR0NcpU8zsDcUOZhM+eZ6CzlUFtuaEuRyjm6mxDO0KI7lJAp7/NzB6tcellRrgWxL+NO7b5TSxi+m28qu5ocQ=="; }; }; "aws-sdk-2.920.0" = { @@ -13477,6 +13387,15 @@ let sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ=="; }; }; + "bitcoinjs-lib-6.0.0" = { + name = "bitcoinjs-lib"; + packageName = "bitcoinjs-lib"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.0.tgz"; + sha512 = "KYx81rVE4LDbZcHfE375NCX4CDeZuz7HECZm/KAmqKMY2jpD3ZcUnI7Fm+QX5EMF/xmtzzfrNL/BNxo8o0iOQg=="; + }; + }; "bitfield-0.1.0" = { name = "bitfield"; packageName = "bitfield"; @@ -13963,22 +13882,13 @@ let sha512 = "zEvNSymgMeMMeFwWmwpklFoN/OJA3YO/pVgFTBV3TVq5ulfS0+mVKEGfeInEQESoaSVK1dsVPGr2RLD22uH/aQ=="; }; }; - "bolt03-1.2.11" = { + "bolt03-1.2.12" = { name = "bolt03"; packageName = "bolt03"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.11.tgz"; - sha512 = "IFZBOz2FkBh1GwYtxiX2V+tZH5DPn15c7QoikYPKoSc5Khubhfu7bNWfNpdSf1s2/feV8+UjOQ6bzzbkjsYRBg=="; - }; - }; - "bolt07-1.7.3" = { - name = "bolt07"; - packageName = "bolt07"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.3.tgz"; - sha512 = "zXhf60qEpFXwRTeoaJ+0SyPw/jzBtIHZLCJBvaa0rFGiiQKdWXdaiIWeyIkxl74p/UGUv4BQsbkAgB0Em/1QOQ=="; + url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.12.tgz"; + sha512 = "kGtY3c2gdtsYhLCgcAmNvuGlDWlXJ2ysjuFIF39uQTXUykvI8icAnIzAxlZirhtqmRA3uRq4LB6M3BXbGShFrw=="; }; }; "bolt07-1.7.4" = { @@ -13990,15 +13900,6 @@ let sha512 = "y82Na9vEBY+rqjJhjYMFAch70nWvbL5OiEPFqNf7cGTtQfG7g/Vui2KnemrX1mxEw2SgccF+Rn1NSRm9HFtu3w=="; }; }; - "bolt09-0.1.5" = { - name = "bolt09"; - packageName = "bolt09"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt09/-/bolt09-0.1.5.tgz"; - sha512 = "oT1+erg21vat55oXNd7nNEkCO0FQnmaraFZuyXFyeVk7dZCm/3vgic0qK1VuUSV+ksYXJfRKYC4AqfYrtHNPZg=="; - }; - }; "bolt09-0.2.0" = { name = "bolt09"; packageName = "bolt09"; @@ -14512,13 +14413,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.17.6" = { + "browserslist-4.18.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.17.6"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz"; - sha512 = "uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz"; + sha512 = "ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA=="; }; }; "brq-0.1.8" = { @@ -15710,15 +15611,6 @@ let sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; - "cbor-8.0.0" = { - name = "cbor"; - packageName = "cbor"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cbor/-/cbor-8.0.0.tgz"; - sha512 = "nMmaLWbj7+bC6MsApKRIig8h+yjgNLhPLXaCelq5+C7mpWsHgIcseZSdvgexSY5uE1Q3m2uPvIDZwSdxdo7qig=="; - }; - }; "cbor-8.0.2" = { name = "cbor"; packageName = "cbor"; @@ -15755,22 +15647,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.1.31" = { + "cdk8s-1.1.33" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.1.31"; + version = "1.1.33"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.31.tgz"; - sha512 = "mPFT6pSE4n8p5wE6IjJZeCfJAU5kZBmSjYIbT3Jkz4KYtiSSbdKB3tD/b37VL4RZCOv4OqCAU3mF87BgB+xu0w=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.33.tgz"; + sha512 = "+ts6ksmpPxryb7MB6hlNF1NNqLy/n2D/DzqW/dcB4ymML7iaXDrCwkWWOqaQCIE5SL1rm37uBnX/pyjDOtsn8A=="; }; }; - "cdk8s-plus-22-1.0.0-beta.38" = { + "cdk8s-plus-22-1.0.0-beta.40" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.38"; + version = "1.0.0-beta.40"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.38.tgz"; - sha512 = "tSBAA6H8hSnuMWFWmFepGsS+gMh+3bWCbKCRL3FfJbh7iH9H1SESmWNUgAMMwzoFKCT3MyKSVt6gbbisP6LOlA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.40.tgz"; + sha512 = "5BMhOy2wJyruukF9cKkqXgrVlI6UiZZaEnBmLwEoOMWi/v3NoQPcsHT9CVTauUEfSFlzBb0iFcuqrafYWIpYaw=="; }; }; "cdktf-0.7.0" = { @@ -23577,6 +23469,15 @@ let sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; + "ecpair-1.0.1" = { + name = "ecpair"; + packageName = "ecpair"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecpair/-/ecpair-1.0.1.tgz"; + sha512 = "5qPa0GVZJI1FAMS+4GZBWXS/bzY7/p2ehuGuHPqvsRWe2yXDc4Bgvf89BMJz87pqcW7+ogGQkLZfwflMr/RPgQ=="; + }; + }; "ecstatic-4.1.4" = { name = "ecstatic"; packageName = "ecstatic"; @@ -23703,13 +23604,13 @@ let sha512 = "U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA=="; }; }; - "electron-to-chromium-1.3.895" = { + "electron-to-chromium-1.3.896" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.895"; + version = "1.3.896"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.895.tgz"; - sha512 = "9Ww3fB8CWctjqHwkOt7DQbMZMpal2x2reod+/lU4b9axO1XJEDUpPMBxs7YnjLhhqpKXIIB5SRYN/B4K0QpvyQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz"; + sha512 = "NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24137,13 +24038,13 @@ let sha512 = "xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA=="; }; }; - "engine.io-parser-5.0.1" = { + "engine.io-parser-5.0.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.1.tgz"; - sha512 = "j4p3WwJrG2k92VISM0op7wiq60vO92MlF3CRGxhKHy9ywG1/Dkc72g0dXeDQ+//hrcDn8gqQzoEkdO9FN0d9AA=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.2.tgz"; + sha512 = "wuiO7qO/OEkPJSFueuATIXtrxF7/6GTbAO9QLv7nnbjwZ5tYhLm9zxvLwxstRs0dcT0KUlWTjtIOs1T86jt12g=="; }; }; "enhanced-resolve-2.3.0" = { @@ -29502,22 +29403,13 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "goldengate-10.4.0" = { + "goldengate-10.4.2" = { name = "goldengate"; packageName = "goldengate"; - version = "10.4.0"; + version = "10.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.4.0.tgz"; - sha512 = "GWQgk3aaev6LVJbaRHZVWKSE7l+mAkcN9dMwdWgC1LU36CdA7Z/5n2LmdZvkmi2M47+Eog3/4rQfnK1r1I0vQA=="; - }; - }; - "goldengate-10.4.1" = { - name = "goldengate"; - packageName = "goldengate"; - version = "10.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.4.1.tgz"; - sha512 = "X3jniV7yV5gG9aOKgKHqflyGmOaNDm1xLfnUdhzRAqlhW7P0vj7VT3v3bm2vfy7ciG53FxW7SMDV9nZBvTyYvg=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.4.2.tgz"; + sha512 = "VZ0VPPIuiSO5/ZZr/UqFP3X3Yv04/TZxIe+SO+Ceqy43ulthPZcnrWsB8hYW2gqZzOPJeVJaYaX9FmL70kYITw=="; }; }; "gonzales-pe-4.3.0" = { @@ -32662,13 +32554,13 @@ let sha512 = "uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ=="; }; }; - "ink-text-input-4.0.1" = { + "ink-text-input-4.0.2" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.1.tgz"; - sha512 = "wiqkrB2tgnCnv51r2LpNLVfgrd/V+UXF3ccry+/Q7on9CBt8LVavX6NDYRMdXljuM+CcFV/sVro0bCr5oxB05w=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.2.tgz"; + sha512 = "euuugcNExOx5E+qNM1c+pDF7V8yw/xzCRWEfFk1KjQT9CYtaVAYre13YbMFsYPkGD26dvX6XAffUgkwXme/p5Q=="; }; }; "ink-use-stdout-dimensions-1.0.5" = { @@ -33139,15 +33031,6 @@ let sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="; }; }; - "invoices-2.0.0" = { - name = "invoices"; - packageName = "invoices"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-2.0.0.tgz"; - sha512 = "UnU0bS3+cMA2UvYrF5RXp/Hm7v/nYiA3F0GVCOeRmDiZmXAt/eO7KdqyRzewopvhBlev7F7t7GZzRRYY1XE3xg=="; - }; - }; "invoices-2.0.1" = { name = "invoices"; packageName = "invoices"; @@ -33157,6 +33040,15 @@ let sha512 = "qd6Os70iotC/P09ArTWsXB3/G8MJRYMkrJQ1k2983kzdKVlROgWobKmdvrA/IFmjg0Ztg/wDkhx49dIQqT8PzQ=="; }; }; + "invoices-2.0.2" = { + name = "invoices"; + packageName = "invoices"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-2.0.2.tgz"; + sha512 = "d1PX0ivZUw5u5kqIZ4bEajzTmKMe6EHXry4ZypsKT6SuvG4bTmn3sdCz867EhuMNZY2/Yj3/R1LXqCVTtsDPmA=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -35696,13 +35588,13 @@ let sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; - "jsdom-18.0.1" = { + "jsdom-18.1.0" = { name = "jsdom"; packageName = "jsdom"; - version = "18.0.1"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-18.0.1.tgz"; - sha512 = "mgVzrYP4IJiJKVqXkAdBn+jg+nQgPusBxTJulz3m1Y/1RIrkk8aDoNaQE5BNbHwe72WwiwE7k3Av2THXDpvzPQ=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-18.1.0.tgz"; + sha512 = "q6QFAfSGLEUqRJ+GCV6vn6ItZCMARWh1d33wiJZPxc+wMNw7HK71JPmQ4C2lIZAsBH8TiJu4uplach/UcrC6bQ=="; }; }; "jsdom-7.2.2" = { @@ -35795,13 +35687,13 @@ let sha512 = "AjJ0tlrnBatJB7OJ/cn9sFaLpM4Ra7fSkxLlHNWsVE1KFAUnCLIcDloXaytaDmBXY/emxi3/XbWwGUIqbjbCIw=="; }; }; - "jsii-srcmak-0.1.396" = { + "jsii-srcmak-0.1.398" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.396"; + version = "0.1.398"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.396.tgz"; - sha512 = "io/gnInaCTuxgqA/sueTLm44nlJdcWNeUnrZUMW166VKNp+XCLF4kccLaSM6BwuoLKoSxtOL3BAjfYgqtVNIuQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.398.tgz"; + sha512 = "owTEb9AENT/MQQoHIIiAWvD/sTJtooHwlsNTnM3GaBmEZdntsCjYrDbWGZG1baZjRq2d6PBPqVs7EfxHMIUXjA=="; }; }; "json-bigint-1.0.0" = { @@ -36092,13 +35984,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.49" = { + "json2jsii-0.2.51" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.49"; + version = "0.2.51"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.49.tgz"; - sha512 = "4SzHZSGzlD3FG2599ROxzaW1O3rnV9M+0ZP0TPAcQky31NruMocL21WVjzBzG2EZmM4u7L4JlceHVVFLCmziYw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.51.tgz"; + sha512 = "r/pye6PVthtdz3wW8vAwL3t0xUt40FIhqlY5bkZJ6OR2jM2WBJWgBuCoLs3YhKxwNRR7uDsfHTAhexX8ga0tUA=="; }; }; "json3-3.2.6" = { @@ -37532,67 +37424,22 @@ let sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; - "lightning-4.1.3" = { + "lightning-4.13.3" = { name = "lightning"; packageName = "lightning"; - version = "4.1.3"; + version = "4.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.1.3.tgz"; - sha512 = "DI21mqAdwBM/Os3pcAnBrpUCoaKQzJFTEv2c+DEJUzPBnpxRGGKGurlT5FDz9QZSTag7YgBb5ghsqtjQ2MlFWg=="; + url = "https://registry.npmjs.org/lightning/-/lightning-4.13.3.tgz"; + sha512 = "7behHnEw4PPAZ2BOXr+B80mtPFRnxZESBKkV0fgpniM6siidItxDiZEfyRXB1/5KDON7A/m6qgCkdyljQU/CCA=="; }; }; - "lightning-4.10.7" = { + "lightning-4.14.3" = { name = "lightning"; packageName = "lightning"; - version = "4.10.7"; + version = "4.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.10.7.tgz"; - sha512 = "V2IkR55hA0nqMNfjmkgJSGDvkiu+v3hegz2Kj4az3kVFqUMIN9Eb8uFqZ8xKM5PZFBQHaZ59Tm1EZHPPFCNi6A=="; - }; - }; - "lightning-4.12.1" = { - name = "lightning"; - packageName = "lightning"; - version = "4.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.12.1.tgz"; - sha512 = "SXct38/j1LpKRtpxggc7eokwy13QZg7ziChWf+n9LJdMFkZgKmt3RIOwh6UaaKKV462uyJa2m3Sd/j+kInNF6w=="; - }; - }; - "lightning-4.12.2" = { - name = "lightning"; - packageName = "lightning"; - version = "4.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.12.2.tgz"; - sha512 = "vYdmsIeYq5Tzd4k9HQ41VfP26jZfjtyemZEX1TUfhTBxgqgJvlXubhXfkxXaVb9FF2URdJfZRNo2YYHacFozmQ=="; - }; - }; - "lightning-4.13.1" = { - name = "lightning"; - packageName = "lightning"; - version = "4.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.13.1.tgz"; - sha512 = "4pKOAp86o0298Vt7aZRXr0UH7ymq2zRIB+wZlUUoHAZ36rKpeBhsMb1DPDZCh0ntcocYaedkCIXjbz/a5sALVA=="; - }; - }; - "lightning-4.14.1" = { - name = "lightning"; - packageName = "lightning"; - version = "4.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.14.1.tgz"; - sha512 = "k8PINVBXEhrpsAM5cnxMCWVBqI1FyoAE/HbkwfWzzcEhLdshGzJEnwmi2MxhNqhTnBBZBuDgtZakCifkZVj41g=="; - }; - }; - "lightning-4.5.0" = { - name = "lightning"; - packageName = "lightning"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.5.0.tgz"; - sha512 = "oKH9EVKxgPIWm2f3/7vLImQAZQVP2souwAMMg5njGdCPAlekA8KH+/r+Ltuv5jd1vQigwmQMkfmdZzd4qmOI8Q=="; + url = "https://registry.npmjs.org/lightning/-/lightning-4.14.3.tgz"; + sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA=="; }; }; "lilconfig-2.0.4" = { @@ -37748,103 +37595,40 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-5.0.3" = { + "ln-accounting-5.0.5" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.3.tgz"; - sha512 = "C6aYABDRKoNLIooap5FZxvPFVcQjLYuHkbg5vTQHhydBMje8M/e8ZtHXWQNC3cC42W6dE7Nrdh1cCg1cYhNp6g=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.5.tgz"; + sha512 = "WPAdlGE9byTrL79U4PrSV19fbOCmvWlRlGydt52qPy6CSrY1xkGe2s736ge3tjwNmcFDf4XSrxq7xn/oyF658w=="; }; }; - "ln-accounting-5.0.4" = { - name = "ln-accounting"; - packageName = "ln-accounting"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.4.tgz"; - sha512 = "28hggeYTXHim0d6g65c1PiHoKKV3cVXApBEui9b7WXeo+FumGVTcZTJ2g6Ojed45GrNK9I9WBECVW3X/YKVMuA=="; - }; - }; - "ln-service-52.0.3" = { + "ln-service-52.16.0" = { name = "ln-service"; packageName = "ln-service"; - version = "52.0.3"; + version = "52.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.0.3.tgz"; - sha512 = "upswAJU9Mrfh3l+q46rvmRu8Pf7iYR2vkKyq16dgiBgxKw7fzvI8aL2Xi0xrtyoRUOUODOyEzO7/MRRhNKcvMA=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.16.0.tgz"; + sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ=="; }; }; - "ln-service-52.14.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "52.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.14.1.tgz"; - sha512 = "Q+dDt1MM6HwcEYrq4BZ2bISYyUkrg44HS7YOKAzzPif+UC/fzsYfUmqjHhb3EhNq9Err14NbfcE/qQgbWZjalw=="; - }; - }; - "ln-service-52.14.2" = { - name = "ln-service"; - packageName = "ln-service"; - version = "52.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.14.2.tgz"; - sha512 = "Fd48a8g26I4Bz9HR50PjSpXWPryiZTfy57v3oRaBlZdZIpiwoyYRc8Bod25lvJeq0aKwsSl87TQjTqXDF+eXeA=="; - }; - }; - "ln-service-52.14.3" = { - name = "ln-service"; - packageName = "ln-service"; - version = "52.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.14.3.tgz"; - sha512 = "pRzU5i1aG9tn5bjH9vtS2/IngL3ZFmSKNdbLuw1QDvUE0VTkethL2hST7cJCNFpiPftuM65eNtT10woBXgYBfQ=="; - }; - }; - "ln-service-52.15.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "52.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.15.0.tgz"; - sha512 = "7HjeyEMrcIGP9Q6LdRyVD7qFWu+gQbWkwuOpnFJYoodKsLqhWFykAZ7wS2OjXlvw/8+/ASQcxe5o2gVm501lLw=="; - }; - }; - "ln-service-52.4.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "52.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.4.0.tgz"; - sha512 = "8fKd/Px3c57CyjmL5CRY88MmVQ2cBkz2kB/VB5SEThzqQJbwDz0nVCOE9T5+ZV7t3TSAuonPwuJJxaoCJCrRHA=="; - }; - }; - "ln-sync-2.1.0" = { + "ln-sync-3.0.1" = { name = "ln-sync"; packageName = "ln-sync"; - version = "2.1.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-2.1.0.tgz"; - sha512 = "5Djy5IUeM9jT6r0s6ptnaKjJZxHTQxVATYcK+Y7vdvQ4vf15sRY+sSSPqL1uYpbUWLo5hUSwLcGuLeBYgEUDlg=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.0.1.tgz"; + sha512 = "rCH59pxjqsWrcwse8hL9FdWGMj7L3tGMTzxussOnbM2oEfj9LsvRPxrcj7+mEMhuJ+/OZ8V31jIUwCGwUTMz6w=="; }; }; - "ln-sync-3.0.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.0.0.tgz"; - sha512 = "j+QGoRwJietE0LpYu/1pKXxM2EpHGFKr+9YG5jM2k7RQvKh3ND3pciNWbhGiGBDdANES9aDuy6aTA/12505ZaQ=="; - }; - }; - "ln-telegram-3.4.0" = { + "ln-telegram-3.4.2" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.4.0"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.4.0.tgz"; - sha512 = "Vq3wy7JrwpEVVLw1LAfkfxcN5e5Q8rWqRZOddyEcj5Hdf5J/AZea0UMDjVoNoYs8Dg9m8VCO9DjCaHQdmShFcA=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.4.2.tgz"; + sha512 = "yb3x+kFmjkEykBtUWX+zE6uhkWTDm7wEq0QkLL2tqx5y51a6KAehClX6qjnuKeFjXRzeN0D8tUI2B9RV2NjAAA=="; }; }; "load-bmfont-1.4.1" = { @@ -39792,13 +39576,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.0.2" = { + "luxon-2.1.1" = { name = "luxon"; packageName = "luxon"; - version = "2.0.2"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.0.2.tgz"; - sha512 = "ZRioYLCgRHrtTORaZX1mx+jtxKtKuI5ZDvHNAmqpUzGqSrR+tL4FVLn/CUGMA3h0+AKD1MAxGI5GnCqR5txNqg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.1.1.tgz"; + sha512 = "6VQVNw7+kQu3hL1ZH5GyOhnk8uZm21xS7XJ/6vDZaFNcb62dpFDKcH8TI5NkoZOdMRxr7af7aYGrJlE/Wv0i1w=="; }; }; "lzma-native-8.0.1" = { @@ -40674,13 +40458,13 @@ let sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; - "mdast-util-from-markdown-1.0.4" = { + "mdast-util-from-markdown-1.1.0" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.0.4.tgz"; - sha512 = "BlL42o885QO+6o43ceoc6KBdp/bi9oYyamj0hUbeu730yhP1WDC7m2XYSBfmQkOb0TdoHSAJ3de3SMqse69u+g=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.1.0.tgz"; + sha512 = "Mex7IIeIKRpGYNNywpxTfPhfFBTxBL5IVacPMU6GjYF+EkIvy++19cBgxVFyHVd2JpC/chG2IKGqZLffoo7Q1g=="; }; }; "mdast-util-frontmatter-0.2.0" = { @@ -40827,13 +40611,13 @@ let sha512 = "RDLRkBFmBKCJl6/fQdxxKL2BqNtoPFoNBmQAlj5ZNKOijIWRKjdhPkeufsUOaexLj+78mhJc+L7d1MYka8/LdQ=="; }; }; - "mdast-util-mdx-jsx-1.1.1" = { + "mdast-util-mdx-jsx-1.1.2" = { name = "mdast-util-mdx-jsx"; packageName = "mdast-util-mdx-jsx"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-1.1.1.tgz"; - sha512 = "C4W4hXmagipaeMwi5O8y+lVWE4qP2MDxfKlIh0lZN6MZWSPpQTK5RPwKBH4DdYHorgjbV2rKk84rNWlRtvoZCg=="; + url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-1.1.2.tgz"; + sha512 = "1/bDUZvPGNVxiAjrVsehMZTaNomihpbIMoMr8/UcAQ4h7itDFhN93LtO9XzQPlEM+CMueCoRYGQfl7N+5R+8Mg=="; }; }; "mdast-util-mdxjs-esm-1.1.1" = { @@ -46671,22 +46455,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.3.0" = { + "ot-builder-1.3.1" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.3.0.tgz"; - sha512 = "FPUhp3BlpGYtjIwngN+7onKCKKR659LO8qajLzJQF48s7EAvqt2JxRZyLesWm9CgI6v0LS+CPyy8MrdKpxmn4Q=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.3.1.tgz"; + sha512 = "D/E2rbNPKGOOyodYEbDEn0nKcPraDuZvIpCPkTeP80+hAxrrhdv2XGE97SGT33pr23EbOiWTJ71gW62KADLmCw=="; }; }; - "otb-ttc-bundle-1.3.0" = { + "otb-ttc-bundle-1.3.1" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.3.0.tgz"; - sha512 = "bb+46cdq0mvvf97Sx4llGxAuzkO7awX4+vdJZFEYFgeu40yHWUSEQBsWRgdsk6//jJ3oIiMiYZOq+qQcz/Wsww=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.3.1.tgz"; + sha512 = "OMtFR7CuG6f3Q+Wl1burzRK2Zet2QjlODbUcyy/0GJTFsmz72tWIKNa6rvzcYo7djldeLPy6uzBqGAFwtMJZtw=="; }; }; "ow-0.21.0" = { @@ -47292,13 +47076,13 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paid-services-3.1.1" = { + "paid-services-3.1.2" = { name = "paid-services"; packageName = "paid-services"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.1.1.tgz"; - sha512 = "wYWxZX9iCzA8T1baYHXl7fUSWhpDQ9AQvnlyUnSv+oQpLIYASPfPQmk4oPKfUuYBOZpgd+y3guxFt2ZF7MzPbQ=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.1.2.tgz"; + sha512 = "aVjouLGNT4q45PnBt0WoDJBHA6TVG/lQwKgcZAe9EDYOzjWfHonQK7zcN8tB6wZY8kb0FUHXDdfg4oQbR3LQXQ=="; }; }; "pako-0.2.9" = { @@ -50461,13 +50245,13 @@ let sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA=="; }; }; - "probing-2.0.0" = { + "probing-2.0.1" = { name = "probing"; packageName = "probing"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/probing/-/probing-2.0.0.tgz"; - sha512 = "FtIdFZPzV4CZTdR6ZFAidXj0AvN0zFkV74MM31UzVvaFac06ODyz8sK4rk2qFFonJNNiF7o7SrRQ1gYVXXpCMA=="; + url = "https://registry.npmjs.org/probing/-/probing-2.0.1.tgz"; + sha512 = "kkoAQ/oqf7FKvdyZlJF28Be5DeNnaGhCC7JWhWG16yJ9xV2RtTFLVKPQ0SgtXKSB90soghCLUYG4ToogAw4yXA=="; }; }; "proc-log-1.0.0" = { @@ -50857,13 +50641,13 @@ let sha512 = "YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA=="; }; }; - "property-information-6.1.0" = { + "property-information-6.1.1" = { name = "property-information"; packageName = "property-information"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-6.1.0.tgz"; - sha512 = "aTSKXRnBlDpqo6cHVuZ88oaW1XGjABV10cV8RhK7AwBRjX+/D/LqspUF9f+TFSprZwXAsdJhx3KaJCdj8xZygw=="; + url = "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz"; + sha512 = "hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w=="; }; }; "proto-list-1.2.4" = { @@ -52036,13 +51820,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.186" = { + "pyright-1.1.187" = { name = "pyright"; packageName = "pyright"; - version = "1.1.186"; + version = "1.1.187"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.186.tgz"; - sha512 = "W5Ke8Lqop4HpabSMOTWRd6bRQx1i+PTAHENoa5RQHMsGV50y8WwmNOGcxeFixdz64UfXPO2Ye2XoR5wEz3JU8w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.187.tgz"; + sha512 = "g3M7FoNH1HiCmOK0c6Y7c4KdUSqwDyuUQKiU11onzHT17ZHLpcLo7drDBEnBREUSlG30FpxRKFHqk0doo90Yyg=="; }; }; "q-0.9.7" = { @@ -59848,13 +59632,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.125" = { + "sscaff-1.2.127" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.125"; + version = "1.2.127"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.125.tgz"; - sha512 = "RSlu5c9aD7+PvFVprE/NEqNs94gRqO5vXlzpXLfY6P8G9q65cXuEmjZUTT8x4D2ee93ILfrk/SKDfjGnCjazTw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.127.tgz"; + sha512 = "lmfLzIKLeolLAujyn2yNcUkg2ia31j7NHVgGEiIe+YqhYomSXzjQxM/k1G0cNvMYNPWvkBakS4Um/ppe2/Zrog=="; }; }; "ssh-config-1.1.6" = { @@ -61900,13 +61684,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.9.11" = { + "systeminformation-5.9.12" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.9.11"; + version = "5.9.12"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.11.tgz"; - sha512 = "lvNC6ZpIyVJAlYeug/QH0N6L59iX1/YqxdXjNbemGlhI43FSd4fHFr+DyIlpKjSlzawR/1W3YwrTYuUNai1N5A=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.12.tgz"; + sha512 = "9tCCSA5ChSWBadJrrs7GYSvCBt9oKeqBAp0tv4FaeAIrYjIJ4gxrkFc+2xdMrJd8HEGKBMD2TSTMsXhmn+dBtw=="; }; }; "sywac-1.3.0" = { @@ -61954,15 +61738,6 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.7.2" = { - name = "table"; - packageName = "table"; - version = "6.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.7.2.tgz"; - sha512 = "UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g=="; - }; - }; "table-6.7.3" = { name = "table"; packageName = "table"; @@ -67779,15 +67554,6 @@ let sha512 = "IHliMEEYSY0tJjJt0ECb8ESx/nRXpoy9kN42WVQXgaqGyizFAf3jibSiezDQTrrY7f3kywXggCU+kkJEM+OLZQ=="; }; }; - "vscode-json-languageservice-4.1.9" = { - name = "vscode-json-languageservice"; - packageName = "vscode-json-languageservice"; - version = "4.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.9.tgz"; - sha512 = "kxNHitUy2fCxmP6vAp0SRLrUSuecUYzzxlC+85cC3jJlFHWmvtCJOzikC+kcUnIdls9fQSB8n0yHs8Sl6taxJw=="; - }; - }; "vscode-jsonrpc-3.5.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -69795,24 +69561,6 @@ let sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; }; }; - "ws-8.2.0" = { - name = "ws"; - packageName = "ws"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz"; - sha512 = "uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g=="; - }; - }; - "ws-8.2.2" = { - name = "ws"; - packageName = "ws"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz"; - sha512 = "Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw=="; - }; - }; "ws-8.2.3" = { name = "ws"; packageName = "ws"; @@ -73632,7 +73380,7 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" @@ -73655,7 +73403,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -74250,7 +73998,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -74397,7 +74145,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.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -75586,7 +75334,7 @@ in sources."escape-string-regexp-5.0.0" ]; }) - sources."mdast-util-from-markdown-1.0.4" + sources."mdast-util-from-markdown-1.1.0" sources."mdast-util-frontmatter-1.0.0" sources."mdast-util-gfm-2.0.0" sources."mdast-util-gfm-autolink-literal-1.0.2" @@ -75596,7 +75344,7 @@ in sources."mdast-util-gfm-task-list-item-1.0.0" sources."mdast-util-mdx-1.1.0" sources."mdast-util-mdx-expression-1.1.1" - sources."mdast-util-mdx-jsx-1.1.1" + sources."mdast-util-mdx-jsx-1.1.2" sources."mdast-util-mdxjs-esm-1.1.1" sources."mdast-util-to-markdown-1.2.4" sources."mdast-util-to-nlcst-5.2.1" @@ -75681,7 +75429,7 @@ in sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-6.1.0" + sources."property-information-6.1.1" sources."pump-1.0.3" sources."pump-chain-1.0.0" sources."pupa-2.1.1" @@ -75894,7 +75642,7 @@ in sources."async-3.2.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."caniuse-lite-1.0.30001280" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -75905,7 +75653,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -76034,9 +75782,9 @@ in sha512 = "7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA=="; }; dependencies = [ - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."caniuse-lite-1.0.30001280" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."escalade-3.1.1" sources."fraction.js-4.1.2" sources."node-releases-2.0.1" @@ -76071,7 +75819,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1027.0" // { + (sources."aws-sdk-2.1028.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -76692,20 +76440,16 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.10.0"; + version = "11.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.10.0.tgz"; - sha512 = "PJeibrVjtgeG/62w+QFw0bqxZj8FaRmRKHai5wewC3MAO1fxLDcIrTJP7jADRpC5O9ALzpO0yvtu5DvG76iK8A=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.11.0.tgz"; + sha512 = "jmJjvAB00rF+zKthCDzCOIz8IxJah2cjgcBHSjLqgV7AYbyyDEUNiFZhSlymEfmGc2pJI2/JhetYEVu9PpDl3Q=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" sources."@alexbosworth/node-fetch-2.6.2" sources."@alexbosworth/saxophone-0.6.2" - (sources."@grpc/grpc-js-1.4.2" // { - dependencies = [ - sources."@types/node-16.11.7" - ]; - }) + sources."@grpc/grpc-js-1.4.4" sources."@grpc/proto-loader-0.6.6" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" @@ -76729,7 +76473,7 @@ in sources."@types/express-serve-static-core-4.17.25" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-10.12.18" + sources."@types/node-16.11.7" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.7" @@ -76738,7 +76482,7 @@ in sources."@types/ws-8.2.0" sources."abort-controller-3.0.0" sources."accepts-1.3.7" - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."ansi-0.3.1" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -76771,31 +76515,27 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."bech32-1.1.4" + sources."bech32-2.0.0" sources."bessel-1.0.2" sources."bindings-1.5.0" sources."bip174-2.0.1" - sources."bip32-2.0.6" + (sources."bip32-2.0.6" // { + dependencies = [ + sources."@types/node-10.12.18" + ]; + }) sources."bip65-1.0.3" sources."bip66-1.1.5" sources."bip68-1.0.4" sources."bitcoin-ops-1.4.1" - sources."bitcoinjs-lib-5.2.0" + sources."bitcoinjs-lib-6.0.0" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."bn.js-4.12.0" + sources."bn.js-5.2.0" sources."body-parser-1.19.0" - (sources."bolt01-1.2.3" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) - sources."bolt03-1.2.11" - (sources."bolt07-1.7.4" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) + sources."bolt01-1.2.3" + sources."bolt03-1.2.12" + sources."bolt07-1.7.4" sources."bolt09-0.2.0" (sources."boxen-5.1.2" // { dependencies = [ @@ -76899,8 +76639,13 @@ in sources."destroy-1.0.4" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" + sources."ecpair-1.0.1" sources."ee-first-1.1.1" - sources."elliptic-6.5.4" + (sources."elliptic-6.5.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -76931,14 +76676,7 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."global-dirs-3.0.0" - (sources."goldengate-10.4.1" // { - dependencies = [ - sources."bech32-2.0.0" - sources."bn.js-5.2.0" - sources."cbor-8.0.2" - sources."ln-service-52.14.3" - ]; - }) + sources."goldengate-10.4.2" sources."got-9.6.0" sources."graceful-fs-4.2.8" (sources."has-ansi-2.0.0" // { @@ -76985,12 +76723,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."invoices-2.0.1" // { - dependencies = [ - sources."bech32-2.0.0" - sources."bn.js-5.2.0" - ]; - }) + sources."invoices-2.0.2" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" @@ -77022,121 +76755,45 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lightning-4.13.1" // { + (sources."lightning-4.14.3" // { dependencies = [ - sources."@types/node-16.11.6" - sources."bn.js-5.2.0" - sources."cbor-8.0.2" - ]; - }) - (sources."ln-accounting-5.0.4" // { - dependencies = [ - sources."ln-service-52.14.3" - ]; - }) - (sources."ln-service-52.15.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.4.4" - sources."@types/node-16.11.7" - sources."bn.js-5.2.0" - sources."lightning-4.14.1" - ]; - }) - (sources."ln-sync-3.0.0" // { - dependencies = [ - sources."cbor-8.0.2" - ]; - }) - (sources."ln-telegram-3.4.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.7" - sources."@grpc/proto-loader-0.6.4" - sources."@types/node-16.11.7" - sources."@types/ws-7.4.7" - sources."ansi-regex-5.0.1" - sources."bech32-2.0.0" - sources."bn.js-5.2.0" - sources."bolt07-1.7.3" - sources."bolt09-0.1.5" - sources."cbor-8.0.0" - (sources."goldengate-10.4.0" // { + (sources."invoices-2.0.1" // { dependencies = [ - sources."async-3.2.1" - (sources."asyncjs-util-1.2.6" // { + (sources."bitcoinjs-lib-5.2.0" // { dependencies = [ - sources."async-3.2.0" - ]; - }) - sources."ln-service-52.0.3" - ]; - }) - sources."invoices-2.0.0" - sources."is-fullwidth-code-point-3.0.0" - (sources."lightning-4.1.3" // { - dependencies = [ - sources."@types/node-16.7.3" - sources."async-3.2.1" - (sources."asyncjs-util-1.2.6" // { - dependencies = [ - sources."async-3.2.0" + sources."bech32-1.1.4" ]; }) ]; }) - (sources."ln-accounting-5.0.3" // { + ]; + }) + sources."ln-accounting-5.0.5" + sources."ln-service-52.16.0" + (sources."ln-sync-3.0.1" // { + dependencies = [ + sources."bech32-1.1.4" + (sources."invoices-2.0.1" // { dependencies = [ - sources."@grpc/proto-loader-0.6.5" - sources."@types/node-16.9.1" - sources."async-3.2.1" - (sources."asyncjs-util-1.2.6" // { + sources."bech32-2.0.0" + (sources."bitcoinjs-lib-5.2.0" // { dependencies = [ - sources."async-3.2.0" + sources."bech32-1.1.4" ]; }) - sources."lightning-4.5.0" - sources."ln-service-52.4.0" - sources."ws-8.2.2" ]; }) - (sources."ln-service-52.14.2" // { + (sources."lightning-4.13.3" // { dependencies = [ - sources."@grpc/grpc-js-1.4.2" - sources."@grpc/proto-loader-0.6.6" - sources."@types/node-16.11.6" - sources."@types/ws-8.2.0" - sources."bolt07-1.7.4" - sources."bolt09-0.2.0" + sources."bitcoinjs-lib-5.2.0" sources."cbor-8.0.2" - sources."invoices-2.0.1" - sources."lightning-4.12.2" - sources."ws-8.2.3" ]; }) - (sources."ln-sync-2.1.0" // { - dependencies = [ - sources."@grpc/proto-loader-0.6.5" - sources."@types/node-16.10.4" - sources."@types/ws-8.2.0" - sources."async-3.2.1" - (sources."asyncjs-util-1.2.6" // { - dependencies = [ - sources."async-3.2.0" - ]; - }) - sources."bolt09-0.2.0" - sources."cbor-8.0.2" - sources."lightning-4.10.7" - ]; - }) - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."table-6.7.2" - sources."ws-8.2.0" ]; }) + sources."ln-telegram-3.4.2" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" - sources."lodash.clonedeep-4.5.0" sources."lodash.difference-4.5.0" sources."lodash.get-4.4.2" sources."lodash.pad-4.5.1" @@ -77154,7 +76811,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.0.2" + sources."luxon-2.1.1" sources."macaroon-3.0.4" (sources."make-dir-3.1.0" // { dependencies = [ @@ -77188,7 +76845,7 @@ in sources."nan-2.15.0" sources."negotiator-0.6.2" sources."node-addon-api-2.0.2" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.6" sources."node-gyp-build-4.3.0" sources."nofilter-3.1.0" sources."normalize-url-4.5.1" @@ -77220,56 +76877,21 @@ in sources."semver-6.3.0" ]; }) - (sources."paid-services-3.1.1" // { - dependencies = [ - sources."@types/node-16.11.6" - sources."bn.js-5.2.0" - sources."cbor-8.0.2" - sources."lightning-4.12.2" - sources."ln-service-52.14.2" - ]; - }) + sources."paid-services-3.1.2" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" sources."prettyjson-1.2.1" - (sources."probing-2.0.0" // { - dependencies = [ - sources."@types/node-16.11.6" - sources."bech32-2.0.0" - sources."bn.js-5.2.0" - sources."bolt09-0.1.5" - sources."cbor-8.0.2" - (sources."invoices-2.0.0" // { - dependencies = [ - sources."bolt07-1.7.3" - ]; - }) - (sources."lightning-4.12.1" // { - dependencies = [ - (sources."asyncjs-util-1.2.6" // { - dependencies = [ - sources."async-3.2.0" - ]; - }) - sources."bolt09-0.2.0" - ]; - }) - sources."ln-service-52.14.1" - ]; - }) + sources."probing-2.0.1" sources."process-nextick-args-2.0.1" - (sources."protobufjs-6.11.2" // { - dependencies = [ - sources."@types/node-16.11.7" - ]; - }) + sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" (sources."psbt-1.1.10" // { dependencies = [ - sources."bn.js-5.2.0" + sources."bech32-1.1.4" + sources."bitcoinjs-lib-5.2.0" ]; }) sources."pump-3.0.0" @@ -77359,10 +76981,15 @@ in }) sources."through-2.3.8" sources."tiny-emitter-2.1.0" - sources."tiny-secp256k1-1.1.6" + (sources."tiny-secp256k1-1.1.6" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) sources."tmp-0.0.29" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" + sources."tr46-0.0.3" sources."truncate-utf8-bytes-1.0.2" sources."tslib-2.1.0" sources."tweetnacl-1.0.3" @@ -77391,6 +77018,8 @@ in sources."varuint-bitcoin-1.1.2" sources."vary-1.1.2" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" (sources."widest-line-3.1.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -79859,17 +79488,17 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.28"; + version = "1.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.28.tgz"; - sha512 = "JAcF1zh6/ZfiZCnjpjqeuTi+DfbAW9zL7gBYWqCAZMXdj1BHGsOmjXomHRHLU/fE80lFYJSYUmrjfJw+neMQ4Q=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.29.tgz"; + sha512 = "hvQr4muvZ5mM//MpTH7IK8bSKRl/c3s/8GXx4BghWI+noG0/O06XxaN4ZeQuIdXHuZ4/7Qi2YA6a7qgifnetyQ=="; }; dependencies = [ sources."@jsii/check-node-1.43.0" sources."@jsii/spec-1.43.0" sources."@types/node-12.20.37" sources."@xmldom/xmldom-0.7.5" - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."at-least-node-1.0.0" @@ -79877,8 +79506,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.1.31" - sources."cdk8s-plus-22-1.0.0-beta.38" + sources."cdk8s-1.1.33" + sources."cdk8s-plus-22-1.0.0-beta.40" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -79971,14 +79600,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.396" // { + (sources."jsii-srcmak-0.1.398" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.49" + sources."json2jsii-0.2.51" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -80016,7 +79645,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.125" + sources."sscaff-1.2.127" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -80436,7 +80065,7 @@ in ]; }) sources."ink-spinner-4.0.3" - sources."ink-text-input-4.0.1" + sources."ink-text-input-4.0.2" sources."ink-use-stdout-dimensions-1.0.5" sources."inquirer-8.2.0" sources."internal-slot-1.0.3" @@ -80657,7 +80286,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.125" + sources."sscaff-1.2.127" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -81316,7 +80945,7 @@ in sources."ms-2.0.0" sources."request-light-0.4.0" sources."vscode-json-languageserver-1.3.4" - (sources."vscode-json-languageservice-4.1.9" // { + (sources."vscode-json-languageservice-4.1.10" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -81776,7 +81405,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -82442,7 +82071,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -82580,7 +82209,7 @@ in sha512 = "scmrgeDh1nXAevfgiflyDLIykXJp9q1gi6uHGViO2m7Qu/L0SGTClT3Y7pA46SFXMxeKq/f8lBvUltvPzksWXg=="; }; dependencies = [ - sources."pyright-1.1.186" + sources."pyright-1.1.187" ]; buildInputs = globalBuildInputs; meta = { @@ -82767,7 +82396,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -82786,7 +82415,7 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -82827,7 +82456,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83214,6 +82843,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-ultisnips = nodeEnv.buildNodePackage { + name = "coc-ultisnips"; + packageName = "coc-ultisnips"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-ultisnips/-/coc-ultisnips-1.2.3.tgz"; + sha512 = "gefj80C24vZ9FTnFLWXhNC8aW9VBVQGELH0e80gAAZma/RY5FGOkzWVvtjO9vQqAVHt4TQUErybsf/en5ci82w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "ultisnips source for coc.nvim"; + homepage = "https://github.com/neoclide/coc-sources#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; @@ -83378,7 +83025,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -83784,10 +83431,10 @@ in concurrently = nodeEnv.buildNodePackage { name = "concurrently"; packageName = "concurrently"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/concurrently/-/concurrently-6.3.0.tgz"; - sha512 = "k4k1jQGHHKsfbqzkUszVf29qECBrkvBKkcPJEUDTyVR7tZd1G/JOfnst4g1sYbFvJ4UjHZisj1aWQR8yLKpGPw=="; + url = "https://registry.npmjs.org/concurrently/-/concurrently-6.4.0.tgz"; + sha512 = "HZ3D0RTQMH3oS4gvtYj1P+NBc6PzE2McEra6yEFcQKrUQ9HvtTGU4Dbne083F034p+LRb7kWU0tPRNvSGs1UCQ=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -86437,7 +86084,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -86515,7 +86162,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.1" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -87090,10 +86737,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.76.0"; + version = "6.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.76.0.tgz"; - sha512 = "U9hs4hm0UzpfjHV1+SKxdH01dVxRByfkffRvnDNMIt84v94eZXhctjywAO3kqRHpq30oCXY6N6/+kKd/QM9G9A=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.77.0.tgz"; + sha512 = "BSll/YysODUv2VI9tdZyryWJnWWCdUox16PzfT2aHnvHD1bkJyvM55b5mOQu3gMiSBam66ZmcqBWavZi3K3AbA=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -87958,7 +87605,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" @@ -87993,7 +87640,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -88030,7 +87677,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."ink-text-input-4.0.1" // { + (sources."ink-text-input-4.0.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -90175,7 +89822,7 @@ in sources."supports-color-8.1.1" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -90845,7 +90492,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.895" + sources."electron-to-chromium-1.3.896" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92499,7 +92146,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -92531,7 +92178,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -95201,7 +94848,7 @@ in sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { @@ -95317,7 +94964,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -95533,10 +95180,10 @@ in sources."markdown-escapes-1.0.4" sources."markdown-table-2.0.0" sources."mdast-util-compact-2.0.1" - sources."mdast-util-from-markdown-1.0.4" + sources."mdast-util-from-markdown-1.1.0" sources."mdast-util-mdx-1.1.0" sources."mdast-util-mdx-expression-1.1.1" - sources."mdast-util-mdx-jsx-1.1.1" + sources."mdast-util-mdx-jsx-1.1.2" sources."mdast-util-mdxjs-esm-1.1.1" (sources."mdast-util-to-markdown-1.2.4" // { dependencies = [ @@ -96497,7 +96144,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."agent-base-6.0.2" - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."ajv-formats-2.1.1" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -97921,10 +97568,10 @@ in gtop = nodeEnv.buildNodePackage { name = "gtop"; packageName = "gtop"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/gtop/-/gtop-1.1.1.tgz"; - sha512 = "5w10ZBVNHbahKpgm41YoKPVnT7hxuxBplBpvS91W7XXNC6huaRfH6BRBjMjWKMKBrZqgykHgaYW3PKu1CnY1Cg=="; + url = "https://registry.npmjs.org/gtop/-/gtop-1.1.2.tgz"; + sha512 = "IebcEL7sb+QBmXfAlsljGjAyMNDCa5Dt9Xx7HQvQUI1XuwSFZzivvMzS0dWIFL2TKKuF77ticbBi+Imip4vx2g=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -97998,7 +97645,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.9.11" + sources."systeminformation-5.9.12" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -99201,7 +98848,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1027.0" + sources."aws-sdk-2.1028.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -100346,9 +99993,9 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.1" - sources."@ot-builder/bin-composite-types-1.3.0" - sources."@ot-builder/bin-util-1.3.0" - (sources."@ot-builder/cli-help-shower-1.3.0" // { + sources."@ot-builder/bin-composite-types-1.3.1" + sources."@ot-builder/bin-util-1.3.1" + (sources."@ot-builder/cli-help-shower-1.3.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -100358,39 +100005,39 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/cli-proc-1.3.0" - sources."@ot-builder/cli-shared-1.3.0" - sources."@ot-builder/common-impl-1.3.0" - sources."@ot-builder/errors-1.3.0" - sources."@ot-builder/io-bin-cff-1.3.0" - sources."@ot-builder/io-bin-encoding-1.3.0" - sources."@ot-builder/io-bin-ext-private-1.3.0" - sources."@ot-builder/io-bin-font-1.3.0" - sources."@ot-builder/io-bin-glyph-store-1.3.0" - sources."@ot-builder/io-bin-layout-1.3.0" - sources."@ot-builder/io-bin-metadata-1.3.0" - sources."@ot-builder/io-bin-metric-1.3.0" - sources."@ot-builder/io-bin-name-1.3.0" - sources."@ot-builder/io-bin-sfnt-1.3.0" - sources."@ot-builder/io-bin-ttf-1.3.0" - sources."@ot-builder/io-bin-vtt-private-1.3.0" - sources."@ot-builder/ot-1.3.0" - sources."@ot-builder/ot-encoding-1.3.0" - sources."@ot-builder/ot-ext-private-1.3.0" - sources."@ot-builder/ot-glyphs-1.3.0" - sources."@ot-builder/ot-layout-1.3.0" - sources."@ot-builder/ot-metadata-1.3.0" - sources."@ot-builder/ot-name-1.3.0" - sources."@ot-builder/ot-sfnt-1.3.0" - sources."@ot-builder/ot-standard-glyph-namer-1.3.0" - sources."@ot-builder/ot-vtt-private-1.3.0" - sources."@ot-builder/prelude-1.3.0" - sources."@ot-builder/primitive-1.3.0" - sources."@ot-builder/rectify-1.3.0" - sources."@ot-builder/stat-glyphs-1.3.0" - sources."@ot-builder/trace-1.3.0" - sources."@ot-builder/var-store-1.3.0" - sources."@ot-builder/variance-1.3.0" + sources."@ot-builder/cli-proc-1.3.1" + sources."@ot-builder/cli-shared-1.3.1" + sources."@ot-builder/common-impl-1.3.1" + sources."@ot-builder/errors-1.3.1" + sources."@ot-builder/io-bin-cff-1.3.1" + sources."@ot-builder/io-bin-encoding-1.3.1" + sources."@ot-builder/io-bin-ext-private-1.3.1" + sources."@ot-builder/io-bin-font-1.3.1" + sources."@ot-builder/io-bin-glyph-store-1.3.1" + sources."@ot-builder/io-bin-layout-1.3.1" + sources."@ot-builder/io-bin-metadata-1.3.1" + sources."@ot-builder/io-bin-metric-1.3.1" + sources."@ot-builder/io-bin-name-1.3.1" + sources."@ot-builder/io-bin-sfnt-1.3.1" + sources."@ot-builder/io-bin-ttf-1.3.1" + sources."@ot-builder/io-bin-vtt-private-1.3.1" + sources."@ot-builder/ot-1.3.1" + sources."@ot-builder/ot-encoding-1.3.1" + sources."@ot-builder/ot-ext-private-1.3.1" + sources."@ot-builder/ot-glyphs-1.3.1" + sources."@ot-builder/ot-layout-1.3.1" + sources."@ot-builder/ot-metadata-1.3.1" + sources."@ot-builder/ot-name-1.3.1" + sources."@ot-builder/ot-sfnt-1.3.1" + sources."@ot-builder/ot-standard-glyph-namer-1.3.1" + sources."@ot-builder/ot-vtt-private-1.3.1" + sources."@ot-builder/prelude-1.3.1" + sources."@ot-builder/primitive-1.3.1" + sources."@ot-builder/rectify-1.3.1" + sources."@ot-builder/stat-glyphs-1.3.1" + sources."@ot-builder/trace-1.3.1" + sources."@ot-builder/var-store-1.3.1" + sources."@ot-builder/variance-1.3.1" sources."@unicode/unicode-13.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" @@ -100472,8 +100119,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.3.0" - sources."otb-ttc-bundle-1.3.0" + sources."ot-builder-1.3.1" + sources."otb-ttc-bundle-1.3.1" sources."passerror-1.1.1" sources."patel-0.35.1" sources."path-is-absolute-1.0.1" @@ -100731,7 +100378,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1027.0" // { + (sources."aws-sdk-2.1028.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -102825,7 +102472,7 @@ in sources."ms-2.1.2" ]; }) - sources."engine.io-parser-5.0.1" + sources."engine.io-parser-5.0.2" sources."ent-2.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -103044,7 +102691,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.6" + sources."browserslist-4.18.0" sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."bytesish-0.4.4" @@ -103100,7 +102747,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -105935,7 +105582,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -106074,7 +105721,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110803,7 +110450,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -110957,7 +110604,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.895" + sources."electron-to-chromium-1.3.896" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -113020,7 +112667,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.9.11" + sources."systeminformation-5.9.12" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -113920,10 +113567,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.186"; + version = "1.1.187"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.186.tgz"; - sha512 = "W5Ke8Lqop4HpabSMOTWRd6bRQx1i+PTAHENoa5RQHMsGV50y8WwmNOGcxeFixdz64UfXPO2Ye2XoR5wEz3JU8w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.187.tgz"; + sha512 = "g3M7FoNH1HiCmOK0c6Y7c4KdUSqwDyuUQKiU11onzHT17ZHLpcLo7drDBEnBREUSlG30FpxRKFHqk0doo90Yyg=="; }; buildInputs = globalBuildInputs; meta = { @@ -114573,7 +114220,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -114831,7 +114478,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116140,7 +115787,7 @@ in sources."iconv-lite-0.6.3" sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.1" - sources."jsdom-18.0.1" + sources."jsdom-18.1.0" sources."levn-0.3.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" @@ -117090,7 +116737,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -117623,7 +117270,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1027.0" // { + (sources."aws-sdk-2.1028.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -119023,7 +118670,7 @@ in sources."cors-2.8.5" sources."debug-4.3.2" sources."engine.io-6.0.1" - sources."engine.io-parser-5.0.1" + sources."engine.io-parser-5.0.2" sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."ms-2.1.2" @@ -120262,7 +119909,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1027.0" // { + (sources."aws-sdk-2.1028.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121054,7 +120701,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -122350,7 +121997,7 @@ in sources."@textlint/utils-12.0.2" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -125413,7 +125060,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -125701,7 +125348,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" @@ -125746,7 +125393,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -127976,7 +127623,7 @@ in sources."supports-color-7.2.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.7.1" + sources."ajv-8.8.0" sources."ansi-regex-5.0.1" sources."json-schema-traverse-1.0.0" sources."strip-ansi-6.0.1" @@ -128083,12 +127730,12 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.17.6" + sources."browserslist-4.18.0" sources."buffer-from-1.1.2" sources."caniuse-lite-1.0.30001280" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.895" + sources."electron-to-chromium-1.3.896" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -128215,10 +127862,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.4.0.tgz"; - sha512 = "+S0XRIbsopVjPFjCO8I07FXYBWYqkFmuP56ucGMTs2hA/gV4q2M9xTmNo5Tg4o8ffRR+Nm3AsXnQXxKRyYovrA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.5.0.tgz"; + sha512 = "Ss4WptsUjYa+3hPI4iYZYEc8FrtnfkaPrm5WTjk9ux5kiCS718836srs0ppKMHRaCHP5mQ6g4JZGcfDdGbCjpQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 7b97febc6ecb..1867567178e4 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -1,27 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi -, aiohttp, pytest, pytest-cov, pytest-aiohttp +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, typing-extensions }: buildPythonPackage rec { - pname = "aiohttp_remotes"; - version = "1.0.0"; + pname = "aiohttp-remotes"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a"; + pname = "aiohttp_remotes"; + inherit version; + sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174"; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions + ]; - checkInputs = [ pytest pytest-cov pytest-aiohttp ]; - checkPhase = '' - python -m pytest + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --no-cov-on-fail --cov-branch --cov=aiohttp_remotes --cov-report=term --cov-report=html" "" ''; + pythonImportsCheck = [ + "aiohttp_remotes" + ]; + meta = with lib; { - homepage = "https://github.com/wikibusiness/aiohttp-remotes"; description = "A set of useful tools for aiohttp.web server"; + homepage = "https://github.com/wikibusiness/aiohttp-remotes"; license = licenses.mit; - maintainers = [ maintainers.qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b93ba47c72a4..a99be4038b38 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.8.1"; + version = "1.9.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1avq04hmps2cd33dd5n4bc3lclqg0hv6khn804fbv0hmy7lywp8b"; + sha256 = "1ff1hr282snpjs5ggf7agxk5y6nr4xjdahmzq6hv56gj4lcfsq7c"; }; # Package is not compatible with Python 3.5 diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index fbdd15522e6a..e3125343dffa 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.12.5"; + version = "0.12.6"; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8bb80b37ebfd01f6078c60bb3231118380ac06842de692f6e37b6f8643e15a1d"; + sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index d0a4c2b19d72..ee7f9fd44ff4 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "85c9c25612f160897ae212532ec7c19c94b0f4463f4830d0ee08cb2d296df407"; + sha256 = "9372467c74930d20827135d468b7fcaa1ad42e4673a4591ceadbb6ad8e1b7e07"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index d0a05c03f115..2013bc645450 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205"; + sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index aa3d9c8ab0fa..ee3f0460fd7e 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.1.1"; pname = "azure-loganalytics"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e"; + sha256 = "68ffb9a2206e06b9672100a8e6351cc04f75bb81867f30d416c68b55d624d793"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index c3ba311d4c49..2023eb0ab567 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "9.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; + sha256 = "582e314ca05a9be0cd391c64689e6a5332d5bbad76c2ea751b727cfe99a2a3d2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index c7528dace274..6d226816082d 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "4.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; + sha256 = "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index a7cac4b6df4b..fae47547cc74 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; + sha256 = "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index a8958eef2083..6da9e8e2e0b4 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "19.2.0"; + version = "19.3.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c8da1cf9523b89d4b268546ea087153372633962e31a4e6befae20d0ae308bac"; + sha256 = "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix index b9441ae49706..176385bceca3 100644 --- a/pkgs/development/python-modules/bracex/default.nix +++ b/pkgs/development/python-modules/bracex/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bracex"; - version = "2.2"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "8230f3a03f1f76c192a7844377124300fbaec83870a728b629dfabd9be9e83d0"; + sha256 = "1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index cea08d62c102..e6c42ac0c4d6 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Python bindings for Capstone disassembly engine"; maintainers = with maintainers; [ bennofs ris ]; # creates a manylinux2014-x86_64 wheel - broken = stdenv.isAarch64; + broken = !stdenv.isx86_64; }; } diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index cd903aa5dcab..d26cd7e99855 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.9.4"; + version = "1.9.6"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1d8wxj2hi68yr303v4h5wh4q7iv8gb2qm1q054vnf0kgczxnl732"; + sha256 = "0r3pmkcgmsk3z6iy714fpg05mrs4ckb7ldyjsws6hwidcijha8rk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index e39884e0ea64..25ad1128d66b 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux_led"; - version = "0.24.17"; + version = "0.24.21"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-NAmODGk60Lt9OiTppYV40vvGL6g28spKRC7NxVFubxE="; + sha256 = "sha256-d55FrCnEh6uS/2yL0HcaeqGjTzWmrwg6h5jKReyzJAw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix index 9c32bc2dd951..fd269f0b69e4 100644 --- a/pkgs/development/python-modules/hangups/default.nix +++ b/pkgs/development/python-modules/hangups/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hangups"; - version = "0.4.14"; + version = "0.4.15"; disabled = pythonOlder "3.6"; @@ -26,12 +26,12 @@ buildPythonPackage rec { owner = "tdryer"; repo = "hangups"; rev = "v${version}"; - sha256 = "14njagpdp13zlaqnwl2mh7fkpnsaqr6wkr4lwh608v06pkwwcwcm"; + sha256 = "sha256-47OvfFK92AtX6KiYnvro2B17RfQWyzgsgvOfl5T3Kag="; }; postPatch = '' substituteInPlace setup.py \ - --replace "protobuf>=3.1.0,<3.16" "protobuf" \ + --replace "protobuf>=3.1.0,<3.17" "protobuf" \ --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" ''; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 26448f3a21d2..0228ae6bcf23 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -21,6 +21,7 @@ , pythonOlder , pyyaml , requests +, stdenv , tornado }: @@ -84,6 +85,12 @@ buildPythonPackage rec { "http" "test_read_pattern" "test_remote_arr" + "test_flatten_flag" + # Timing-based, flaky on darwin and possibly others + "TestServerV1Source.test_idle_timer" + ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + # Flaky with older low-res mtime on darwin < 10.13 (#143987) + "test_second_load_timestamp" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 2f1f4718c611..76ac4abf8ca1 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -1,25 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "minidump"; - version = "0.0.20"; + version = "0.0.21"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1rr91nnlzv7gnbcvv8qhbyx1kh2s4jdv7nv0qka5jya32rzjaigm"; + sha256 = "sha256-g9YSr7bFdyfr84rKQztVD4P5+MfDtlYq0quXBx/YXzo="; }; # Upstream doesn't have tests doCheck = false; - pythonImportsCheck = [ "minidump" ]; + + pythonImportsCheck = [ + "minidump" + ]; meta = with lib; { description = "Python library to parse and read Microsoft minidump file format"; homepage = "https://github.com/skelsec/minidump"; license = with licenses; [ mit ]; - maintainers = [ maintainers.fab ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 56d1caa7eaf6..e3fc2424bcd8 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,20 +6,25 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.36"; + version = "8.12.37"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e29717fcf86d68082fc6e42ca07e52bff863b6e0b354edd1644ba15c35ef213d"; + sha256 = "sha256-28VgmShEoFn1bHwMalh5BOZdlWdAu/t+OViZgLyQVbg="; }; checkInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/*.py" ]; + pytestFlagsArray = [ + "tests/*.py" + ]; - pythonImportsCheck = [ "phonenumbers" ]; + pythonImportsCheck = [ + "phonenumbers" + ]; meta = with lib; { description = "Python module for handling international phone numbers"; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 1196a6575da8..ddef2dcc1c1e 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,12 +1,13 @@ { lib +, betamax +, betamax-matchers +, betamax-serializers , buildPythonPackage , fetchFromGitHub -, betamax -, betamax-serializers -, betamax-matchers , mock , prawcore , pytestCheckHook +, pythonOlder , requests-toolbelt , update_checker , websocket-client @@ -14,13 +15,16 @@ buildPythonPackage rec { pname = "praw"; - version = "7.4.0"; + version = "7.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "1wcr59k1bncwfza5k8mllaxz8fwfyqbwgm5xp908w2449i71wl7r"; + sha256 = "sha256-xcITJ349ek9Y0HvJwzKJ7xDUV74w2v3yTBaj5n8YJ58="; }; propagatedBuildInputs = [ @@ -38,7 +42,9 @@ buildPythonPackage rec { requests-toolbelt ]; - pythonImportsCheck = [ "praw" ]; + pythonImportsCheck = [ + "praw" + ]; meta = with lib; { description = "Python Reddit API wrapper"; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 141eba29f314..a550ea4b3cf4 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -8,6 +8,7 @@ , catch2 , cmake , cython +, fmt , muparserx , ninja , nlohmann_json @@ -23,11 +24,13 @@ , fixtures , pytest-timeout , qiskit-terra +, setuptools +, testtools }: buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.8.2"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -36,23 +39,16 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - hash = "sha256-7NWM7qpMQ3vA6p0dhEPnkBjsPMdhceYTYcAD4tsClf0="; + sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g="; }; - patches = [ - (fetchpatch { - # https://github.com/Qiskit/qiskit-aer/pull/1250 - name = "qiskit-aer-pr-1250-native-cmake_dl_libs.patch"; - url = "https://github.com/Qiskit/qiskit-aer/commit/2bf04ade3e5411776817706cf82cc67a3b3866f6.patch"; - sha256 = "0ldwzxxfgaad7ifpci03zfdaj0kqj0p3h94qgshrd2953mf27p6z"; - }) - ]; - # Remove need for cmake python package - # pybind11 shouldn't be an install requirement, just build requirement. postPatch = '' substituteInPlace setup.py \ --replace "'cmake!=3.17,!=3.17.0'," "" \ - --replace "'pybind11>=2.6'" "" + --replace "'pybind11', min_version='2.6'" "'pybind11'" \ + --replace "pybind11>=2.6" "pybind11" \ + --replace "scikit-build>=0.11.0" "scikit-build" \ + --replace "min_version='0.11.0'" "" ''; nativeBuildInputs = [ @@ -65,6 +61,7 @@ buildPythonPackage rec { buildInputs = [ blas catch2 + fmt muparserx nlohmann_json spdlog @@ -76,7 +73,6 @@ buildPythonPackage rec { numpy ]; - # Disable using conan for build preBuild = '' export DISABLE_CONAN=1 ''; @@ -92,6 +88,16 @@ buildPythonPackage rec { ]; # Slow tests disabledTests = [ + "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? + "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. + + # these fail for some builds. Haven't been able to reproduce error locally. + "test_kraus_gate_noise" + "test_backend_method_clifford_circuits_and_kraus_noise" + "test_backend_method_nonclifford_circuit_and_kraus_noise" + "test_kraus_noise_fusion" + + # Slow tests "test_paulis_1_and_2_qubits" "test_3d_oscillator" "_057" @@ -105,6 +111,7 @@ buildPythonPackage rec { "_144" "test_sparse_output_probabilities" "test_reset_2_qubit" + # "test_clifford" ]; checkInputs = [ pytestCheckHook @@ -112,6 +119,8 @@ buildPythonPackage rec { fixtures pytest-timeout qiskit-terra + setuptools # temporary workaround for pbr missing setuptools, see https://github.com/NixOS/nixpkgs/pull/132614 + testtools ]; pytestFlagsArray = [ "--timeout=30" diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 7069629470cd..b5bfa729321e 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -19,7 +19,7 @@ , withTorch ? false , pytorch , withPyscf ? false -, pyscf ? null +, pyscf , withScikitQuant ? false , scikit-quant ? null , withCplex ? false @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.9.1"; + version = "0.9.5"; disabled = pythonOlder "3.6"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - hash = "sha256-fptyqPrkUgl3UjtlEmDYORdX/SsONxWozQGEs/EahmU="; + sha256 = "sha256-7QmRwlbAVAR5KfM7tuObkb6+UgiuIm82iGWBuqfve08="; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. @@ -113,13 +113,25 @@ buildPythonPackage rec { pytestFlagsArray = [ "--timeout=30" "--durations=10" - ] ++ lib.optionals (!withPyscf) [ - "--ignore=test/chemistry/test_qeom_ee.py" - "--ignore=test/chemistry/test_qeom_vqe.py" - "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" - "--ignore=test/chemistry/test_bopes_sampler.py" + ]; + disabledTestPaths = lib.optionals (!withPyscf) [ + "test/chemistry/test_qeom_ee.py" + "test/chemistry/test_qeom_vqe.py" + "test/chemistry/test_vqe_uccsd_adapt.py" + "test/chemistry/test_bopes_sampler.py" ]; disabledTests = [ + # TODO: figure out why failing, only fail with upgrade to qiskit-terra > 0.16.1 & qiskit-aer > 0.7.2 + # In test.aqua.test_amplitude_estimation.TestSineIntegral + "test_confidence_intervals_1" + "test_statevector_1" + + # fails due to approximation error with latest qiskit-aer? + "test_application" + + # Fail on CI for some reason, not locally + "test_binary" + # Online tests "test_exchangedata" "test_yahoo" diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix new file mode 100644 index 000000000000..d4eaa58e7af9 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -0,0 +1,78 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub + # Python Inputs +, fastdtw +, numpy +, pandas +, psutil +, qiskit-terra +, qiskit-optimization +, scikit-learn +, scipy +, quandl +, yfinance + # Check Inputs +, pytestCheckHook +, ddt +, pytest-timeout +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-finance"; + version = "0.2.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY="; + }; + + propagatedBuildInputs = [ + fastdtw + numpy + pandas + psutil + qiskit-terra + qiskit-optimization + quandl + scikit-learn + scipy + yfinance + ]; + + checkInputs = [ + pytestCheckHook + pytest-timeout + ddt + qiskit-aer + ]; + + pythonImportsCheck = [ "qiskit_finance" ]; + disabledTests = [ + # Fail due to approximation error, ~1-2% + "test_application" + + # Tests fail b/c require internet connection. Stalls tests if enabled. + "test_exchangedata" + "test_yahoo" + "test_wikipedia" + ]; + pytestFlagsArray = [ + "--durations=10" + ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index aa02de42fb32..88fcb82857d5 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -7,9 +7,9 @@ , qiskit-terra , requests , requests_ntlm -, websockets +, websocket-client # Visualization inputs -, withVisualization ? false +, withVisualization ? true , ipython , ipyvuetify , ipywidgets @@ -23,6 +23,7 @@ , nbformat , pproxy , qiskit-aer +, websockets , vcrpy }: @@ -39,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.13.1"; + version = "0.18.0"; disabled = pythonOlder "3.6"; @@ -47,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I="; + sha256 = "sha256-mVgR9vq9UpM/3VED4hpEev8YAoZY1URAxu7pVv+cjU8="; }; propagatedBuildInputs = [ @@ -56,9 +57,13 @@ buildPythonPackage rec { qiskit-terra requests requests_ntlm - websockets + websocket-client ] ++ lib.optionals withVisualization visualizationPackages; + postPatch = '' + substituteInPlace setup.py --replace "websocket-client>=1.0.1" "websocket-client" + ''; + # Most tests require credentials to run on IBMQ checkInputs = [ pytestCheckHook @@ -67,6 +72,7 @@ buildPythonPackage rec { pproxy qiskit-aer vcrpy + websockets ] ++ lib.optionals (!withVisualization) visualizationPackages; pythonImportsCheck = [ "qiskit.providers.ibmq" ]; @@ -75,6 +81,7 @@ buildPythonPackage rec { "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" + "test_coder_optimizers" # TODO: reenable when package scikit-quant is packaged, either in NUR or nixpkgs # slow tests "test_websocket_retry_failure" diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix new file mode 100644 index 000000000000..a2006079c195 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -0,0 +1,87 @@ +{ lib +, pythonOlder +, pythonAtLeast +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + # Python Inputs +, fastdtw +, numpy +, psutil +, qiskit-terra +, scikit-learn +, sparse + # Optional inputs +, withTorch ? true +, pytorch + # Check Inputs +, pytestCheckHook +, ddt +, pytest-timeout +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-machine-learning"; + version = "0.2.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY="; + }; + + propagatedBuildInputs = [ + fastdtw + numpy + psutil + qiskit-terra + scikit-learn + sparse + ] ++ lib.optional withTorch pytorch; + + doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue? + checkInputs = [ + pytestCheckHook + pytest-timeout + ddt + qiskit-aer + ]; + + pythonImportsCheck = [ "qiskit_machine_learning" ]; + + pytestFlagsArray = [ + "--durations=10" + "--showlocals" + "-vv" + "--ignore=test/connectors/test_torch_connector.py" # TODO: fix, get multithreading errors with python3.9, segfaults + ]; + disabledTests = [ + # Slow tests >10 s + "test_readme_sample" + "test_vqr_8" + "test_vqr_7" + "test_qgan_training_cg" + "test_vqc_4" + "test_classifier_with_circuit_qnn_and_cross_entropy_4" + "test_vqr_4" + "test_regressor_with_opflow_qnn_4" + "test_qgan_save_model" + "test_qgan_training_analytic_gradients" + "test_qgan_training_run_algo_numpy" + "test_ad_hoc_data" + "test_qgan_training" + ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix new file mode 100644 index 000000000000..09941fcdd448 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -0,0 +1,80 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub + # Python Inputs +, h5py +, numpy +, psutil +, qiskit-terra +, retworkx +, scikit-learn +, scipy +, withPyscf ? false +, pyscf + # Check Inputs +, pytestCheckHook +, ddt +, pylatexenc +}: + +buildPythonPackage rec { + pname = "qiskit-nature"; + version = "0.2.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY="; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "h5py<3.3" "h5py" + ''; + + propagatedBuildInputs = [ + h5py + numpy + psutil + qiskit-terra + retworkx + scikit-learn + scipy + ] ++ lib.optional withPyscf pyscf; + + checkInputs = [ + pytestCheckHook + ddt + pylatexenc + ]; + + pythonImportsCheck = [ "qiskit_nature" ]; + + pytestFlagsArray = [ + "--durations=10" + ] ++ lib.optionals (!withPyscf) [ + "--ignore=test/algorithms/excited_state_solvers/test_excited_states_eigensolver.py" + ]; + + disabledTests = [ + # small math error < 0.05 (< 9e-6 %) + "test_vqe_uvccsd_factory" + # unsure of failure reason. Might be related to recent cvxpy update? + "test_two_qubit_reduction" + ] ++ lib.optionals (!withPyscf) [ + "test_h2_bopes_sampler" + "test_potential_interface" + ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix new file mode 100644 index 000000000000..5d9ae3d4375f --- /dev/null +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -0,0 +1,63 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub + # Python Inputs +, decorator +, docplex +, networkx +, numpy +, qiskit-terra +, scipy + # Check Inputs +, pytestCheckHook +, ddt +, pylatexenc +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-optimization"; + version = "0.2.3"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img="; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "networkx>=2.2,<2.6" "networkx" + ''; + + propagatedBuildInputs = [ + docplex + decorator + networkx + numpy + qiskit-terra + scipy + ]; + + checkInputs = [ + pytestCheckHook + ddt + pylatexenc + qiskit-aer + ]; + + pythonImportsCheck = [ "qiskit_optimization" ]; + pytestFlagsArray = [ "--durations=10" ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 8b83c506808e..da31f86500fb 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -16,7 +16,10 @@ , python-dateutil , retworkx , scipy +, scikit-quant ? null +, symengine , sympy +, tweedledum , withVisualization ? false # Python visualization requirements, optional , ipywidgets @@ -29,9 +32,6 @@ # Crosstalk-adaptive layout pass , withCrosstalkPass ? false , z3 - # Classical function -> Quantum Circuit compiler -, withClassicalFunctionCompiler ? true -, tweedledum # test requirements , ddt , hypothesis @@ -52,12 +52,11 @@ let seaborn ]; crosstalkPackages = [ z3 ]; - classicalCompilerPackages = [ tweedledum ]; in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.17.4"; + version = "0.18.3"; disabled = pythonOlder "3.6"; @@ -65,7 +64,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo="; + sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs="; }; nativeBuildInputs = [ cython ]; @@ -82,10 +81,12 @@ buildPythonPackage rec { python-dateutil retworkx scipy + scikit-quant + symengine sympy + tweedledum ] ++ lib.optionals withVisualization visualizationPackages - ++ lib.optionals withCrosstalkPass crosstalkPackages - ++ lib.optionals withClassicalFunctionCompiler classicalCompilerPackages; + ++ lib.optionals withCrosstalkPass crosstalkPackages; # *** Tests *** checkInputs = [ @@ -103,21 +104,21 @@ buildPythonPackage rec { disabledTestPaths = [ "test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency - ] ++ lib.optionals (!withClassicalFunctionCompiler) [ - "test/python/classical_function_compiler/" + # These tests are nondeterministic and can randomly fail. + # We ignore them here for deterministic building. + "test/randomized/" + # These tests consistently fail on GitHub Actions build + "test/python/quantum_info/operators/test_random.py" ]; + pytestFlagsArray = [ "--durations=10" ]; disabledTests = [ - # Not working on matplotlib >= 3.4.0, checks images match. - "test_plot_circuit_layout" - # Flaky tests - "test_cx_equivalence" - "test_pulse_limits" - "test_1q_random" - ] ++ lib.optionals (!withClassicalFunctionCompiler) [ - "TestPhaseOracle" - ] ++ lib.optionals stdenv.isAarch64 [ - "test_circuit_init" # failed on aarch64, https://gist.github.com/r-rmcgibbo/c2e173d43ced4f6954811004f6b5b842 + "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error. + "test_cx_equivalence" # Fails due to flaky test + "test_two_qubit_synthesis_not_pulse_optimal" # test of random circuit, seems to randomly fail depending on seed + "test_qv_natural" # fails due to sign error. Not sure why + ] ++ lib.optionals (lib.versionAtLeast matplotlib.version "3.4.0") [ + "test_plot_circuit_layout" ] # Disabling slow tests for build constraints ++ [ @@ -147,6 +148,12 @@ buildPythonPackage rec { "test_qaoa_qc_mixer_4" "test_abelian_grouper_random_2" "test_pauli_two_design" + "test_shor_factoring" + "test_sample_counts_memory_ghz" + "test_two_qubit_weyl_decomposition_ab0" + "test_sample_counts_memory_superposition" + "test_piecewise_polynomial_function" + "test_vqe_qasm" ]; # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 6cc24be1958a..45e0326a1b71 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -8,14 +8,28 @@ , qiskit-ibmq-provider , qiskit-ignis , qiskit-terra + # Optional inputs +, withOptionalPackages ? true +, qiskit-finance +, qiskit-machine-learning +, qiskit-nature +, qiskit-optimization # Check Inputs , pytestCheckHook }: +let + optionalQiskitPackages = [ + qiskit-finance + qiskit-machine-learning + qiskit-nature + qiskit-optimization + ]; +in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.26.2"; + version = "0.32.0"; disabled = pythonOlder "3.6"; @@ -23,7 +37,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - hash = "sha256-QYWKKS7e/uCt5puWV4jA9Emp7M4Cyv2RUCxilbChWhw="; + sha256 = "sha256-fKR072hOD0a9TtWulqyKUT3Riwq+NHTtciR+NN5JC1Y="; }; propagatedBuildInputs = [ @@ -32,7 +46,7 @@ buildPythonPackage rec { qiskit-ibmq-provider qiskit-ignis qiskit-terra - ]; + ] ++ lib.optionals withOptionalPackages optionalQiskitPackages; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index a3b21168b228..47f69183d685 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -67,8 +67,8 @@ buildPythonPackage rec { inherit doCheck; preCheck = '' - # Some tests depends on executables on PATH - PATH="$out/bin:${gunicorn}/bin:$PATH" + # Some tests depends on sanic on PATH + PATH="$out/bin:$PATH" ''; disabledTests = [ @@ -86,6 +86,16 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/sanic-org/sanic/issues/2298 "test_no_exceptions_when_cancel_pending_request" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # These appear to be very sensitive to output of commands + # Output is different on aarch64 + "test_server_run" + "test_host_port" + "test_num_workers" + "test_access_logs" + "test_version" + # Failing for a different reason than Darwin + "test_no_exceptions_when_cancel_pending_request" ]; # avoid usage of nixpkgs-review in darwin since tests will compete usage diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 9c3583fe365a..b06c1cb5db48 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , python @@ -63,13 +64,18 @@ in buildPythonPackage rec { # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" ]; - pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) [ + pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([ # These tests require network access "skimage/data/test_data.py::test_skin" "skimage/data/tests/test_data.py::test_skin" "skimage/io/tests/test_io.py::test_imread_http_url" "skimage/restoration/tests/test_rolling_ball.py::test_ndim" - ]; + ] ++ lib.optionals stdenv.isDarwin [ + # Matplotlib tests are broken inside darwin sandbox + "skimage/feature/tests/test_util.py::test_plot_matches" + "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" + "skimage/io/tests/test_mpl_imshow.py::" + ]); # Check cythonized modules pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index cb63f8d11ba4..ae5e5bef474b 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - sha256 = "sha256-y87Cnci4gJHrttThGPeOS/h6VK8x95cQA9nZs1fBfAw="; + sha256 = "sha256-b6zncEAPtKgBPLFRsCSGeBqiD4A/mHEhjQaEIsefc28="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { "tests/test_popups.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" + "tests/test_webdriver_edge_chromium.py" "tests/test_webdriver_firefox.py" "tests/test_webdriver_remote.py" "tests/test_zopetestbrowser.py" diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index 4b24b3ff4efa..81f0dad52eb0 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -4,18 +4,20 @@ , cmake , ninja , scikit-build + # Check Inputs +, pytestCheckHook }: buildPythonPackage rec { pname = "tweedledum"; - version = "1.0.0"; + version = "1.1.1"; format = "pyproject"; src = fetchFromGitHub{ owner = "boschmitt"; repo = "tweedledum"; rev = "v${version}"; - hash = "sha256-59lJzdw9HLJ9ADxp/a3KW4v5aU/dYm27NSYoz9D49i4="; + sha256 = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM="; }; nativeBuildInputs = [ cmake ninja scikit-build ]; @@ -23,10 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "tweedledum" ]; - # TODO: use pytest, but had issues with finding the correct directories - checkPhase = '' - python -m unittest discover -s ./python/test -t . - ''; + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "python/test" ]; meta = with lib; { description = "A library for synthesizing and manipulating quantum circuits"; diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index 66033fcce311..55f2180ebf44 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -5,6 +5,7 @@ , requests , matrix-client , distro +, click , cryptography , pyopenssl , pytestCheckHook @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "zulip"; - version = "0.8.0"; + version = "0.8.1"; disabled = !isPy3k; @@ -21,14 +22,15 @@ buildPythonPackage rec { owner = "zulip"; repo = "python-zulip-api"; rev = version; - sha256 = "sha256-gJ+YRJC6wmQzPakApOqytyPy34cS/jjzEZhRIvWUBIQ="; + sha256 = "sha256-vYeZEz8nuZYL1stHLa595IbhyNbqqxH4mx7ISbqRAlA="; }; - sourceRoot = "source/zulip"; + sourceRoot = "${src.name}/zulip"; propagatedBuildInputs = [ requests matrix-client distro + click # from requests[security] cryptography diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 7f189e83e195..a31a6478a761 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,16 +1,5 @@ -{ lib -, stdenv -, fetchurl -, jre -, writeScript -, common-updater-scripts -, git -, nixfmt -, nix -, coreutils -, gnused -, disableRemoteLogging ? true -}: +{ lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt +, nix, coreutils, gnused, disableRemoteLogging ? true }: with lib; @@ -20,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = @@ -91,14 +80,13 @@ let maintainers = [ maintainers.nequissimus ]; }; }; -in -{ +in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA="; + sha256 = "5n9q/7d/PwDJfBPITYyDua24+fci6bi1oG5dSw8A244="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "2F35qhWI6hNb+Eh9ZTDznqo116yN7MZIGVchaAIM36A="; + sha256 = "RIuNyWvwNM39/rczUH328K5ky5hePflokW/VP603j+I="; }; } diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 65a49551035d..33c3a20e2d86 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "sha256-IpmvFUWNaFQ1ls7u625vvj1TnRYXR+X1mAGdBcwRFLk="; + sha256 = "sha256-qxUYqqz6dlpkw6MGHH8iPfZcbc3/ZF1E+C8arISSTdY="; }; - cargoSha256 = "sha256-ccy5ZFS2Gp4Dwo8gsS6vzHHO1siicOp7uZTsCh6SKsM="; + cargoSha256 = "sha256-qJEhcqa78QW9X5ZD3Jy2BfRh/SkOhqBLzTT00u4DM0Q="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index a3b41aa03e26..67f6b3a76f3b 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2021.5.29"; + version = "2021.11.9"; src = fetchPypi { inherit pname version; - sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e"; + sha256 = "7662399162bc887ee86e96d0baa6984236228af9c1fd6594be0b18910225579d"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/development/tools/pypi-mirror/default.nix index 945fafa7648c..54bc09d6b9a3 100644 --- a/pkgs/development/tools/pypi-mirror/default.nix +++ b/pkgs/development/tools/pypi-mirror/default.nix @@ -4,13 +4,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "pypi-mirror"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "montag451"; repo = pname; rev = "v${version}"; - sha256 = "0sjzjvq2jnsr5mfyvkww3rfk3k5xcl8wa07q614850m0sn907laz"; + sha256 = "077f3asi5fdbb2j2ll4xdwv7ndfbfr81bpn3zi55h6idfdc7zzc0"; }; pythonImportsCheck = [ "pypi_mirror" ]; diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix index e417582b16a9..d1254ed48a29 100644 --- a/pkgs/development/web/nodejs/v17.nix +++ b/pkgs/development/web/nodejs/v17.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "17.0.1"; - sha256 = "071lhqbn103rnn8avqmqwnn2k4yqgcymx624f23k8z6bfbw81i3f"; + version = "17.1.0"; + sha256 = "1iyazwpgv3pxqh7zz3s87qwrbahifrj9sj1a2vwhkc4jxcvkz03b"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 4064023fafd3..f1bcab2895fb 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,21 +1,37 @@ -{ lib, stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal -, SDL2, boost, ffmpeg_3, Cocoa, OpenAL }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, sfml +, libGLU +, libGL +, bullet +, glm +, libmad +, xlibsWrapper +, openal +, SDL2 +, boost +, ffmpeg +, Cocoa +, OpenAL }: stdenv.mkDerivation { - version = "2019-10-26"; + version = "unstable-2021-10-14"; pname = "openrw"; - src = fetchgit { - url = "https://github.com/rwengine/openrw"; - rev = "51b7264744d1aaa20de3b86a7a4e92a9930881ba"; - sha256 = "04s088wfxkfmb4dxdvad611yxj8smxlnxdm5xy81zldfzybvx8dg"; + src = fetchFromGitHub { + owner = "rwengine"; + repo = "openrw"; + rev = "0f83c16f6518c427a4f156497c3edc843610c402"; + sha256 = "0i6nx9g0xb8sziak5swi8636fszcjjx8n2jwgz570izw2fl698ff"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3 + sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with lib; { diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 423ac7b1111d..48b2f87ab67b 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.1105.0"; + version = "2021.1113.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "0dhxbpqm49691hrxj0in9gb22snbb7svdrvp9664fkvvp3m3cywb"; + sha256 = "EDW3DGnDkdH6k4XKDc5xWFYeIMcoRN4S9nMBF+TeAl8="; }; nativeBuildInputs = [ diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 42b92cc90582..165702e60621 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -7,6 +7,9 @@ (fetchNuGet { name = "Fody"; version = "6.5.3"; sha256 = "14yj3xj4jh2ayl8jsyypxv9af0xbw30946kn14m0bfmlyl027wkp"; }) (fetchNuGet { name = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) (fetchNuGet { name = "HtmlAgilityPack"; version = "1.11.37"; sha256 = "1q0kkw2rhvxi67hqv18ziv2dvmhi7f68745gcs1253mwv5da4vy6"; }) + (fetchNuGet { name = "Humanizer"; version = "2.11.10"; sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk"; }) + (fetchNuGet { name = "Humanizer.Core"; version = "2.11.10"; sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv"; }) + (fetchNuGet { name = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) (fetchNuGet { name = "Humanizer.Core.af"; version = "2.11.10"; sha256 = "18fiixfvjwn8m1i8z2cz4aqykzylvfdqmmpwc2zcd8sr1a2xm86z"; }) (fetchNuGet { name = "Humanizer.Core.ar"; version = "2.11.10"; sha256 = "009fpm4jd325izm82ipipsvlwd31824gvskda68bdwi4yqmycz4p"; }) (fetchNuGet { name = "Humanizer.Core.az"; version = "2.11.10"; sha256 = "144b9diwprabxwgi5a98k5iy95ajq4p7356phdqi2lhzwbz7b6a9"; }) @@ -19,8 +22,8 @@ (fetchNuGet { name = "Humanizer.Core.es"; version = "2.11.10"; sha256 = "07bw07qy8nyzlgxl7l2lxv9f78qmkfppgzx7iyq5ikrcnpvc7i9q"; }) (fetchNuGet { name = "Humanizer.Core.fa"; version = "2.11.10"; sha256 = "00d4hc1pfmhfkc5wmx9p7i00lgi4r0k6wfcns9kl1syjxv3bs5f2"; }) (fetchNuGet { name = "Humanizer.Core.fi-FI"; version = "2.11.10"; sha256 = "0z4is7pl5jpi4pfdvd2zvx5mp00bj26d9l9ksqyc0liax8nfzyik"; }) - (fetchNuGet { name = "Humanizer.Core.fr-BE"; version = "2.11.10"; sha256 = "1s25c86nl9wpsn6fydzwv4rfmdx5sm0vgyd7xhw5344k20gazvhv"; }) (fetchNuGet { name = "Humanizer.Core.fr"; version = "2.11.10"; sha256 = "0sybpg6kbbhrnk7gxcdk7ppan89lsfqsdssrg4i1dm8w48wgicap"; }) + (fetchNuGet { name = "Humanizer.Core.fr-BE"; version = "2.11.10"; sha256 = "1s25c86nl9wpsn6fydzwv4rfmdx5sm0vgyd7xhw5344k20gazvhv"; }) (fetchNuGet { name = "Humanizer.Core.he"; version = "2.11.10"; sha256 = "1nx61qkjd6p9r36dmnm4942khyv35fpdqmb2w69gz6463g4d7z29"; }) (fetchNuGet { name = "Humanizer.Core.hr"; version = "2.11.10"; sha256 = "02jhcyj72prkqsjxyilv04drm0bknqjh2r893jlbsfi9vjg2zay3"; }) (fetchNuGet { name = "Humanizer.Core.hu"; version = "2.11.10"; sha256 = "0yb6ly4s1wdyaf96h2dvifqyb575aid6irwl3qx8gcvrs0xpcxdp"; }) @@ -33,8 +36,8 @@ (fetchNuGet { name = "Humanizer.Core.lv"; version = "2.11.10"; sha256 = "0czxx4b9g0w7agykdl82wds09zasa9y58dmgjm925amlfz4wkyzs"; }) (fetchNuGet { name = "Humanizer.Core.ms-MY"; version = "2.11.10"; sha256 = "0kix95nbw94fx0dziyz80y59i7ii7d21b63f7f94niarljjq36i3"; }) (fetchNuGet { name = "Humanizer.Core.mt"; version = "2.11.10"; sha256 = "1rwy6m22pq65gxn86xlr9lv818fp5kb0wz98zxxfljc2iviw1f4p"; }) - (fetchNuGet { name = "Humanizer.Core.nb-NO"; version = "2.11.10"; sha256 = "1qszib03pvmjkrg8za7jjd2vzrs9p4fn2rmy82abnzldkhvifipq"; }) (fetchNuGet { name = "Humanizer.Core.nb"; version = "2.11.10"; sha256 = "0ra2cl0avvv4sylha7z76jxnb4pdiqfbpr5m477snr04dsjxd9q9"; }) + (fetchNuGet { name = "Humanizer.Core.nb-NO"; version = "2.11.10"; sha256 = "1qszib03pvmjkrg8za7jjd2vzrs9p4fn2rmy82abnzldkhvifipq"; }) (fetchNuGet { name = "Humanizer.Core.nl"; version = "2.11.10"; sha256 = "1i9bvy0i2yyasl9mgxiiwrkmfpm2c53d3wwdp9270r6120sxyy63"; }) (fetchNuGet { name = "Humanizer.Core.pl"; version = "2.11.10"; sha256 = "0kggh4wgcic7wzgxy548n6w61schss2ccf9kz8alqshfi42xifby"; }) (fetchNuGet { name = "Humanizer.Core.pt"; version = "2.11.10"; sha256 = "09j90s8x1lpvhfiy3syfnj8slkgcacf3xjy3pnkgxa6g4mi4f4bd"; }) @@ -42,8 +45,8 @@ (fetchNuGet { name = "Humanizer.Core.ru"; version = "2.11.10"; sha256 = "13mmlh0ibxfyc85xrz3vx4mcg56mkzqql184iwdryq94p0g5ahil"; }) (fetchNuGet { name = "Humanizer.Core.sk"; version = "2.11.10"; sha256 = "04ja06y5jaz1jwkwn117wx9cib04gpbi0vysn58a8sd5jrxmxai5"; }) (fetchNuGet { name = "Humanizer.Core.sl"; version = "2.11.10"; sha256 = "05hxk9v3a7fn7s4g9jp5zxk2z6a33b9fkavyb1hjqnl2i37q2wja"; }) - (fetchNuGet { name = "Humanizer.Core.sr-Latn"; version = "2.11.10"; sha256 = "01hdyn7mmbyy7f3aglawgnsj3nblcdpqjgzdcvniy73l536mira0"; }) (fetchNuGet { name = "Humanizer.Core.sr"; version = "2.11.10"; sha256 = "0x6l2msimrx72iywa1g0rqklgy209sdwg0r77i2lz0s1rvk5klm5"; }) + (fetchNuGet { name = "Humanizer.Core.sr-Latn"; version = "2.11.10"; sha256 = "01hdyn7mmbyy7f3aglawgnsj3nblcdpqjgzdcvniy73l536mira0"; }) (fetchNuGet { name = "Humanizer.Core.sv"; version = "2.11.10"; sha256 = "0cbgchivw3d5ndib1zmgzmnymhyvfh9g9f0hijc860g5vaa9fkvh"; }) (fetchNuGet { name = "Humanizer.Core.th-TH"; version = "2.11.10"; sha256 = "1v7f9x3b04iwhz9lb3ir8az8128nvcw1gi4park5zh3fg0f3mni0"; }) (fetchNuGet { name = "Humanizer.Core.tr"; version = "2.11.10"; sha256 = "02c4ky0dskxkdrkc7vy8yzmvwjr1wqll1kzx0k21afhlx8xynjd4"; }) @@ -54,24 +57,21 @@ (fetchNuGet { name = "Humanizer.Core.zh-CN"; version = "2.11.10"; sha256 = "01dy5kf6ai8id77px92ji4kcxjc8haj39ivv55xy1afcg3qiy7mh"; }) (fetchNuGet { name = "Humanizer.Core.zh-Hans"; version = "2.11.10"; sha256 = "16gcxgw2g6gck3nc2hxzlkbsg7wkfaqsjl87kasibxxh47zdqqv2"; }) (fetchNuGet { name = "Humanizer.Core.zh-Hant"; version = "2.11.10"; sha256 = "1rjg2xvkwjjw3c7z9mdjjvbnl9lcvvhh4fr7l61rla2ynzdk46cj"; }) - (fetchNuGet { name = "Humanizer.Core"; version = "2.11.10"; sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv"; }) - (fetchNuGet { name = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) - (fetchNuGet { name = "Humanizer"; version = "2.11.10"; sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk"; }) (fetchNuGet { name = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) - (fetchNuGet { name = "managed-midi"; version = "1.9.14"; sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) + (fetchNuGet { name = "ManagedBass"; version = "3.0.0"; sha256 = "1yh1s36w465z8gcj4xs6q048g63z7m3nyfy1vvw1lgh7k6hqqgma"; }) (fetchNuGet { name = "ManagedBass.Fx"; version = "3.0.0"; sha256 = "0sck1wmjlcy8q941bamk1i0k4yrklyilsgg6c832xdh96sdc049s"; }) (fetchNuGet { name = "ManagedBass.Mix"; version = "3.0.0"; sha256 = "0brnm0ry96b81hgffbaj52s53bsn9c8cx4q24j0whsvmcqqxhs4v"; }) - (fetchNuGet { name = "ManagedBass"; version = "3.0.0"; sha256 = "1yh1s36w465z8gcj4xs6q048g63z7m3nyfy1vvw1lgh7k6hqqgma"; }) + (fetchNuGet { name = "managed-midi"; version = "1.9.14"; sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) (fetchNuGet { name = "Markdig"; version = "0.26.0"; sha256 = "1pg0yica8h1c2kx10pqzc5iclmlfll5wbw1bxa8l251w1qnfglv2"; }) - (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) (fetchNuGet { name = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) + (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.11"; sha256 = "0x6c6m8s4mq1j21sys8j1xp8sqvy5n3shcpcm0yyx4r2ld2cpdkr"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.11"; sha256 = "1b60rhlbn8s4c39nl2kb1xfq0m3kzy407hdvz2s5r9qc8y9p55ps"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.11"; sha256 = "1rq6lildicnz6ngrf1m46ynya0hbn0hzazdqp6c3lkmkw3pgd8wp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "5.0.11"; sha256 = "0n09fldmy60ggffznfwzr99hfpa0p9qxq4hp2zy4j94cmqkqm1pg"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "5.0.11"; sha256 = "13hpp6sq0ad56v1l09gq4mnmj5y1f9lykd2x12hjrdpk3g7gqdix"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; version = "5.0.11"; sha256 = "1iyxkr2lks5xfay4h70z94dnjm5dpbygyyi9krrx1lin1na235ly"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "5.0.11"; sha256 = "13hpp6sq0ad56v1l09gq4mnmj5y1f9lykd2x12hjrdpk3g7gqdix"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; version = "5.0.11"; sha256 = "1vsskslaz7428f13q0hjf81hvfxip9wsc53z5j37ysk9qmixlnyd"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "5.0.11"; sha256 = "0vdr2n9lfjybkv0m21lhpnxv0shlyfnyffv32vziiglhssdza15g"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "5.0.11"; sha256 = "0w60z54wxv1nndv7mz9rqswdh8k4rxmgihnxkirp4gr0idr7ln7j"; }) @@ -84,8 +84,8 @@ (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "3.11.0"; sha256 = "0pwidgg4ifm7cirdy3hf61dyvg6lk4vgb6q7lyb4y0h0b6mvkrcl"; }) - (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.11.0"; sha256 = "16myshcix4a37c4vlig4gi9jnhb6p6py171xgn6b0ab6wz020r71"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "3.11.0"; sha256 = "1h16b7dsp1mq7d7picyfhkssqr6xiyywi5x1fd4jwclyrvanyl81"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.11.0"; sha256 = "16myshcix4a37c4vlig4gi9jnhb6p6py171xgn6b0ab6wz020r71"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "5.0.3"; sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.11.0"; sha256 = "07iaqjdhp55cw3y159i3h4j30l9s69gn5q6rv08bkizv8yk7yhls"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; version = "3.11.0"; sha256 = "0jmcjx37b3649b16kisg9pjmz3m86pba9b1p1y0vlq1r4hyzvn3m"; }) @@ -96,28 +96,28 @@ (fetchNuGet { name = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.221401"; sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r"; }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; version = "2.0.226801"; sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; version = "2.2.6"; sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "2.2.6"; sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; version = "2.2.6"; sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Design"; version = "2.2.6"; sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; version = "2.2.6"; sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; }) - (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "2.2.6"; sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; version = "2.2.6"; sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; }) - (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; version = "2.2.6"; sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "2.2.6"; sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "2.2.0"; sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "2.2.0"; sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) - (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "2.2.0"; sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) - (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) - (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.2"; sha256 = "0db6d1b076nfqfn5mhy63l3gkfn5kr29hwcrx81ldr7y062r1b9y"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) - (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) - (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; sha256 = "0i7li76gmk6hml12aig4cvyvja9mgl16qr8pkwvx5vm6lc9a3nn4"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) @@ -154,31 +154,31 @@ (fetchNuGet { name = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { name = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { name = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) - (fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { name = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) + (fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; }) (fetchNuGet { name = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; }) + (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1108.0"; sha256 = "0zcmxnb521j8v9q863l5bf74svgsn8lc00d03kmldyfhcjq6zqb9"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; }) - (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1104.0"; sha256 = "1k2hh3ys3dzwsqx6ynspryd5dxv66y9v3rrafb6klb9a2vvvf1dy"; }) - (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1026.0"; sha256 = "1500x3cmllhw0vkxmvixzhhpmgfqqkpadcnj4y7n4694kiqcwccn"; }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1112.0"; sha256 = "0q0z0f9f9g2a6523zyp5a7k3z0h2rallnz6pzyahkn2vz9s4ykxj"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.178"; sha256 = "1bv77rrf3g6zr4bzfrrqqzl0vjj4c8izc0sakckda8dlm6h3gxln"; }) (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.468-alpha"; sha256 = "1qa2xg5p6ywmvzz868vck2jy4sn8vfqssa4an4afqsmc4amxfmc8"; }) (fetchNuGet { name = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) - (fetchNuGet { name = "Realm.Fody"; version = "10.6.0"; sha256 = "031igfdwrkgn5nh19qxh6s6l8l1ni6lgk65dhqrzqc202xqidsdm"; }) (fetchNuGet { name = "Realm"; version = "10.6.0"; sha256 = "0vsd99zr22a2cvyx71gdqqvr2ld239v5s4dhhfdkjgvadz5dyc2a"; }) + (fetchNuGet { name = "Realm.Fody"; version = "10.6.0"; sha256 = "031igfdwrkgn5nh19qxh6s6l8l1ni6lgk65dhqrzqc202xqidsdm"; }) (fetchNuGet { name = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) - (fetchNuGet { name = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) @@ -207,20 +207,20 @@ (fetchNuGet { name = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { name = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { name = "System.CodeDom"; version = "4.5.0"; sha256 = "1js3h3ig0zwyynl1q88siynp8ra0gz0pfq1wmvls6ji83jrxsami"; }) + (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { name = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { name = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { name = "System.Composition"; version = "1.0.31"; sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; }) (fetchNuGet { name = "System.Composition.AttributedModel"; version = "1.0.31"; sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; }) (fetchNuGet { name = "System.Composition.Convention"; version = "1.0.31"; sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; }) (fetchNuGet { name = "System.Composition.Hosting"; version = "1.0.31"; sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; }) (fetchNuGet { name = "System.Composition.Runtime"; version = "1.0.31"; sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; }) (fetchNuGet { name = "System.Composition.TypedParts"; version = "1.0.31"; sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) - (fetchNuGet { name = "System.Composition"; version = "1.0.31"; sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; }) (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) @@ -236,30 +236,30 @@ (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { name = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { name = "System.Interactive.Async"; version = "3.2.0"; sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; }) - (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) - (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { name = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) - (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { name = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { name = "System.IO.Packaging"; version = "5.0.0"; sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n"; }) - (fetchNuGet { name = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { name = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.IO.Packaging"; version = "5.0.0"; sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) + (fetchNuGet { name = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { name = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { name = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) - (fetchNuGet { name = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { name = "System.Management"; version = "4.5.0"; sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; }) (fetchNuGet { name = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -274,15 +274,17 @@ (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { name = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) - (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { name = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) - (fetchNuGet { name = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { name = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) @@ -290,10 +292,10 @@ (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { name = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) @@ -302,15 +304,13 @@ (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) @@ -330,30 +330,30 @@ (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { name = "System.Text.Encodings.Web"; version = "5.0.1"; sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }) (fetchNuGet { name = "System.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }) (fetchNuGet { name = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { name = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { name = "System.Threading.Channels"; version = "5.0.0"; sha256 = "11z28x3cawry60l5phkqrvavm0mshz84n4c79hrz0p65lq8jpxgs"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) (fetchNuGet { name = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { name = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { name = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index ce1753038346..265b193193e8 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-9ZdITKGjCgVy/0CzaPO9+mlGvy/qWXwl4NSGRV7ySb0="; + sha256 = "sha256-eRegE+Q5dEtuT2XRKAK0sycRuK6sdSXKS6aLCsBDU8g="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 9b3db346e049..715f33421210 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -8,11 +8,11 @@ let d2u = lib.replaceChars ["-"] ["_"]; - mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a: + mkLibRetroCore = { core, src, description, license, broken ? false, version ? "2020-03-06", ... }@a: lib.makeOverridable stdenv.mkDerivation ((rec { name = "libretro-${a.core}-${version}"; - version = "2020-03-06"; + inherit version; inherit (a) src; buildInputs = [ zlib ] ++ a.extraBuildInputs or []; @@ -334,10 +334,11 @@ in with lib.licenses; dolphin = mkLibRetroCore { core = "dolphin"; + version = "2021-11-01"; src = fetchRetro { repo = "dolphin"; - rev = "1fbd59911d1b718c142d6448dee3ede98152e395"; - sha256 = "1rymsvs034l1hbxc3w8zi9lhmgka2qaj3jynjy152dccd480nnd4"; + rev = "3370f7693be95c23ac779e5172ff52b7eb2861a7"; + sha256 = "0ylxi25kbv0h2p24aid7z4i0w6drf7h92q02hjdl3h3gni98lk9i"; }; description = "Port of Dolphin to libretro"; license = gpl2Plus; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 4ffbee147158..f6c576301daa 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -5,14 +5,15 @@ , platform-tools , ffmpeg +, libusb1 , SDL2 }: let - version = "1.19"; + version = "1.20"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-h2+TIhguaqxqWNsTNPQiWFXvOhfq68gKq2YB2dHsuGc="; + sha256 = "sha256-sgruSVH5mwYMSkQAC6lN6XP5YEdY72K+slOzcarT3zQ="; }; in stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IR4FTbVtHp9rRm0U4d1zkl0u+oR5FeElJ91NIspSKWg="; + sha256 = "sha256-yj/hpndVC1oInrYmCSKQix1kNWy/GpAlmO/6o3vvQQE="; }; # postPatch: @@ -37,7 +38,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; - buildInputs = [ ffmpeg SDL2 ]; + buildInputs = [ ffmpeg SDL2 ] ++ lib.optionals stdenv.isLinux [ + libusb1 + ]; # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index d9a0adcdbb18..497c64c7c2c8 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1037,6 +1037,7 @@ self: super: { "coc-tslint" "coc-tslint-plugin" "coc-tsserver" + "coc-ultisnips" "coc-vetur" "coc-vimlsp" "coc-vimtex" diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 1fdd0647557d..b642314737c9 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -9,9 +9,9 @@ let sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gperf ]; buildInputs = [ - glib gperf util-linux kmod + glib util-linux kmod ]; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 62f0414987a0..e4ebd4500f20 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -747,6 +747,7 @@ let BSD_PROCESS_ACCT_V3 = yes; + BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support BT_HCIUART_BCSP = option yes; BT_HCIUART_H4 = option yes; # UART (H4) protocol support BT_HCIUART_LL = option yes; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 40aa8a338bff..03389f7b7d24 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -78,6 +78,18 @@ let }); }) + (self: super: { + nettigo-air-monitor = super.nettigo-air-monitor.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; + src = fetchFromGitHub { + owner = "bieniu"; + repo = "nettigo-air-monitor"; + rev = version; + sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE="; + }; + }); + }) + # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { @@ -813,8 +825,9 @@ in with py.pkgs; buildPythonApplication rec { "tests/auth/mfa_modules/test_notify.py" # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address "tests/components/emulated_hue/test_upnp.py" - # tado/test_climate.py: Tries to connect to my.tado.com + # tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com "tests/components/tado/test_climate.py" + "tests/components/tado/test_water_heater.py" ]; disabledTests = [ diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 2919438d1e4b..de65e75ab9da 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -498,10 +498,10 @@ in name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; - rev = "0.9.0"; - sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7"; + rev = "92b80642538eec4cfc98114dec5917b8d820e912"; + sha256 = "0a8d9ifryhhnll7k7jcsf9frshk5yhpsgz7zgxdmw81wbz5hxklc"; }; - inputs = [ pkgs.ffmpeg_3 ]; + inputs = [ pkgs.ffmpeg ]; }; vod = { diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 051497f863cb..ebd8d26de125 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-09-21"; + version = "unstable-2021-11-10"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "0b918b357cb0c282d53cbdf59e1931a2054cd60a"; - sha256 = "sha256-vUhP71vZ5XFG7MDkPFpAcCUL4kIdzHJ1hAkwqIi6ksQ="; + rev = "c179db3d4331db9d85c7acfdaa1e96e295d277ba"; + sha256 = "sha256-/fFbhKiSQq9E9iucinTgUTyOtfDKCMgvzebHjfOaJ+M="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix new file mode 100644 index 000000000000..e6ada50152a4 --- /dev/null +++ b/pkgs/servers/openvscode-server/default.nix @@ -0,0 +1,173 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, runCommand +, cacert, moreutils, jq, git, pkg-config, yarn, python3 +, esbuild, nodejs-14_x, libsecret, xorg, ripgrep +, AppKit, Cocoa, Security, cctools }: + +let + system = stdenv.hostPlatform.system; + + nodejs = nodejs-14_x; + yarn' = yarn.override { inherit nodejs; }; + defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; + + vsBuildTarget = { + x86_64-linux = "linux-x64"; + aarch64-linux = "linux-arm64"; + x86_64-darwin = "darwin"; + }.${system} or (throw "Unsupported system ${system}"); + + # replaces esbuild's download script with a binary from nixpkgs + patchEsbuild = path : version : '' + mkdir -p ${path}/node_modules/esbuild/bin + jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json + sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + ''; + +in stdenv.mkDerivation rec { + pname = "openvscode-server"; + version = "1.62.0"; + + src = fetchFromGitHub { + owner = "gitpod-io"; + repo = "openvscode-server"; + rev = "openvscode-server-v${version}"; + sha256 = "0lmka1hgf1703h70s7i2lx07535n2l867kmnc5h89c4vaswy6649"; + }; + + yarnCache = stdenv.mkDerivation { + name = "${pname}-${version}-${system}-yarn-cache"; + inherit src; + nativeBuildInputs = [ cacert yarn git ]; + buildPhase = '' + export HOME=$PWD + + yarn config set yarn-offline-mirror $out + find "$PWD" -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --frozen-lockfile --ignore-scripts --ignore-platform \ + --ignore-engines --no-progress --non-interactive + ''; + + installPhase = '' + echo yarnCache + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "142m0vkddzv09rbbqw7y7x19q7akkn00dn6az5ppr86k6bmhyk6p"; + }; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + nativeBuildInputs = [ + nodejs yarn' python3 pkg-config makeWrapper git jq moreutils + ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + ++ (with xorg; [ libX11 libxkbfile ]) + ++ lib.optionals stdenv.isDarwin [ + AppKit Cocoa Security cctools + ]; + + patches = [ + # Patch out remote download of nodejs from build script + ./remove-node-download.patch + ]; + + postPatch = '' + export HOME=$PWD + + # remove all built-in extensions, as these are 3rd party extensions that + # get downloaded from vscode marketplace + jq --slurp '.[0] * .[1]' "product.json" <( + cat << EOF + { + "builtInExtensions": [] + } + EOF + ) | sponge product.json + ''; + + configurePhase = '' + # set default yarn opts + ${lib.concatMapStrings (option: '' + yarn --offline config set ${option} + '') defaultYarnOpts} + + # set offline mirror to yarn cache we created in previous steps + yarn --offline config set yarn-offline-mirror "${yarnCache}" + '' + lib.optionalString stdenv.isLinux '' + # set nodedir, so we can build binaries later + npm config set nodedir "${nodeSources}" + ''; + + buildPhase = '' + # install dependencies + yarn --offline --ignore-scripts + + # run yarn install everywhere, skipping postinstall so we can patch esbuild + find . -path "*node_modules" -prune -o \ + -path "./*/*" -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --frozen-lockfile --offline --ignore-scripts --ignore-engines + + ${patchEsbuild "./build" "0.12.6"} + ${patchEsbuild "./extensions" "0.11.23"} + + # patch shebangs of node_modules to allow binary packages to build + patchShebangs ./remote/node_modules + + # put ripgrep binary into bin so postinstall does not try to download it + find -name vscode-ripgrep -type d \ + -execdir mkdir -p {}/bin \; \ + -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; + '' + lib.optionalString stdenv.isDarwin '' + # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ + # (see issue #101229) + pushd ./remote/node_modules/@parcel/watcher + mkdir -p ./build/Release + mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node + jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json + popd + '' + '' + # rebuild binaries, we use npm here, as yarn does not provide an alternative + # that would not attempt to try to reinstall everything and break our + # patching attempts + npm --prefix ./remote rebuild --build-from-source + + # run postinstall scripts after patching + find . -path "*node_modules" -prune -o \ + -path "./*/*" -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' + + # build and minify + yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min + ''; + + installPhase = '' + mkdir -p $out/libexec + + cp -R -T ../vscode-reh-web-${vsBuildTarget} "$out/libexec" + + ln -s ${nodejs}/bin/node $out/libexec + + makeWrapper "$out/libexec/server.sh" "$out/bin/openvscode-server" + ''; + + meta = with lib; { + description = "Run VS Code on a remote machine"; + longDescription = '' + Run upstream VS Code on a remote machine with access through a modern web + browser from any device, anywhere. + ''; + homepage = "https://github.com/gitpod-io/openvscode-server"; + license = licenses.mit; + maintainers = with maintainers; [ dguenther ghuntley ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/servers/openvscode-server/remove-node-download.patch b/pkgs/servers/openvscode-server/remove-node-download.patch new file mode 100644 index 000000000000..9262be5b293d --- /dev/null +++ b/pkgs/servers/openvscode-server/remove-node-download.patch @@ -0,0 +1,27 @@ +--- ./build/gulpfile.reh.js ++++ ./build/gulpfile.reh.js +@@ -277,8 +277,6 @@ + .pipe(util.stripSourceMappingURL()) + .pipe(jsFilter.restore); + +- const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`; +- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); + + let web = []; + if (type === 'reh-web') { +@@ -296,7 +294,6 @@ + license, + sources, + deps, +- node, + ...web + ); + +@@ -376,7 +373,6 @@ + const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; + + const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( +- gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`), + util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), + packageTask(type, platform, arch, sourceFolderName, destinationFolderName) + )); diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 8311d0aa58f3..3daa69de492b 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-wrBfgwzb+HI6cu9EyC70xZ5WsfkW+o+Q69jeCjoZRtI="; - arm64-linux_hash = "sha256-wnuLqd1T/21QyqjHbpK2w+WRyW1rd4pHqcRLFrIKHW8="; - x64-osx_hash = "sha256-gu+eByulCs9zLe3AXfVfcOXB49q6V7MWQ2DN2O/enfk="; + x64-linux_hash = "sha256-S3ktqBapIi6YIjDOIMziCzecS86hR2LIUey3SLNuWgg="; + arm64-linux_hash = "sha256-lxPglw3whyMQ+v7GpKMygxqINDoczKmh7KpGAuzuQwM="; + x64-osx_hash = "sha256-EUg3eC5QwGgCSi9qAPs6s8wenSXEmLvLHUTlvoLWAtc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.1.1.1030"; + version = "0.1.2.1060"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index cab0b70b64df..0034a831bfe2 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests +{ lib, stdenv, fetchzip, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -22,15 +22,11 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.6.3"; + version = "10.6.5"; - src = fetchurl { - urls = [ - "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" - "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" - ]; - sha256 = "1nqq1g6h2gvsraqziv2qq42v7y6fzbfw357mh3d1zv7md9h2bhav"; - name = "mariadb-${version}.tar.gz"; + src = fetchzip { + url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"; + sha256 = "0rvcllbplgn92kr5n3qxfasnsqc8cn9ijm01fb7i7j2p9zxnfhig"; }; nativeBuildInputs = [ cmake pkg-config ] @@ -95,7 +91,6 @@ common = rec { # attributes common to both builds rm "$out"/bin/{mariadb-config,mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig - rm -rf "$out"/share/aclocal ''; passthru.mysqlVersion = "5.7"; @@ -135,8 +130,7 @@ client = stdenv.mkDerivation (common // { ]; postInstall = common.postInstall + '' - rm -rf "$out"/share/doc - rm "$out"/bin/{mysqltest,mytop} + rm "$out"/bin/{mariadb-test,mysqltest} libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} @@ -199,6 +193,7 @@ server = stdenv.mkDerivation (common // { ''; postInstall = common.postInstall + '' + rm -rf "$out"/share/aclocal chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} '' + optionalString withStorageMroonga '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6d484e41dae7..1560cba17f89 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-10-27"; + version = "2021-11-11"; pname = "oh-my-zsh"; - rev = "2e46b2a2dcb96cadd94283bdce95eca75bef1433"; + rev = "b3ba9978cc42a5031c7b68e3cf917ec2e64643bc"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "ZZs7SBfRX1JUmjukvnOqMx77vXgoxqHEatGfRvfToK8="; + sha256 = "9a5eVMphQ0jay9ogc/9ZFS+vvHlXhPYCCo8kMdgVsnA="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index d59f50ce3b9c..126ed8e67c61 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -4,7 +4,7 @@ stdenvNoCC.mkDerivation rec { pname = "zinit"; version = "3.7"; src = fetchFromGitHub { - owner = "zdharma"; + owner = "zdharma-continuum"; repo = pname; rev = "v${version}"; hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE="; @@ -37,6 +37,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/zdharma/zinit"; description = "Flexible zsh plugin manager"; license = licenses.mit; - maintainers = with maintainers; [ pasqui23 ]; + maintainers = with maintainers; [ pasqui23 sei40kr ]; }; } diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 136da49491b1..f10b79d2ab00 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.10.11"; + version = "2021.10.15"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-2M6nCJD1ovW8Wzw+ucii5PjeNTOiTletor7MPCMPl38="; + sha256 = "sha256-OEkSgT3Rg0ZcTCTeOd2+GlopzhI19spOLkH3nDDCWo8="; }; meta = with lib; { diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 7425056cfae3..d7c37bb2742b 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -1,16 +1,17 @@ { buildGoPackage, fetchFromGitHub, lib -, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm +, pkg-config +, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif }: buildGoPackage rec { pname = "wallutils"; - version = "5.9.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "17xw1311xpmi5c8mwa9yvn4pxa7g4n09j84lvy61gmxc5m128fwy"; + sha256 = "1phlkpy8kg4ai2xmachpbbxvl8fga9hqqbad2a2121yl60709l1k"; }; goPackagePath = "github.com/xyproto/wallutils"; @@ -22,13 +23,14 @@ buildGoPackage rec { sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go ''; - buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ]; meta = with lib; { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 41e6e32b8310..53e49cc02ca2 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchCrate, rustPlatform, openssl, pkg-config }: +{ lib, stdenv, fetchCrate, rustPlatform, openssl, pkg-config, Security }: rustPlatform.buildRustPackage rec { pname = "apkeep"; @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "A command-line tool for downloading APK files from various sources"; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index d9fcd8b29bc2..bff4b5310bd1 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2021-10-20"; + version = "unstable-2021-11-13"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "5a79c76c9b8ef337cffb9537a3d8a47c9ffc8b04"; - sha256 = "zDkYp2YPEur26qEwG8DQQzv8/T288HG/9mzzkN4SEtU="; + rev = "4bb7b14843c302695b7d47d4d814f38998da1a68"; + sha256 = "NbB+UGydk0zSkqTPYw5KOHR0mv1UHH2pXLYdMRdG8UE="; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index a645525da27c..c664de7c5dc6 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "diskus"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "diskus"; rev = "v${version}"; - sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05"; + sha256 = "sha256-SKd2CU0F2iR4bSHntu2VKvZyjjf2XJeXJG6XS/fIBMU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1irgj8kna4mwrp91s3ccbfwv2kdkjl89865y88s8v6zd9wzj3c8q"; + cargoSha256 = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50="; meta = with lib; { description = "A minimal, fast alternative to 'du -sh'"; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 7605c92bf438..6c4f71c507e7 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; + sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4="; }; patches = [ diff --git a/pkgs/tools/misc/ytree/default.nix b/pkgs/tools/misc/ytree/default.nix index 9121b1289f24..fcfbdbd10da1 100644 --- a/pkgs/tools/misc/ytree/default.nix +++ b/pkgs/tools/misc/ytree/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ytree"; - version = "2.03"; + version = "2.04"; src = fetchurl { url = "https://han.de/~werner/${pname}-${version}.tar.gz"; - sha256 = "sha256-WDqnFVLRNH4Oq+OaI2+loXS/Z93piHGFO5/iojO8rvE="; + sha256 = "sha256-bnqLf2jv5tNlq+M6HQbXOa2F8io9VN3QrsJKNHjWZkI="; }; buildInputs = [ diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 24968c64a093..1fc5e84fddef 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] + configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" "--enable-ntp-signd" ] ++ lib.optional stdenv.isLinux "--enable-scfilter"; meta = with lib; { diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 194365130bf3..331738be5329 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: +{lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ncurses, libnl }: stdenv.mkDerivation rec { pname = "horst"; @@ -11,6 +11,22 @@ stdenv.mkDerivation rec { sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3: + # https://github.com/br101/horst/pull/110 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/br101/horst/commit/c9e9b6cc1f97edb9c53f3a67b43f3588f3ac6ea7.patch"; + sha256 = "15pahbnql44d5zzxmkd5ky8bl3c3hh3lh5190wynd90jrrhf1a26"; + # collides for context change, well apply this part in postPatch + excludes = [ "display-main.c" ]; + }) + ]; + postPatch = '' + # Apply second part of ncurses-6.3.patch: + substituteInPlace display-main.c --replace 'wprintw(dump_win, str);' 'wprintw(dump_win, "%s", str);' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses libnl ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 5dc789e0dc58..98aabadf6da3 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, python2Packages +, python3 , asciidoc , cacert , docbook_xsl @@ -9,15 +9,15 @@ , libxslt }: -python2Packages.buildPythonApplication rec { - version = "7.3.4"; +python3.pkgs.buildPythonApplication rec { pname = "offlineimap"; + version = "8.0.0"; src = fetchFromGitHub { owner = "OfflineIMAP"; - repo = "offlineimap"; + repo = "offlineimap3"; rev = "v${version}"; - sha256 = "sha256-sra2H0+5+LAIU3+uJnii+AYA05nuDyKVMW97rbaFOfI="; + sha256 = "0y3giaz9i8vvczlxkbwymfkn3vi9fv599dy4pc2pn2afxsl4mg2w"; }; nativeBuildInputs = [ @@ -28,11 +28,14 @@ python2Packages.buildPythonApplication rec { libxslt ]; - propagatedBuildInputs = with python2Packages; [ - six + propagatedBuildInputs = with python3.pkgs; [ + certifi + distro + imaplib2 kerberos - rfc6555 pysocks + rfc6555 + urllib3 ]; postPatch = '' @@ -40,7 +43,7 @@ python2Packages.buildPythonApplication rec { sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |" # Provide CA certificates (Used when "sslcacertfile = OS-DEFAULT" is configured") - sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' + sed -i offlineimap/utils/distro_utils.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; postInstall = '' @@ -52,6 +55,10 @@ python2Packages.buildPythonApplication rec { # Test requires credentials doCheck = false; + pythonImportsCheck = [ + "offlineimap" + ]; + meta = with lib; { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = "http://offlineimap.org"; diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/tools/nix/info/info.sh index f108962b3bad..6708a541f3d9 100755 --- a/pkgs/tools/nix/info/info.sh +++ b/pkgs/tools/nix/info/info.sh @@ -70,7 +70,7 @@ nixev() { } desc_system() { - nixev '(import {}).system' + nixev '(import {}).stdenv.hostPlatform.system' } desc_host_os() { diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 1345e2caa406..fd3b4a5a3e46 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub -, nixUnstable +, nix , nix-prefetch , nixpkgs-fmt , nixpkgs-review @@ -19,7 +19,7 @@ buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch nixpkgs-fmt nixpkgs-review ]) ]; checkPhase = '' diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index fc55902ce5fc..f365348607aa 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -58,7 +58,7 @@ common = ]; buildInputs = - [ curl libsodium openssl sqlite xz bzip2 nlohmann_json + [ curl libsodium openssl sqlite xz bzip2 brotli boost editline ] ++ lib.optionals stdenv.isDarwin [ Security ] @@ -209,6 +209,13 @@ common = ]; }); + # master: https://github.com/NixOS/nix/pull/5536 + # 2.4: https://github.com/NixOS/nix/pull/5537 + installNlohmannJsonPatch = fetchpatch { + url = "https://github.com/NixOS/nix/pull/5536.diff"; + sha256 = "sha256-SPnam4xNIjbMgnq6IP1AaM1V62X0yZNo4DEVmI8sHOo="; + }; + in rec { nix = nixStable; @@ -241,6 +248,8 @@ in rec { boehmgc = boehmgc_nixUnstable; + patches = [ installNlohmannJsonPatch ]; + inherit storeDir stateDir confDir; }); @@ -258,6 +267,8 @@ in rec { boehmgc = boehmgc_nixUnstable; + patches = [ installNlohmannJsonPatch ]; + inherit storeDir stateDir confDir; }); diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 6a099299e905..3555f65c40d0 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.8"; + version = "1.13.0"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0f3nnhipx2p8w04rxva0pcf7g1nhr4f5bz5dbvr2m76lkiaz5q3v"; + sha256 = "sha256-MBpk84H3Ng/+rCjW2Scm/su0/5kgs7IzvFk/bFLNzXY="; }; - vendorSha256 = "14khs15k9d5m5dms3l4a5bi0s3zl1irm0i4s9pf86gpyz7b55l6a"; + vendorSha256 = "sha256-HGc6jUp4WO5P5dwfa0r7+X78a8us9fWrf+/IOotZHqk="; subPackages = [ "." ]; diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index d00b71977a22..3f1b79c3e015 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "proselint"; - version = "0.12.0"; + version = "0.13.0"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; - sha256 = "2a98d9c14382d94ed9122a6c0b0657a814cd5c892c77d9477309fc99f86592e6"; + sha256 = "7dd2b63cc2aa390877c4144fcd3c80706817e860b017f04882fbcd2ab0852a58"; }; propagatedBuildInputs = [ click future six ]; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 1e6c86c19923..c64136ad6b98 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scdoc"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = pname; rev = version; - sha256 = "1g37j847j3h4a4qbbfbr6vvsxpifj9v25jgv25nd71d1n0dxlhvk"; + sha256 = "07c2vmdgqifbynm19zjnrk7h102pzrriv73izmx8pmd7b3xl5mfq"; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35d58301dd8c..ee2d656c8bcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4074,6 +4074,12 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; + inherit (import ../development/libraries/libsbsms pkgs) + libsbsms + libsbsms_2_0_2 + libsbsms_2_3_0 + ; + libskk = callPackage ../development/libraries/libskk { inherit (gnome) gnome-common; }; @@ -23852,7 +23858,9 @@ with pkgs; apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; - apkeep = callPackage ../tools/misc/apkeep { }; + apkeep = callPackage ../tools/misc/apkeep { + inherit (darwin.apple_sdk.frameworks) Security; + }; apngasm = callPackage ../applications/graphics/apngasm {}; apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {}; @@ -28825,6 +28833,11 @@ with pkgs; vscodium-fhs = vscodium.fhs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; + openvscode-server = callPackage ../servers/openvscode-server { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin) cctools; + }; + code-server = callPackage ../servers/code-server { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; inherit (darwin) cctools; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f6567ca230a..b4cd4106113d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -108,6 +108,7 @@ in { else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.darwin) autoSignDarwinBinariesHook; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; @@ -122,7 +123,7 @@ in { # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr; + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; @@ -132,7 +133,7 @@ in { # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr; + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fad1f41d540a..c63a35749259 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7915,16 +7915,24 @@ in { qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; + qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-finance = callPackage ../development/python-modules/qiskit-finance { }; qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + qiskit-machine-learning = callPackage ../development/python-modules/qiskit-machine-learning { }; + + qiskit-nature = callPackage ../development/python-modules/qiskit-nature { }; + + qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { }; + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; qrcode = callPackage ../development/python-modules/qrcode { };