diff options
Diffstat (limited to 'pkgs')
678 files changed, 15496 insertions, 6576 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index e665edabd07..b84b4e6aa9a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -10,7 +10,7 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - # On the update after all 1.4rc, qt5.15 will be supported. + # On the update after all 1.4rc, qt5.15 and protobuf 3.15 will be supported. version = "1.4.0rc1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index a2e71b955ec..ebcd09ca6ad 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, -util-linux, pythonPackages, libnotify }: +util-linux, python3Packages, libnotify }: stdenv.mkDerivation { name = "clerk-2016-10-14"; @@ -12,10 +12,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pythonPackages.mpd2 ]; + buildInputs = [ python3Packages.mpd2 ]; dontBuild = true; + strictDeps = true; + installPhase = '' DESTDIR=$out PREFIX=/ make install wrapProgram $out/bin/clerk \ diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 0de66b24e70..e2ec9bf8ab2 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { strictDeps = true; + CXXFLAGS = "-std=c++11"; configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0"; postPatch = '' diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index e2c19ac156d..bb92682b141 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY="; + sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4="; }; buildInputs = [ diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 13b488ce7d7..bf054b118e1 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 +{ mkDerivation, lib, fetchFromGitHub, pkg-config, qtscript, qmake, libjack2 }: mkDerivation rec { pname = "jamulus"; - version = "3.6.2"; + version = "3.7.0"; src = fetchFromGitHub { - owner = "corrados"; + owner = "jamulussoftware"; repo = "jamulus"; rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4="; + sha256 = "sha256-8zCPT0jo4ExgmZWxGinumv3JauH4csM9DtuHmOiJQAM="; }; nativeBuildInputs = [ pkg-config qmake ]; @@ -20,7 +20,7 @@ mkDerivation rec { description = "Enables musicians to perform real-time jam sessions over the internet"; longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details"; homepage = "https://github.com/corrados/jamulus/wiki"; - license = lib.licenses.gpl2; # linked in git repo, at least + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.seb314 ]; }; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 8e6113a716d..7f412d528db 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.5"; + version = "0.5.6"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "sha256-8eAUg+vxpoDZ7AMMmvIPXypawPHgZCwYvVWTz6qc62s="; + sha256 = "sha256-F96ngrM0wUb0rNlIx8Mf/dKvyJnrNH6+Ab4WBup59Lg="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 85bc9e3542c..153e52c82e1 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,20 +1,49 @@ -{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkg-config }: +{ lib, stdenv, fetchFromGitHub +, libjack2, libsndfile, xorg, freetype, libxkbcommon +, cairo, glib, gnome3, flac, libogg, libvorbis, libopus +, cmake, pkg-config +}: stdenv.mkDerivation rec { pname = "sfizz"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "sfztools"; repo = pname; rev = version; - sha256 = "0zpmvmh7n0064rxfqxb7z9rnz493k7yq7nl0vxppqnasg97jn5f3"; + sha256 = "sha256-3RdY5+BPsdk6vctDy24w5aJsVOV9qzSgXs62Pm5UEKs="; fetchSubmodules = true; }; + buildInputs = [ + libjack2 + libsndfile + flac + libogg + libvorbis + libopus + xorg.libX11 + xorg.libxcb + xorg.libXau + xorg.libXdmcp + xorg.xcbutil + xorg.xcbutilcursor + xorg.xcbutilrenderutil + xorg.xcbutilkeysyms + xorg.xcbutilimage + libxkbcommon + cairo + glib + gnome3.zenity + freetype + ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libjack2 libsndfile ]; + postPatch = '' + substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ + --replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity' + ''; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 655a047a3a6..69aae9d6433 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify +, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 -, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa +, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: let @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.46.916.g416cacf1"; + version = "1.1.55.494.gca75f788"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "43"; + rev = "45"; deps = [ alsaLib @@ -34,12 +34,13 @@ let freetype gdk-pixbuf glib - gtk2 + gtk3 libdrm libgcrypt libnotify libpng libpulseaudio + libxkbcommon mesa nss pango @@ -78,11 +79,10 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1"; + sha512 = "5d61a2d5b26be651620ab5d18d3a204d8d7b09dcec8a733ddc176c44cb43e9176c4350933ebe4498b065ba219113f3226c13bea9659da738fe635f41d01db303"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ squashfsTools ]; + nativeBuildInputs = [ makeWrapper squashfsTools ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 51f00d021c3..7f7be99f9a2 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "0fm6vwpw0pa98v2yn8p3818rrlv9lk3pmgnal1b2kh52im5ll7m8"; + sha256 = "16284gv31wdwmb99056962d1gh6xz26ami6synr47nsbbp5l0s6k"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1f5s6a0wjrs2spsicirhbvb5xlz9iflwsaqchij9k02hfcsr308y"; + sha256 = "12ymjwpxx3sdna8w5j9fnwwfk8ynk9ziwl0lkpq68y0vyllln5an"; }; patches = [ diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 52914c1128a..61ce54beec2 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, - dotnetPackages, dotnetCorePackages, writeScript, bash + dotnetPackages, dotnetCorePackages }: let @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.6.8"; + version = "1.0.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1znmix9w7ahzyb933lxzqv6j8j5qycknq3gmnkakj749ksshql1b"; + sha256 = "1pbq0kik29sx1lwlic7fvhnjhrpnlk94w53wmywqnlpgjscx8x8a"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 9065ff49cf8..b579fc8f7f8 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -20,24 +20,29 @@ sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { + name = "BIP78.Sender"; + version = "0.2.0"; + sha256 = "0gyynn15rc1x9p2703ffi4jnbpbd0k3wvg839xrk2skmaw8nxamf"; + }) + (fetchNuGet { name = "BTCPayServer.Hwi"; version = "1.1.3"; sha256 = "1c8hfnrjh2ad8qh75d63gsl170q8czf3j1hk8sv8fnbgnxdnkm7a"; }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.4"; - sha256 = "1f4wgs8ijk1wmppz5lmas7l6m83szz57jyk6ak0dxhccdld9rdaj"; + version = "1.2.7"; + sha256 = "0jzmzvlpf6iba2fsc6cyi69vlaim9slqm2sapknmd7drl3gcn2zj"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; - version = "1.2.1"; - sha256 = "0iv9frbr6xfxif3pnfd7c87y8mv31nqkdrnhvnaswrx43nv6s272"; + version = "1.2.3"; + sha256 = "1rdrwmijx0v4z0xsq4acyvdcj7hv6arfh3hwjy89rqnkkznrzgwv"; }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.1"; - sha256 = "14km69jzmnyqg19w27g6znml4z0xkm8l4j7rj0x36bw67cjmgahv"; + version = "1.2.3"; + sha256 = "02197rh03q8d0mv40zf67wp1rd2gbxi5l8krd2rzj84n267bcfvc"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; @@ -45,19 +50,24 @@ sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0"; }) (fetchNuGet { + name = "BTCPayServer.Lightning.Common"; + version = "1.2.2"; + sha256 = "07xb7fsqvfjmcawxylriw60i73h0cvfb765aznhp9ffyrmjaql7z"; + }) + (fetchNuGet { name = "BTCPayServer.Lightning.Eclair"; - version = "1.2.0"; - sha256 = "0w7nwsr0n2hrqak023xa294palsk3r96wlgw2ks8d3p5kxm8kskp"; + version = "1.2.2"; + sha256 = "03dymhwxb5s28kb187g5h4aysnz2xzml89p47nmwz9lkg2h4s73h"; }) (fetchNuGet { name = "BTCPayServer.Lightning.LND"; - version = "1.2.1"; - sha256 = "0ql4qyvz0rms6ls46pi3bgak3r6hj2c5ivnzahiq6cb84pbl61cr"; + version = "1.2.4"; + sha256 = "0qnj5rsp6hnybsr58zny9dfbsxksg1674q0z9944jwkzm7pcqyg4"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.0"; - sha256 = "1yd6nhlssb9k08p5491knlwwjij9324ildir99sa9cp24rlq5nis"; + version = "1.2.2"; + sha256 = "17yl85vqfp7l12bv3f3w1b861hm41i7cfhs78gaq04s4drvcnj6k"; }) (fetchNuGet { name = "BuildBundlerMinifier"; @@ -80,11 +90,6 @@ sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) (fetchNuGet { - name = "DBriize"; - version = "1.0.1.3"; - sha256 = "0rsm68hwq2ky8i6mv3ckdjkj4vjygnkgk3disva0skl3apk833dc"; - }) - (fetchNuGet { name = "DigitalRuby.ExchangeSharp"; version = "0.6.3"; sha256 = "1vb7ahafcd3lcbiiz552aisilwm1yq3j600gkf1wik8vhvsk02fs"; @@ -666,13 +671,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.21"; - sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.33"; - sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; + version = "2.0.28"; + sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; }) (fetchNuGet { name = "NBitcoin"; @@ -686,13 +686,13 @@ }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.60"; - sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; + version = "5.0.67"; + sha256 = "049marx1jwr7srlpqspimrqqgahh53gi2iyp7bpzn5npsbzh9v3h"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.68"; - sha256 = "0k275mbp9wannm10pqj4nv8agjc1f6hsrfhl0m6ax1apv81sfxcd"; + version = "5.0.73"; + sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; }) (fetchNuGet { name = "NBitpayClient"; @@ -701,8 +701,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.19"; - sha256 = "0nahfxdsryf5snjy87770m51v2jcry02lmb10ilsg4h2ig4pjdk4"; + version = "3.0.20"; + sha256 = "1mwa6ncmg5r6q7yn6skm9dgqm631c7r7nadcg9mvbw81113h0xxy"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -731,11 +731,6 @@ }) (fetchNuGet { name = "Newtonsoft.Json"; - version = "11.0.1"; - sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) @@ -921,8 +916,8 @@ }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "87.0.4280.8800"; - sha256 = "1zrizydlhjv81r1fa5g8wzxrx1cxly3ip7pargj48hdx419iblfr"; + version = "88.0.4324.9600"; + sha256 = "0jm8dpfp329xsrg69lzq2m6x9yin1m43qgrhs15cz2qx9f02pdx9"; }) (fetchNuGet { name = "Selenium.WebDriver"; diff --git a/pkgs/applications/blockchains/lndmanage.nix b/pkgs/applications/blockchains/lndmanage.nix new file mode 100644 index 00000000000..56db469ff45 --- /dev/null +++ b/pkgs/applications/blockchains/lndmanage.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "lndmanage"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "bitromortac"; + repo = pname; + rev = "v${version}"; + sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb"; + }; + + propagatedBuildInputs = with python3Packages; [ + cycler + decorator + googleapis-common-protos + grpcio + grpcio-tools + kiwisolver + networkx + numpy + protobuf + pyparsing + python-dateutil + six + pygments + ]; + + preBuild = '' + substituteInPlace setup.py --replace '==' '>=' + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "Channel management tool for lightning network daemon (LND) operators"; + homepage = "https://github.com/bitromortac/lndmanage"; + license = licenses.mit; + maintainers = with maintainers; [ mmilata ]; + }; +} diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 41931bc9ec3..3be8b908c7a 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ehmry rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 5dc35e996be..e4d8d72fb4c 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "sha256-RUrJuJF0R0mc7XdLyk915fRWtMfzjp5QE6oeWxHfyEQ="; + sha256 = "sha256-+bzMo0s+wdp8T/YjPk6mrPSPid1G8WScB8FJhXdL9JQ="; }; - cargoSha256 = "sha256-b+winsCzU0sXGDX6nUtWq4JrIyTcJ3uva7RlV5VsXfk="; + cargoSha256 = "sha256-ibjjJ5zGF6wbO24/RoYKsTYsMNXHb1EdekDwSICPc5g="; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index e24531c373a..e86d145bdf4 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.12.4"; + version = "1.1.12.5"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-1yg0C1lJrLxQEs2GA+XEBUx/JAyc+aW0UWjLhSEy0RI="; + sha256 = "sha256-6KIsSsCAyZ6uYSbDBIKdtM4adGOttvJ78obCptcd57s="; }; dontBuild = true; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index f43d3ca9be3..029501c7787 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd }: @@ -19,6 +19,12 @@ in mkDerivation { patches = [ ./sddm-ignore-config-mtime.patch + # Load `/etc/profile` for `environment.variables` with zsh default shell. + # See: https://github.com/sddm/sddm/pull/1382 + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch"; + sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58="; + }) ]; postPatch = diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 2507cb13d7a..59d1f11312d 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 -, enchant, gucharmap, python, gnome3 +, enchant, gucharmap, python3, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 - enchant gucharmap python ]; + enchant gucharmap python3 ]; meta = with lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 2d9138bc32e..efb3adaaa28 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.122.3"; + version = "1.129.3"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b"; + sha256 = "1sg9wg6w3w0phrnnzpj7h2g22y0x7a3dl57djzydayxmg8fnn2ys"; }; postPatch = '' @@ -91,7 +91,12 @@ stdenv.mkDerivation rec { install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications '' + lib.concatMapStringsSep "\n" (lexer: '' - install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib + if [ -d "CudaText-lexers/${lexer}" ]; then + install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib + else + echo "${lexer} lexer not found" + exit 1 + fi '') additionalLexers; meta = with lib; { diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 89f6dbc75fa..a0044aaf833 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -6,38 +6,38 @@ }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2020.11.22", - "sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7" + "rev": "2021.02.13", + "sha256": "1p2r2q1al6rcsdbbg8ilm4xn6w48bj348khxdmpak7vfwx9741h8" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.01.12", - "sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9" + "rev": "2021.03.05", + "sha256": "1p2pzha5dd4p23j2bv6jxphj596dlb5v8ixjzg4x2zglz2hir6yz" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.01.19", - "sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1" + "rev": "2021.03.16", + "sha256": "1sq9j2zaif019gl6nf391lyp8k9s38f5s6ci7k3z5v90hkz1dcql" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.01.17", - "sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly" + "rev": "2021.03.08", + "sha256": "0xvnvx4qzp6nxi912i4zlnal91k6vbcsyfbz05ib73sz68xqd5qv" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.01.12", - "sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq" + "rev": "2021.03.16", + "sha256": "159s1rpl829bmaa4bllqhjm8z0vji1ncsd6hw2s8z8hz28n905k8" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2020.10.04", - "sha256": "0z66cm9pgdi7whqaim6hva4aa08zrr1881n1fal7lnz6wlla824k" + "rev": "2021.03.16", + "sha256": "1a4mxcwjm9naxh4piqm5y93w2xd5rgl0vcn108wy1pkr221agg2q" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2021.01.16", - "sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5" + "rev": "2021.02.18", + "sha256": "0fy6bmpdcl2aa8pb7zban6midkfwdj99x14hdghrv7cp8l4gcsg5" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -46,8 +46,8 @@ }, "CudaText-lexers": { "owner": "Alexey-T", - "rev": "2021.01.16", - "sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh" + "rev": "2021.02.01", + "sha256": "051jnrhfpl9n5pgrssf68lj732zxhvjbvna4746ngmdyxvw6dqfd" }, "bgrabitmap": { "owner": "bgrabitmap", diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a389cf539a9..857b0562c00 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.4"; + version = "13.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.4.tar"; - sha256 = "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65"; + url = "https://elpa.gnu.org/packages/auctex-13.0.5.tar"; + sha256 = "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2203,10 +2203,10 @@ elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.1.tar"; - sha256 = "08l9qmhvxiscxn4mfb80x57mk4gfm5r0fs2l9c8i3gfzd4i3h091"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.2.tar"; + sha256 = "1sw18ijp9rhaf8y8x8z5rmxy23pxd3gaicgmp2zndcfmm54gwsic"; }; packageRequires = [ emacs modus-themes ]; meta = { @@ -2237,10 +2237,10 @@ elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.1.tar"; - sha256 = "0xz304zcc872c2zwnlm8ky0m18smf7bffiyj21ygghgclr7kgma1"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.2.tar"; + sha256 = "1qn3kzxwf81zc7gprd9wblhb8b8akdkxwajpgk036y8i4cmvmspn"; }; packageRequires = [ emacs modus-themes ]; meta = { @@ -3252,10 +3252,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-0.1.1.tar"; - sha256 = "0z34m06lxw6xd6bxacm1h5cijamsksk4daf6fbzhd7kqmw3gbgqg"; + url = "https://elpa.gnu.org/packages/setup-0.1.2.tar"; + sha256 = "1q29phch4fvmvc255kgvzsnzdqp6kaip7ybpxprd0kkdjs3jrsqv"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 7ed43a82cc3..01ad01f9049 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210315"; + version = "20210322"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210315.tar"; - sha256 = "128agds82kfmvxshzrs61802vgwlf2dsm79hq9x2bljrnvf8p14l"; + url = "https://orgmode.org/elpa/org-20210322.tar"; + sha256 = "0iv54rhwa0972yr1wqzmlkggs5vc6qajz8mmyfhynp65ap088g6v"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210315"; + version = "20210322"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210315.tar"; - sha256 = "0dih4690pbbnwlphjnv1kgvsw43pkcgk41xjjiphy9sf7w9gr11j"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210322.tar"; + sha256 = "0riswc3ira8hsawm37yypji55z47bw2477kaw3qx7ghz3n62r9nf"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 3b9cb3f5288..7703579db80 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -1918,8 +1918,8 @@ "annotation", "eri" ], - "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299", - "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08" + "commit": "ecb93230ad9327991e542731756cbe1405c85d5f", + "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w" }, "stable": { "version": [ @@ -2442,14 +2442,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20210218, - 1006 + 20210325, + 512 ], "deps": [ "all-the-icons" ], - "commit": "d08e8d4043d8731b81f74421cf0455ba8845113a", - "sha256": "1sk83c9inm14s0v11ij43ldkskyhwf3lyfm5nq4pa0nbn1dpkvb0" + "commit": "5a984b4d7f811e2ad08fdc461a1e89205804b7bd", + "sha256": "05bglgqc4q5p9zr6ylllg16crpxcnb6p51xkk5v1nljgi3n9786l" }, "stable": { "version": [ @@ -2511,8 +2511,8 @@ "all-the-icons", "ivy-rich" ], - "commit": "82877633366139cc858f243b9d7fdff83c1ebe62", - "sha256": "0jyqgp9hgxy8qc8hdzr6gi8vwxaw7sz9lg297rmqx6i1hnv247aq" + "commit": "2efbbf231ea3b3248177051a10c52c151686c4b4", + "sha256": "1rrnanmmq07jx83w51b9gpwv2al1xw01xqb6xbpzd4bi2gjlayy5" }, "stable": { "version": [ @@ -3104,11 +3104,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210211, - 1931 + 20210322, + 1739 ], - "commit": "3e0d5f39b24eeded849c1c4903f9a75976732d2b", - "sha256": "1l1xmb12qfs0rvgvqqnbjn0njdgxiprxx6fd0vzinlpfdfk1f39j" + "commit": "54ac759facadacbfea5c1e7c2975e2da6434cdda", + "sha256": "18pr4bympwl6c2a1bsk4s8ixg4l7ykcxfh1bk42vvbcqnbmvd7dw" }, "stable": { "version": [ @@ -3146,8 +3146,8 @@ 20200914, 644 ], - "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299", - "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08" + "commit": "ecb93230ad9327991e542731756cbe1405c85d5f", + "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w" }, "stable": { "version": [ @@ -3775,11 +3775,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20210119, - 1200 + 20210321, + 1641 ], - "commit": "10d5cfa1563f314e5b24b151f63b9579992a7ba5", - "sha256": "0czbp56jg40y33p05l1wvrinjiz795zjk4gyxyvjbra11a8byf84" + "commit": "1724860a6a930a539472bb56bc3cae0e317dc055", + "sha256": "184phkylr4ax586glx7qx2f8yfdbbjx94vwq698z2yxs4jphni91" } }, { @@ -5454,8 +5454,8 @@ "avy", "embark" ], - "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd", - "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54" + "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355", + "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8" }, "stable": { "version": [ @@ -5498,14 +5498,14 @@ "repo": "mrkkrp/avy-menu", "unstable": { "version": [ - 20190713, - 1348 + 20210321, + 1732 ], "deps": [ "avy" ], - "commit": "970204989bcd4a4f8223c2fe980a08dc58441045", - "sha256": "196pwh83p0yrnagpiig8h2mq9xxm7wk9q8x832ffwizip4yni80b" + "commit": "2c5e0c08d6cb27c213a8eda5c7033e3ff2aa9661", + "sha256": "11sa9a5vh546dpnxmrhxps77c225vkrfqsb6qlsnli2kmp5cxj48" }, "stable": { "version": [ @@ -6040,11 +6040,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20210206, - 1822 + 20210320, + 519 ], - "commit": "041e442b6ab2b85a254e17bfc776a508e1b66abf", - "sha256": "1rcw4jsla3fhrb6b5margiwk2i2m0rrf3vp8lxk8vdg9bsy5ikmc" + "commit": "0c3aa33520ae4cb467c76ce53d438827df77eb1a", + "sha256": "0ibwxwyncyrgbpvhcx523813njdgln34wmqf0x826qv4hh4ai0yw" }, "stable": { "version": [ @@ -6377,14 +6377,14 @@ "repo": "tohojo/bbdb-vcard", "unstable": { "version": [ - 20201016, - 1902 + 20210325, + 2208 ], "deps": [ "bbdb" ], - "commit": "8d2fa496e58ded18f5eb589c1781adaf48a5f73f", - "sha256": "0ssmr4cyywqhr42fjmk5z3hb1z7ddbbz8y9sc5bzad7wncbybwbv" + "commit": "113c66115ce68316e209f51ebce56de8dded3606", + "sha256": "1sr5kd2gvw1b4hl147yb60cgx6j730vdnpyr09p7vmpw65hzwlwm" }, "stable": { "version": [ @@ -6514,11 +6514,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20210319, - 1039 + 20210320, + 1115 ], - "commit": "94465a6c80827e7db9dc2384932b168a0d8254e4", - "sha256": "1jnx6fqmj0i4kxpw03znribqj5nlhyprwlmsbi63hjzbd51h83q3" + "commit": "18d0bbde367dfe259d697d1c589e3040d69797ee", + "sha256": "13gdlaiqi3jnavwrwj5ic9aqycfvbzw8d4v0413nwzag35bz4mpl" }, "stable": { "version": [ @@ -7773,8 +7773,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20210311, - 620 + 20210323, + 1836 ], "deps": [ "cl-lib", @@ -7783,8 +7783,8 @@ "flycheck", "yasnippet" ], - "commit": "7193bef7d45232bdbd0b42cbd8893c15f68ad0e5", - "sha256": "1wj5wak9vwq0jp2kvw78g07h9k48qcx7jn61yfn1n9rzyigaxa8a" + "commit": "bc5572f796bc3ecafadadcbd93de73052304c856", + "sha256": "0x1lw3cx9vx0l9xr9683p2385msny8dkp2w5l6kfa8imbyclpkp2" } }, { @@ -7819,8 +7819,8 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210305, - 1714 + 20210323, + 1341 ], "deps": [ "dash", @@ -7828,8 +7828,8 @@ "multiple-cursors", "pcre2el" ], - "commit": "948501463dc2c63e133dda3b3ed28f4c81d24d26", - "sha256": "05q98rzhmkjmqfkhxy6g7qaybvgc6ypxvz5yiajwm8gcwwch2han" + "commit": "17a7a9219a5a9b7156f58f7f30227fc2b79b6020", + "sha256": "1jcvz9vy5sz9bysrlg2b9d3732zab8hmg8hg5ghwjx5kgxl2yfzh" }, "stable": { "version": [ @@ -8047,14 +8047,14 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20200811, - 1622 + 20210325, + 2154 ], "deps": [ "fringe-helper" ], - "commit": "4e12ec16d6b896402f8bcdc1cd468d4064a2df6f", - "sha256": "1pdrpvff6hvhjv512z1vkivd848ar5li4p63jnbvl90hp7kpy7c3" + "commit": "733a44bc491d9d28f9eefc2550616e97b1419cee", + "sha256": "0dfd3w3g31fjzqvzn57xw3whr60fy8yj8hnga8b4n9698dihw0bn" }, "stable": { "version": [ @@ -9408,16 +9408,16 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20201225, - 854 + 20210321, + 944 ], "deps": [ "dash", "s", "transient" ], - "commit": "1f38fc34a8c159846450d18b1ee50cc960349ee7", - "sha256": "18m8g9scjllckq1c71z2dl1khgjq02d65vjakxbiyp0c049f40mq" + "commit": "a3b04c0c37b1e8ceff2472e21a3579e64e944528", + "sha256": "04fzskx066v5091467da3plsxkqx3acbaqmk282k8cdaxsnr4ifd" }, "stable": { "version": [ @@ -9720,8 +9720,8 @@ "s", "shut-up" ], - "commit": "d1ee01ba3c06a62e784c3982ad6f50dbabf5c00f", - "sha256": "1fbk6b4jpg9sg886dbd66fmmwawrjzdw564d49822s6vnjhgs0wf" + "commit": "7ae2d54004b26ebb891f7a011c86cff706acbf1a", + "sha256": "1ksw4rcbghjjni7v622cdfd84312fs39xhiyzbk7xmh57clrbx4f" }, "stable": { "version": [ @@ -10238,8 +10238,8 @@ 20171115, 2108 ], - "commit": "225c5e0cbd4704606eaafecb908bcd8daed4c54f", - "sha256": "1k8lx2s61kynhdv43czasp27vxb3bh6kmpsd0caxklk5n6m804rj" + "commit": "9914e9c951e1598bafb6bce8cf5ad5cbe260d290", + "sha256": "1ziq8xq94nys5g95jrng1w33rsmhfi0k3bfbsfh8ifvz2lhd1ai5" }, "stable": { "version": [ @@ -10466,14 +10466,14 @@ "repo": "mrkkrp/char-menu", "unstable": { "version": [ - 20190713, - 1343 + 20210321, + 1657 ], "deps": [ "avy-menu" ], - "commit": "a1ccf5ed786af6e2441037964668d817b9c7362f", - "sha256": "19yl7gmzalhrhr3spi8vs6wpxpv6m3m1d9564naznswxx19sjcjy" + "commit": "d77c4d64fc8acc386a0fb9727d346c838e75f011", + "sha256": "11hls33r3lq46griyvpfnwkgwfwa4adfjzd03hcx2dn5ji0x0yxb" }, "stable": { "version": [ @@ -10973,8 +10973,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210318, - 837 + 20210325, + 825 ], "deps": [ "clojure-mode", @@ -10985,8 +10985,8 @@ "sesman", "spinner" ], - "commit": "32835ea157212c500756ab625ddba4844b029c14", - "sha256": "0h9wwk72gp19fljiv9c18h5qz7ckddqhcvppm9k0vddxy7vhbhv5" + "commit": "4278d7cf0b54af5cc84f4a521ee1ed6e81a96adc", + "sha256": "1538cfygk1yr8nr5axjqa29jd2n8v6mwk6plgvnrdrp1msspcvm2" }, "stable": { "version": [ @@ -11177,14 +11177,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210111, - 2141 + 20210323, + 1704 ], "deps": [ "cl-lib" ], - "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", - "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" + "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da", + "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw" }, "stable": { "version": [ @@ -11684,8 +11684,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210311, - 1802 + 20210322, + 2122 ], "deps": [ "cider", @@ -11698,8 +11698,8 @@ "seq", "yasnippet" ], - "commit": "2c700d76d46c92b9bb068230b27047321868b1fe", - "sha256": "1rnjxsgm6fsip9njdmpmdmlga2isi6kh41xdnmwi3m34i1fzl6md" + "commit": "9f3e7357117e96135de051b78deabc0a327c7b06", + "sha256": "1k9w8bzl92cz0dl7lly6ba3i2vcvdfngqk0abji00pmpgrkla1rk" }, "stable": { "version": [ @@ -11946,11 +11946,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210307, - 824 + 20210322, + 704 ], - "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a", - "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm" + "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245", + "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3" }, "stable": { "version": [ @@ -11970,14 +11970,14 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20200922, - 656 + 20210322, + 704 ], "deps": [ "clojure-mode" ], - "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a", - "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm" + "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245", + "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3" }, "stable": { "version": [ @@ -12279,8 +12279,8 @@ 20210104, 1831 ], - "commit": "9b4390e76be7e46f2031563642f0a1cae5dbf4e8", - "sha256": "19h3gf7b63b8xblyqrdlizzsjpjsg6xi0spp4fsymlhvxm5j2g1b" + "commit": "b22c800604e22a0ffdb13aa5fd4cfb7ee26896a4", + "sha256": "1gf0l4jwhm0xf4j1gnnb8158g8cycv2m2ijxbpc5fhwdbcfdfc13" }, "stable": { "version": [ @@ -12809,8 +12809,8 @@ 20210107, 2111 ], - "commit": "71b72baed2008e38ad1eb6558934e64094351cd7", - "sha256": "1z39lha9jb1bxr1xlyy5clqqqvnafipx0rf8pdjw9qhbjh4kk2x1" + "commit": "1445a556af9da3681ae0e7e7242352e9fe39fe73", + "sha256": "1d6wxzw1wf378jzvlzfsdq5gqq2i196lr8dszj4df472vsiw1hqi" }, "stable": { "version": [ @@ -13250,11 +13250,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210224, - 2244 + 20210327, + 150 ], - "commit": "88001d794d963049339883216b6606de0a1209ea", - "sha256": "097s1zan4xg7vrkcapylcbs0a9ky1wbglxf9sz44aslwzrsgvy1p" + "commit": "7207cb143829edbcaa2a4b4c0011090747d2207c", + "sha256": "017rjccvidcjsc5pbb36hwdssnvpnfm4wjciv75aaq6d5jhj0889" }, "stable": { "version": [ @@ -13495,8 +13495,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20200729, - 401 + 20210324, + 1603 ], "deps": [ "cl-lib", @@ -13505,8 +13505,8 @@ "dash", "yasnippet" ], - "commit": "4da7b41e25943c0e30171ed25c761c5311999f0d", - "sha256": "1pmj4bdpnaydqai9lcxkjyik6yhbqjb2xb1wdfxpv1agzazmfyx1" + "commit": "7423ee253951a439b2491e1cd2ea8bb876d25cb7", + "sha256": "15rd9ga4ydhl6ljzdg26a3kcaqlhaygp67507wrrf8j3801ivks4" }, "stable": { "version": [ @@ -14266,8 +14266,8 @@ "company", "nixos-options" ], - "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", - "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" + "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916", + "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z" }, "stable": { "version": [ @@ -14473,8 +14473,8 @@ "company", "prescient" ], - "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", - "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" + "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", + "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" }, "stable": { "version": [ @@ -15446,11 +15446,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210318, - 1440 + 20210323, + 1627 ], - "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb", - "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9" + "commit": "19540d37783dc34bdb98d7cea24e8bb57090dab4", + "sha256": "0vsgxfxb9bhgncxyhrvxpaan4pwca2vwvpr4qjcgqh1bb147rrkr" }, "stable": { "version": [ @@ -15476,8 +15476,8 @@ "consult", "flycheck" ], - "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb", - "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9" + "commit": "19540d37783dc34bdb98d7cea24e8bb57090dab4", + "sha256": "0vsgxfxb9bhgncxyhrvxpaan4pwca2vwvpr4qjcgqh1bb147rrkr" }, "stable": { "version": [ @@ -15539,8 +15539,8 @@ "espotify", "marginalia" ], - "commit": "031e0e63a214dd089478d60e6d900c1a65851678", - "sha256": "0lmcihysjwmk22yhqmiby1sbj9f67lr6wpdzyz9df8wsmziva26v" + "commit": "b70b4737ece5a081411069eb08103ddbbf8e584a", + "sha256": "1kplm8rhyp5fssfi8pswafnck96m6zjkyvqjcwil459liy8lpw46" } }, { @@ -15856,15 +15856,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210313, - 1108 + 20210322, + 24 ], "deps": [ "ivy", "swiper" ], - "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", - "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" + "commit": "47b496544e238041bca5e3c9ca55848648344312", + "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" }, "stable": { "version": [ @@ -16434,16 +16434,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20201214, - 550 + 20210320, + 1641 ], "deps": [ "elquery", "f", "s" ], - "commit": "2f25d645448d64f2516f8f1181429c35cd214639", - "sha256": "0prhapqan96hha92sjfkhx3dv7zgxbrc7fcm8kk63z38psnx92zx" + "commit": "766b09cbe92cb5b689a36a9c136013a51da95712", + "sha256": "1p5b39574dpw0lljhm4l200if65fjpgnnbqsimf31r0y4rm1pr0d" } }, { @@ -16842,8 +16842,8 @@ 20210216, 1703 ], - "commit": "fa80bfef81168509ddbd840d95c6671efe91c253", - "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db" + "commit": "cb2e2a435ea9f4fa8c7517b4909af8b62bca8a3e", + "sha256": "18dk9623ff2kxfhbdnh4l68n5dfxqgrm6ilmv85dfj685kahd0d3" }, "stable": { "version": [ @@ -16973,16 +16973,16 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210319, - 846 + 20210321, + 914 ], "deps": [ "tree-sitter", "tree-sitter-indent", "tree-sitter-langs" ], - "commit": "d942b2762c72a0112f564af173fa66d2e63903cf", - "sha256": "0g6x85mayjd7cf9b19bsnrbmv32kf75318qx76csa3bqgq309whx" + "commit": "f977800161ccdb58d5650a8ca60017c83863d80a", + "sha256": "1j173ir1c95jhj5671yah6jmz2qfk3sfspl0naz48s0bs2n5bxcw" }, "stable": { "version": [ @@ -17439,11 +17439,11 @@ "repo": "kijimaD/current-word-highlight", "unstable": { "version": [ - 20210228, - 1644 + 20210323, + 1401 ], - "commit": "1d185f88ffe8d5ddc788772c40d37cf7e99a03ba", - "sha256": "1da11j754pgshfibj7w9wixhbzcjzn1iqifblflz2mqgny3nsisd" + "commit": "d860f4e170ffa4cef840da93647f458cc409d554", + "sha256": "1mpimgsqkanvgmdvh9zm0vsyf6j4mhsf65p7kx389as82qb7hdy2" }, "stable": { "version": [ @@ -17463,11 +17463,11 @@ "repo": "mvarela/Curry-On-theme", "unstable": { "version": [ - 20210308, - 1244 + 20210322, + 1717 ], - "commit": "316fad72466cc5bd120a26cf235e9357117230a0", - "sha256": "11gkfccrynq3bk8qcbibinai9l497sij4b4zlizdf8qicjymmkd1" + "commit": "b53a61d443cc75906d9f97e19f19be71f1e19bc4", + "sha256": "1idh5by5fzndaywf86lckz7mxr5kxggbzlgpjjvmahlnma110a1j" } }, { @@ -17651,8 +17651,8 @@ 20190111, 2150 ], - "commit": "0ec9be57f5770869cb2fbe36e00bbde405b3b855", - "sha256": "16qiazp9p24nwaspdyi04jjlvpjpw291c40nvzlnqa2afdk5zwxn" + "commit": "8609e0fa7d361f1392823ff6e1a618720cd62df3", + "sha256": "101nvcjf6x38fbcg8fhg5xryid3plncmj36i7137gnhsn1r9fsdv" }, "stable": { "version": [ @@ -17803,11 +17803,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20201120, - 1520 + 20210325, + 935 ], - "commit": "412f5c80f3da1699ae69b878405fd71e65b6358a", - "sha256": "1icwdkaybs1cpqgvdzvgqickgcpm0ykpr4345jzhc193gfb1iccc" + "commit": "ca13f96e5dfa319ceb7b094ee452ddf55b67905c", + "sha256": "0cyl8g5gbdypj44yk91sq4frkqahpwkgvnk1i3zda79m453dzg06" } }, { @@ -18229,14 +18229,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210306, - 1508 + 20210325, + 757 ], "deps": [ "page-break-lines" ], - "commit": "1327fc36a0ba3136c7ffd3f1a1dda27f196631e6", - "sha256": "1zq3h3zgssvydxb9lmlcjn6wb2kri4jk96w43cl48myq27nsj5ri" + "commit": "00f1dc84d3fbaf439d23645aa531eee59e28f688", + "sha256": "0afn7p79na8351gimmjrj2z4y3slyvsrinm8gx7qphflz2a13m2z" }, "stable": { "version": [ @@ -20598,8 +20598,8 @@ 20191227, 2028 ], - "commit": "cd052dfef602fe79d8dfbcf9f06e6da74412218b", - "sha256": "1zhnr4wkb0gifhf1gfssipanifaiixvz6wqlmscxyp7hdm8xjvad" + "commit": "4ca32658aebaf2335f0368a0fd08f52eb1aee960", + "sha256": "1dwzlxz0q9wqn1az1b0bfl8ywib4nd5grdfqaa06fqd63zlp71pg" }, "stable": { "version": [ @@ -21561,11 +21561,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20210301, - 52 + 20210326, + 1812 ], - "commit": "07dde72b0e356d772fb65b969bd6decfa166e4d7", - "sha256": "17hpwhv0mg7ai90sczb6p4i6fwi9s1i3dsbnmk9rf6w6f5y0r1wk" + "commit": "3b1374563f62d71aec11ebd33d37109459e54571", + "sha256": "1gvsibvg543jby99b7r13x0q4d9n21nl5sh0y2rb7alk0chx3pmx" }, "stable": { "version": [ @@ -21771,16 +21771,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210308, - 1212 + 20210322, + 1517 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "0c2f2f0aa2911880b20b2a7e9a5ba20f19be7e24", - "sha256": "1i367ihnx3vspwx5ly7imj3rmx9f113jmf4i0siklxx0gb7r65n7" + "commit": "00bc89b8ded4c452ccf65edce5dce6f9a1e41611", + "sha256": "1k5qhxjh7h6hwdjxgjb1vxj9kclpli9wrrv350z5f40l4fwzawlw" }, "stable": { "version": [ @@ -21824,14 +21824,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210302, - 1549 + 20210322, + 1750 ], "deps": [ "cl-lib" ], - "commit": "55f01ede533c800e6eb44ef5bdc2fe64d0400425", - "sha256": "19lhvf6gsvpadmx27lswdnl6y93sywn17d7yjbigva62lmr6yq0w" + "commit": "4199e74db170200995ee8dfbb55ffae004d6e219", + "sha256": "0vfhnywww560rf0b7h2gc9w4x4738xwq12c8qi9y267110zg62mz" }, "stable": { "version": [ @@ -21912,8 +21912,8 @@ 20190325, 1917 ], - "commit": "b61df3561ea9bed1848cf69b6bb53f7fdf6916dc", - "sha256": "063jw3b94l43j31piygjcjzqp2gf828xr3da1hd3qimp25c9fsv6" + "commit": "93d9b1ec833a871bde2fd0f78abc269872808048", + "sha256": "07sh6sskzx8cxf2z4z1xjnrbr440974024953m0w7rqm0gn4cb28" }, "stable": { "version": [ @@ -22473,8 +22473,8 @@ 20210213, 757 ], - "commit": "a181b937c20c706f24ba1d17021593b0087ac574", - "sha256": "0g3s4g3lq42c6ca10idxlybwj3pici2v7r9aifyr5q15n2xgpizq" + "commit": "a88ce5bbc996b550071c8df890276eb1b10e778c", + "sha256": "1957i1d2lv9jfd8ck22vj0wd59sk5gd04xi5qbvzw1y9dl9xshp7" }, "stable": { "version": [ @@ -23783,8 +23783,8 @@ 20201122, 25 ], - "commit": "507a694fb778754f3967bf95d9e1c4e446725835", - "sha256": "1hvir0bxlh9jbd3781pdx72hkrrnai6qg56mskl30vdbjv0byhhh" + "commit": "537e2e165984b53b45cf760ea9e4b86794b8a09d", + "sha256": "07cnp40rbl2p4mn40cib6mvby1svxqd8kb3dxb3a8idb736nzqrp" } }, { @@ -23992,8 +23992,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210319, - 2010 + 20210326, + 1008 ], "deps": [ "eldoc", @@ -24002,8 +24002,8 @@ "project", "xref" ], - "commit": "b4ffcf26fb392ed83f6c40bc9b62cbe54483119c", - "sha256": "1lpi249cv61892nl8a0asx6z4dzgyphrh4f5cn9awryyv8x166dx" + "commit": "2fbcab293e11e1502a0128ca5f59de0ea7888a75", + "sha256": "0fsar0ab0wj74jkbgkbigcg4ia6hg574yvqr2wq2s8lw7m22j8c4" }, "stable": { "version": [ @@ -24153,8 +24153,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210317, - 12 + 20210322, + 1150 ], "deps": [ "anaphora", @@ -24165,8 +24165,8 @@ "websocket", "with-editor" ], - "commit": "147940d5d734b22e8dc6fc24d1d7423766ceed0c", - "sha256": "1yjdlghgsm4alrfp6nsfq2wi7ym66nbh1gx3dfsm5c1hr22lx9fq" + "commit": "142ff5078b3074ce3ac8bf90abd8c38d9733253e", + "sha256": "05b4gqxfjap6bhfcxjj6v6kv2bhni5a1mzh9ylril5f81xj323gy" }, "stable": { "version": [ @@ -24663,11 +24663,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210316, - 1921 + 20210323, + 2234 ], - "commit": "d63021046b5ccb129669f1eae60ffc5f48338230", - "sha256": "1mf98cfnmb58bzwrfcg6v1k02mmzwzkig3h61qx779014ayq7v2h" + "commit": "25531186c10b74a10ee24990f9e967296cc70342", + "sha256": "14lk3whvj45ilb7mv60dfpxhbw3jsddglz0mq5vhdgy6n8wkcpa9" } }, { @@ -24712,11 +24712,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210228, - 2242 + 20210325, + 2223 ], - "commit": "47228bf2e4f187dc332301c5e06768b5d36c4392", - "sha256": "0kly9lw34sl3pmcgck2j058fjnh2hkhz9hd009j6s4lj0a1fbiar" + "commit": "a7211e47c1dd543ca5d84b7b85ca205fc6315abe", + "sha256": "0806wzrmcl58rp1gs2d3z0dz68h3jigwi0azf8rypz1fp5dkks7j" }, "stable": { "version": [ @@ -24862,14 +24862,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20201123, - 836 + 20210320, + 1511 ], "deps": [ "dash" ], - "commit": "9856ff8e1351086d0d738c1db300af63d6c085ba", - "sha256": "0wfgz1ry1gqwk941fs4i3z8gq6s53v1fr2lwhsi06hvgs8nxaqgm" + "commit": "ecc59d313dd9ddfc4d6a2a3c7a9374aaf214e653", + "sha256": "0qy8s0vqaxkksplasang3n9bqnq7q43lfyd0jl39nynlrg8avhpc" }, "stable": { "version": [ @@ -25449,14 +25449,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20201216, - 1838 + 20210324, + 1605 ], "deps": [ "pkg-info" ], - "commit": "9de08c17d54e190d220aa03cca58bd41497f44b6", - "sha256": "0v6w2qkw52zrq0wwly0dli7gii2g64194m5169zslfrhk9rymkyp" + "commit": "0212b06f079f4965b6032bbbe7f86876575770de", + "sha256": "0n9b901kzk95r28a17amx25xyffvxbfrxw62sakrn0q3pbq988s2" }, "stable": { "version": [ @@ -25537,8 +25537,8 @@ "reformatter", "s" ], - "commit": "188b9c743d8ec99ff7735d2581999d07f43b5bbe", - "sha256": "0cjjx4mf4lr1rcalzfl52ps91hyc9pvmsgpnfcb6x3akshbjab6x" + "commit": "e9fcf9cc2779cf7f5ae7ee4be339164b26755c69", + "sha256": "05g3r5hc6slaca8g7n6i6bk9lpq9jsb2kv2q5v8nbz96abqg56zm" }, "stable": { "version": [ @@ -25827,11 +25827,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210304, - 1432 + 20210325, + 1219 ], - "commit": "893368d222faf94d0be66da8ab581c47e1c04082", - "sha256": "115wrc8rnslyssh2fwd1mc0a6l942rkjzfv6c4509h95b2xfdp8p" + "commit": "2d50b2861ab0ba6a2a518de44823869fb4b14dfc", + "sha256": "0x0sfim9l5xl4fysy61w7migf504ynnmnraiwisdxl9bap7iraw9" }, "stable": { "version": [ @@ -26524,11 +26524,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210317, - 1432 + 20210326, + 1428 ], - "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd", - "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54" + "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355", + "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8" }, "stable": { "version": [ @@ -26554,8 +26554,8 @@ "consult", "embark" ], - "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd", - "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54" + "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355", + "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8" }, "stable": { "version": [ @@ -27333,8 +27333,8 @@ "inheritenv", "seq" ], - "commit": "a7c6ca84a2b0617c94594a23a0c05246f14fa4ee", - "sha256": "1dpwb5plymb13jv44rdxkg0lrc180076rcvricac6xk33pklsmbz" + "commit": "110a221f8205655a31fa51bffd45e1e9da056ffc", + "sha256": "1zjqkp701nlc0cldqxwj97jflz3imv1nzpq2sqjm4ir45lwp8jci" }, "stable": { "version": [ @@ -28098,8 +28098,8 @@ 20200914, 644 ], - "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299", - "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08" + "commit": "ecb93230ad9327991e542731756cbe1405c85d5f", + "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w" }, "stable": { "version": [ @@ -28123,8 +28123,8 @@ 20210315, 1640 ], - "commit": "ebc70093c3be41cd86da18d2f188ce9648dc287c", - "sha256": "1gvb5p92gnl0lv48wqgls6jyhyzkd7kckklrsmn325s6vnqx72cd" + "commit": "94c9738e10326554af80d128c76e4bded1c7b983", + "sha256": "1vyk87yy9vpscrxvcd0f14fvbd200af0fiwgw26fdd5f5j6iz2hk" }, "stable": { "version": [ @@ -28873,8 +28873,8 @@ 20210224, 126 ], - "commit": "6a0a939ad2b07203e7c66a71b3a348ea06780cff", - "sha256": "1kjywdafjga5rd2way2vafwb0paz2fb2dkg1i5vlsggwhkl7dn6r" + "commit": "b70b4737ece5a081411069eb08103ddbbf8e584a", + "sha256": "1kplm8rhyp5fssfi8pswafnck96m6zjkyvqjcwil459liy8lpw46" } }, { @@ -28986,11 +28986,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210318, - 748 + 20210326, + 1730 ], - "commit": "96ba4876753e7ac592a150f7ee1272747dc693d3", - "sha256": "0drfgzkdah2gpz7ahacbsqh5i1y4znrjgj4hmlwx4ycpcvvixbrz" + "commit": "c101d44bd70a3f51bf546e18e74e98f62f4a3eba", + "sha256": "06b056fmkbvsdzf0l7zywghkax3fqszbkywv822qr3hiwb62lc21" }, "stable": { "version": [ @@ -29154,15 +29154,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20210315, - 1643 + 20210326, + 1431 ], "deps": [ "csv-mode", "ess" ], - "commit": "b642e2e7f4643eadee14c3599f9af399a2f714fe", - "sha256": "1dm4w0cj4sc1ybfmvgapwxlnkbywkfqs79gx13381k99ah0wbgji" + "commit": "283251e8ac19ac0c0f89a4b0f0eb38482167e52b", + "sha256": "0kp94y27csj08868rbiwdfzgjx9q71j7d0whpqhsh27qhc189crq" }, "stable": { "version": [ @@ -29215,11 +29215,15 @@ "repo": "tali713/esxml", "unstable": { "version": [ - 20201226, - 2146 + 20210323, + 1102 + ], + "deps": [ + "cl-lib", + "kv" ], - "commit": "f3d60206eda3cd66bea07c903198d12c4761e326", - "sha256": "1gyydxm1dja4qn9al7b5g9gm7y75qwbn516migxiy20vdzhvksfx" + "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740", + "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml" }, "stable": { "version": [ @@ -29569,15 +29573,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210319, - 1539 + 20210325, + 2108 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357", - "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h" + "commit": "7eace67fc6d1f992e447f216baf9a8b7be634c1e", + "sha256": "13cgja2ss5afrpabz0rlhrh89vaw7dzaf1gh43b3hdbma8gh9li8" }, "stable": { "version": [ @@ -29771,15 +29775,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210319, - 1440 + 20210323, + 310 ], "deps": [ "annalist", "evil" ], - "commit": "2d3d652cb51eeddc6c63ad9cbf251ecbd2f561d6", - "sha256": "15vdi5kynm1gczvdp006zyac96n1q25im9pf2q2n244ph9rzgc4v" + "commit": "b45ec5b3156d27a18a949e4bf55643107a21abc2", + "sha256": "09sxky26kpdxjdc52vpabxq8h88fx9rnarykn1d2a063bpldz2rp" }, "stable": { "version": [ @@ -30337,14 +30341,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210201, - 522 + 20210325, + 123 ], "deps": [ "evil" ], - "commit": "cdb9b90381ac0a225b01fb99472f5b23b612eb6e", - "sha256": "0qf3583w082787hsp5ihj84w8k2d0pwpci6a9ig8qk9f4sk66v04" + "commit": "8c8c94bea899718f393ad041202a355e6f24ea19", + "sha256": "0vygxkvri6363wi3byjd2r23bjyvjkfy58n2kshslaq18z5vylzl" }, "stable": { "version": [ @@ -31094,8 +31098,8 @@ "deps": [ "evil" ], - "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357", - "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h" + "commit": "7eace67fc6d1f992e447f216baf9a8b7be634c1e", + "sha256": "13cgja2ss5afrpabz0rlhrh89vaw7dzaf1gh43b3hdbma8gh9li8" }, "stable": { "version": [ @@ -31696,8 +31700,8 @@ "deps": [ "cl-lib" ], - "commit": "d14d6d2966efe5a1409f84a6b9d998268f74761d", - "sha256": "0jgy17s7gkjpdls8ql8qfpncd5vrwm50i3svmnlqic6ds4mkc7s0" + "commit": "bf4bdc8b8911e7a2c04e624b9a343164c3878282", + "sha256": "0b19lhidn2kvkc4aaa1x634y2biryq85di1iwxdh8070k4j2yw9s" }, "stable": { "version": [ @@ -32385,11 +32389,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210303, - 1351 + 20210324, + 1332 ], - "commit": "2db5c559ca7356189083fb698a053bb1fee922a9", - "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g" + "commit": "38cddb422572ca6f7dc004583bb8ba6a99b3315a", + "sha256": "19c0n5yjannz7sqwmw65j7clvwx6idnzy5lmc01ayghf3w2ksir2" }, "stable": { "version": [ @@ -32860,11 +32864,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210301, - 1703 + 20210322, + 1527 ], - "commit": "b0ce628d253e0fcb648144081535bb8569532220", - "sha256": "0mqfwmqdfm3j4yjcmpwgikblsgfxmj15pagq537ds9yb960myxs1" + "commit": "ba14a7ddc21f8bc2b9bc58abd1655abbe12118d7", + "sha256": "0lypgn8hppivq3w8jddgbyfs7x67xjkbx2j0is96lfdb0zykp9b9" }, "stable": { "version": [ @@ -33182,11 +33186,11 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210315, - 413 + 20210323, + 118 ], - "commit": "50607615352df980dfe99d464f5fd0b3d70a4381", - "sha256": "120182fjalcamijwxvrfgf72f63k5jy1z9rl4arg80bx2682a0pj" + "commit": "595c6ac9d5e5b2dc138b472a40bc85c7f20a56c0", + "sha256": "1fqg4jg3x7vrcap46vbncazzjaj6yan57rdmi2n8xbhmw3jcc8z9" }, "stable": { "version": [ @@ -33532,11 +33536,11 @@ "repo": "mrkkrp/fix-input", "unstable": { "version": [ - 20190713, - 1349 + 20210320, + 1244 ], - "commit": "7aef6fb29840a2f3c7e3c01eeeb7838a0e702050", - "sha256": "0hf4x16fr5z5l2ypp41sw78dz5qpi14pphpbh8zdg4ky5sa8d4fd" + "commit": "10b3aebc3d4411e6889f3428e8f097c0fbf8585c", + "sha256": "0c850rc9nnbvwf1sbp66xk6p246ylrfpqqhh6bcl7lm8b8v0kfzh" }, "stable": { "version": [ @@ -33877,15 +33881,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20201117, - 825 + 20210324, + 1102 ], "deps": [ "apel", "oauth2" ], - "commit": "068b35e863be9245e717e79def55f93580188bc8", - "sha256": "00jkappcri9y9yx35pg1gm1x81qmybkisc06rl4zxi9w76ch4rkk" + "commit": "ddf5b6eceb73d7dbf6ff3a2d5281a2957cc2b836", + "sha256": "1pf7jg0psirjm2s84hcmjxkhd5s8vlgprn1miykxks2yxkvk01xf" } }, { @@ -34178,8 +34182,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20210314, - 2015 + 20210321, + 852 ], "deps": [ "dash", @@ -34187,8 +34191,8 @@ "pkg-info", "seq" ], - "commit": "6e6ac0c50f85170ed47bf1711bc761941b69b325", - "sha256": "1rp53zpd8mi16r7n66hxy3jv966rr3yw9v3d8dsq9lnnyly9llny" + "commit": "f8c679fff349850c80541a31de50009c3c15d4c9", + "sha256": "0v0zyq7zn89j036sp8ijxwpb0n435sf444ki618y7mv77k2qflxx" }, "stable": { "version": [ @@ -35855,8 +35859,8 @@ "flycheck", "package-lint" ], - "commit": "64cf27d69051e02a32e3c517cbfea23f9d2d7557", - "sha256": "0m2bmdwrj7ccf6ndv089qbbrz1msbcgls0ckbbhzpxxq39as2rpv" + "commit": "303f9e0708292937a668e1145f5eaa19d7d374e2", + "sha256": "0xav8x3vs7i8kvvhnq86scahjzv6m9mnpiibapflc995wqs4yq02" }, "stable": { "version": [ @@ -36286,8 +36290,8 @@ "flycheck", "relint" ], - "commit": "86ebb4dac919eda01341b15b9c896742b9d17c30", - "sha256": "1k638y125xyb0bc5i2zrkypwb770jn1ndky6qak31n4ws41xynbd" + "commit": "4d112871b82d5ea6d0d3e4aaacc55a45536707b7", + "sha256": "1plqica209q1x8kzyy4iz97bvd8vqxgv1l00mlf946q201ps7yb1" }, "stable": { "version": [ @@ -36587,14 +36591,14 @@ "repo": "Wilfred/flycheck-title", "unstable": { "version": [ - 20170216, - 2346 + 20210321, + 558 ], "deps": [ "flycheck" ], - "commit": "6faea67be8661faf8152217869d16e993cc2bc49", - "sha256": "08b2cq5bzmq9aa8b8glx5js2nhfpgdsd0r2sgvi0ij937yz8lf37" + "commit": "74e4375f372f7b9ce0fdfa34dc74a048376679ae", + "sha256": "0ivdv7gsbi3p6nzkyr0dl4iw3846dwys9mrx3pbnf9awzrcihnid" }, "stable": { "version": [ @@ -37236,8 +37240,8 @@ "deps": [ "flymake-easy" ], - "commit": "ae58795f948402e987cda4c15f10354f8ec2d0fd", - "sha256": "1hr35xxj6w34h7xs13n6sxs69j3z3i0r1qim3hgyiym797xjsa0p" + "commit": "03b4e5e7ad11938781257a783e717ab95fe65952", + "sha256": "1yayfh4j155fpwybh26w6hvdg1whrd8wmaz8w406s4rqpsw93q92" }, "stable": { "version": [ @@ -38661,8 +38665,8 @@ "deps": [ "seq" ], - "commit": "98e2729b7dfc99607778b07ef03ff994a74c045d", - "sha256": "09c9rmrs8aazmmiq0v71p7yhcgk7ykr0il188xl8qc39m4rky9mz" + "commit": "9b0079c10c73e5f0785a8e727c1240ea9a781a5d", + "sha256": "02qxrq582cmcc6wmflh314z724kzxfp2l31h5b71372lck3f0slq" }, "stable": { "version": [ @@ -39273,14 +39277,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20200514, - 1516 + 20210323, + 1426 ], "deps": [ "cl-lib" ], - "commit": "8f5f6939044b68a97d231b6902ab5ac86744db2a", - "sha256": "15fnn413rmaav9zi8p5yqvim0wblsljfp6xhgsa68zji5y99lxva" + "commit": "5bfeab6c0e13bfefddb98b30b6e60489a1574d8e", + "sha256": "193wbn2y0562gm08yaq8dim1y52vvxvz6vxh3gpxgk95zrr0ll1s" }, "stable": { "version": [ @@ -39943,6 +39947,24 @@ } }, { + "ename": "geiser-mit", + "commit": "a327661f80b577f53ae8874ce9ab499d95c442c8", + "sha256": "1zbisdf8mw183qxx7khlfni31lp6airza8q8vvcp5frz277kk9cg", + "fetcher": "gitlab", + "repo": "emacs-geiser/mit", + "unstable": { + "version": [ + 20210308, + 257 + ], + "deps": [ + "geiser" + ], + "commit": "1caea838ddbbf3d8e0c6f39656f8ff3b445e371a", + "sha256": "0r3ycjcrqbfnlci31bzr7l4nqrfklj839k3ba0c19vfga8wyakfq" + } + }, + { "ename": "gemini-mode", "commit": "4fd0ef91c2a4259d6e4e8833d687b6aeae14e65a", "sha256": "0a0g3rpvcixnch0903jggffv2wa4s9j91mfsga4yrvwlwzswz6rd", @@ -40741,8 +40763,8 @@ "transient", "with-editor" ], - "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", - "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" + "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", + "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" }, "stable": { "version": [ @@ -41724,14 +41746,14 @@ "repo": "TxGVNN/gitlab-pipeline", "unstable": { "version": [ - 20200903, - 201 + 20210322, + 439 ], "deps": [ "ghub" ], - "commit": "ecb3a2277f6a1c7fed73f9381834724c143c85da", - "sha256": "1nqrim3fpgf5npzl14sd0h6dlhi925hns2f75l4arrhbcjgcn984" + "commit": "089400ac1d411a2b58cf1a64f28911079d5c898f", + "sha256": "0zck5488fswqcl7ahknm6nan5al8db73p2jbxnwcv2cxcia81qza" }, "stable": { "version": [ @@ -43547,11 +43569,11 @@ "repo": "jcs-elpa/goto-char-preview", "unstable": { "version": [ - 20200927, - 509 + 20210323, + 332 ], - "commit": "6209973933bec4081145dbcb8e3e442cb29a8c52", - "sha256": "1ckpdgfr7da37fwx9pw0vc8bdcmbpdpygfn8gkwwmz3yjk3021h7" + "commit": "6ab5128c028aac3ae070ba8df041b8039487253a", + "sha256": "0d8dihhl7cn3afwhn09drymm7c5hsf8v2m6rvpq5z7nkskkjw80v" }, "stable": { "version": [ @@ -43634,11 +43656,11 @@ "repo": "jcs-elpa/goto-line-preview", "unstable": { "version": [ - 20210113, - 616 + 20210323, + 422 ], - "commit": "605a182c389b60b11dad0738babc66d227a4ed23", - "sha256": "1p5bpb5870mkfqgx8dqapx6mvfc6h2g8hzngljd71i3b5idlxx0s" + "commit": "c83688ea95b4308145555fea50e953a26d67b1b2", + "sha256": "0hi4jikr5hk4v28790mw1rj1myvr1pwldy7wh3n8bajhqdhbr59v" }, "stable": { "version": [ @@ -43667,8 +43689,8 @@ "magit-popup", "s" ], - "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411", - "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g" + "commit": "7ce0a83a88e6cca59d10df0e7824739854558bd2", + "sha256": "0jhy8flny9dlddw8fhymxm7s5c9sl3yxnqh8icdwb9vhgq754wcy" }, "stable": { "version": [ @@ -44283,8 +44305,8 @@ 20200725, 725 ], - "commit": "1aebf9c36ecfd6523e84fe092faa6ff06ce2177d", - "sha256": "1m86b1x4rkxy1m3q3yj564jihhxcw8ysbfxc38vl75ldnsgvbmy8" + "commit": "98d566db769b865f102a0c6802a08ebce8ae5e7f", + "sha256": "0dh0a2msrbr31lzrp9b0xrp78g4h02qcsxjjzgmqyb6fqzhbr3kd" }, "stable": { "version": [ @@ -45352,11 +45374,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210303, - 1948 + 20210325, + 2112 ], - "commit": "20f72ccc17c8233dbb7c94ebf52a2a59e7d97730", - "sha256": "0lgm5hbzbzb9izpsryvhiygq26cg5dpwmkxbvldikj9scw1dp57i" + "commit": "1baa12abfa2c81128e5b13d1351f2978a4a54b4f", + "sha256": "12lalrjbf018wkc40pqmpc2jrm64avk0smkili4cqkhspcidci8s" }, "stable": { "version": [ @@ -45686,16 +45708,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210318, - 1838 + 20210326, + 1959 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03", - "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j" + "commit": "98af298c517148fbb31774a548c85ecdc1bcf8ab", + "sha256": "0gdi08krvk648fq4hk2b3aiks6plff9cpixghwsgin6rl3k33h67" }, "stable": { "version": [ @@ -45836,14 +45858,14 @@ "repo": "emacs-helm/helm-apt", "unstable": { "version": [ - 20200823, - 1546 + 20210324, + 1929 ], "deps": [ "helm" ], - "commit": "42923e367f6ccc1c94b1a5c070993e0ad96c9ea3", - "sha256": "1q5pxd0vjxqrvk0gf0nxbc9b77xidaijkddh6zz3j7fbjmzyrp4x" + "commit": "c952b5dc26015bc9c947973df99246212d276b63", + "sha256": "0k095s738vv3cgvs1p40ivh68kaslc0xb5kplxp67ic89rg49w9i" }, "stable": { "version": [ @@ -46594,14 +46616,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210319, - 1649 + 20210324, + 1445 ], "deps": [ "async" ], - "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03", - "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j" + "commit": "98af298c517148fbb31774a548c85ecdc1bcf8ab", + "sha256": "0gdi08krvk648fq4hk2b3aiks6plff9cpixghwsgin6rl3k33h67" }, "stable": { "version": [ @@ -48205,14 +48227,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20210317, - 1205 + 20210324, + 1515 ], "deps": [ "helm" ], - "commit": "58dbeafb184cf6a10a1ae3078b37310dd82ad2ed", - "sha256": "1hlqvpb34pq4bmyplm58wsnwfrflp5bf7kzjl8nrsj9fcqr29nbv" + "commit": "48696448e52d266f5b2cb5ee1390071dab4d16e8", + "sha256": "1nhza9af2xfwq1idk4g69kr4wyyf9samk3vi40jvkfnwap4w3ip4" }, "stable": { "version": [ @@ -48521,8 +48543,8 @@ "helm", "nixos-options" ], - "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", - "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" + "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916", + "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z" }, "stable": { "version": [ @@ -48608,14 +48630,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20200311, - 633 + 20210324, + 1927 ], "deps": [ "helm" ], - "commit": "b7a18dfc17e8b933956d61d68c435eee03a96c24", - "sha256": "0sbk8c05v28xz7mdpzrlawn5iwf3hkkr1fj8lsi861l4fhjbmcap" + "commit": "d67186d3a64e610c03a5f3d583488f018fb032e4", + "sha256": "07wsz9hbv83m3k03cxvlr2hxd2lkxx9qpphn9j6axmysi9i5bc8q" }, "stable": { "version": [ @@ -48648,8 +48670,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2", - "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5" + "commit": "bf8039aadddaf02569fab473f766071ef7e63563", + "sha256": "0hmn9yy2d7wy6zz81ddd96rksmvs9k5529dfqrkrpl4v3bn3g52d" }, "stable": { "version": [ @@ -51310,11 +51332,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20201126, - 818 + 20210320, + 1051 ], - "commit": "05a8c5119c717f53e2e9c279d316f04dd744b9b3", - "sha256": "11pa6nlpisaba9db0a8iqs86m4ly93cnd8rszd051dg3av8snx67" + "commit": "717b4f743c633362a8b28c883c454c5ef3711722", + "sha256": "16b1hnxzfygn3pgck5d8m612iwn42bxsx0zhdqrzmjl9sjvvps4h" } }, { @@ -52279,11 +52301,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210107, - 1435 + 20210325, + 2311 ], - "commit": "30072ccf0a49bb47360dce12965db1b1e2f2b57d", - "sha256": "16p7k3lwlykpgrc2pkbdx7z209bzps9ksizjhgbcfbkn67xpavka" + "commit": "81e6651203ef666af4ddc63dc726cfb1443fe16b", + "sha256": "0m7k91kwhy8v602li3rfzmcb4qb443w2iv8qh38ncsl0l6bsc982" } }, { @@ -53664,14 +53686,14 @@ "repo": "bmag/imenu-list", "unstable": { "version": [ - 20210316, - 2102 + 20210325, + 1536 ], "deps": [ "cl-lib" ], - "commit": "b50222378412fbe321622a84cb2b036e084c697a", - "sha256": "1936dd41fa05ndzf2bwhllvjz97iz0rflkazjipr7dvz5q072wj2" + "commit": "b03b86aee6ac30067906dddc385db8188657d023", + "sha256": "0vi4cj6cijra3d0khiqc185iqzhkzillbwnhglxi82r4zrzwnyzg" }, "stable": { "version": [ @@ -54164,14 +54186,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210317, - 1221 + 20210322, + 1421 ], "deps": [ "clojure-mode" ], - "commit": "3e712d9f489313c4097ccc891abedcfb6e1788d3", - "sha256": "1bdz8zsv6vixgvq88vc8mlq729rn105wr2mzjl6a2w9b8zkjzs08" + "commit": "1e99b8246bb1fe7666d613a9ae566e2a939fc2bb", + "sha256": "0bqznd3mn0fd8km5in9k2i87pxcjv6wszdgjp4ajzw742dznkb2f" }, "stable": { "version": [ @@ -54483,8 +54505,8 @@ 20210204, 354 ], - "commit": "13c0135ddd96519ddeb993ee21163d6e11b4f464", - "sha256": "1zwj26mxc4md4ar79pfdi8i4v2qr9bdrqjb8ykal524gqm79xsb9" + "commit": "7e4c8b0d0a43b6f1c6c4d6dbd2f3bf5ce7f20067", + "sha256": "1qc54wx5f1yvap9hxi1k5qqsascxxs9lq317qpzipmbazw7qk7ch" }, "stable": { "version": [ @@ -55142,15 +55164,15 @@ "repo": "Sarcasm/irony-mode", "unstable": { "version": [ - 20201018, - 1707 + 20210321, + 1750 ], "deps": [ "cl-lib", "json" ], - "commit": "76fd37f9616f5c851106654c8fb5eb98670d351f", - "sha256": "1kbskyfw04l8cra6phlxblhkn38p5l6mm2xyjdsxxlfhcc0vwi02" + "commit": "ec6dce7ee16ffaa9a735204534aa4aa074d14487", + "sha256": "0pabzcr06jywa3n4bax8dxxkmb1ffq3cpw1jnxnqpx18h96pfar2" }, "stable": { "version": [ @@ -55468,8 +55490,8 @@ 20210311, 1638 ], - "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", - "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" + "commit": "47b496544e238041bca5e3c9ca55848648344312", + "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" }, "stable": { "version": [ @@ -55496,8 +55518,8 @@ "avy", "ivy" ], - "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", - "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" + "commit": "47b496544e238041bca5e3c9ca55848648344312", + "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" }, "stable": { "version": [ @@ -55864,8 +55886,8 @@ "hydra", "ivy" ], - "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", - "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" + "commit": "47b496544e238041bca5e3c9ca55848648344312", + "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" }, "stable": { "version": [ @@ -56070,8 +56092,8 @@ "ivy", "prescient" ], - "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", - "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" + "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", + "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" }, "stable": { "version": [ @@ -58012,11 +58034,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200917, - 713 + 20210323, + 612 ], - "commit": "8ea90c7927f6d87a291cfb0216f34dacf43c722e", - "sha256": "1ymanbalx41xri5kiqs83a80a72yr9831if6cz2m24pg3g7rwr9c" + "commit": "fe6f6f7a80f8d60ecffa5b2cb43667bb9dc11705", + "sha256": "0afgdga2p7ipdimvi2xncmqxv87x2khg603iifyylfq26wyxscr7" }, "stable": { "version": [ @@ -58123,14 +58145,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20201223, - 741 + 20210327, + 657 ], "deps": [ "vterm" ], - "commit": "c051cdc4ba574039b622fce37a5f61685dcc6d89", - "sha256": "0ixlh640106cdvdnnmr7p6n0c5bg5qzyk9mspylsnlgiws4gz1ff" + "commit": "1d70c7f9fb91654e38fc868baf0ef72399f75ded", + "sha256": "1zhc71vsc7xjkabqkpv3pbf8hippqiqrd3ng1ws4b9fn1kv68av3" }, "stable": { "version": [ @@ -58753,11 +58775,11 @@ "repo": "delaanthonio/kconfig-mode", "unstable": { "version": [ - 20200628, - 1721 + 20210321, + 1106 ], - "commit": "d9fdf751646abe2b75b7bbeb46e7552e0f36f290", - "sha256": "0dhkggvni5k4rnj2m6lva99hj1925b4w24dh9nv3m9w0x7b49263" + "commit": "7d03fa239e6879854c3b26c8e750489eceb58503", + "sha256": "0j07h1g8xcs6lq6gyi594zb353x9igi9k9iz8nci8gy79l3n7l3m" } }, { @@ -59324,14 +59346,14 @@ "repo": "mrkkrp/kill-or-bury-alive", "unstable": { "version": [ - 20190713, - 1340 + 20210320, + 1231 ], "deps": [ "cl-lib" ], - "commit": "7db85a3f3004ff400e24105d1875f4e3a6eec7a6", - "sha256": "02nv6hzzr60gn24ra88smrwmkfjcb33c987dcgxqv7rzjpdjagnx" + "commit": "388067e764bf3922234196e2e9dd9e8f664c634d", + "sha256": "0rxzl3rsa45jq8b8bjirsc6yry95zxlyp81v5r4hkvgyxqhcp3c1" }, "stable": { "version": [ @@ -59442,8 +59464,8 @@ 20210318, 2106 ], - "commit": "3421cedfd83acb9fd0dd15600811662136faa1c6", - "sha256": "103d32iamgharcjnqagm5w63ssj6365mqcxjdrvzarhgsq2gqx6b" + "commit": "09c957050af1c37d381d855ac886fb2aa2896d39", + "sha256": "1lfbl1kvnw09qbcsxks14kj9ya1gsahs9wmgznn100d7nqnjwhsc" }, "stable": { "version": [ @@ -59502,17 +59524,17 @@ }, { "ename": "klere-theme", - "commit": "07a3e348d69738ae59fce3570a61b0cdc565fdb8", - "sha256": "1lgvk6q2853rpk15i91zf917r8wmrb7bnagp4x02fws49x83hqrs", - "fetcher": "github", - "repo": "WammKD/emacs-klere-theme", + "commit": "b6f489036d7d3d171f0ff2613e3192f73c956b3d", + "sha256": "0hqj3jf5l79gf59llx2qy6ml7r5bdwjnm8c7r0qfhyvrk0lp7smm", + "fetcher": "git", + "url": "https://codeberg.org/WammKD/emacs-klere-theme.git", "unstable": { "version": [ - 20180415, - 1823 + 20210320, + 1912 ], - "commit": "c064f9e5c44173c239fce239a62c8d5e61827672", - "sha256": "1rfdk35k1cj1z5gnsckcy93mqgj1amqzb13b89k11bnzc2m6r7zl" + "commit": "f9eacacc00455e6c42961ec41f24f864c2a05ace", + "sha256": "10a84q8ilzs5b8f8yf2awlyfa8v3s6gr1lz459nlnkq9fflxwdj1" } }, { @@ -59727,8 +59749,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210222, - 2212 + 20210326, + 2053 ], "deps": [ "dash", @@ -59736,8 +59758,8 @@ "transient", "yaml-mode" ], - "commit": "0c118987feee05059629073228d966502f5d0e93", - "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs" + "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790", + "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8" }, "stable": { "version": [ @@ -59769,8 +59791,8 @@ "evil", "kubel" ], - "commit": "0c118987feee05059629073228d966502f5d0e93", - "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs" + "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790", + "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8" }, "stable": { "version": [ @@ -60086,16 +60108,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210312, - 1104 + 20210325, + 1344 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "3f2d0e95362c3ea9ed78f32fcb3d310c2366df12", - "sha256": "1898ixkcgmcwzfxl4cpjdc9kim5s2a5n2s7hi6xqzccqx2mf4brd" + "commit": "5a3c307928438afec317bbb88d56fd67ae89f87c", + "sha256": "1y3szymdb8xf6kv6g9hlmf89bcy3r8c1qzf9gh968yml2gqzrfhb" } }, { @@ -60843,11 +60865,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20210318, - 26 + 20210322, + 2306 ], - "commit": "3c53ecc4fd27736560db7a64587e516b26521d61", - "sha256": "176h5n3azjqyp63map0224m01jrqzmjy4g9cdh00mna5p2n1lbwr" + "commit": "32fef097970e66b6cc75ee8233a7edaeee6431df", + "sha256": "1yv2lb3wpnck5ig8n4z7nwlksi6frnfjlh6fqslwqnxyz5n3xsr0" }, "stable": { "version": [ @@ -61403,8 +61425,8 @@ 20210303, 1751 ], - "commit": "46827603dc28320c359ca30364778f24f66ea6f4", - "sha256": "1jf6cfp26n7k2hr30sh16x7ijd1pig0g4krzmv5dpgw0m5v1ba6f" + "commit": "cadaa46a6eafa305e9b176f6decc649708e6fec9", + "sha256": "04imm0j7d8f7xcfbha8vhyf66hsq1sv0y3r1i582r91psrzhlai6" }, "stable": { "version": [ @@ -62043,14 +62065,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20210227, - 1744 + 20210324, + 1547 ], "deps": [ "s" ], - "commit": "55494982d21de36c182b41896e1ed571bda69541", - "sha256": "06r7d5zgavam9jdnffnb3gznx9k5347dlwc4yj1knhfnphzzvl7a" + "commit": "211eec1e8b03503a53fa3eb4528375f36972f759", + "sha256": "1kawczbjdvjzyz3fflp1ij0vi9qcrl0yhrv7knx9j1zh187jp7z7" } }, { @@ -62989,16 +63011,16 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20201113, - 2220 + 20210320, + 913 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "c70ee8b54357c56d1b972393ee53e57a2e545fbb", - "sha256": "01klra1yr3jk2fhk1s07ziygkfvv5qxgi8v30i8z13v5v4vi5mfx" + "commit": "515e5977b3d1f6cb521984f084868f28efd47e72", + "sha256": "1m05c80bf7d7kkk58c91c2f3lyln0wh6mvxbyi856fh1clb5gv13" }, "stable": { "version": [ @@ -63219,8 +63241,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210319, - 1818 + 20210326, + 1728 ], "deps": [ "dash", @@ -63230,8 +63252,8 @@ "markdown-mode", "spinner" ], - "commit": "726ba9b174be01ca84b850428c41b6f3b3dfc9c9", - "sha256": "15wmb3bapmkvg21dqhv6v3xjx1iaxbzbjxf0las6a87dyb8qz1gn" + "commit": "7d72c9e79b17bb96477326bc97a9251bf64eb0fb", + "sha256": "0ngz46b1b4zilgbf90ghzcni7qz9qdwhmng4jpdqs3hv9a4n5c15" }, "stable": { "version": [ @@ -63537,16 +63559,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210317, - 1358 + 20210326, + 507 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "784e6d4bb72c6ad1338f3c62d88e2e95056f236f", - "sha256": "04xv0v8l6x57d66rlk4ibs9m59hvliv35ikmiz1dygpdn3ili9zh" + "commit": "1dbea9ff206a626d5c2d735e3f8fcdac59827963", + "sha256": "175am5hycgxmd4329mnwgcjfpyycxyjip5wl96n297zxnb4m94wb" }, "stable": { "version": [ @@ -63885,15 +63907,15 @@ "repo": "nbfalcon/macrostep-geiser", "unstable": { "version": [ - 20210222, - 1552 + 20210324, + 2141 ], "deps": [ "geiser", "macrostep" ], - "commit": "4409d0f6834e0429c42e0675365bc58284312ad1", - "sha256": "02ydl3lfm269bi7dczkqsk6rbcdir759gd0nk7f477aw6x03hgwf" + "commit": "8600fca05fd12a2e0ffe63238ddbfcb37c285dac", + "sha256": "1912hxbb7mbra91vjw1fnzbb4fd9ri59lc1hcrw196c7a4hzgv0y" } }, { @@ -64009,8 +64031,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210312, - 1012 + 20210326, + 329 ], "deps": [ "dash", @@ -64018,8 +64040,8 @@ "transient", "with-editor" ], - "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", - "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" + "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", + "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" }, "stable": { "version": [ @@ -64365,8 +64387,8 @@ "libgit", "magit" ], - "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", - "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" + "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", + "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" } }, { @@ -64520,8 +64542,8 @@ "deps": [ "dash" ], - "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", - "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" + "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", + "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" }, "stable": { "version": [ @@ -64595,14 +64617,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20200519, - 418 + 20210327, + 350 ], "deps": [ "magit" ], - "commit": "8eea04c10d116057d3d4f249e6a184d5ed090263", - "sha256": "1m2p317xkbhfadba30m8lq01k543368ajbxid1v9627slgkcjf89" + "commit": "99cb9c0501f0f1ea7ec3ebf0fb398f3d36cddafb", + "sha256": "189c4hrgbrwx44nidf4xv30yyb2y7lid57by0fn9hyi21nbk2gmx" }, "stable": { "version": [ @@ -65310,11 +65332,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210317, - 1054 + 20210324, + 906 ], - "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f", - "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh" + "commit": "5ce5a0e6d23d92391167a49d994f093764ee0dee", + "sha256": "009ki4m5i0lvh9ml2jz93j4sbjab51c4qazz1858mq888hldpwr9" }, "stable": { "version": [ @@ -66380,16 +66402,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210319, - 1657 + 20210326, + 1659 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "a3dbefc07f897fb09124d8568272a31791657898", - "sha256": "15969wbd9wqryi2q1f3n21c732m0my5rp9lc3v4xa4w288s1m21a" + "commit": "28b9f855f175b390cb00c35a0e55cc50725a0938", + "sha256": "12j1l48ahipw1w10kqg54ikfclib8a178cg9q6k9sn2q4v9bx0j6" } }, { @@ -66403,8 +66425,8 @@ 20210129, 1443 ], - "commit": "5dae97414e4e4f68a9d71d79362e03416bb6e6ce", - "sha256": "09c430k88kwvcni1v68ncvnf5pdpp236ij8k6vf5rnm5khki6vj3" + "commit": "cc17ed60630fb1831ad950fe62970b1c7a7f4c8b", + "sha256": "0mfvxg74h9mcs8pp9p3m498vflnpncvsa514qf36kajmbdbxn0sk" }, "stable": { "version": [ @@ -66452,14 +66474,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20200819, - 1759 + 20210327, + 7 ], "deps": [ "f" ], - "commit": "6ec97ab934023a8aa094705bb1c9803fd85d24c1", - "sha256": "1hhpihmacbam3fgk7pjlzn7hnakz38ksds052nzirvw6a68ynzgk" + "commit": "b8847cc15eee1a7e3c7e0eefc91f2296256f84b9", + "sha256": "002bv1z8hr5h30dp9m8jq0h8lzi668lj2asx89jigfsrz4z6k4kg" } }, { @@ -66470,11 +66492,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20200907, - 743 + 20210321, + 1136 ], - "commit": "d995dafa388ec03c0113cd1ac46403c20ad18ab0", - "sha256": "1swipsr9j0r2rpngz0dwykqnbs84j3pspx70dxmqyjm7qqabypnq" + "commit": "88717d5256d4cf47a85756dc5e204ea23eec165d", + "sha256": "1y8j8qgy6pw80ja4ppzkdrcnq3k6qwzc1i81g7399rkpbj62kd53" }, "stable": { "version": [ @@ -67428,14 +67450,14 @@ "repo": "mrkkrp/mmt", "unstable": { "version": [ - 20190713, - 1347 + 20210321, + 1829 ], "deps": [ "cl-lib" ], - "commit": "d7729563e656a3e8adef6bce60348861ba183c09", - "sha256": "05f218f0lncgx2bbipjz7db09rrka8fq0qf5qkvbgssagxyl7rav" + "commit": "05cdbb643469676b91a44badecf84deccb50f262", + "sha256": "09zlqx9xrcj80vdd07yz9gzq5p8mayjlqkrcv7c8vm5wn5dl3gnq" }, "stable": { "version": [ @@ -67802,11 +67824,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210319, - 543 + 20210326, + 1916 ], - "commit": "121aa48cadd9ab3fd64f5cddc057bdcc94dd7383", - "sha256": "1aqsh0qbk0rkcfznbbhhja3whl6xygij89kdqlzc4az0kj43l2jq" + "commit": "e07461ca01b04a6536961eb538769f9889813852", + "sha256": "18gwyy5an1k9pf9n6ccygs4k7nbrv6scp7wyvaabayzxqv50lhsn" }, "stable": { "version": [ @@ -67829,8 +67851,8 @@ 20210308, 1053 ], - "commit": "d432815230f4e62d3f38a0819621ff227f780522", - "sha256": "1gfqx0xvxyyf35yngc5sgq7xb42xxv8wzvm36sgg2qqlkgvrh6fz" + "commit": "b23975ba57a68f69551424552f484227db8a7b97", + "sha256": "0vr02ng574k1xfykxn2j2xhl78x4zsvzcszswqjrlps55bvxkm7b" }, "stable": { "version": [ @@ -68158,11 +68180,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20210318, - 1137 + 20210324, + 825 ], - "commit": "9d3170f60dd188bac2d0304daf2a94bec9bfbbd3", - "sha256": "1fc20zglhv48aiy5vl8y6vlk3nimwgfzajx8pq4n7jga3k7cp0q5" + "commit": "f94cf84138a81212ffe856599834f7824a1b6e95", + "sha256": "0rdvcv8hwrxxbb9s8sfx5331a08kdk28x8chnnq3pj58pxqvagy3" }, "stable": { "version": [ @@ -68493,8 +68515,8 @@ 20210306, 1053 ], - "commit": "8ad7b19d89e65ec81c78204986088154d8702309", - "sha256": "1m4vnwfr04cr3rbg7cny49spz08c09sgm8zpq99r510xn8xxs7vg" + "commit": "473a26ccd17304f6c64eaac8c61090659bcdb936", + "sha256": "114nimj1q9dn18in2bdzkswkxd3rm0xxzxiix4jv6hzhsm8rznw8" }, "stable": { "version": [ @@ -69339,14 +69361,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20201215, - 1559 + 20210323, + 1128 ], "deps": [ "cl-lib" ], - "commit": "a9d7764f80b241978f3d4e76bc981ef10bab5d70", - "sha256": "0r5dgzra3wimny5kaqhkfj1723mbwsdjabi26jp77hxkrhx7v905" + "commit": "7b13b03c995e13ad86e499d40ec49c4dc281f889", + "sha256": "1fysnjbh0dai1bzx4122fp4qhbyn82m8hh3smd0xhwphjwrbnl57" }, "stable": { "version": [ @@ -70797,8 +70819,8 @@ 20181024, 1439 ], - "commit": "ac0fe07d9e924661c6c443f4a9503d4f4308fb20", - "sha256": "06ifnn51pqsjx958rj8wwkq3dpw2gsfnqhhlfc27frf9zjk0qdwh" + "commit": "8cd25aa78c2ff2ca8b3712f8c3630d1a095856d9", + "sha256": "0qq1p2pjpnvhrblbsh80k43ksrzb1nw48gw8srw32vih91pv02x5" }, "stable": { "version": [ @@ -70920,15 +70942,15 @@ "repo": "travisbhartwell/nix-emacs", "unstable": { "version": [ - 20191126, - 759 + 20210325, + 1622 ], "deps": [ "dash", "s" ], - "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", - "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" + "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916", + "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z" } }, { @@ -70957,8 +70979,8 @@ 20160209, 1841 ], - "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", - "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" + "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916", + "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z" }, "stable": { "version": [ @@ -70987,8 +71009,8 @@ "deps": [ "reformatter" ], - "commit": "213251f82a69edc033766ec96948e83aeb428cd2", - "sha256": "1hx13p9rs33j2ajbg0dp6a371hr0dcxbcyzr5xlvkg6gf746lmg8" + "commit": "0df268136d14f27770fa5bb3bdb991e987337cf4", + "sha256": "137hvv9ry2h5975v06x22bdirdn7ms0gv216wkz6y68897k7hv3p" }, "stable": { "version": [ @@ -71502,8 +71524,8 @@ 20210205, 1412 ], - "commit": "13efbd0e1c88fcbdb48b4c30c7852c5bf1fbd0b7", - "sha256": "0xc06vqyqpkbq6hd00vdcwxk74mraxmbswin3j716iyx5j7hk7wc" + "commit": "4e209ca99ac8084a357c6fc8d7773f6207cfa16d", + "sha256": "07ygvb6skrz0vxvvswjf35qdgps2p8cfhmjxqprkj1x59k7dvwi6" }, "stable": { "version": [ @@ -71612,15 +71634,15 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20210228, - 2125 + 20210323, + 1105 ], "deps": [ "dash", "esxml" ], - "commit": "b6138895ace3042ed78140b6f4859e544fbca27e", - "sha256": "03knl5zch59r1zrk2kvricvirp6rhcdiywny3n9cmbv653gjzyvi" + "commit": "b3c7cc28e95fe25ce7b443e5f49e2e45360944a3", + "sha256": "0va9xjrq30cv5kb59a4rq5mcm83ggnv774r8spmskff3hj8012wf" }, "stable": { "version": [ @@ -73242,8 +73264,8 @@ 20201204, 945 ], - "commit": "585b139f3dee1f801edbbf6545891232119c9087", - "sha256": "15gfvnkqzixwvq4jq8w6y7v7lyd2j8gca62hap3rsh6c41b8ls1p" + "commit": "448ac7c1496e2a6e83d63a7bcd9cf4e35bb2b1fb", + "sha256": "0rgh3c17h3k5bj897by7v64xbpf9pqpkg1kicka3w4g8gc0mb3v8" }, "stable": { "version": [ @@ -74128,11 +74150,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210227, - 1543 + 20210323, + 2341 ], - "commit": "9d5b95f40275dc47a57e9d4ee9b9994ee3a4b426", - "sha256": "0ksjvi257m6ij7dd40rjc106grxi727717w8k58h3i5l6f03w70f" + "commit": "44935d8962be5724d8a3a4358ce0a4222450ee26", + "sha256": "1f76k6cp0m6r47s91za3sad09vrka41x9vwxh40bi9achwc3538q" }, "stable": { "version": [ @@ -75418,28 +75440,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210226, - 1636 + 20210320, + 1023 ], "deps": [ "dash", "org" ], - "commit": "5f9ac60cedb0be935c2b7ccefd484c0a378bc9d9", - "sha256": "0xbxfrrbcklhji6j99hvz7j6k6hv60cjvrwnf5kq3af1wy0kiayg" + "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6", + "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h" }, "stable": { "version": [ 1, 5, - 6 + 7 ], "deps": [ "dash", "org" ], - "commit": "f7e6dfb349e5c93a134f1d6badacd504b5b345ef", - "sha256": "1h65qa0m3p999pbhw9z98pn7bnz1qczsfybp3zr0g66mi7qqbalq" + "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6", + "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h" } }, { @@ -75474,30 +75496,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210226, - 1635 + 20210320, + 1013 ], "deps": [ "dash", "org", "s" ], - "commit": "1f029b28b817dcdc7d1deb734a087ba08e66c6b5", - "sha256": "04qcdf3knpxjjp972skdqgdh56bhh8frvljw1zb5wnln6byvqxr3" + "commit": "47dda7d3dce11e8ab9a3847f8c6a1cbb8345f861", + "sha256": "1s1y0xlin1yx716awzbq6lvzz5c3c5i9qvacgm006bypg8qlmz1a" }, "stable": { "version": [ 7, 1, - 5 + 6 ], "deps": [ "dash", "org", "s" ], - "commit": "c8998d4b81879c757cc2825200543921e0f6b637", - "sha256": "0cjpvcwfiaanaii91937907nsfadwnnlaq16yx79xk8gcvbrx1fg" + "commit": "47dda7d3dce11e8ab9a3847f8c6a1cbb8345f861", + "sha256": "1s1y0xlin1yx716awzbq6lvzz5c3c5i9qvacgm006bypg8qlmz1a" } }, { @@ -75557,16 +75579,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20201119, - 154 + 20210325, + 424 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "df45be17fb66490f625b60c99d9954e614885101", - "sha256": "1hsfkkm3ykdf7n8a6k0mpzilhjpy7vllwrl2s4rfb9mhnaq5yb8y" + "commit": "7beb2023c36106aefe1a260a7618e285d52eb0a1", + "sha256": "0srn5z0r3g8mjb8pibwipzjm5p3w8dwzldfdmlyli1a6akcinsxv" }, "stable": { "version": [ @@ -75591,14 +75613,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20210204, - 820 + 20210326, + 1207 ], "deps": [ "org" ], - "commit": "f4b15499135d43e98244dda4606a5b97462b3f39", - "sha256": "140wfvj2cygpip75w60difg9gwvh5c53ds6zbysnj5zqsjm4zica" + "commit": "043bb9e26f75066dc1787cdc9265daca7a14dd4e", + "sha256": "0x4fvxdrllih2n643v3wgq0rl72dyhk11xqi2l1h718iaz4kqi5i" }, "stable": { "version": [ @@ -75982,8 +76004,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20210228, - 542 + 20210324, + 1820 ], "deps": [ "dash", @@ -75991,8 +76013,8 @@ "org-ql", "s" ], - "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2", - "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5" + "commit": "bf8039aadddaf02569fab473f766071ef7e63563", + "sha256": "0hmn9yy2d7wy6zz81ddd96rksmvs9k5529dfqrkrpl4v3bn3g52d" }, "stable": { "version": [ @@ -76114,6 +76136,27 @@ } }, { + "ename": "org-notifications", + "commit": "cd49aa8b5692ce460f3a3e9f6310f82665de4a47", + "sha256": "03gbdn1igdhna7kpcvwwf21mkyp94fwv1glsajd1l88r1a9n3dss", + "fetcher": "github", + "repo": "doppelc/org-notifications", + "unstable": { + "version": [ + 20210310, + 1149 + ], + "deps": [ + "alert", + "org", + "seq", + "sound-wav" + ], + "commit": "41a8a6b57e11a5b676b03925d473066655364808", + "sha256": "1fb4jm1zhfllzzrdbasgp1r3ggjs3xa4pfd5papi6mfcz9ypxqsh" + } + }, + { "ename": "org-octopress", "commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b", "sha256": "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw", @@ -76772,8 +76815,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210315, - 1730 + 20210324, + 1337 ], "deps": [ "bibtex-completion", @@ -76788,8 +76831,8 @@ "pdf-tools", "s" ], - "commit": "7b0ebdd2e34b3a509c7f043cb9d919a0069491c2", - "sha256": "1r1p2k9x5sddxr8cf5ds3hqz2xn4zvy9zabgyr63s16cl7hhn2lg" + "commit": "3ca9beb744621f007d932deb8a4197467012c23a", + "sha256": "1n262rsmil2n7dilf711gs8rciv8gd7wf3vadb0zcbkbn703jbk9" }, "stable": { "version": [ @@ -76955,15 +76998,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210316, - 840 + 20210322, + 2231 ], "deps": [ "bibtex-completion", + "org-ref", "org-roam" ], - "commit": "81b6fedf99996a78199067e61935964dea9389ee", - "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9" + "commit": "ffe0cdbcfd7421c10268fb3437fc5bd6ceadcbd2", + "sha256": "1a9k9nxcqzyfip06m59la1rq8siswhg9zys3y6i3iz5wfy5vd0lk" }, "stable": { "version": [ @@ -76987,8 +77031,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20210312, - 1125 + 20210321, + 1040 ], "deps": [ "dash", @@ -76998,8 +77042,8 @@ "s", "simple-httpd" ], - "commit": "a9051e03a2fc3744aa6716ebb529142caa0af2f0", - "sha256": "0199ri3xabrc7xy746s0f87y6vy9hw90ylw5pj7ha29xvcrfh851" + "commit": "2122a61e9e9be205355c7e2c1e4b65986d6985a5", + "sha256": "05fh2065hl17vqsph5kgraaq303q2j48aqvll2mdpl666rhdlws8" }, "stable": { "version": [ @@ -77335,11 +77379,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210306, - 1316 + 20210321, + 2008 ], - "commit": "ea437f80de87ea72deff1d420854bd2c011ef4e5", - "sha256": "0y6i2cc99x5cl8ylyfarim1pka5cy4zqmv2m4x2s9bsar60nwmii" + "commit": "e0265c97dd9d014760eb6280be6c8bb81793cdf5", + "sha256": "0g0mwgc5mrwchqj679b8jzxn2j4pfnysyp3xlpx41gk24hakpfqh" }, "stable": { "version": [ @@ -78066,30 +78110,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20210226, - 1635 + 20210320, + 1019 ], "deps": [ "dash", "org", "s" ], - "commit": "866010a4391d12c9c1968a74e396d9b0ffa58d78", - "sha256": "0s4xkzz39xd4cdfb325h1d3nwpp4nzfzn9w1wjfpgz9n5mrpmhvp" + "commit": "f5512304dccc152816f9957f5627c814bcb0f683", + "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv" }, "stable": { "version": [ 2, 4, - 3 + 4 ], "deps": [ "dash", "org", "s" ], - "commit": "8e22ffe59d241a0f43395f2cd88589ffb0c7db23", - "sha256": "0vcawnrj5ap3h0cy5h1nsiki41scgdhxf83adnvv3lj6gwif1l9a" + "commit": "f5512304dccc152816f9957f5627c814bcb0f683", + "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv" } }, { @@ -79304,15 +79348,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20210115, - 2234 + 20210323, + 2145 ], "deps": [ "htmlize", "org" ], - "commit": "38b83ac6a70e9f1bc5cefb79a3b4e5397d11e467", - "sha256": "140yj6z9bz7i6ap7m9b465ambsczmx43zjp7887qjf77zbnf152b" + "commit": "2095537695135c7f1bc19db043925eb7d482907b", + "sha256": "0pingsmmdpw9g88rri7rkw8ajp1f982vx9rh97nfn51ppr94ihbw" } }, { @@ -80237,8 +80281,8 @@ "deps": [ "cl-lib" ], - "commit": "af4f87beb48afc3fb455c58648749e5bfdda1d03", - "sha256": "1cn61si2dn60pm3q0d0yjlrsfbns2v51zsdfl52rnfmnrhnl3qjl" + "commit": "0f13dd6655f6d4ff71b77c6d2c93727e5f43b254", + "sha256": "0l4qwz2s63r26y5v02yrpncjdiyspw7pill0bjjlcawvxffykw9i" }, "stable": { "version": [ @@ -80275,15 +80319,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210227, - 314 + 20210326, + 241 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04", - "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz" + "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4", + "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl" }, "stable": { "version": [ @@ -80312,8 +80356,8 @@ "deps": [ "package-lint" ], - "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04", - "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz" + "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4", + "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl" }, "stable": { "version": [ @@ -80481,8 +80525,8 @@ 20210104, 2224 ], - "commit": "69caea070379f3324c530e96e06625c3cd097cb9", - "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" + "commit": "3b8549cd414d4d7ee0168ab9917124133566d3db", + "sha256": "1jdr9rl90vs78pjdnxcl2igc1ll97ryxxgbyqxzkhbivixi4v87n" }, "stable": { "version": [ @@ -80971,11 +81015,11 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20210308, - 2025 + 20210325, + 1714 ], - "commit": "c19374a3cf9ce57a356a044731063040c552df32", - "sha256": "04mghs7wn6ml8nr75pvqzzrjljv9d5252j4qkcg2llbpvhkya75h" + "commit": "f130fa04ec75131686872f24a253d0a1d5522fa4", + "sha256": "1i85c00cjvj79i104xswg5xjz7wkvcgar04fgjc9zphrihnp409x" }, "stable": { "version": [ @@ -81273,11 +81317,11 @@ "repo": "juergenhoetzel/password-mode", "unstable": { "version": [ - 20210214, - 1905 + 20210323, + 1816 ], - "commit": "ed4a4bedbdd920aad486009932495cb6ab70c3e6", - "sha256": "1xqsrvnqcfmlncqbys21p8pzwxl064lzgs5qfb2m6w0p9ipblkjw" + "commit": "114b721ebbf384b6af6fd46797e83896a9e14aca", + "sha256": "1zwc3wk770plfwlywqwiviqv9hiskf3fsl2nv9zp4gmvphzrqvql" } }, { @@ -83020,11 +83064,11 @@ "repo": "kljohann/pikchr-mode", "unstable": { "version": [ - 20201212, - 2228 + 20210324, + 2125 ], - "commit": "dd4bb08f189c96039128dddceba26bfdabd1431b", - "sha256": "0w964qn9qag4pfwrs9pyv226ivmy1lw4s068hyi9f0jkm2fhd2za" + "commit": "5d424c5c97ac854cc44c369e654e4f906fcae3c8", + "sha256": "07qjz0mzl6cqgavv5sc9n1v7zq5q6f8is6nn126v0zk6rskp366q" } }, { @@ -84692,11 +84736,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20210319, - 31 + 20210326, + 2042 ], - "commit": "89ed8ab2da330ffefa0d32ac34491467fc6be228", - "sha256": "1n9raivjdsh0nrn0npw2357j72ccqb19mpnmg4cq5qj5q1if2f8v" + "commit": "096078acea59df6109906641e9dd44893ed4f6a2", + "sha256": "1cvb40ad3zazfqjzwqgz4bnn9a2pl8yi52b0qfd56ccp32b24n91" } }, { @@ -85236,8 +85280,8 @@ 20210227, 600 ], - "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", - "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" + "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", + "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" }, "stable": { "version": [ @@ -85946,8 +85990,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20210218, - 831 + 20210325, + 2120 ], "deps": [ "f", @@ -85956,8 +86000,8 @@ "projectile", "rake" ], - "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d", - "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb" + "commit": "f1fe6e8eff485dc560e6ffe7f0b9c46a61509a58", + "sha256": "1b9wsn6mm1ajh81f6bmp3ajxch3j05bzslzxjakw93gjg69w74y1" }, "stable": { "version": [ @@ -86277,11 +86321,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210317, - 510 + 20210321, + 2132 ], - "commit": "56ee4ebc97e77da7d61eaa7b00580bf4ef5b87d9", - "sha256": "0hqmsqb6q2m0gq52lfm64xh8sc9kc48jbqr2w0vd6mp2467afj42" + "commit": "f0f0476d07401aba2cf428a71f7ee960cd1b3154", + "sha256": "1h6bwk1l3fm34xx8nbwh2s3g8ab5zbnx1givgaf64hf3z7r44xic" }, "stable": { "version": [ @@ -86384,8 +86428,8 @@ 20200619, 1742 ], - "commit": "617e2556171d5db4f0c13bed56a5010d08fc3b4c", - "sha256": "0blmqy1jh2c536lwrksrbndmy0za6dxafkww28wkfhs64s9dqwdm" + "commit": "aedb8d726c8d2a371d999354d44ca7e1bdbb1e73", + "sha256": "1qw9mmkxrv78062zw8bvrhp4nc4mhz8j76j534flvdy5w5cwv38q" }, "stable": { "version": [ @@ -86627,14 +86671,14 @@ "repo": "nbfalcon/ptemplate", "unstable": { "version": [ - 20210204, - 1306 + 20210324, + 1446 ], "deps": [ "yasnippet" ], - "commit": "0d03fe3b2c608ab31bda309ef8e7a7d076bb0069", - "sha256": "18lb3an90py39lmxk05fw5ppxa3xqrhck2qz27a0zaxvd6y3hqmx" + "commit": "b81cc7be8865745c3a60177a244d2a69729ab21b", + "sha256": "1j6lgb7knnnydyd1jryai8vlr7i5jc2d7l693yyhs79jdypzss4c" } }, { @@ -86645,14 +86689,14 @@ "repo": "nbfalcon/ptemplate-templates", "unstable": { "version": [ - 20210222, - 1555 + 20210324, + 1443 ], "deps": [ "ptemplate" ], - "commit": "f65acbb4991470cb5ae513c9f2a8197ead297704", - "sha256": "094qxh06jibc6kxs2fa5cw1xmj8mf7ykgdw02qpk0rjmczwns9vs" + "commit": "3788387973dde3101f9a3f2064572be033c59ad6", + "sha256": "17jc7gjawbj7b5v2i2jfxwnjgi023xrr28dyigzv6yw72fzqcnlh" } }, { @@ -86844,8 +86888,8 @@ 20210109, 244 ], - "commit": "8410baff69ba934b64d78340c7fd20aa1e67dbfb", - "sha256": "1gc5rg5rggljmcfz93kz03fy21455nvp7vz79pknqyf8k67aah4h" + "commit": "0acd1af446424ba855153161fe07a20f67dc0a89", + "sha256": "0rxdsmx8826az4blhnnvqrx7bjky9hwph6gkyrh33sck26xhh3g5" } }, { @@ -87392,8 +87436,8 @@ 20200503, 1624 ], - "commit": "cdfc8374b1b0ee88af0463bdbe58299186244d53", - "sha256": "0657491d55x4r4fir357l372pxz7palj60plsk7hinir3db9q7ri" + "commit": "5d5f65727829240ffcb84b7be8c5d1e4dcefa0ed", + "sha256": "1j4a7fwbsyjsz0lh7vrw2kyw8khqbaskzqnx03a91br8q3dv0xba" } }, { @@ -87764,8 +87808,8 @@ "f", "s" ], - "commit": "e0e5cc882f2f1316268ec461a34d4be8abc313b7", - "sha256": "0hbvy8wdi5dgxn86j8z54y2fhcvm605xxm6xv054nl6fw2hh2h5h" + "commit": "fe75bc17baae314bf8f5e0b12aad3fccfc6c5397", + "sha256": "1g5mfn37d01259s2xii2d41027xpif4czxipq4sa7d6sfyq50h7h" }, "stable": { "version": [ @@ -88116,11 +88160,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20201130, - 952 + 20210327, + 141 ], - "commit": "80087806741a4d7fd5ce0f74c8e27f4779a737d9", - "sha256": "19i07v4m3rss9ici3j5iayn717kbr8pmxss5iinzgdf4bi1yx293" + "commit": "57db985c6d293747dc8c40c4e08b465e148613a8", + "sha256": "02fzzfq5z4qabas75ihfbvz9pkz9ya2rblrzck8wk0fswzdq32nw" }, "stable": { "version": [ @@ -88278,15 +88322,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210226, - 1343 + 20210326, + 1308 ], "deps": [ "faceup", "pos-tip" ], - "commit": "48084a44e50a3ecd91e40ac5b58eed297e314f3f", - "sha256": "18r0pi6g9nfhzj8l306r28al4pfwkn836arvnpbysqxjknxnvqll" + "commit": "5115c4786075b39525008755a5fb843c397ca743", + "sha256": "0am68bv4wg1lw20k9y83529zkg5d7ql8q9ibgpw1qlx2ll4zxgla" } }, { @@ -89726,8 +89770,8 @@ 20200814, 435 ], - "commit": "5aa8c1867950b9b2ba6e583271f9c0d715853c5a", - "sha256": "1aypb17k408i4lg9v3fnb5q2n8m3iry4ca4c7axjbvax09dawznk" + "commit": "576d339aa80f40c6053592988001bdb285c1cf21", + "sha256": "1hdr5vr5xzlpj5xyapgbm9drrham6r776lmj8sjqaqrdffgxj8dh" }, "stable": { "version": [ @@ -90567,6 +90611,21 @@ } }, { + "ename": "revert-buffer-all", + "commit": "02ff00238a8af45d9e26e0b7b6b19a507ea06f86", + "sha256": "1lyxwh3kjlhyi5ln2lmbhyn28fxdd3l58djc9mqbzwdfm81qprsv", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-revert-buffer-all", + "unstable": { + "version": [ + 20210322, + 159 + ], + "commit": "14efdbf24ebe0d743ccb3f0d43acae98939c94fd", + "sha256": "1kimlfq98a8gym0kb6z8b5mys0gsqz8iywnxrbh5s3ck6s911dn7" + } + }, + { "ename": "review-mode", "commit": "f2f9e2667389577d0703874ca69ebe4800ae3e01", "sha256": "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n", @@ -90797,8 +90856,8 @@ "popup", "posframe" ], - "commit": "edcb6278b1a864d28ed96375e18ff77def09feb0", - "sha256": "1g8ns518yn30838by7nd13k73nz8k6wk580jcsfjqpwjig8vr5as" + "commit": "519e6eb3b5e8e668c2835d27f54fcf5776242576", + "sha256": "1q0kzdy3nxswsriq4fxr00wmw43x737dd7pnkf9g6v8hd7gsqkzc" }, "stable": { "version": [ @@ -91660,11 +91719,11 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20210224, - 1444 + 20210323, + 1742 ], - "commit": "cb76adf8e41d393090a4a3c6f390bd75288642c3", - "sha256": "0gkd7yabjdw6si814wzbkr7hi835pah8z6l0kfyhllvqnkp66qsc" + "commit": "92b70a1ed0aa9bdbed3915efe47b3ba92fe2cb74", + "sha256": "1jvclzlr9lhvb05zdnqw2l3y2m1nca2m5z8m1a7rmq9bk1wwl4pa" } }, { @@ -92298,8 +92357,8 @@ 20200830, 301 ], - "commit": "4ebebdaf0dec2f7aaebb6a1c1f6163f503caaa63", - "sha256": "1vj4rd5mq93sg10cbdcr2yx5i954ng9s369dghw35h9dasblz1pl" + "commit": "3413825c2de675c087fbb39f9aeec4145495fad1", + "sha256": "036ffrfkdakix7z8ksfw78wk1plqnkcf26acn9sksbxcyk4lbjnk" } }, { @@ -92331,8 +92390,8 @@ 20210205, 851 ], - "commit": "402d6df56457e9c512c3d77c7bcb0d04c77715f1", - "sha256": "018c668i1cv6a22gvvbzgn8111wh9zbk6yr41cj9xb1pwg0y373d" + "commit": "1ab5f645606e40db07b813a1600835d1442c060a", + "sha256": "1hzlgypb5pp8rpylm8qbbcqya5b0kjgq44m4n2wq6bix77iphsd8" }, "stable": { "version": [ @@ -93102,11 +93161,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210316, - 835 + 20210325, + 1415 ], - "commit": "a72109ab3eb3a06d1d8e01629bed06871b2c94d2", - "sha256": "19z3hicdkr11112snalp657f28wb1n6l1kky7qffd01a71pmd8ia" + "commit": "f5a1f6b6c89719f80c29388c2c784d6b4e346081", + "sha256": "1p3da5pzmzhbqgcgzkii6hh1klrdfch6fnq4g3pa9mxrnis8v4py" }, "stable": { "version": [ @@ -93125,15 +93184,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210311, - 1613 + 20210321, + 1927 ], "deps": [ "prescient", "selectrum" ], - "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", - "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" + "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", + "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" }, "stable": { "version": [ @@ -93310,15 +93369,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210316, - 1434 + 20210323, + 905 ], "deps": [ "dash", "edit-indirect" ], - "commit": "12db61458b053cee2d57dbf04f725f03487bb895", - "sha256": "1h7mr10agkvx8v6pvki8klz6b33lls201wn10q1fgg42djcw2skk" + "commit": "bebc27121d6d2da900810d552cd5e423ca870bee", + "sha256": "1b87pqvx4p8kwmc63scw9n4v1qj2rp0avx32jl5v3lbgbhvsr3zz" } }, { @@ -94038,8 +94097,8 @@ "deps": [ "reformatter" ], - "commit": "465dc1fcaeed778b504d3d349a30e611368dcc00", - "sha256": "1gzky5xs63y7xl7j2hs81aja8qq6c5l3vk07hh050flw4yfxyi23" + "commit": "49c9e11567874bc4c5c4b3578a6b8f6b1948c691", + "sha256": "002y0ci1hh55qhyyp1m6gw5d9ncbcfk9bhk6qg30s3x1g1dhq2bi" }, "stable": { "version": [ @@ -94106,8 +94165,8 @@ 20210218, 2329 ], - "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37", - "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph" + "commit": "7da7afc51aec1ab02056512b921e29a8c68615c9", + "sha256": "1fcfmzahmamrxrklbwrrig4gv745lpznpbxx5rlmb7wpndf2cpdy" } }, { @@ -94293,15 +94352,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210218, - 115 + 20210321, + 844 ], "deps": [ "language-detection", "org" ], - "commit": "3f6807543ffc1da16ede10df8a05d5e4414ba7df", - "sha256": "053r87s6jxl3hi8f7215hvn4xm6913l9wrjxwafv76gsdyl9cgz7" + "commit": "a73268705e3558ee91dc05674c5c3bed7fe28202", + "sha256": "1jjs0pclv0ya4d65wzafkvgb7lmg7f13jj0pihs1ch507fyiw3gp" }, "stable": { "version": [ @@ -94931,11 +94990,11 @@ "repo": "dawranliou/sketch-themes", "unstable": { "version": [ - 20210222, - 1337 + 20210325, + 1700 ], - "commit": "33b63867db76225e46eda0a8a613813151dc5b62", - "sha256": "19dlwp27g1sd1hd0wq8s16fqk8v4ll6xwn2hl1a9axkdk97mps27" + "commit": "407094c03e934043aa6d70369bf3e1bd841d1c91", + "sha256": "1glm8cxd91kq6910rrzgh3xaas67fylvgqxq2ld6gzcgmxzhv8yl" }, "stable": { "version": [ @@ -97372,11 +97431,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210317, - 909 + 20210324, + 1207 ], - "commit": "ca8f409788964daeabdeff9c8beb36109900f996", - "sha256": "1hkzhjnnz1m5lsh2alphr3d234zpbxw44xxhb47l2ws0vr64w50x" + "commit": "30c5eea9440915c2795670ecdbf836f3cb9dcc1b", + "sha256": "0h2gsq4ms1236nzardhd06b2090v21i0xyljri0lkpj0p3f6p986" } }, { @@ -97805,8 +97864,8 @@ "deps": [ "reformatter" ], - "commit": "0cdb882874ba0853f4f831a07a85b511258472b2", - "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify" + "commit": "0351dad6bec06a381484c0c95309d46a7a8acdb4", + "sha256": "0hra8lrg4fkqr6x6cq9mbqx8y7fkbccgzxmqfngy8cj2dbcvp9k9" }, "stable": { "version": [ @@ -97960,11 +98019,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210318, - 2242 + 20210325, + 445 ], - "commit": "512d51e8b6f912857d484095defd7b89535edfbb", - "sha256": "0nww5hhzajj4vhps9n1hlyrgj3lifr9lg2dm1s04f2hy84pn9jm1" + "commit": "633a0ff419438987f6271ff5a5da26307950a3cd", + "sha256": "070p4wyphhm7115afvq7lhxkb69c7l7fz3q5nkwbpjsdp5s8isns" }, "stable": { "version": [ @@ -98388,8 +98447,8 @@ 20200606, 1308 ], - "commit": "755c709c02e4e091ceb934fd5672db416fc94dbd", - "sha256": "08fb1qlld0dyi7i1pd5xb1g6z2681nyrqfl1ihq0gr8dal6mc772" + "commit": "c0a2d92567d024c2136e9a25ce720fb0b565d31c", + "sha256": "192c1j33d6b1j2wdz6js70lql4ysl6d3vjnw3sqzcp22cgjlb2pp" }, "stable": { "version": [ @@ -98838,6 +98897,24 @@ } }, { + "ename": "subsonic", + "commit": "2aae45d7195a93eab44fc5fec2285a5f9d8187de", + "sha256": "19v5qv6pf21f9nddzl3jka75k5x4c81i4ywvy2arqq2nz5avqvlf", + "fetcher": "git", + "url": "https://git.sr.ht/~amk/subsonic.el", + "unstable": { + "version": [ + 20210321, + 1937 + ], + "deps": [ + "transient" + ], + "commit": "cb7c6c14f00367188a5565fed9c23a857f27a4d0", + "sha256": "1k69c0zhfjy90y7hvvlsppjvan5zrif4p48i4ih7wiy47giwicb4" + } + }, + { "ename": "sudden-death", "commit": "3f20f389a2d7ddf49ca64d945b41584a7c120faf", "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh", @@ -99462,8 +99539,8 @@ "deps": [ "ivy" ], - "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", - "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" + "commit": "47b496544e238041bca5e3c9ca55848648344312", + "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" }, "stable": { "version": [ @@ -99778,8 +99855,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210319, - 329 + 20210327, + 20 ], "deps": [ "evil", @@ -99789,11 +99866,10 @@ "lispy", "paredit", "seq", - "smartparens", "undo-tree" ], - "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb", - "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf" + "commit": "a3d6d74089e0fa0031cdef5114393d2f569d68d9", + "sha256": "1qfn95mbq92p31g9yw68sf8854v3jk2251xy6asxqv8n9ckkhji9" }, "stable": { "version": [ @@ -100186,14 +100262,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210319, - 2222 + 20210321, + 2129 ], "deps": [ "s" ], - "commit": "09f2049d5fac5c046e517108ac527d087a7352d8", - "sha256": "024yxwb40jpfk5bfb3achf0vkbkblnkidy7rymvln2mzym85g77s" + "commit": "b83315c9a63ba2f6bbeaaa449a3b78b84a87ec1c", + "sha256": "03pc85g5f5ys0s45ccg3z7dni4cxngs3532xf9ng94a421yhxmkr" } }, { @@ -100655,15 +100731,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210319, - 2200 + 20210326, + 1352 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "de153b575d0a6470314efb3cba9b48b14b5f6d57", - "sha256": "014hzm2dlvzrx15557zhd3h8d0dn6akyprxc81ijc6wfczj8bv6m" + "commit": "c047b20cf3c367d06fba097e4c8a58967524d7ab", + "sha256": "0h29jscvmyw4s11wkpy538v71c87badz6ac8whs6nk3g04scsv8n" }, "stable": { "version": [ @@ -100710,16 +100786,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20210211, - 117 + 20210322, + 2248 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "2fbcdb44a9dfa608c44b19e731d15438b4b03d87", - "sha256": "0y7zak23cri9glysdmx035fvzrcpzr0fzsvjx9vcanlivq94v7fq" + "commit": "aebac4658e553902369a3bf465bacc1f07a01106", + "sha256": "1kbxhrlg3pddg10zb9h3ky72f6l67nb5cziv17i3d0shx2z0sw17" }, "stable": { "version": [ @@ -101254,11 +101330,11 @@ "repo": "TxGVNN/terraform-doc", "unstable": { "version": [ - 20200803, - 1545 + 20210322, + 837 ], - "commit": "d609290021ea7f2d10caadffc9131663838f8ad4", - "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v" + "commit": "77181c75cbde5954542688659cd4f2352ed29fbe", + "sha256": "1bcwja7hm11hxd1nmf1z93hkzcvkkpxavvbivg6j336ygzr1r82g" }, "stable": { "version": [ @@ -101557,6 +101633,21 @@ } }, { + "ename": "theme-anchor", + "commit": "74f79dc5db5246a2f70e4d4ad76601be8b5c79d8", + "sha256": "15819kkxvhk03yfzd0qp78d5ayc33cm064gy7fdpi0aq28nbw6ba", + "fetcher": "github", + "repo": "GongYiLiao/theme-anchor", + "unstable": { + "version": [ + 20210327, + 340 + ], + "commit": "a6f5986a9569a4647fd4e3b6533b50efaf5aa1fd", + "sha256": "10fg2si0s5lavk8ljnycb0942fkl3dpkny5n6arir3jd17ypp3sv" + } + }, + { "ename": "theme-changer", "commit": "d08b24a2aec1012751054c68f7d55bac1bd1fd11", "sha256": "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w", @@ -101731,8 +101822,8 @@ 20200212, 1903 ], - "commit": "c6b9113fbe9d3510eb49d24f10cd47a249260e01", - "sha256": "0r7k57lpazrz65ix53cflc94msvw7j68myg6y8x0bz44hf8m5irs" + "commit": "3b42e95dc9167a28554991af0d172543475f2003", + "sha256": "1gw54kpzqdldivr4kyw08n12mpqkg303wxhc2wqjnn95dhmxql07" }, "stable": { "version": [ @@ -101798,8 +101889,8 @@ "deps": [ "haskell-mode" ], - "commit": "d88a8ece548f932aa17cf09b36fa441135ca0cbd", - "sha256": "1ga1ybn81w68ma939s73m84ina0xh2f36bkpfxy4j7ahm0h6vlmb" + "commit": "f26eb3062cca9369b2a05bd208633e8b4f91c28e", + "sha256": "0vx4nfpcan9c6qi9x0z1a03sm33ifrclnvd0rs43fjb6s05xhwwq" }, "stable": { "version": [ @@ -101822,8 +101913,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20210313, - 1524 + 20210323, + 1647 ], "deps": [ "cl-lib", @@ -101832,8 +101923,8 @@ "s", "typescript-mode" ], - "commit": "f6ad5e591c4a21a8ed252444cbc0cf6b079d2449", - "sha256": "1vkvlkgbk1mlfk31gdf13w4lq3nj7pskp5xd40hivirgmck18wd4" + "commit": "2a3ac4f38472d66e2d8a6bbe5dadb52bc008acbd", + "sha256": "1fj2fghiycnzds2zxfxgj1d9mdzsvs9rvl9bwy2f1vwawqk1m48w" }, "stable": { "version": [ @@ -102210,11 +102301,11 @@ "repo": "snosov1/toc-org", "unstable": { "version": [ - 20201105, - 826 + 20210323, + 1256 ], - "commit": "aef220c266f53d36055f74f4a243c6483c563d2a", - "sha256": "1gknxlypzgmyi30mdii94018mk5z28xqbla4hb5p1ihhl7p32r1p" + "commit": "c4c61c5a382f94a3a4537e254243006dec2dcca4", + "sha256": "00a2al7ghrlabf65kfj1mk30p2pl37h6ppwlgghbgiy7rwlzkdbm" }, "stable": { "version": [ @@ -102677,8 +102768,8 @@ 20201101, 1045 ], - "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", - "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" + "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da", + "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw" }, "stable": { "version": [ @@ -103028,26 +103119,26 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210315, - 238 + 20210320, + 1052 ], "deps": [ "tsc" ], - "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", - "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" + "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", + "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" }, "stable": { "version": [ 0, 15, - 0 + 1 ], "deps": [ "tsc" ], - "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", - "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" + "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", + "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" } }, { @@ -103058,15 +103149,15 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20210215, - 1506 + 20210322, + 2033 ], "deps": [ "seq", "tree-sitter" ], - "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4", - "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53" + "commit": "18d263720c5a8f7fde0db368c7c36ea70437fc0b", + "sha256": "0iwi44309837hx0sl8py175ayn7haannp1sz2d0jk7binka7n4md" }, "stable": { "version": [ @@ -103155,8 +103246,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210304, - 2130 + 20210324, + 2101 ], "deps": [ "ace-window", @@ -103168,8 +103259,8 @@ "pfuture", "s" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" }, "stable": { "version": [ @@ -103198,15 +103289,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210309, - 1844 + 20210324, + 2101 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" } }, { @@ -103224,8 +103315,8 @@ "evil", "treemacs" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" }, "stable": { "version": [ @@ -103254,8 +103345,8 @@ "deps": [ "treemacs" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" }, "stable": { "version": [ @@ -103286,8 +103377,8 @@ "pfuture", "treemacs" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" }, "stable": { "version": [ @@ -103319,8 +103410,8 @@ "persp-mode", "treemacs" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" }, "stable": { "version": [ @@ -103352,8 +103443,8 @@ "perspective", "treemacs" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" } }, { @@ -103371,8 +103462,8 @@ "projectile", "treemacs" ], - "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", - "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" + "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", + "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" }, "stable": { "version": [ @@ -103626,20 +103717,20 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210315, - 238 + 20210320, + 1052 ], - "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", - "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" + "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", + "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" }, "stable": { "version": [ 0, 15, - 0 + 1 ], - "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", - "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" + "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", + "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" } }, { @@ -103709,14 +103800,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20200518, - 1820 + 20210320, + 1929 ], "deps": [ "caml" ], - "commit": "ccde45bbc292123ec20617f1af7f7e19f7481545", - "sha256": "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac" + "commit": "37a673020152ae0dbcaa250118b155d84e448f68", + "sha256": "0b9bnfwcnxkwjrdb4vm7y8wznqz4z990pv1s473gs97l7p04b1j9" }, "stable": { "version": [ @@ -104448,8 +104539,8 @@ 20210106, 220 ], - "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", - "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" + "commit": "eef1614c79eb259cb782437a25680246793a924d", + "sha256": "0vx0sv8595lbx8x23ly3dg6zb73skp4cxi8l6m2h4l4v8fs6r0fl" }, "stable": { "version": [ @@ -106457,11 +106548,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20201229, - 2303 + 20210323, + 2039 ], - "commit": "5b08b9ae9da5b95e42e94e4c9ec01d63e8848ea2", - "sha256": "1zg69lqg7yxxr4bw5lhcs5r8pljqalxqqbzvv3zrcifx7n24qzi9" + "commit": "a93dc5fc64340d8abda1272f67d46d4cc09a4c85", + "sha256": "1csybmfm5zgn2jpl9g3cb49vd26ds7x972wxiig3ri4zrmyn7y2l" }, "stable": { "version": [ @@ -106723,11 +106814,11 @@ "repo": "ianpan870102/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210317, - 930 + 20210325, + 917 ], - "commit": "d54fc120f0c0b363a8bef159da58786fb51e7b0f", - "sha256": "1imz2fr9164lsc8f1qji439iz4a643qslmxd9526alxa8gwx2yiz" + "commit": "6e7a02b624628d05fd5cfb5f26d044618a00c905", + "sha256": "1xdb6pwl8p6rzb7l6qf8nz2rn6ggjg9krimqsl167551bkjri4gw" }, "stable": { "version": [ @@ -106762,11 +106853,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210313, - 1359 + 20210326, + 1458 ], - "commit": "98179e129544bdee7d78fc095098971eeb72428d", - "sha256": "0abh1ydq4rzisgy1wf591r5jj606wh0w9jza7pjzwy30s19qd7bl" + "commit": "1bc4516f53955dcbf397cf999f38e67eec835d8c", + "sha256": "0lvdr7ifb3cb5ll8pl0lyw4qzg0v1plzl4fg5drn3z6aanznva38" } }, { @@ -106783,8 +106874,8 @@ "deps": [ "vterm" ], - "commit": "d10239b7bb89b78dddb82f66ac2286bc0b02747b", - "sha256": "0r9n23wg9cfy10h5f9zqr8jpkvw34f9rylri3nxq870awjab7rqi" + "commit": "a0429842e6197a6ec83c0de30701127a4edb9e92", + "sha256": "1h0ssi84b0amhdjxjw6xyjb525d67b4jx0qpqk3fr08s9c87z8k9" } }, { @@ -106868,8 +106959,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20210216, - 751 + 20210323, + 911 ], "deps": [ "bind-key", @@ -106878,8 +106969,8 @@ "s", "versuri" ], - "commit": "196683c3860793f2255bd0b3091ac9d538fa3ba7", - "sha256": "1465fx3h6ylgqg98m08ja0f48xwsxqai1vnigbb1fwlaxg3k23lm" + "commit": "16f9d9ee4744f4170ab9eab361783e3e32e3b627", + "sha256": "19pfxdg4kmvir6fgn9i4mqqlqk7lq77170kva6avxz12jz36i22r" }, "stable": { "version": [ @@ -106997,11 +107088,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210226, - 23 + 20210321, + 2346 ], - "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37", - "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph" + "commit": "7da7afc51aec1ab02056512b921e29a8c68615c9", + "sha256": "1fcfmzahmamrxrklbwrrig4gv745lpznpbxx5rlmb7wpndf2cpdy" } }, { @@ -107800,11 +107891,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210318, - 1726 + 20210327, + 311 ], - "commit": "1441ff884092de03fa7be97fcfd03eefd4dd4b07", - "sha256": "0i2idvcck5605miyc938h2y85jvbmd1nky20nmyhrs9q155lifxv" + "commit": "782b45736c36dcd48e614167d46ff7fc0edd2a7b", + "sha256": "0m6mpwvhvhb02rk2lkylw5w7q9nqm3sqdyzyz5bcqm3layck4pcv" } }, { @@ -107815,11 +107906,11 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200217, - 1030 + 20210322, + 2207 ], - "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", - "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" + "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23", + "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i" }, "stable": { "version": [ @@ -107845,8 +107936,8 @@ "deps": [ "wgrep" ], - "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", - "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" + "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23", + "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i" }, "stable": { "version": [ @@ -107875,8 +107966,8 @@ "deps": [ "wgrep" ], - "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", - "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" + "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23", + "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i" }, "stable": { "version": [ @@ -107899,14 +107990,14 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200128, - 109 + 20210322, + 2148 ], "deps": [ "wgrep" ], - "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", - "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" + "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23", + "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i" }, "stable": { "version": [ @@ -107935,8 +108026,8 @@ "deps": [ "wgrep" ], - "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", - "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" + "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23", + "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i" }, "stable": { "version": [ @@ -107974,11 +108065,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210131, - 1837 + 20210324, + 1821 ], - "commit": "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44", - "sha256": "1g07i6hyv9glhk6xq1z9vn81vi2f0byy7dp3rg4gw22sm6f6d1al" + "commit": "c632dbf27a77c1c73ce559041b3a78ec5f78b187", + "sha256": "1dsr7x0mbw8jmdm26278a9lqmh3mkrkzr24fp6ssf316hh51cc3v" }, "stable": { "version": [ @@ -108089,8 +108180,8 @@ 20200304, 2227 ], - "commit": "c344cfd78df23980ee48fb85fbc16989b7d4cffe", - "sha256": "1jwz89j6v8mmdim8knnwjz2ip0cwn5lq6x8nz78xns1ba5fg293b" + "commit": "3c5a7161c0dd0caa65e9a61640b06aff101be848", + "sha256": "1i4xnl178lbaqnrxxk9qxzz3v0krj4wawh8zyprh2xirgxqspks8" }, "stable": { "version": [ @@ -108162,8 +108253,8 @@ "deps": [ "cl-lib" ], - "commit": "4a1d44ec7b1421913cb39a6e83854329be910e68", - "sha256": "0az61n9c4mf2l68y67lmp34d678n13s06kpx62r4v5kaar2vhz8i" + "commit": "3c1a55103e52c7a3010ee0043af22484d23a441e", + "sha256": "0bkfx18jpy8b91yq917va5x2mkrzqlyi6a38bi90zfqhxz5h69g4" }, "stable": { "version": [ @@ -108233,8 +108324,8 @@ "makey", "s" ], - "commit": "f57b7d182372c33a7e52a785363acf292422c8aa", - "sha256": "09zak7zqpvlxij4p1raz10wbc9x7qmik0y1xzcj7v2sh14z952iq" + "commit": "58a0e556b4b96e1d23082a7ec2e8c0d4183a1a24", + "sha256": "0nvyacv711bb56cj9zrja6svzwhmdw22qg1c1bwprnh4nig43a03" } }, { @@ -109088,11 +109179,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20201217, - 1159 + 20210325, + 939 ], - "commit": "c9403c68a7e6491134110d7cacc130c34eae85a0", - "sha256": "0zkg6b45nc8ap8c8r95r25wyxymnslp3k1x2mmnmj0ivyi0bxjib" + "commit": "808248353b7617fd5b307defc3e1e8ccfed45045", + "sha256": "1akxxh3400j9rd7zagmhjfrvvg14g4mlzzgbc1y0n2l33k690fz4" }, "stable": { "version": [ @@ -109345,6 +109436,21 @@ } }, { + "ename": "wwg", + "commit": "f2428271e2ad88d1349cf25aa18144491a1b95b8", + "sha256": "02wld1rxj6kcmrmcvx2v5ah068hk6c66bv9xs94sysvx3l6za18z", + "fetcher": "github", + "repo": "ag91/writer-word-goals", + "unstable": { + "version": [ + 20210314, + 2101 + ], + "commit": "d62ece22ab7c8c46d874f5ae61712aa517b25ce2", + "sha256": "16m77snvipr7blwsd12p7biqxqq9hchq3qmd0h79h9kci1990j2r" + } + }, + { "ename": "wwtime", "commit": "28f034fbabe9de76e2e4ae44be8c8240b08f0535", "sha256": "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic", @@ -109999,11 +110105,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20210110, - 640 + 20210320, + 1123 ], - "commit": "9f0cd128fd118fbdf9ea64816c38c0d45adb9733", - "sha256": "0c326d218p8pp1dcs1zz3q2mgvda82c9drh73hgb8n610f2gvd9d" + "commit": "f5bcb89e026562abb8da4ea337457d43fed2e71b", + "sha256": "0hhhah6aq5wc6jqvf836h8ysmym1jk78acrdf6n486ck537zh5i3" } }, { @@ -110291,6 +110397,21 @@ } }, { + "ename": "yaml", + "commit": "b96babefbbaf18adcbe7db6065766fd6ba5aa016", + "sha256": "057v3magsdhxbb3n9z09cli48f56kzlqyiwwg3009nfvpkf5vm2q", + "fetcher": "github", + "repo": "zkry/yaml.el", + "unstable": { + "version": [ + 20210326, + 533 + ], + "commit": "9ebddb55238d746dc5a5d46db04c9f360c140b99", + "sha256": "124lv7jjscaq7pgn72gk7zhrl54c27zqnyh8z51mn8j8mbpvf68a" + } + }, + { "ename": "yaml-imenu", "commit": "71e7c2df9e34093ad2634d5a56133fa30126fb5c", "sha256": "03r7020gyr96m1z7p947nb7z8szzlkqv21g1hm10sqa8qp7k0qli", @@ -110896,11 +111017,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210216, - 29 + 20210324, + 1847 ], - "commit": "eb2a38c71a955fa934ac7a907b9924b3755e40c7", - "sha256": "0zvk10mgy3q10qmigqx2g1vfxvrwzs27lq4gq0qkh7k4qish2zgx" + "commit": "4ea0f4d8128951432169b1e6db3dd4ac42492e93", + "sha256": "177zh0d6ax9j1fdv569b0adnb873b2913b9pmj26y8ipsbg4iwa6" }, "stable": { "version": [ @@ -111304,15 +111425,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210214, - 1135 + 20210326, + 942 ], "deps": [ "ace-window", "deft" ], - "commit": "8ea36747ff499e82a911c367eba8f7423c6301a4", - "sha256": "0p0hz0s3fzpig3vinj7wv3vs29ba5rshw4glxrk3q1hlv3hh4q4s" + "commit": "293d406203c5c060ceb64874812bc193ac91fb74", + "sha256": "08r0ipi6wbqfna4jwpvyp64vkzy3jdrjy0vac43gi2s3cbxl3wmg" }, "stable": { "version": [ @@ -111874,15 +111995,15 @@ "repo": "mrkkrp/zzz-to-char", "unstable": { "version": [ - 20190713, - 1344 + 20210321, + 1707 ], "deps": [ "avy", "cl-lib" ], - "commit": "b0a50b8cb6925c3184405f81be9ef9be9da69f09", - "sha256": "003rg7x1vfv946j1m6yalzsgr88wvm3443pqf9yqwnzl2a3djq0g" + "commit": "18d26571b91a9c56b6a7e0d2a58188e833ab5d0f", + "sha256": "0cl76m06cm0wmb8bx6g6xrxaks2vr6zqpibc9d94gbkr5jzccg9k" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 23a81c9cb00..2249009af77 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.0-rc4"; + version = "2.0.0-rc5"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3"; + sha256 = "sha256-Gc0/AHxxJd5Cq3dBQ0Xy2TF78CBmQFYUzm4s7q1aHEE="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix index 5429497d209..29a3e1ff1ca 100644 --- a/pkgs/applications/editors/hecate/default.nix +++ b/pkgs/applications/editors/hecate/default.nix @@ -21,6 +21,5 @@ buildGoPackage rec { longDescription = "The Hex Editor From Hell!"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; }; } diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 3ea3ea51478..4fada31a0f5 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -29,24 +29,24 @@ let connect-kak = buildKakounePluginFrom2Nix { pname = "connect-kak"; - version = "2021-02-13"; + version = "2021-02-24"; src = fetchFromGitHub { - owner = "alexherbo2"; + owner = "kakounedotcom"; repo = "connect.kak"; - rev = "0858c0e50c6ca6d214fb088f052385a242548e83"; - sha256 = "1w4pwybg3v916hcyc49gz0blygv54ivv81x8fxp44ck0sy98idr3"; + rev = "a536605a208149eed58986bda54f3dda215dfe61"; + sha256 = "1svw64zk28sn271vjyzvq21zaln13vnx59rxnxah6adq8n5nkr4a"; }; - meta.homepage = "https://github.com/alexherbo2/connect.kak/"; + meta.homepage = "https://github.com/kakounedotcom/connect.kak/"; }; fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-01-27"; + version = "2021-03-15"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "e10de405e2a98e910d0808059200d206ba80f865"; - sha256 = "1hbsm1k8k0cgv7gxqicvnl22n2lb1plhkanniggk694gll22lq68"; + rev = "4e6c9a857511fccdbbc835a1c9acb205b6486a4c"; + sha256 = "0syhhdlsm7vg6hcd2n2acag9g562z49rbb5smh5p2gnplhmp93i0"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; @@ -149,26 +149,26 @@ let powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-02-15"; + version = "2021-02-25"; src = fetchFromGitHub { - owner = "jdugan6240"; + owner = "andreyorst"; repo = "powerline.kak"; - rev = "322a760daa099d519ff50d14c29b27f3e2af00d1"; - sha256 = "0mb8f8p6g75p05ifp45i0gbq2mib8c8giz7r1xfd0yrwspp4aksc"; + rev = "64ad98b6c85e63345563671b043960464d51c4b0"; + sha256 = "09w2sk19qi64hgsyg4gb407vyppnlgk272mqbinz2r3apy6szkl3"; }; - meta.homepage = "https://github.com/jdugan6240/powerline.kak/"; + meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; prelude-kak = buildKakounePluginFrom2Nix { pname = "prelude-kak"; - version = "2020-09-06"; + version = "2021-02-24"; src = fetchFromGitHub { - owner = "alexherbo2"; + owner = "kakounedotcom"; repo = "prelude.kak"; - rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23"; + rev = "5dbdc020c546032885c1fdb463e366cc89fc15ad"; sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c"; }; - meta.homepage = "https://github.com/alexherbo2/prelude.kak/"; + meta.homepage = "https://github.com/kakounedotcom/prelude.kak/"; }; replace-mode-kak = buildKakounePluginFrom2Nix { diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index 6cd856cb6c2..b1874146089 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,16 +1,16 @@ alexherbo2/auto-pairs.kak -alexherbo2/connect.kak -alexherbo2/prelude.kak alexherbo2/replace-mode.kak alexherbo2/sleuth.kak andreyorst/fzf.kak +andreyorst/powerline.kak danr/kakoune-easymotion Delapouite/kakoune-buffers Delapouite/kakoune-registers enricozb/tabs.kak@main greenfork/active-window.kak -jdugan6240/powerline.kak kakoune-editor/kakoune-extra-filetypes +kakounedotcom/connect.kak +kakounedotcom/prelude.kak listentolist/kakoune-rainbow mayjs/openscad.kak occivink/kakoune-buffer-switcher diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index d75dcc9ac90..2ca24cf661a 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -34,13 +34,13 @@ self: super: { kak-ansi = stdenv.mkDerivation rec { pname = "kak-ansi"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "eraserhd"; repo = "kak-ansi"; rev = "v${version}"; - sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d"; + sha256 = "pO7M3MjKMJQew9O20KALEvsXLuCKPYGGTtuN/q/kj8Q="; }; installPhase = '' diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 49dafe8fc1a..3d3fa196117 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -57,6 +57,6 @@ python3Packages.buildPythonApplication rec { ''; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.steveej ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix new file mode 100644 index 00000000000..d925ddd2a52 --- /dev/null +++ b/pkgs/applications/editors/neovim/neovim-qt.nix @@ -0,0 +1,43 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper +, msgpack, neovim, pythonPackages, qtbase }: + +mkDerivation rec { + pname = "neovim-qt-unwrapped"; + version = "0.2.16.1"; + + src = fetchFromGitHub { + owner = "equalsraf"; + repo = "neovim-qt"; + rev = "v${version}"; + sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny"; + }; + + cmakeFlags = [ + "-DUSE_SYSTEM_MSGPACK=1" + "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found + ]; + + buildInputs = [ + neovim.unwrapped # only used to generate help tags at build time + qtbase + ] ++ (with pythonPackages; [ + jinja2 python msgpack + ]); + + nativeBuildInputs = [ cmake doxygen ]; + + preCheck = '' + # The GUI tests require a running X server, disable them + sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d' + ''; + + doCheck = true; + + meta = with lib; { + description = "Neovim client library and GUI, in Qt5"; + homepage = "https://github.com/equalsraf/neovim-qt"; + license = licenses.isc; + maintainers = with maintainers; [ peterhoeg ]; + inherit (neovim.meta) platforms; + }; +} diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 8eaa9204c43..5210b6b67c8 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,79 +1,38 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper -, msgpack, neovim, pythonPackages, qtbase }: +, msgpack, neovim, pythonPackages, qtbase, neovim-qt-unwrapped }: let - unwrapped = mkDerivation rec { - pname = "neovim-qt-unwrapped"; - version = "0.2.16.1"; - - src = fetchFromGitHub { - owner = "equalsraf"; - repo = "neovim-qt"; - rev = "v${version}"; - sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny"; - }; - - cmakeFlags = [ - "-DUSE_SYSTEM_MSGPACK=1" - "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found - ]; - - buildInputs = [ - neovim.unwrapped # only used to generate help tags at build time - qtbase - ] ++ (with pythonPackages; [ - jinja2 python msgpack - ]); - - nativeBuildInputs = [ cmake doxygen ]; - - preCheck = '' - # The GUI tests require a running X server, disable them - sed -i ../test/CMakeLists.txt \ - -e '/^add_xtest_gui/d' - ''; - - doCheck = true; - - meta = with lib; { - description = "Neovim client library and GUI, in Qt5"; - homepage = "https://github.com/equalsraf/neovim-qt"; - license = licenses.isc; - maintainers = with maintainers; [ peterhoeg ]; - inherit (neovim.meta) platforms; - inherit version; - }; - }; + unwrapped = neovim-qt-unwrapped; in - stdenv.mkDerivation { - pname = "neovim-qt"; - version = unwrapped.version; - buildCommand = if stdenv.isDarwin then '' - mkdir -p $out/Applications - cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications - - chmod -R a+w "$out/Applications/nvim-qt.app/Contents/MacOS" - wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \ - --prefix PATH : "${neovim}/bin" - '' else '' - makeWrapper '${unwrapped}/bin/nvim-qt' "$out/bin/nvim-qt" \ - --prefix PATH : "${neovim}/bin" - - # link .desktop file - mkdir -p "$out/share/pixmaps" - ln -s '${unwrapped}/share/applications' "$out/share/applications" - ln -s '${unwrapped}/share/pixmaps/nvim-qt.png' "$out/share/pixmaps/nvim-qt.png" - ''; - - preferLocalBuild = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - passthru = { - inherit unwrapped; - }; +stdenv.mkDerivation { + pname = "neovim-qt"; + version = unwrapped.version; + buildCommand = if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications + + chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS + wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \ + --prefix PATH : ${neovim}/bin + '' else '' + makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \ + --prefix PATH : ${neovim}/bin + + # link .desktop file + mkdir -p $out/share/pixmaps + ln -s ${unwrapped}/share/applications $out/share/applications + ln -s ${unwrapped}/share/pixmaps/nvim-qt.png $out/share/pixmaps/nvim-qt.png + ''; + + preferLocalBuild = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + passthru = { + inherit unwrapped; + }; - inherit (unwrapped) meta; - } + inherit (unwrapped) meta; +} diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index e65d210b5bf..22e6185b22f 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,11 +19,11 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-3pMLhwDAdys8LNDQyjX1D9PXe9+CxiUetRa0noyiWwo="; + hash = "sha256-zWjfY8dBtBYLEsvqAvJ8RxWCeUZuNEOTDSU1pFLAatY="; }; postPatch = '' diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 19cc7bc2970..533e353a43e 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -33,6 +33,10 @@ in python3.pkgs.buildPythonApplication { paths = map (path: "${path}/lib/aspell") enchantAspellDicts; }}" ) + + substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \ + --replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \ + --replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg" ''; meta = with lib; { diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index ec310639c36..3050599ba58 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: +{ lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { - version = "11.0_beta"; + version = "11.1"; pname = "textadept11"; - nativeBuildInputs = [ pkg-config unzip ]; + nativeBuildInputs = [ pkg-config unzip zip ]; buildInputs = [ - gtk2 ncurses glib zip + gtk2 ncurses glib ]; src = fetchFromGitHub { name = "textadept11"; owner = "orbitalquark"; repo = "textadept"; - rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1"; - sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs"; + rev = "1df99d561dd2055a01efa9183bb9e1b2ad43babc"; + sha256 = "0g4bh5dp391vi32aa796vszpbxyl2dm5231v9dwc8l9v0b2786qn"; }; preConfigure = @@ -40,7 +40,9 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" + "PREFIX=$(out)" + "WGET=true" + "PIXMAPS_DIR=$(out)/share/pixmaps" ]; meta = with lib; { diff --git a/pkgs/applications/editors/textadept/11/deps.nix b/pkgs/applications/editors/textadept/11/deps.nix index 2ab72574bbd..b9c7e94ee3b 100644 --- a/pkgs/applications/editors/textadept/11/deps.nix +++ b/pkgs/applications/editors/textadept/11/deps.nix @@ -3,13 +3,13 @@ url = "https://www.scintilla.org/scintilla445.tgz"; sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag"; }; - "9e2ffa159299899c9345aea15c17ba1941953871.zip" = { - url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip"; - sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122"; + "6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip" = { + url = "https://github.com/orbitalquark/scinterm/archive/6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip"; + sha256 = "083xvpw14dxbyrv4i48q76bmr44hs637qv363n6ibfs8xv1kq7iv"; }; - "scintillua_4.4.5-1.zip" = { - url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip"; - sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04"; + "scintillua_4.4.5-2.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-2.zip"; + sha256 = "1061y2gg78zb2mml8msyarxgdwbf7g8g2v08fr1qqsqi2pbb7mfc"; }; "lua-5.3.5.tar.gz" = { url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; @@ -19,17 +19,17 @@ url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; }; - "v1_7_0_2.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; - sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i"; + "v1_8_0.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; + sha256 = "12p1p5qpdql44y3cc035h8rs8rgdqp6nrnrixlp5544agb5bx9p3"; }; "64587546482a1a6324706d75c80b77d2f87118a4.zip" = { url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip"; sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9"; }; - "cdk-5.0-20150928.tgz" = { - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; - sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; + "cdk-5.0-20200923.tgz" = { + url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; + sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; }; "libtermkey-0.20.tar.gz" = { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index b6222c8a6d2..4fbbacf8f1e 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0"; + sha256 = "sha256-Pf9nA5DUAJ+PPNG+oP7RO4/TD8fy4ADsyq625a6cbFk="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 734b189d1e4..4215b20180e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -75,7 +75,6 @@ in stdenv.mkDerivation rec { patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch; configureFlags = [ - "--enable-gui=${guiSupport}" "--with-features=${features}" "--disable-xsmp" # XSMP session management "--disable-xsmp_interact" # XSMP interaction @@ -95,6 +94,7 @@ in stdenv.mkDerivation rec { "--disable-carbon_check" "--disable-gtktest" ] + ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" ++ lib.optional stdenv.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ lib.optionals luaSupport [ @@ -127,8 +127,22 @@ in stdenv.mkDerivation rec { ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ; - buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau - libXmu glib libICE ] + buildInputs = [ + ncurses + glib + ] + # All X related dependencies + ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [ + libSM + libICE + libX11 + libXext + libXpm + libXt + libXaw + libXau + libXmu + ] ++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11 ++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index d1ae71cd11e..68249c20d13 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -19,18 +19,18 @@ fi VSCODE_VER=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name) sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix" -VSCODE_LINUX_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-x64/stable" +VSCODE_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-x64/stable" VSCODE_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_URL}) sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" "$ROOT/vscode.nix" -VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable" +VSCODE_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin/stable" VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" -VSCODE_LINUX_AARCH64_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-arm64/stable" +VSCODE_LINUX_AARCH64_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-arm64/stable" VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL}) sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix" -VSCODE_LINUX_ARMV7L_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-armhf/stable" +VSCODE_LINUX_ARMV7L_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-armhf/stable" VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL}) sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ba03bb65c26..988bcf412ef 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw"; - x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf"; - aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw"; - armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8"; + x86_64-linux = "0fpa3b807hy3wrb98h5s0p6ljya279bikv2qwq30nvr0f4zn48bk"; + x86_64-darwin = "0bw7pdzn0a0zr7x8fpwck7v73dq5vh71ja00z11mhjrkjnvmmd9k"; + aarch64-linux = "04wrqcmyamhwiwcyay1z0q0dvf6g7k3pcs93x7hahy16l65w7s2c"; + armv7l-linux = "1hkc9i4z021jwjn275w790bppfvi63g0cnwvkssqdh1c94939rhv"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.54.2"; + version = "1.54.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -34,7 +34,7 @@ in src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; - url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; + url = "https://update.code.visualstudio.com/${version}/${plat}/stable"; inherit sha256; }; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 7d36a2fd7f5..3d0e98602ad 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,20 +1,39 @@ -{ fetchurl, lib, stdenv, glib, libgee, pkg-config, ncurses, boehmgc, perl, help2man, vala }: +{ lib +, stdenv +, fetchurl +, boehmgc +, glib +, help2man +, libgee +, ncurses +, perl +, pkg-config +, vala +}: stdenv.mkDerivation rec { - name = "zile-2.6.0.90"; + pname = "zile"; + version = "2.6.1"; src = fetchurl { - url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "1bhdwnasmqhy0hi3fqmpzr8xkw5zlqjpmf1cj42h4cg3fnamp6r3"; + url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; + hash = "sha256-v7rN33aOORc6J0Z5JP5AmZCj6XvjYyoCl5hl+7mvAnc="; }; - buildInputs = [ glib libgee ncurses boehmgc vala ]; - nativeBuildInputs = [ perl pkg-config ] - # `help2man' wants to run Zile, which won't work when the - # newly-produced binary can't be run at build-time. - ++ lib.optional - (stdenv.hostPlatform == stdenv.buildPlatform) - help2man; + buildInputs = [ + boehmgc + glib + libgee + ncurses + ]; + nativeBuildInputs = [ + perl + pkg-config + vala + ] + # `help2man' wants to run Zile, which won't work when the + # newly-produced binary can't be run at build-time. + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man; # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. @@ -24,33 +43,38 @@ stdenv.mkDerivation rec { gl_cv_func_fstatat_zero_flag="yes"; meta = with lib; { - description = "Lightweight Emacs clone"; - + homepage = "https://www.gnu.org/software/zile/"; + description = "Zile Implements Lua Editors"; longDescription = '' - GNU Zile, which is a lightweight Emacs clone. Zile is short - for Zile Is Lossy Emacs. Zile has been written to be as - similar as possible to Emacs; every Emacs user should feel at - home. - - Zile has all of Emacs's basic editing features: it is 8-bit - clean (though it currently lacks Unicode support), and the - number of editing buffers and windows is only limited by - available memory and screen space respectively. Registers, - minibuffer completion and auto fill are available. Function - and variable names are identical with Emacs's (except those - containing the word "emacs", which instead contain the word - "zile"!). - - However, all of this is packed into a program which typically - compiles to about 130Kb. - ''; + GNU Zile is a text editor development kit, so that you can (relatively) + quickly develop your own ideal text editor without reinventing the wheel + for many of the common algorithms and data-structures needed to do so. - homepage = "https://www.gnu.org/software/zile/"; + It comes with an example implementation of a lightweight Emacs clone, + called Zemacs. Every Emacs user should feel at home with Zemacs. Zemacs is + aimed at small footprint systems and quick editing sessions (it starts up + and shuts down instantly). - license = licenses.gpl3Plus; + More editors implemented over the Zile frameworks are forthcoming as the + data-structures and interfaces improve: Zz an emacs inspired editor using + Lua as an extension language; Zee a minimalist non-modal editor; Zi a + lightweight vi clone; and more... - maintainers = with maintainers; [ pSub ]; + Zile is a collection of algorithms and data-structures that currently + support all basic Emacs-like editing features: it is 8-bit clean (though + Unicode support is not ready yet), and the number of editing buffers and + windows is only limited by available memoryand screen space + respectively. Registers, minibuffer completion and auto fill are + available. + Zemacs implements a subset of Emacs with identical function and variable + names, continuing the spirit of the earlier Zile editor implemented in C. + GNU Zile, which is a lightweight Emacs clone. Zile is short for Zile Is + Lossy Emacs. Zile has been written to be as similar as possible to Emacs; + every Emacs user should feel at home. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pSub AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 81e81c88537..21b4cfa94b1 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , mkDerivation , fetchFromGitHub +, fetchpatch , substituteAll , gdal , cmake @@ -19,7 +20,7 @@ mkDerivation rec { pname = "OpenOrienteering-Mapper"; - version = "0.9.4"; + version = "0.9.5"; buildInputs = [ gdal @@ -38,14 +39,21 @@ mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b"; + sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5"; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.diff; - inherit qttranslations; - }); + patches = [ + # https://github.com/NixOS/nixpkgs/issues/86054 + (substituteAll { + src = ./fix-qttranslations-path.diff; + inherit qttranslations; + }) + # https://github.com/OpenOrienteering/mapper/pull/1907 + (fetchpatch { + url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch"; + sha256 = "1bkckapzccn6k0ri6bgrr0nhis9498fnwj7b32s2ysym8zcg0355"; + }) + ]; cmakeFlags = [ # Building the manual and bundling licenses fails @@ -81,7 +89,8 @@ mkDerivation rec { and provides a free alternative to the existing proprietary solution. ''; homepage = "https://www.openorienteering.org/apps/mapper/"; - license = licenses.gpl3; + changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}"; + license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ mpickering sikmir ]; }; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index d9de3eb7fc1..d07904c8597 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages, -libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, +libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, gtk-mac-integration-gtk2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ gtk2 libxml2 gettext python libxml2Python docbook5 + [ gtk2 libxml2 gettext python2 libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] ++ lib.optional withGNOME libgnomeui ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 18fe87b128d..8188a3949dc 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.20"; + version = "0.9.22"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-FtkBIoz5u70DbZZBH4uSaAkmOphWA9H0uYuukIPVGUM="; + sha256 = "sha256-DOiO36suytukkviqYyLL47DFVzsJt2ZfSnnni95CLaA="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 67b64ee575c..8633494a4ca 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitHub -, fetchpatch , libGLU , qtbase , qtscript @@ -19,13 +18,13 @@ mkDerivation rec { pname = "meshlab"; - version = "2020.07"; + version = "2020.12"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = "Meshlab-${version}"; - sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri"; + sha256 = "QrnqXEVqI1ADUYWalZ0h/0+xS+gDZTinm0weT39onw0="; fetchSubmodules = true; # for vcglib }; @@ -46,17 +45,11 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - patches = [ - # Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch"; - sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565"; - }) - ]; - preConfigure = '' - substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop - cd src + substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop + cmakeDir=$PWD/src + mkdir ../build + cd ../build ''; cmakeFlags = [ @@ -75,19 +68,12 @@ mkDerivation rec { postFixup = '' patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped - patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped ''; - # Meshlab is not format-security clean; without disabling hardening, we get: - # src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security] - # 61 | int chars_written = snprintf(buf, buf_size, f, std::forward<Ts>(ts)...); - # | - hardeningDisable = [ "format" ]; - meta = { description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 395ae028423..fe5f99de121 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab -, fetchpatch , writeText , cmake , doxygen @@ -44,24 +44,16 @@ stdenv.mkDerivation rec { pname = "monado"; - version = "0.4.1"; + version = "21.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "114aif79dqyn2qg07mkv6lzmqn15k6fdcii818rdf5g4bp7zzzgm"; + sha256 = "07zxs96i3prjqww1f68496cl2xxqaidx32lpfyy0pn5am4c297zc"; }; - patches = [ - # fix libsurvive autodetection, drop with the next version update - (fetchpatch { - url = "https://gitlab.freedesktop.org/monado/monado/-/commit/345e9eab56e2de9e8b07cf72c2a67cf2ebd01e62.patch"; - sha256 = "17c110an6sxc8rn7dfz30rfkbayg64w68licicwc8cqabi6cgrm3"; - }) - ]; - nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index f5595da47ad..5982e4abe0f 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , boost , cmake , ilmbase @@ -11,26 +10,20 @@ , openexr , robin-map , unzip +, fmt }: stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.1.9.0"; + version = "2.2.12.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "1bbxx3bcc5jlb90ffxbk29gb8227097rdr8vg97vj9axw2mjd5si"; + sha256 = "16z8lnsqhljbfaarfwx9rc95p0a9wxf4p271j6kxdfknjb88p56i"; }; - patches = [ - (fetchpatch { - url = "https://github.com/OpenImageIO/oiio/pull/2441/commits/e9bdd69596103edf41b659ad8ab0ca4ce002f6f5.patch"; - sha256 = "0x1wmjf1jrm19d1izhs1cs3y1if9al1zx48lahkfswyjag3r5dn0"; - }) - ]; - outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ @@ -47,6 +40,7 @@ stdenv.mkDerivation rec { opencolorio openexr robin-map + fmt ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/openimageio/2539_backport.patch b/pkgs/applications/graphics/openimageio/2539_backport.patch new file mode 100644 index 00000000000..c484b2ef9cf --- /dev/null +++ b/pkgs/applications/graphics/openimageio/2539_backport.patch @@ -0,0 +1,31 @@ +diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp +index 10b75c21..0287d9c5 100644 +--- a/src/libOpenImageIO/exif.cpp ++++ b/src/libOpenImageIO/exif.cpp +@@ -213,6 +213,9 @@ static const EXIF_tag_info exif_tag_table[] = { + + + ++// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define ++// them ourselves. ++#ifndef GPSTAG_VERSIONID + enum GPSTag { + GPSTAG_VERSIONID = 0, + GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2, +@@ -237,6 +240,7 @@ enum GPSTag { + GPSTAG_DIFFERENTIAL = 30, + GPSTAG_HPOSITIONINGERROR = 31 + }; ++#endif + + static const EXIF_tag_info gps_tag_table[] = { + { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 }, +@@ -270,7 +274,7 @@ static const EXIF_tag_info gps_tag_table[] = { + { GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 }, + { GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 }, + { GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 }, +- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, ++ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, + { -1, NULL } // signal end of table + }; + diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 8bd82c78393..2461fcc2765 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { "dist_dir=" ]; + patches = [ + # Backported from https://github.com/OpenImageIO/oiio/pull/2539 for 1.8.17 + ./2539_backport.patch + ]; + meta = with lib; { homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index b0719631c09..cc4f4342c61 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "photoflare"; - version = "1.6.7"; + version = "1.6.7.1"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; rev = "v${version}"; - sha256 = "sha256-Gx3YP29NrNHp0p05a1O4Xb9kqkA6pQLTJZ3/wOx+BWY="; + sha256 = "sha256-7b7ICcHuMjOMtyQDkokoHeZrF4G+bOzgRJP4mkns+Zc="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index f444ebfe5be..9fd629ca8e9 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -81,7 +81,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { meta = with lib; { description = "Photo and video importer for cameras, phones, and memory cards"; homepage = "https://www.damonlynch.net/rapid/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index f19ee160984..b8695a30154 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ffmpeg_3, kio, taglib + ffmpeg_4, kio, taglib }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ffmpeg_3 kio taglib ]; + buildInputs = [ ffmpeg_4 kio taglib ]; } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 41fd8683c5f..0b3e21cc03a 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "8.0.28"; + version = "8.0.30"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-okLeyok/5rihGXaQaUR06dGkpuqqW02qJ6q6VVLtZsE="; + hash = "sha256-j+fp/f8nta+OOuOFU4mmUrGYlVmAqdaXO4rLJ0in+m8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index d50f3637988..52d56d5c8f5 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, python, bind, iproute, bc, gitMinimal }: +, curl, python3, bind, iproute, bc, gitMinimal }: let version = "1.23.0"; deps = lib.makeBinPath [ curl - python + python3 bind.dnsutils iproute bc @@ -24,11 +24,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' + postPatch = '' patchShebangs install.sh substituteInPlace install.sh --replace /usr/local "$out" ''; + strictDeps = true; + dontBuild = true; installPhase = '' diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 039dfe59ff7..69f0d58159e 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = [ cmake makeWrapper ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { alembic (opensubdiv.override { inherit cudaSupport; }) tbb - makeWrapper embree gmp + pugixml ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { openvdb ] else [ - pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL + llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index c74ac5ffb30..0ce89afa6ce 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, gettext }: +{ lib, fetchFromGitHub, python2Packages, gettext }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "cherrytree"; version = "0.39.4"; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with pythonPackages; [ pygtk dbus-python pygtksourceview ]; + propagatedBuildInputs = with python2Packages; [ pygtk dbus-python pygtksourceview ]; patches = [ ./subprocess.patch ]; diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index 821b88f9b20..a8d041de107 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }: +{ stdenv, runtimeShell, lib, fetchurl, python2Packages, unzip }: # This package uses a precompiled "binary" distribution of CuraByDagoma, # distributed by the editor. @@ -13,7 +13,9 @@ # I guess people owning a 3D printer generally don't use i686. # If, however, someone needs it, we certainly can find a solution. -stdenv.mkDerivation rec { +let + pythonPackages = python2Packages; +in stdenv.mkDerivation rec { pname = "curabydagoma"; # Version is the date, UNIX format version = "1520506579"; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { }; unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz"; nativeBuildInputs = [ unzip ]; - buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ]; + buildInputs = [ pythonPackages.python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ]; # Compile all pyc files because the included pyc files may be older than the # py files. However, Python doesn't realize that because the packages @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { cat > $out/bin/curabydago <<EOF #!${runtimeShell} export PYTHONPATH=$PYTHONPATH - ${python.out}/bin/python $out/curabydago/cura.py + ${pythonPackages.python.interpreter} $out/curabydago/cura.py EOF chmod a+x $out/bin/curabydago diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 73295c96e4b..6cbc7ffd475 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4/67GwNIRcbC6qYe5s8DD16b2uVcG0DI1ScQk31Ffk0="; + sha256 = "sha256-Fy202w1lUrymnpnCmWwnbpMsda7JrZ3B0c+a9UtKsSA="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index b31c17cc319..5bc8de522de 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, gnome2, keybinder }: +{ lib, fetchFromGitHub, python2Packages, gnome2, keybinder }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { ver = "0.93"; name = "dockbarx-${ver}"; @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { substituteInPlace dockx_applets/volume-control.py --replace /usr/share/ $out/share/ ''; - propagatedBuildInputs = (with pythonPackages; [ pygtk pyxdg dbus-python pillow xlib ]) + propagatedBuildInputs = (with python2Packages; [ pygtk pyxdg dbus-python pillow xlib ]) ++ (with gnome2; [ gnome_python gnome_python_desktop ]) ++ [ keybinder ]; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 911a319a963..b62d154feb1 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -1,10 +1,10 @@ -{ lib, pythonPackages }: +{ lib, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "dotfiles"; version = "0.6.4"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit version pname; sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv"; }; @@ -12,8 +12,8 @@ pythonPackages.buildPythonApplication rec { # No tests in archive doCheck = false; - checkInputs = with pythonPackages; [ pytest ]; - propagatedBuildInputs = with pythonPackages; [ click ]; + checkInputs = with python3Packages; [ pytest ]; + propagatedBuildInputs = with python3Packages; [ click ]; meta = with lib; { description = "Easily manage your dotfiles"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 273077b3bda..edce14d0573 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -150,6 +150,6 @@ python3.pkgs.buildPythonApplication { homepage = "https://electrum.org/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ehmry joachifm np prusnak ]; + maintainers = with maintainers; [ joachifm np prusnak ]; }; } diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 0a6796a9b07..736685f5eb1 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, pkg-config, cmake, bluez, libusb1, curl +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, bluez, libusb1, curl , libiconv, gettext, sqlite , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , postgresSupport ? false, postgresql ? null @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ] + strictDeps = true; + + buildInputs = [ bluez libusb1 curl gettext sqlite libiconv ] ++ optionals dbiSupport [ libdbi libdbiDrivers ] ++ optionals postgresSupport [ postgresql ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index cebbcfe59ba..c9c815771a8 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.8"; + version = "8.9"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo="; + sha256 = "sha256-nl9iu8ezgMZ1wy2swDXYRDLlkSz1II+C65UUWNvGBxg="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 22444e22054..e6350dfb7cb 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,21 +2,23 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.4.8"; + version = "3.4.10"; src = fetchzip { url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf"; + sha256 = "sha256-4/EcVjIc+8OMkll8OxE5oXiqk+w9k1Nv9ld8N7oFFp0="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/opt cp -r ext lib $out/opt/ install -D bin/gremlin.sh $out/opt/bin/gremlin-console makeWrapper $out/opt/bin/gremlin-console $out/bin/gremlin-console \ --prefix PATH ":" "${openjdk}/bin/" \ --set CLASSPATH "$out/opt/lib/" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a4c32b9b931..8f3444d85d8 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.81.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9YroUxcLixu+MNL37JByCulCHv0WxWGwqBQ/+FGtZLw="; + sha256 = "sha256-D0bwy8LJihlfM+E3oys85yjadjZNfPv5xnq4ekaZPCU="; }; - vendorSha256 = "sha256-5gQyoLirXajkzxKxzcuPnjECL2mJPiHS65lYkyIpKs8="; + vendorSha256 = "sha256-pJBm+yyy1DbH28oVBQA+PHSDtSg3RcgbRlurrwnnEls="; doCheck = false; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 894b44a8451..b8e72daa6f7 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "17560"; + version = "17580"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ffrbg2d4s2dmc9zy9b4fbsqnp9g0pvp6vnrq7gbsmxh0y23sw56"; + sha256 = "05y1g48llnpbyv0r8dn3kyhcfqylsg4fbp540xn1n7sk3h17gwsw"; }; macosx = fetchurl { - url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "17qrilj20bvzd8ydfjjirpqjrsbqbkxyj4q35q87z9j3pgnd1h71"; + url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; + sha256 = "0aqkr6951zbi7a6zawvpsh51i0c4nyz2xkj52gg8n4vxli5pp3y1"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0wmncbi5g3ijn19qvmvwszb2m79wnv4jpdmpjd7332d3qi5rfmwn"; + sha256 = "04mxrirlyjy8i5s6y8w84kxv3wjlhhdfmlaxxlxd25viim73g3zv"; }; }; in diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix new file mode 100644 index 00000000000..666009b99a0 --- /dev/null +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchFromGitHub +, wrapQtAppsHook +, pkg-config +, qmake +, qtquickcontrols2 +, SDL2 +, SDL2_ttf +, libva +, libvdpau +, libxkbcommon +, alsaLib +, libpulseaudio +, openssl +, libopus +, ffmpeg +}: + +stdenv.mkDerivation rec { + pname = "moonlight-qt"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "moonlight-stream"; + repo = pname; + rev = "v${version}"; + sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + pkg-config + qmake + ]; + + buildInputs = [ + qtquickcontrols2 + SDL2 + SDL2_ttf + libva + libvdpau + libxkbcommon + alsaLib + libpulseaudio + openssl + libopus + ffmpeg + ]; + + meta = with lib; { + description = "Play your PC games on almost any device"; + homepage = "https://moonlight-stream.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 3ee87d58c08..14141ca1ea3 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors , nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry -, python3, pyotherside, python3Packages +, python3, pyotherside }: mkDerivation rec { @@ -16,12 +16,14 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake python3 qttools python3.pkgs.wrapPython + ]; + buildInputs = [ kirigami2 qtquickcontrols2 qtlocation qtsensors nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry ]; - propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ]; postPatch = '' substituteInPlace pure-maps.pro \ @@ -30,10 +32,11 @@ mkDerivation rec { qmakeFlags = [ "FLAVOR=kirigami" ]; - dontWrapQtApps = true; - postInstall = '' - wrapQtApp $out/bin/pure-maps \ - --prefix PYTHONPATH : "$out/share" + pythonPath = with python3.pkgs; [ gpxpy ]; + + preInstall = '' + buildPythonPath "$pythonPath" + qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; meta = with lib; { diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index fafd91f7811..1bdcd6ea8a6 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -31,6 +31,5 @@ mkDerivation { homepage = "https://centrabit.com/"; license = licenses.gpl3; platforms = qt5.qtbase.meta.platforms; - maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 0ae7a5c1ec0..523dc6aab83 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,43 +1,71 @@ -{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, makeWrapper +, pkg-config +, which +, yacc +, gnuplot +, libxls +, libxml2 +, libzip +, ncurses +}: stdenv.mkDerivation rec { - version = "0.7.0"; pname = "sc-im"; + version = "0.8.0"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "0xi0n9qzby012y2j7hg4fgcwyly698sfi4i9gkvy0q682jihprbk"; + sha256 = "sha256-/eG2BdkyfEGoSzPu6jT+Bn1RZTGT1D3etGj1tYchm1M="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ yacc ncurses libxml2 libzip libxls ]; + sourceRoot = "${src.name}/src"; - buildPhase = '' - cd src + # make default colors readable on dark background + patches = [ + (fetchpatch { + url = "https://github.com/andmarti1424/sc-im/commit/78d2fdaaf2c578691e68fb5bd773803cb967ddba.patch"; + sha256 = "09716zsqa9qdsj2qpkji8wlzsmp9gl66ggvrg7lmrwwnvli2zn2w"; + }) + (fetchpatch { + url = "https://github.com/andmarti1424/sc-im/commit/f29d6605c8170febcec0dea7bda9613bee3b7011.patch"; + sha256 = "1zs1sb23g0k6lig4d0qdzq1wdhcdzl424ch567zyjl191lyhsjyg"; + }) + ]; - sed 's/LDLIBS += -lm/& -lncurses/' -i Makefile + patchFlags = [ "-p2" ]; - sed -e "\|^prefix = /usr/local| s|/usr/local|$out|" \ - -e "\|^#LDLIBS += -lxlsreader| s|^#|| " \ - -e "\|^#CFLAGS += -DXLS| s|^#|| " \ - -i Makefile + nativeBuildInputs = [ + makeWrapper + pkg-config + which + yacc + ]; - make - export DESTDIR=$out - ''; + buildInputs = [ + gnuplot + libxls + libxml2 + libzip + ncurses + ]; + + makeFlags = [ "prefix=${placeholder "out"}" ]; - installPhase = '' - make install prefix= + postInstall = '' + wrapProgram "$out/bin/sc-im" --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" ''; meta = with lib; { homepage = "https://github.com/andmarti1424/sc-im"; - description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; + description = "An ncurses spreadsheet program for terminal"; license = licenses.bsdOriginal; - maintainers = [ ]; + maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; }; - } diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 3fb99d5b3d5..5032836ab9f 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "2.5.0"; + version = "2.8.0"; sha256 = { - x86_64-linux = "sha256-Mn1oie+YHNtYKriIAIHdO+tUQDqaA34dkAJgZvQy76I="; + x86_64-linux = "sha256-W8+LzWMPDCrFZCm9p/Gcj7OXqJw/gs7lMxTKjOQChQY="; }.${system} or throwSystem; meta = with lib; { diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 4a7b7ad63b7..962059600a4 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xzMXbF0M7asZtyo8DmM5yyNoHKy0H6amRDhu6hjHgq4="; + sha256 = "sha256-JVHcunpS+2/0d7XaUZ95m9QpVHCG1Tq8LJ9KNURSRy8="; }; - vendorSha256 = "sha256-6ij0NQMjDnZJhuqkUR7MdBLAMS5Xa2HKIgQjegKJyvc="; + vendorSha256 = "sha256-4uRhbRPfCRYwFlfucXOYhLruj7hkV4G9Sxjh9yQkDEQ="; doCheck = false; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index f3764ce60f3..a7037522c62 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.31"; + version = "1.32"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp"; + sha256 = "sha256-Ss8kdfUAMC8v05rdt2SoO6vPyssG5v8gOzdf/v18cdg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 4b9627a843b..eb8c81dae7e 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -1,5 +1,10 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas -, texlive, pandoc, pandoc-citeproc +{ appimageTools +, lib +, fetchurl +, gtk3 +, gsettings-desktop-schemas +, texlive +, pandoc }: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. @@ -14,7 +19,8 @@ let appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 rec { +in +appimageTools.wrapType2 rec { inherit name src; profile = '' @@ -22,7 +28,7 @@ in appimageTools.wrapType2 rec { ''; multiPkgs = null; # no 32bit needed - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ]; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index da36f2de68e..723ea6235c2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "90.0.4430.30", - "sha256": "01b6naziii72pvw35wphfqz3inih75is038yf1mdp1847jbvxpwp", - "sha256bin64": "0k48mfzmyjb0w75fkm2j7ll340qgmzvmskz12awc2l19hgnw1s8p", + "version": "90.0.4430.40", + "sha256": "0n7g4j981h3fn5wgpb3azpili9682nq0yikhd4z7dr7agvpnfr3k", + "sha256bin64": "120rbh8bpcj3z5kqdaicqnsd2mh0xcr8y1411kl0zpwa6hfvgm3r", "deps": { "gn": { "version": "2021-02-09", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "91.0.4449.6", - "sha256": "1y6z7p64fi4dxyrxrnlmg0wwczgw58cinrsywhnrpl2wp2y3v6m3", - "sha256bin64": "1baxra0hg981awinyyvm1x46rlskjmhs2m1h0zf72l11y1jyj5vc", + "version": "91.0.4455.2", + "sha256": "0nqw1jxysyl72dg2bqls7w9cm366j6i1p4sadf3s5vc0i7yr7h3i", + "sha256bin64": "0d7s7bg58489ph4i92yj4vkww0cl7473pk9sir64gcmm9z18yjc3", "deps": { "gn": { "version": "2021-03-12", diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5a71b9d7071..0971dd3b63f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,975 @@ { - version = "86.0.1"; + version = "87.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ach/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ach/firefox-87.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b9006b2c0251ae2264a60be3763dcf9610f3a8569f2a05f266e59c8232400e8c"; + sha256 = "656c92c9a588aed2059f4f68968735f884db6ee94b0619d983bd4affd2100174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/af/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/af/firefox-87.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7f4268d613acee2e003fe8042dc2e969bd0f6f14b906b35ce6b8c727fbb13d76"; + sha256 = "0f8fe2b470177df3525fbf533934c66a5e4abdaa3dfb7848962ac148b224592d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/an/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/an/firefox-87.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8a892626b4f34413423f4da61d7e0099e215bc9e597092bbd625445e27998d17"; + sha256 = "a96ae593965364871d35ba0fd6dcd1029254110ee59f4a7abe27cf6d273c7be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ar/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ar/firefox-87.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "c837e97ca8b46de448fbc9fd2120ffbb735474ade8a6f64f7ded8dbdfc4c7406"; + sha256 = "58eaefaba44b4b0592442e709604b597c74fd81390f8fcc410a8e605956a0bdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ast/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ast/firefox-87.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8c3b990b899d70c46827ac5a7f32faf9cf44bfba195283bf47d277ccc8da8cbe"; + sha256 = "ca33473b77b8a57c305fe89cdd66b95810441aa54295ed687736a24c9160e45f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/az/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/az/firefox-87.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8fa2a9e6cb6c70fd92b43e2ae145956337f87dd21b468ac375a90a7d18551bce"; + sha256 = "6965f0b68279228a575dfb503eabae8d75f32e0fa8de119f4d48f0e9ec36d61c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/be/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/be/firefox-87.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "dddbf1e9eb8ecc928b534ef5fd77cb52edd0c67f68a522bbc377d5943cfaaa90"; + sha256 = "a19d6d94cc15d269dbddccae06b4c92a3436e57d45dbebe8c6a2ff23df66fd28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bg/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bg/firefox-87.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c4eac8234b58f40b40ec5be3fc37817f768d35804f2f923b9d0effa5cf906782"; + sha256 = "885a44cf0acedc5ffbfcc73cce41f6eb2dcab13d070eeb156e64277b346a4fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bn/firefox-87.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "41efed647c468ad3da21090e11a4bb861d26106471e0543c3709016d1ca2bd06"; + sha256 = "09773257768f061819fa92ec229c1f94b217c04e78781d8e59a8dc1225f92be7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/br/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/br/firefox-87.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "53076688c25034f02b3c30455fbdbea0287bfdd8d5100c0f5edb77ad32955f36"; + sha256 = "23ec95e130593c51384a64165c33f02c4c5af753313fbaf8fa0f94bca1184506"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bs/firefox-87.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "304d9fa41a95f6abf61c16f765ec4651a159af0cabb09b1ce76f805d27746dc4"; + sha256 = "30455df45e86894fd5a75ef6b9989b64f49da8ac8bee9656ea2724cfca59555c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca-valencia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca-valencia/firefox-87.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e845d6cbff2cd88b9e1f7526e8aa9eac4aa53c116301ba861e1beb04f9deb4e7"; + sha256 = "8ca8a4ee40ac57140560c3aeb664d60be5ecd8842f328544924a97d910c02303"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca/firefox-87.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5159eb68a571fb035c4621cbeae9d7a88d40172876a00b3ab6512a8701f43f59"; + sha256 = "3cc1cd1c7657a704d3c6c1a42934eac75439c05af5617d2d24991d62d412237e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cak/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cak/firefox-87.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "efab62e54fa41a65d5989078ee594dc2c2e8c355bd656828321cc342cc167def"; + sha256 = "160c598f55c012fc92c0882f7062a82b8057177398edfcdeb41c60aa83570f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cs/firefox-87.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1cc3e58c1c2790bd13346b752b2209bc8db08a9470960e06857913a70a7826dc"; + sha256 = "1209d5401b55441126bcc64faa9d7692c92d2c009a40587923c048bec0cf2508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cy/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cy/firefox-87.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "230d79e979cdc350164fe37ea4ba84183db935ba973efab1ab14b56f0a12344f"; + sha256 = "d177530e3e31900a38e9127b5d60bcc3b937c76e8b12b13c289a29e2afd06c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/da/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/da/firefox-87.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "04d50be5260cafde33729aca15cd9731f6fb1550da2db86719e6d672639607fb"; + sha256 = "2e623b11e18d38dee391863115af75fae4119894a89606aa6f4194d04a1773c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/de/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/de/firefox-87.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a4b5c447cb34b91ac5053153e73520d9f5fc8b06a390f5694cda6bc2131efe12"; + sha256 = "a29837d6c062ded4aed732cee06fe23773a57d62aecbca1e1a56c9d7a37423df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/dsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/dsb/firefox-87.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "eea691c668126056cb1e4137cf4f6e8d40fe46f79a00c73ccd59723cfb63e404"; + sha256 = "cf584f97b136444861845bf1db0fe9d65d809f4a167a0f8bed780f94048fbb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/el/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/el/firefox-87.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d6774ba0cdc0e89091cb57bc1669927f58ed9811617cfbd358567e2a85f977d2"; + sha256 = "73d03707575ef3270f7419d031fc85babdc498b1576d316abac273cd88dde30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-CA/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-CA/firefox-87.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8cb49ea8e3db760de1f3d97f1583f4219c3039d09632f5ef186311145aa2c3c9"; + sha256 = "1d11c8a1f23df4e88668beecee244f2d0743b006e46d96e4a6a35bffc341569d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-GB/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-GB/firefox-87.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2ee2ead0c7765e9e5744dff5d7bdfe2ac890cb6859362426bf8244e393f1bb5a"; + sha256 = "d885931198cf3958fca683ee4c301f25610f6b4d5777068fd812bd53048aecb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-US/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-US/firefox-87.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d419da5168312f5d023481668fb4767a27799f02248b4ea90fef98a54ab73b86"; + sha256 = "3c9207bee0a998634c4fd12293acfae207d16508749ad405bf1e8717d06acf02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eo/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eo/firefox-87.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0b73a3695f0291c3afdc1635976e6129f94d72d9a9a422ebd3a0cfbbb9343697"; + sha256 = "3d57787fc840f80271f4d26810f347929a96479ca58bd416bf1f94e3499a07b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-AR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-AR/firefox-87.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4fe2c2428ce205054d16ee33f432dd865e4d919b63f7c2f0a458bd5b80c9c0b8"; + sha256 = "294c83cce5bbead7c263e950ed8bb2787d4735f4086521726400ef97c5d26b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-CL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-CL/firefox-87.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f5d1850c5c10051b04a445001a2991e52a3c1b93002b3534030e85ee0a3c6b5f"; + sha256 = "4e57c8a517084eee27edb6ad706a250ebb323419407f1ef9c9f9ae4f0dc8d8b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-ES/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-ES/firefox-87.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b99f0532bdc3ab04c421442cf0ea4c24db19a87104ad7d2eff51acb0a383b154"; + sha256 = "9cdea632b1c1365d3c6ec08e9acd154819d081f025473b027da8d5e873da66bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-MX/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-MX/firefox-87.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "56bc322d4c7c160fe1bf095039b5b6e31fcfa234bd5d66ba0995f22af49f5bae"; + sha256 = "3698541ca4e9eb7f5c422082cbacd407870ffb170c9f9d0fe5f0c55dfe2b5449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/et/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/et/firefox-87.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "962dcd00ed62c5ca6ef86ede3e965e699f403435de9ce933457dac940141c293"; + sha256 = "86a1986a7c63f63c559d36d3d42e95def0eb8a89075879c3253156e80ed161c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eu/firefox-87.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2ba0643490d449ad39b07e98713f8693ecc16b368cc459a9ea89a35a1ed74978"; + sha256 = "5db12874991a1583ec09c934e18c93225b9831acc857d8c1b633f48c65e7a415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fa/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fa/firefox-87.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "11566ef20d466b2930841f4fce2f92960ceeb1771b82449c274f6a4fcfb85e0d"; + sha256 = "5066d7b66933924442d683aaa19aec9385b66eaf49a55b155653ffba57c287d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ff/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ff/firefox-87.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "110cbb0d3662bbc73273535abd2846091bb16dda3c221a60a2f7023ef756f764"; + sha256 = "35c8271fa506fcb43c20ccafb928b109125f3a17f80870a82365bc36f787b5ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fi/firefox-87.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "decb87ed765911a9564e15dd97fc7e35164b0af1ab84167dcd598689c8972d30"; + sha256 = "a3a0dc8cee1db20eb795aea5e94efafc96fc624e50159d8be7f449a093ffd291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fr/firefox-87.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "31fa08ae30af62b65b39c16718ee6c6f132cb157a92fc149a3d36870016abde1"; + sha256 = "d9c1cdbbe2bacb06608f60745ab213cf80b27051c6b58f0ed7ef834b839da7fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fy-NL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fy-NL/firefox-87.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f75d128c1c6a1b3171132f20f42aca2b798180e1d58f20e264d4defa0e4508d8"; + sha256 = "6f15a66cee03b494edf6a68641e0d5f886fe8528e23b9e129b11702cb9a4442e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ga-IE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ga-IE/firefox-87.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9902efeb4b30b0935be5dec5a7f85c4ec659b8d8f236e012b2d1187a52f3b667"; + sha256 = "31fcb9d815afc52db6328b076d89eab85a89d4553748ee7741912d23c420fea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gd/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gd/firefox-87.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "42c779be313524a365dd59013f5486e79b0378d0dc4fe805b5a6769d44ac98d0"; + sha256 = "c9d0b868022bf5c0335ed488df0d6006541cdb7609f8854aedf22b931017ed31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gl/firefox-87.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "cc5d2239946d4b01e31b6da4604a75862f501cc529aecd7962956d4af4dcc970"; + sha256 = "b546355345950e17202c4f2676731b0fe126d4d551131648f10e8c61cb8a2f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gn/firefox-87.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4a94e0f10f9002721ac57e622da7ab43cd1788683288564e87f667069fdac427"; + sha256 = "51c403ad0460db69e2ed6213410d9fe2cb6ae9a5f100bd4f5ac7d36cc68b65c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gu-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gu-IN/firefox-87.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f81a85e1bea666d339774e0cadd316fccf52752c11a0b5a53a82ac22d6d8dabf"; + sha256 = "dad776c9a4809c574967bb18d1ef96ab8eb5e95df713fe88fce044b755951550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/he/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/he/firefox-87.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "347130466e2f42d06707d56e486b4f262874e50c36b69e2badcb7287ff73376b"; + sha256 = "972135a17b091e8338762c4f3e9c60d826dd8b4f4e65c22d6cb07daabac95558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hi-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hi-IN/firefox-87.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9600a709b7e4b2bb8f0c57cde08627aff892341cd68edda563cb4d0366ca13f6"; + sha256 = "5eec4571d25c0c62a0d773af25b2be93d158e06302a6e5d47a0fa60f0819941a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hr/firefox-87.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "bea906c0745f77fc99a830594a2eef1ce609b03596a93cefaaf49044edd483c3"; + sha256 = "3183694fccb7a9560911d3d0813bf22ef79e1fdc8e72a5547258ff28b5ddbb6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hsb/firefox-87.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "56bf66c8f38567771b57e9f6008b0e86845cd71873b8ee4aa2c056e2c47d3f9c"; + sha256 = "82c02b623b0833468950a174a6c46bbf6c657252f0f876abb48e5b839a51f0c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hu/firefox-87.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e7da1098e56e1ad7e1baa3b6075defc6169e28306846c77c8f26c424c748f565"; + sha256 = "0db68343a32b3a69b323b8cf7eade47a453499e092eae5d57414739e2ea92619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hy-AM/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hy-AM/firefox-87.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ce3660bf256ed1cccb9c73d0c895907c68104f7f1cc28e7163363a060a747036"; + sha256 = "65b9c3902feac56c5563fe24a8c1d0f3510fca9b90062f88e4072a0ef6258c06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ia/firefox-87.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b6ebccd0e4c84d71e7da95ae99d6fa2e1a95fe94d6ed200fbf23ea7ff22aff70"; + sha256 = "50023eb339a5886cabdf7b71a65ab130fd0a5609cf18ceec9266100ce96e7c92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/id/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/id/firefox-87.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7d6844743e6a3e56a29f9d5ee599850bdef09f449de70f14e03664c02bebb31a"; + sha256 = "9a7279bcaeed8c6f6c44c4af728eddada5a96fd3c0204d10cd647d09721ec4e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/is/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/is/firefox-87.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "28bc14cf54090b9f52ae8fcbc7703f201407520e72f5aa6cd0b9f953d4db1777"; + sha256 = "697d1ac2cbc467d8526b8cf6a525b21a22fecb78f421936901ed3ecf91911146"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/it/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/it/firefox-87.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1d1a9a7108ebcc0cb796dadbdd9ddf0d8943e5d21c6d56588f33c583e7517b8a"; + sha256 = "4f51f5c632f21a0b589e2c358972f69107ccde6a32c5619e5b9273cd54198e98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ja/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ja/firefox-87.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "64342a2674eba04cda7f38e7382b7b2fa93efa1b5c555f0a01e6c59314913f31"; + sha256 = "2ce4af36d057c26f8b9f95b3c578dc738ea9ee80fbbb20f0c7257312499fb3bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ka/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ka/firefox-87.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "38fd38b9a257ba42928e72fed0c3047e000d2a603d37eba1d879ac1d3a87c371"; + sha256 = "9d4d54895d3237c7431c367a5c9fc07b99b11c91a1645e89fa7668111bb70ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kab/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kab/firefox-87.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "24570eeeaf5129ce8891320efe6a77203a3eb213285c71c9f2312da1c1d15303"; + sha256 = "4e67ce270e0a56f5acbe61a22368bc011ccf420201716bd36f5aec42a5d477bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kk/firefox-87.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cbc294b8e6988e2e010d08608fd1a822f05cf54bb3b3d6772eea13f1a17ee491"; + sha256 = "c1f1feaad98c108f73d575c2b59c3ff2fa26f9fb97a8d30182aeb4bd587063b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/km/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/km/firefox-87.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "ba9acd0c686ea2ef2d6d8af279c6cd75852021d16aa9e6d8a0bb429de605d8fc"; + sha256 = "f99973849aa9e9ca4f7534cc6eb3bb7ccd75cf95f600a4a124dd2750da16d2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kn/firefox-87.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "bba2d328021359961fc0bdf7f5676fe47d72476b4bdb54cd41b09506f49ef0c5"; + sha256 = "4625c75234dfdd35aaa383ebcef3ba9e093c73aec2ca524a0f7b5b28a2438de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ko/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ko/firefox-87.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "983f9e165840452aae854b780a480c215f3e030801ff8184424d53b541e1c8b0"; + sha256 = "d65454c1b36d26d7df7a1eb510f73e7fea47431c6e51dc2119ae6932e11f351e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lij/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lij/firefox-87.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "d57f27ef2a5ab4d8032cb823fa9cb6fc566baced92517dca8ed61560641af96d"; + sha256 = "ef7668799697e1d9c35661f1f6c403307a6deb6b2f265a2906d8baa699c224a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lt/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lt/firefox-87.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1866f926855aed60846004450b34fb341faddc992cfc603ad2b689019e888c8c"; + sha256 = "bd34fdcad69d3e0c79e226899d0df49e5244a4072446fd1cb7a290261f8473c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lv/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lv/firefox-87.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ac79432c516df059b15737c1bb492a3eec6dcd5261a2ebe17698720ae7085cae"; + sha256 = "34c379fa36cb7d1de95c99bfae8476f57a40d6d041941ad1884a8314f8511499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mk/firefox-87.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5d9eefd2926d1554d1feb4526c460506315a805c7e149ca4f87e0ebcb24b3d12"; + sha256 = "4a9020fd5864d35efda8ee36454d72392ef3d2e5c50f0bcd6e6f3326dc8fb984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mr/firefox-87.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a5095a4eeea48bea9c52b843023756a9912a979aa8441aa2160785287bdefd1a"; + sha256 = "6195db5fcfb95148c243d7fa4675fac0467f1093191bbb02dba714723a4f833a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ms/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ms/firefox-87.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "47b1bc88d7a5f3d0feddbdb0d9e30a5cd9e420b85f3fb360bd6429a4ca1e4bc2"; + sha256 = "95410958dbe73ead9ef89fcd81bdc3bd0bc6079cb8997962fd43fa07c6b546c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/my/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/my/firefox-87.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "420e4b3ef4b31bd850374fdd4098e41d455d02ab2bbf52b5c575d28ea6350afe"; + sha256 = "c43a08c4410d7d5d48c29ebbb96765d45dcd20335125bc664f5593d56440e8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nb-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nb-NO/firefox-87.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6f6656a5370de01fc90eeeab8088d69d71c2e55cd9793b285f0bb88b61d44131"; + sha256 = "7f39e801ca6ce05bf6398b914acff4a3cd9016503a4401f9b51f92bd4b2c6737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ne-NP/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ne-NP/firefox-87.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e7ac9e8e6914624349fd4cbb230faa96eed54502ec8019cdf2032606654e4464"; + sha256 = "b3ccaa031229d8e369f1acedb49bd159d282cd771205beb2876a8c7d4fc90413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nl/firefox-87.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a425e62f533d9e360ec2690946cd9ec5fa4f7da9ce6891558fb50a1bf3be6adc"; + sha256 = "3647e87528883cd7bc3310000f77237dac6dc57b62b664c434b16b9bf736930c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nn-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nn-NO/firefox-87.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "69c939c97646fcd628fe3facd0643c2d43790d7997b902a921190b6269dbf88e"; + sha256 = "3a94b93c5bd68f82ff9d310295f6397b902390061d21c0560a0906415e7150f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/oc/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/oc/firefox-87.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6a4c2ace18b9e00ee25a4600e115af847d305e60d89335203209d5a519ce89fc"; + sha256 = "a6fcecb568052565e051879487b34fce54b0e3ca3cc761dd27749d949153523b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pa-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pa-IN/firefox-87.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d81d8fda4acd4ccad2cae15a47123cecdd91afa66f93cd635ea13ed6af074fa8"; + sha256 = "14b10789c0d94e60c85be5594a0a11654a31e60518c78c04e4bea2b5e64843bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pl/firefox-87.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cb4b300ff0e8e8b0d874dce5349202b8b29e5a4ff79ab6044df74a53f5c72dc8"; + sha256 = "44aadea74c71dc86d7a5e0cbc04acbe2e26e46add5daaf0f8b31c4a17b439346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-BR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-BR/firefox-87.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "654cc5d0a0e35823733e6c9d440c43e4483233a4423c6c9bcaf91cb8fcbeb5ae"; + sha256 = "057eb47c7f45a1c0005a508bb36ee04b3edfce0e23e175fa311c9f1cc49b7e03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-PT/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-PT/firefox-87.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a944bf18dc7490ce80779af4cce82c20521b48ddb691ed5504d70075116af0d7"; + sha256 = "dd33f93ef7acd1e183902bd85b292b7073beb9fca3b46279f0405bcd06016771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/rm/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/rm/firefox-87.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "674921eeca942cc77b08e8c33a273d327357d90df7be91140e468517a59a7cbd"; + sha256 = "dd7649d8de678648f54a6dab7a66246abb6b514ccb5044eebff5f6689bae99d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ro/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ro/firefox-87.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8cbc8f6246455b6deae4a8e619f065ba218b59e711747033b08adffbed8498d1"; + sha256 = "bcbc82632f8a6802285f23bf0238738a5abe5e77d70596261cf7fbe6649c9560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ru/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ru/firefox-87.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6d2f6c1d4d8503ee78769c69c97a3cbefa6544a8a1ffb662f10460b6d78fa209"; + sha256 = "bedcd965e2a460bbe2aef0fad6bfe524044ad29225d26009d5311b8796bcb64f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/si/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/si/firefox-87.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "af33afea872e8e2b8825a01d5fcbc40a5b7674813b60735855b5fd0b886c57ac"; + sha256 = "bb93e1dc7621094f32e385632844169a8dc51369be8c5ca459dc17708e1d1ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sk/firefox-87.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7ecd39362865c864d6a5412bed20f8946019e3cb845923ce2ee30112d8e6444b"; + sha256 = "d7dfbfcded930a7d8aa03e482c66004202824256255cf08aee5a84a41d825285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sl/firefox-87.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "93c000e695b37f389356d4f3c48c55de6839688826c507e0cf76fee105409dfa"; + sha256 = "3ab06c56331850805e8e925deefb3cd0d21913fe88e04d6cd16ad9c59041d444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/son/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/son/firefox-87.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "25df54b6e83be77fa22622905d17667a5db613eca263582daffea9c0079031cc"; + sha256 = "6b93d5b1eeaf64ed591a285b1384d63dec16f388609c845e12f4565ed2bb32af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sq/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sq/firefox-87.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6c8eb230a6de1b5056e530bd76ef0d6f6f35ee29a9d814440c6c2a32460b2de1"; + sha256 = "834a04d54a73886c58d0360c675b137b44a69b34003e5d77ba8516397e976874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sr/firefox-87.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a7b82f4383608dae512dd528068d9b4b2d4ca194f118098b328fd1b817bed14c"; + sha256 = "d629d7004fd5c3298e61ec154c7983b8b7bcc4ee8552ebbd53df81eec85e5cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sv-SE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sv-SE/firefox-87.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "dd856d068f32271ad024649c945ea4665faabf81a4057a8c7efe4f1cce302eb2"; + sha256 = "c3d19f42894dac47f78684ea1a9bc9d7a6fbfd51b4186bcb06679a6666a280e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ta/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/szl/firefox-87.0.tar.bz2"; + locale = "szl"; + arch = "linux-x86_64"; + sha256 = "3572e4ef3dc20960e60f342e0dcbb4ca374c9184cf84c40d644c3677b8dbf4b8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ta/firefox-87.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "9cb7ec3e3150a3594ae1a460b70d81ce1ddb9fe42696710a0e7eb1baf7c5aa17"; + sha256 = "b2f40c2f906fa1cdc67ba12faaab62468e71b9c9ec1c28790db56a4728e5f897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/te/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/te/firefox-87.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a3960a97ab3a7a28fe8c218457fe36a5f72827d602ebced3ff74d02f9941100a"; + sha256 = "81f135e5b9e1c90cb22baee13c5ebd5d2a954f3d3a31be74489eb9bbf4dda7ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/th/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/th/firefox-87.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c342893afcc7b68ba09c8875a55bec4ef2a8c5af40c0ae96a13a662eb0d73115"; + sha256 = "dac4e7326e9a2b0c6eec8361ebcf23afc95087f5fabb964c7802856bd8de02cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tl/firefox-87.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3b0de00b254c2d984bbece1d3ca3acaffdc316a44d7270f4cff4c35425310913"; + sha256 = "9be7f3be1ebdfc19c8da8a70b1eef8108c6508dc6c37b39824ef11756f62768c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tr/firefox-87.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "db36a0260fe69a99d3c834e526a6bdd305334490dd3e644dbd8a48606487209e"; + sha256 = "d7be3f1cab9759042cc30002063764dc66a9f622df71291daf93faa204090b02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/trs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/trs/firefox-87.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "94bc2723028e39d161bb7e95a27e9ce935671c80646674aecc871205a6c602ae"; + sha256 = "31b5dc1f40614975a8e3fa05caa0dd8dcab6b15dd0ff1ac4626d9c19b3e763ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uk/firefox-87.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7ad9a53018e54fcdb860cacc5fad9eb34a08e879ab69d47af21eb31f3d6c2803"; + sha256 = "a53842d484e2a632931a72b16b3c8e30c902dc1e46c3cf2a7711bea1fd0911b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ur/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ur/firefox-87.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6d333e34bb8a332efbff91b9f7d69092b69e377c324693b765eb48b49a7ba108"; + sha256 = "1353882717c9ae8e35523ab403870fb08f06ddec2df0730637195b1ee112e746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uz/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uz/firefox-87.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5d111ce8b55637ab03c94fef0ed2e5737bbeee4f80a1ca4ff1847c2e9133c31d"; + sha256 = "43feb49aefcd292f61faadda2771251017c6104038ab1474d43f5cae1e8ee3ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/vi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/vi/firefox-87.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7fafefae0afc2142a01d7304cfeda60ce1f6302c29abe2d906391dcafea0f25a"; + sha256 = "d74a8de627e877e9c28cd19832605e039398dcea312a4784099151972d380516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/xh/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/xh/firefox-87.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "0d177c264ec9b357be2e616fb02958b4c9d7c6baf292f3c76bbeae84fd2202bf"; + sha256 = "3251086b6f58c311906c49a6b499db17eaa3122a8ffcafb6f303db0489530560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-CN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-CN/firefox-87.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2203d75b4a62bfe3cbb51c02665420700ea00686b7b9d4002b9a9a6ddca13f36"; + sha256 = "4d3471f60685d251b10dd1dc06610bb3ebf9d7a4e03616a6f6d988278868dc05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-TW/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-TW/firefox-87.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7d19a8791c79c0bd9fa03ea568f896221cf6432c826f4a59f99ec78139966817"; + sha256 = "8fcfa5987a0cfa37d5408c88701378e970960d21d181342ea2a3d6c43f4e4cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ach/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ach/firefox-87.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "caa9485d62e682e5b06e39528857975d1c862ef23e62c9f4147c5db4027c867f"; + sha256 = "42ba93ba360aac202bd0b653a982dea3c1ea0d5cd6c530deef47c29c189c197f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/af/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/af/firefox-87.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ea114ce9ca7f2c4e5675d25224ffaf7805ec9361097ff47649bd4371937032f7"; + sha256 = "9aef316b230194ec02ebb1e7780e61d85b1a4cd398d56ec0c5238bfb9af8278d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/an/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/an/firefox-87.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "c022590875868195664c4920a3da7bec6bf9942a233190176827d603529a74f1"; + sha256 = "a645abc8fafb548a495efdf9e88ce96af06d0fa4703ed5ea6b63ae79d309f3f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ar/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ar/firefox-87.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "66ac4afbde7ed45e1d0239e3364c62f788ac26c8bd652b5c571a9f965ae632ce"; + sha256 = "c85e9eaf8480ec226eab70a8b434f56fbd5f4f8a7e57f13b341d478142e4ef99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ast/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ast/firefox-87.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "3962d9728bc8a0fde06ab64d6da1f40328938db7689db7b402919191c5286f3e"; + sha256 = "96a1fe1ab748ba2f99a23fd149f1d0b60a27f4d96ad12bb2473ec0393597e968"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/az/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/az/firefox-87.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "84e786225936123aec5c0f2bb27df9dafcd1ceb2e50e8235749dbc081adfd4eb"; + sha256 = "52d3bc8e60196814f7ed1d1732faf32b4129a25379e9f526db7e6b755bbd5746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/be/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/be/firefox-87.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0cfac785cbb8f0c179788dca2a54484473cdfd5e0618894665bbc70d4c2e36f5"; + sha256 = "8cadf14d2ce8341e8a6a11a298203e121125d12ca63833642186b79ae79b5643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bg/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bg/firefox-87.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8c99908f307fa77fe6e92e58d26ea295471e6421181218fd0ca022c767e1f5f2"; + sha256 = "b60d8361c16f9b200255e6a904fdbf8da00a6f33a95280e456b471d54cac75d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bn/firefox-87.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "28b303305691ea7f8228580135acde6c17d745719a96e82c60b8d6738fdf2bde"; + sha256 = "1818bdfc297e2928255c006f8772478ce574c34748102ef64c5645ff59e3e2c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/br/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/br/firefox-87.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "83a76a0e7dad03453178dbb3a792aab03500359b623851b9a6ec9a4c1e0af084"; + sha256 = "7989cb7ba1a6984891c6eaa48a35b09281d0b8c7532c46cb1c87008bff5b68fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bs/firefox-87.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0700c7d655136ac51134a6da9def1747a27d84ee21b523dfcc6f30042f9b8632"; + sha256 = "d618086558e44219582ff263d9555855bd562e0a8b9d588c2a03734d003e1138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca-valencia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca-valencia/firefox-87.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d7738e186c6bd3f4a35c53bc6cf39876ad7774a45bbb3a44529c322f48a490b0"; + sha256 = "8f74cf450192bc9dfd2877269f98663ebeb06fdd0cd6d25db3261e5d1f6b36c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca/firefox-87.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ca63b150369c02a048ddbfaaa2f2faeb2729fb46086937c97a93d684975e2837"; + sha256 = "dee6a1ded1c10b4771294435c23e433ed209dfe55db9cbcc0454b0da23d26cec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cak/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cak/firefox-87.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2a8a8ebe18dce87a021c71e87e2815b227b03e3251d141f044c083d7a4c942dd"; + sha256 = "9e55f71f4040c21d79fabe4487cf5b660baca37c23875a31015e70a520fe0737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cs/firefox-87.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5e60175642fa8260c4125b90412564fbd49b8f91ca204c30dc687108273184db"; + sha256 = "3121a7d49718ebf6c9a8babe0f57962547b54b99864f917d045f78ea4a4aede7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cy/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cy/firefox-87.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ee6e49cc30f01f5604cdb317801ced10c24809ed64f6505f44b6a33cb359641a"; + sha256 = "02c5a049462f3d4c0a538a62756af8b4e59b1acdfc4d92d43639ee3a27e568a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/da/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/da/firefox-87.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8c447626d889aa067bd758a56e4dce720f01192e283c7e01997c6f85f0265f89"; + sha256 = "8bc3ad5f69850d0fd4c91ef2296462fc2c641e8eb9835ac5ffe88a9dd518821a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/de/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/de/firefox-87.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "12d52ecbf5c4b9313c3e9cb61a353f812319142c6b20594f7fbee01a339d98ef"; + sha256 = "2e9e562e10477f4a54d677bf2cd6becf87e4f40336fea8f4337f5e7d928f28f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/dsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/dsb/firefox-87.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5064e20ca27adaf48d5c4041c12db3738c95b9143f667ddbc28230ef9387b28e"; + sha256 = "fc1881741d5aeaa5cc34e9b86515c8ad637984d88814c48f8f014dfab55bf02c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/el/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/el/firefox-87.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a625d2caf3be1a5039a90c3515d1598b5acb87a4e4df4e0ea22f0a63b0405ae7"; + sha256 = "cc44c88c82adbdcde8690825851711b48212a49aa74b7485cc51d234a5027cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-CA/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-CA/firefox-87.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "cc1c18c8d4d53495fc4236c95b353bbe40c3de16ded002b2bb991a824fc67210"; + sha256 = "c6a32c84bd3ed42ee801a5780cf45a6061fc8b37de4220907a98d674831c0a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-GB/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-GB/firefox-87.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c76f7607b28bfee12eebf2aae7590fea71ed2a4f3bb0ce3903f0331187640122"; + sha256 = "cbf4e049602873ae13eabc2176657bdfb95fd4277360991ab4ef2a4e7be697f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-US/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-US/firefox-87.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fe6bb788d3c5264943ae5a287cee691f6aea8b3502f11e386f6d723a08dc545f"; + sha256 = "9127aee106dd9f09fac0c3cb89c5d75553384da4ec9be5943b60a5f55f31fccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eo/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eo/firefox-87.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "39af3debe06726ddd02a4914bfecda2d023d9445e7c735e8974ad73f45955298"; + sha256 = "7f75cb2fa8c73bc98a4d5b0f60ddbc66eff63a9caa271b98bb8eb4897fecdd49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-AR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-AR/firefox-87.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2d66f2f28958157da1dfda56827f5330f6d7b9fb192899b2ad60ecd6d18e9505"; + sha256 = "090b13b1698e70c0d13409ffac5b45a044356556e3ecab970fd34907e16cfc11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-CL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-CL/firefox-87.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "cb69afb6ac3b47721176934047ec9ab3b1127b7d36da7b9ae9af9aec72bb8289"; + sha256 = "1453a40f9c2ae6794dc886d1c5462e4341141fe84792e32a08b0e6c4ac5183c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-ES/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-ES/firefox-87.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3c0ae2ce17078ef568ac71d5cf8ceb0769fdb8298ce17c58468cf57ab7a95af8"; + sha256 = "3dc986b05c389dab03cacd1672c8621f1ec93e5781dd79ec18358e3a1f2e8f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-MX/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-MX/firefox-87.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cd07a75c8c96ac8d31cb988d9d394e5e2eb9bb6cfd6df33d6e60d38a6406a4a8"; + sha256 = "e6b18f0adf5ff99d1c7f84dbabc00b44ad7c3c2a4b95586f58d18421f28dfa1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/et/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/et/firefox-87.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "cced1ea2d54c9d305b61ff1d1025aaa5f23bfe86fca3b0e915f2dcde1384d042"; + sha256 = "573cabc8b8eed9e80d43ce960660737fad1f3bf43266d3e72ea475bec931eb9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eu/firefox-87.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9105eebe6f606292b82eda26eb68b399dd13e1756f1ca88395f0b7714089ea4a"; + sha256 = "5b3d1ecd842b30029fa1749ad7a1aa6486bf96f977d5f274ecababe7909c71b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fa/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fa/firefox-87.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9956fc5949d1e111265dfcd71373d8ada4cb2f554b9ffa2dbda0c430296ece56"; + sha256 = "41edf84920463d8c1f6ac8a8c0c5068143652129ec42377e3a3973d54e8477c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ff/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ff/firefox-87.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "02a6a2f711db26b74094744e9f198ddc05a1188fef0fa330949e9e5056c7ffba"; + sha256 = "492d2b1307558b1b19b5d1d88bcc0eb151d00ebc1331356520068597614919f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fi/firefox-87.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "368c2a59f1446d61a7a27892ddaaa5f933cbbcb9e3f238db5f9e9cb77873e37c"; + sha256 = "f495c5d6965c2fdfd06d23616f4b017c600e07efc22984be743c3eadcb5eceb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fr/firefox-87.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d543125a0e0402245064dc763eafcb3b00237c217a929b04f44db6755319ae2d"; + sha256 = "ba0cbea290a3911a6bc24fd52e726234f90213b05756a57aeeb01a8ebcc7af73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fy-NL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fy-NL/firefox-87.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ad28252c39eac70b9ce15631c65dfe520950d36212a547587978c635bf835187"; + sha256 = "9e9dfcea10f89836b3d63420f90f992b123dcec3beceb3eb739d47b15ced4a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ga-IE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ga-IE/firefox-87.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a16c0117757cadacc408f95a81e38b7f7e9489a4b6ceef30b8a65796fa6a2ca2"; + sha256 = "316b6877a46f452d628509bf94c4e729080d93cb8590d8c17f9ce030823a3b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gd/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gd/firefox-87.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "83b61f8e5801607f7b71fe2fa5fd7aede2cd56e4b46b25057935afb23f28ba01"; + sha256 = "34f2b2660f76ca13697ca029fe06cbdada7e8a0ee3f703c55b5290af4f59d687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gl/firefox-87.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a603031b44679e8e9dfa14c2094690c786b4ded18d736bb16d683e978346fefe"; + sha256 = "b61531887132193a3b68fc1394682305bf242bb8244f19c6e6dc158b0e6dda61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gn/firefox-87.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5146bded3c264c6a77a9e4e9a1c5523e63858eed5077e8ded56d52b94fafa7fc"; + sha256 = "286d7c949488a93370055dc650a70825df689b496de47382c7c326d0be16cf11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gu-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gu-IN/firefox-87.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "d177f05815889cd026879d6ddb3c03d3c62bb3b2787ca68a97902671977400e7"; + sha256 = "c04e2f3cd9514b8494122af0baa474b2e3ac91d62939ec1117f3b07efbffecc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/he/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/he/firefox-87.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c3534b56a9fb43e959c8c6055f6af0c1ce9e512bee8786fa4a1028ba0813cd73"; + sha256 = "9f4436ba36fe3d73f22c0837fa124e712c58169d9db1cccaad91187d895f4b95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hi-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hi-IN/firefox-87.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "a4885b1515cee1352bd534de17742af432502169d8cf2f34426950a5482647cc"; + sha256 = "e1c3674ef1a401c6f8f5f9f3f4cfdc9a858fc670f71d0b09d79677820ed6ddb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hr/firefox-87.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "1d9d49b4360efa296ec8b6750aaf8e09a24d749e3694d30dca446480b350a733"; + sha256 = "7dc0f6c2cf38f90741a8c0a2f5df22b32abb6399d9b24cc827f1ae972a481b23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hsb/firefox-87.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "65b890ced9ffc672d92d8fe998ff4f5deb485f22ec4d1525525fac81ed30c2e6"; + sha256 = "d59ee63de2bcb95575a782294cad35a0ea99eb4c8e4bde8539cd20326d85b41b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hu/firefox-87.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "90e32c53ad910ecce1558c99f10514775b72efc207451e9c61127051c92fe450"; + sha256 = "c9d13a693183290db6a62eda37da63f0d1535db5604a6f62d88b990ac3ea39ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hy-AM/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hy-AM/firefox-87.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "02c1dc969487809e432f4053b39b996ffcf51c81c7827146d3cd7a25ff050abf"; + sha256 = "7edb84df00e57987f4cbef235a1fecc22b6dd7aaafe101f62e002e4e59caf56e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ia/firefox-87.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "81d027c3facbe67258151046d9aa53a7d832d1a120aa671532524c87b79efe80"; + sha256 = "501cafeb34aef4d8dae63f47446abf8b04dcfee93b9931ec06f809823a6c675a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/id/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/id/firefox-87.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7a54acb6b8f14cac3d2a7e21fba5990dbaab9d4efef8d2a55642ff120905cbd9"; + sha256 = "9913aec5634c32300c2f556017be415ef6516a4380af3e597b2abd8e449e82a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/is/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/is/firefox-87.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c1611ebeceaf431883e5dd61b15aef2954007feaea3cc7503573216ba4cbcb0e"; + sha256 = "71b1bf3205043c5c23988de6955a51091ec812e82701d0f37c12e937ed774b69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/it/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/it/firefox-87.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "76042e19b820c69b1d7d39f3be87069142a4fb6c0327b8f67f78b87821454cc9"; + sha256 = "7a842251175a2db53e0bec3b65c2db0007a1fe5d84ec126fa9029c6d9dbc732c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ja/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ja/firefox-87.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6e2d8fe15275935a02e3f07ebf14b61f657a35cdff262d50e3a0f10e3ff587be"; + sha256 = "6a8aa33e333fcfa9bb2a011d08af0d10b445be1a22dacc4458c121e8943b1f62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ka/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ka/firefox-87.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "93f59b3150795ee6a1d5cd446cd0147f5ccee359939fcecae63a262f28eea0ca"; + sha256 = "f2d2cc7b079e0ca69de3568b10bdf6d7f74ef7f8b0bd05a89442be41df3d2239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kab/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kab/firefox-87.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "d71c30914f32b0f5f25c1492e94d0a397997f946f1ff58c85997d9c6c55ddd4e"; + sha256 = "7211457301c54fed01aa3b0735fc7f0814d4fbfeb7862ebe438f5cebf7fed6e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kk/firefox-87.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9c3b1b80d46c75526c5c9b53229e74aa7cb7219a3110218ecbd099e1d05037ac"; + sha256 = "8b18ac077d961279b2bb179ea37819de964e488ab528d4591ce2479ecae167ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/km/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/km/firefox-87.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "95b59cdaa6caeb5cfbcfc673faed614650dbd44458c79684ca7f2ee4ef678e4f"; + sha256 = "6b06454f9e061ae6d099ffbb2079d92538b32eb619d12858c3d759f004c427c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kn/firefox-87.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "31d79f5609140fb213e19b60d638811ef576bb3db8be533aa92a02ffd22d4df5"; + sha256 = "4b8d711f0f33c850d2bf39f16ef0da7e004374445ad8bb3e69e0b74ff0765cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ko/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ko/firefox-87.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f05215e9004a651b239475bf02de19709fb2ceacd99f0da22ba4ae91dfd899f6"; + sha256 = "f6da2239dc4e457623a64f2ac5e56868e70115941ddd3c19093ba180a3aeea7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lij/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lij/firefox-87.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "309ce372ace38efc2cd907df32d18fad97e8fe66728c52efcbc36a36e91163f4"; + sha256 = "fc45263e353af69c7dc2e5d74edefa793b0f1d2bb86f496dd75ad66bdfc7ffe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lt/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lt/firefox-87.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "1426fae07194ec4dde7fd797631cbb561726af5b1c255b72c13a96b54034a440"; + sha256 = "f030574f0bfb8574ce07159fdd213f1e21c4293bf7e1961080e6ef10f7f14b42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lv/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lv/firefox-87.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "48be4205b0d9ba8de2545a73950a4c2836db3d046707ae5db7e2cba0dadaa3a5"; + sha256 = "7648c4616260b09161a3431120fd99c97c5630347ad4ac196956eae4cb4b18f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mk/firefox-87.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6cc5019e2d41510a67cec8850451fa16e868da753dceb8a38a0cec893814f07a"; + sha256 = "c7bfcf5ee846d340d454d6cce2e66c0245bca10d1b74887170ba3820c392155a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mr/firefox-87.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "ba73c1ceac1ad36912f6367a23bcdc4455627d16f2bb589cde4abb5304b06d67"; + sha256 = "808207c6efa62312abf14091992022a3d37ba906c8003316d6af943228ba534a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ms/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ms/firefox-87.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "09935a83eb75eb9f89847d9b279c5728c524bef37d063969ec3e44346ef74c12"; + sha256 = "f836343cd1116657b8f8f28f49df99b36a13a4255d0499945953b64934f80e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/my/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/my/firefox-87.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "55b7adcbe1bb47dc49e1d51d99fa3b3a9aa3028a56fe2c53848ec9591503360a"; + sha256 = "1c01f7dcea9ecbf1af3cc29cb38aa8cd928dc6c10f67fdb20f98a588951336de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nb-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nb-NO/firefox-87.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "87e7f1d1ecb402f9484e40078a3460b18aa41d88f0bedf61edeb937474ab3e69"; + sha256 = "f196268af59a118a4c5ca50b5c7f9ace27d642fd1952085dd693f09462eb27a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ne-NP/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ne-NP/firefox-87.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "0c5e84344df03c41ab835c3af847772d13fe48d3395fc2aeef020eab04f76baa"; + sha256 = "6a80edda7e3b0f97282840eaacd9d4d003e6562c4931a14736bd1aba6ea8eb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nl/firefox-87.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "75f54fc189ee6f43277066a2600bd340375fa5820e64dc340a3ac93a1f0a6ea0"; + sha256 = "495a43b18aa2078bd86468cbd1545ea04b0fc63c847a459156489c18432fe5ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nn-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nn-NO/firefox-87.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e1dd0adfc33ac73890d849c685d3072a8bfbe6ad3b5ad0bcfa0a04c9ec817c1c"; + sha256 = "a3d58b74e2ee2c97a2b4aa5855040f34f79024df55d8de6623991df61cfc3b46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/oc/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/oc/firefox-87.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2eea8f40976373fa98d7d32c016dbf0e05fb8f53f3c0f038a087220ea91999a6"; + sha256 = "c71e444eb03df8c4b28dc34d4cfc32db2471ba12389f448c28a9dc03fc0dbfb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pa-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pa-IN/firefox-87.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "03c1dface09201be51bd8df92a420b67ce885a712231754dec5e42a4e5cb8cd8"; + sha256 = "69eedac3a7f2912f179e2c5838f4dbe109c1b1c570ea1f375d5563a622553f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pl/firefox-87.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1d4fad5713d1b6606551aa9b9527c4919e548fc9fb50b921404609dd7a43c76f"; + sha256 = "106012905a00d898ad3fa43c733c1f568c0df2e74165276feb5b3f5eb79a3b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-BR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-BR/firefox-87.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "53defe8219ee88152a542e24526a3bb9d75e0117e606a3e976d798f441acd64e"; + sha256 = "18434861a77abb7810008af068589250ae5621c1719ed4d37643c7aa3607070a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-PT/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-PT/firefox-87.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d91483eca2e1972ce6a0ac97b0393a9cf28a36eb1e923cd863d37b8fc66f4edd"; + sha256 = "b27fc0941804f4bedf10c15e26fd14fc381416a2c29fbe9b4d01f328e2164022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/rm/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/rm/firefox-87.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "926234371843aae60cc81886ab7ebaca7bceb6f705ab9d2560ddf996e46f6aa3"; + sha256 = "2283c43282caeee2798a93af96979e46a103b3ab7c645e72384fe19973c49534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ro/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ro/firefox-87.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9c63bcf8b603b65f355460d0de6827e363ec0797bddb9d446e116b641a5f430e"; + sha256 = "6d7ba9b40f17f373c4eb151a4bbf6399d27a8e5071342d25a374afc67914bace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ru/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ru/firefox-87.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f4cb8e70dd3c0b2bb97b28c6f85654786f65daf6705559a3dba87a5aa4f0ae18"; + sha256 = "77341829394b41ed8cf63090c30b993e3a540b838bb476239398795eb026442b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/si/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/si/firefox-87.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b305cfa2be37591ae0bf49de8da37ffa3a5c69b242196073d84124dd02dd094e"; + sha256 = "b7aaa753f54ca1aa5172c39e9899c662f62cb81628f29d29ed8774c68697d1fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sk/firefox-87.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "23772e40241f955d20a1579f283c6d648e180ae7da21ef0a914156733f89e6a6"; + sha256 = "fc70db60786a652dfa0d8614c24bb4b5cb46849a468903723c9e9cdfebd9eb52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sl/firefox-87.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7213f902b853bbce4594db2f5555e437a82adaeb506a9d1421ff9015d29a9659"; + sha256 = "392eccb8277c76b4178b6fb74c8974ad31e0b36fe8778b5933b37f6249d3c9b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/son/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/son/firefox-87.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "7b45520bd7305b28803bd4e2f22d41216707754ef46cf6981f0c299b03efeedc"; + sha256 = "c95c7ff206a42cf5c4caba9a3377834c1b8b4d258de566efed15ab0815b64726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sq/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sq/firefox-87.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "11b0b971a705d483f3dd7fab066d034f0a30dd95e16bb7d7aece44d8ccabf450"; + sha256 = "7eb9cbe937262ed47711df80143b49d369bfb185119a3fb51f8a723bb99b1f9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sr/firefox-87.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "07369958e98d1959be2e52b33145ed1075dd85220de38fcaf617d207217a0066"; + sha256 = "4d4b88503ccc6d5f5c16988c626027516681d265b32ee205324919a170caa1b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sv-SE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sv-SE/firefox-87.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7671a24d1b81b26c34a21cedea05b6c132963045d3cbc28ee264f9c56302cefd"; + sha256 = "fe2fdf76541c95166fae7b9d1c0b3390552968ac0a8f47f2e23da750c8b8753a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/szl/firefox-87.0.tar.bz2"; + locale = "szl"; + arch = "linux-i686"; + sha256 = "af91e1a4d0afefd890ce9ab04ac800427670a314089b67dc41e12bfa43ecf112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ta/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ta/firefox-87.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "bf605ceac99dfc2ed058ada9bb9fbd7ae56fdea3453d7dea23ca13dc284391bb"; + sha256 = "043162612ff54115953c25333fcc03d801176db1d379cb7c94f22c0da5a1ae00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/te/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/te/firefox-87.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8aea95f2069a59cbb575f386a7e90d04ecd0f4c4139aefc6dcba54b9b56e7aac"; + sha256 = "2fca2c54dd357d8d5e3bb8804dbc3cfcc7fd1c17f538eaf1e1fd60c95baf7252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/th/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/th/firefox-87.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4985ee399155bd0854c9b9068fa747f396855b1251610c3261fc5c7da5e5894c"; + sha256 = "b049f6cc876fce2d57387d2c90afff4f261baf38e582821656efd455fdbadc03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tl/firefox-87.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d328338029e0282ca5e3c7e0bcff73faddfbb4bdcb47a2978622c80e2dd8d0b3"; + sha256 = "be18fe1caae3a85e3a48b0a5a45cb175bd11c31d1cfbe726dbe4952c50338299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tr/firefox-87.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a438f5504b0fb62173a8a739645e7f269647e33316a35a96c5dce71d9d87bb0a"; + sha256 = "5c43338e0fc0138c280f9231e05c14a553d2b0504053b5c090adb7ecb96cf8d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/trs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/trs/firefox-87.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "41c90f6a5de249fc5b0dcec21d5d2684b5d3be2767d6073529101f31bec569a5"; + sha256 = "510ee9988f4d1c6e0e50fc07d00d2aa80380f89f8db4b0655c7a9c0aaf07fc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uk/firefox-87.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "06419fe5e671a6476500a8ecfe736237adbafdb39148d56d514fc7f07ff09e87"; + sha256 = "a01aa11750b6027f01b45763d691c425b65aa577fe9fcae6f492b40bb8ff6056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ur/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ur/firefox-87.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f5c1729584fc7843da5febf2411196d4615d4d5b490dc9a0f7b0709496b61ad0"; + sha256 = "f2e83dfd361dc8abfc3fab5554d1c545b216a05f57718aa1f8976f7c2dda3b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uz/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uz/firefox-87.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1a898dae70288fac86c0ff36b92731e7b3400652b5bef485db73cd8ed933e8b"; + sha256 = "4c570ba3aa3480efd63ba230b550d750a49289b3bafe9ede881b28184ac26ca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/vi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/vi/firefox-87.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "7c12e8fe3b30ae8b8bb106a3ce866b23dcdcdb7924ca41e8c9b3d541e0300963"; + sha256 = "846862d789b275ba1184b1f65a95570043ee1f8e2f7da5678252c192a8d31966"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/xh/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/xh/firefox-87.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "97f40f99c9d0204db12d1da1e58088dac2fcd02be6f4fd5c477d20f0149d1f56"; + sha256 = "5c5a88654bcec7a8c5bb7245567270542823a377c7843a6b14d8f12cf57b7b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-CN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-CN/firefox-87.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "309e7670632171133fef52c1426a1f42fb4e14c4d99a8f9543439b21105425f4"; + sha256 = "b7774306c5941feb5b7abf4fbc3e3d3af854145fff741f561708b5ee94d1816b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-TW/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-TW/firefox-87.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5993ffa86327a42ea91aa884e90bdb8626d4108a8299acb2f80623e8aaf3ed3e"; + sha256 = "d115d7086947003940bc270b6a83aa612324f7913e044a194c1e05648e241b17"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 925374d38e8..7a3fc9b9a07 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,16 +7,16 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "86.0.1"; + ffversion = "87.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214"; + sha512 = "c1c08be2283e7a162c8be2f2647ec2bb85cab592738dc45e4b4ffb72969229cc0019a30782a4cb27f09a13b088c63841071dd202b3543dfba295140a7d6246a4"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco lovesegfault ]; + maintainers = with lib.maintainers; [ eelco lovesegfault hexa ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -32,16 +32,16 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.8.0esr"; + ffversion = "78.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f"; + sha512 = "28582fc0a03fb50c0a817deb1083817bb7f2f5d38e98439bf655ed4ee18c83568b3002a59ef76edf357bfb11f55832a221d14130f116aac19d850768fba3ac8b"; }; meta = { description = "A web browser built from Firefox Extended Support Release source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = with lib.maintainers; [ eelco hexa ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index ec57bcfae18..a6cf5ad531e 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.21"; + version = "2.22"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8"; + sha256 = "sha256-A2SYazp/Ho4xcb6jYrU/ceHdM2CohC1m/cZVgOvCCE0="; }; buildInputs = with lib; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b1235fe2d8f..6fa585e7ded 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.0.2"; + version = "2.1.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0fxkazz4ykmkiww27l92yr96hq00qn5vvjmknxcy4cl97d2pxa28"; + sha256 = "0fz6rbacy9sbzx0jsvwkrcyv2849ia8pj1w716l6pw9i9wx3gp8x"; }; # Needs tox @@ -60,6 +60,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem + pynacl # extensive ad blocking adblock ] diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 9264bbb1560..064a62ee62d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.13"; + version = "10.0.14"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "sha256-KxJKS/ymbkAg8LjMFz3BDSupPk5cNB1pFz9fFyRTndk="; + sha256 = "1qgwzfdvix5gkqwapb4mki79mlfjzdlw68cq6q1qks0v138x528w"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "sha256-4glc2qP6AdHtWc8zW+varG30rlAXpeFyKjqDPsmiVfI="; + sha256 = "1f13jsk8k8b725h4wr40kfnln8fq7lfl4r992xj4rf98gcydws56"; }; }; in diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 6b1df1acf5a..8310d058492 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.2.1"; + version = "2021.3.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-kmlyj6Q+OAJ0cKMeWxajPDBm99WpRf+Gpvc+Jy79DCo="; + sha256 = "sha256-St2WBdy76OVFlYoY1RGwQj1WsUpPtsL7yX1MFwztKgs="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix index edad7fa1bc9..21a29e31243 100644 --- a/pkgs/applications/networking/cluster/helm/wrapper.nix +++ b/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -1,6 +1,4 @@ -{ stdenv, symlinkJoin, lib, makeWrapper -, writeText -}: +{ symlinkJoin, lib, makeWrapper, writeText }: helm: diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 32ecc8b7c17..ed828feefda 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.5"; + version = "3.6.6"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-FOBSGXVIb4mLDHMqOljZ04W0q/H/HOuFm9Cl2kK027s="; + sha256 = "sha256-SGVch7mMtHi5GYFOrSss4dk29aRTQmBzkPYOetPdF88="; }; vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 739992e6bc0..7c79c4896bc 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -19,6 +19,7 @@ , fetchurl , fetchzip , fetchgit +, zstd }: with lib; @@ -43,9 +44,9 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.19.4+k3s2"; # k3s git tag + k3sVersion = "1.20.4+k3s1"; # k3s git tag traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag - k3sRootVersion = "0.7.1"; # taken from ./scripts/download at the above k3s tag + k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag # bundled into the k3s binary traefikChart = fetchurl { @@ -64,7 +65,7 @@ let k3sRoot = fetchzip { # Note: marked as apache 2.0 license url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; - sha256 = "1wjg54816plbdwgv0dibq6dzmcakcmx0wiqijvr4f3gsxgk59zwf"; + sha256 = "sha256-r3Nkzl9ccry7cgD3YWlHvEWOsWnnFGIkyRH9sx12gks="; stripRoot = false; }; k3sPlugins = buildGoPackage rec { @@ -95,7 +96,7 @@ let url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "1qxjdgnq8mf54760f0vngcqa2y3b048pcmfsf1g593b2ij1kg1zi"; + sha256 = "0rmn3nh8a94axv6lb2xjnn3gpq0scnvj69bvcs74azvw62fvq016"; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -126,7 +127,12 @@ let src = k3sRepo; - patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; + # Patch build scripts so that we can use them. + # This makes things more dynamically linked (because nix can deal with + # dynamically linked dependencies just fine), removes the upload at the + # end, and skips building runc + cni, since we have our own derivations for + # those. + patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ libseccomp ]; @@ -166,9 +172,10 @@ let src = k3sRepo; - patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; + # See the above comment in k3sBuildStage1 + patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config ]; + nativeBuildInputs = [ git pkg-config zstd ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; @@ -255,10 +262,12 @@ stdenv.mkDerivation rec { # Use a wrapper script to reference all the binaries that k3s tries to # execute, but that we didn't bundle with it. installPhase = '' + runHook preInstall mkdir -p "$out/bin" makeWrapper ${k3sBin}/bin/k3s "$out/bin/k3s" \ --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ --prefix PATH : "$out/bin" + runHook postInstall ''; meta = { diff --git a/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch b/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch deleted file mode 100644 index c439241e855..00000000000 --- a/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e79ddef65d08599ae3fe8ff39d202ea2416650b8 Mon Sep 17 00:00:00 2001 -From: Euan Kemp <euank@euank.com> -Date: Sun, 31 May 2020 17:27:05 -0700 -Subject: [PATCH 1/2] Use 'rm' from path in go generate - -/bin/rm is less portable. On some distros, like nixos, it doesn't exist -at all. ---- - main.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main.go b/main.go -index 62908bb7bb..0527222887 100644 ---- a/main.go -+++ b/main.go -@@ -1,5 +1,5 @@ - //go:generate go run pkg/codegen/cleanup/main.go --//go:generate /bin/rm -rf pkg/generated -+//go:generate rm -rf pkg/generated - //go:generate go run pkg/codegen/main.go - //go:generate go fmt pkg/deploy/zz_generated_bindata.go - //go:generate go fmt pkg/static/zz_generated_bindata.go --- -2.25.4 - diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 11e2b0a2915..80a58543ae9 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.2"; + version = "0.24.5"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0cr7ap9yfd9flcph98rxap2f46fc3v689v31mc8n7vxi9jr07irh"; + sha256 = "sha256-CAKvu6/U/2krJzY9VnK9wUHSNCpM6rjRzgXAWhC65uw="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "01g50sfk0k7v60m3anfiq2w9pzl2wpa985s22ciq911h3fscka3f"; + vendorSha256 = "sha256-WcGIw53QPOVPeRXKMr1rH1R+PZRWf9/asyPyoutD8x4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix new file mode 100644 index 00000000000..76bd115a9b1 --- /dev/null +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kube-score"; + version = "1.10.1"; + + src = fetchFromGitHub { + owner = "zegl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-TYsuSPWTiIlPscul/QO59+lt6sbjJdt7pJuJYO5R9Tc="; + }; + + vendorSha256 = "sha256-ob7mNheyeTcDWml4gi1SD3Pq+oWtJeySIUg2ZrCj0y0="; + + meta = with lib; { + description = "Kubernetes object analysis with recommendations for improved reliability and security"; + homepage = "https://github.com/zegl/kube-score"; + license = licenses.mit; + maintainers = [ maintainers.j4m3s ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix new file mode 100644 index 00000000000..ca5e30154da --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubeconform"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "yannh"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lduHYYskEPUimEX54ymOyo5jY7GGBB42YTefDMNS4qo="; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "A FAST Kubernetes manifests validator, with support for Custom Resources!"; + homepage = "https://github.com/yannh/kubeconform/"; + license = licenses.asl20; + maintainers = [ maintainers.j4m3s ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 84a6cd644ec..62c12ac8afc 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,20 +10,20 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { - owner = "AkihiroSuda"; + owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ="; + sha256 = "sha256-0q3UmlXzW0fGYPc1IptuIbCMnKW4pyDm1KxkRqU2voA="; }; - vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4="; + vendorSha256 = "sha256-QVvID9rrOFngL94LWN75HSnyTgh3F0KaScWxMIKUqDM="; nativeBuildInputs = [ makeWrapper installShellFiles ]; - preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in + preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in '' buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>") ''; @@ -36,9 +36,6 @@ buildGoModule rec { --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ --prefix CNI_PATH : "${cni-plugins}/bin" - # nerdctl panics without XDG_RUNTIME_DIR set - export XDG_RUNTIME_DIR=$TMPDIR - installShellCompletion --cmd nerdctl \ --bash <($out/bin/nerdctl completion bash) ''; @@ -52,8 +49,8 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://github.com/AkihiroSuda/nerdctl/"; - changelog = "https://github.com/AkihiroSuda/nerdctl/releases/tag/v${version}"; + homepage = "https://github.com/containerd/nerdctl/"; + changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}"; description = "A Docker-compatible CLI for containerd"; license = licenses.asl20; maintainers = with maintainers; [ jk ]; diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 453c1406fd2..0e97b541a5d 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "octant"; - version = "0.17.0"; + version = "0.18.0"; src = fetchsrc version { - x86_64-linux = "sha256-kYS8o97HBjNgwmrG4fjsqFWxZy6ATFOhxt6j3KMZbEc="; - aarch64-linux = "sha256-/Tpna2Y8+PQt+SeOJ9NDweRWGiQXU/sN+Wh/vLYQPwM="; - x86_64-darwin = "sha256-aOUmnD+l/Cc5qTiHxFLBjCatszmPdUc4YYZ6Oy5DT3U="; + x86_64-linux = "sha256-D/pHOXR7XQoJCGqUep1lBAY4239HH35m+evFd21pcK0="; + aarch64-linux = "sha256-aL1axz3ebqrKQ3xK2UgDMQ+o6ZKgIvwy6Phici7WT2c="; + x86_64-darwin = "sha256-MFxOAAEnLur0LJJNU0SSlO+bH4f18zOfZNA49fKEQEw="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index f344b8c3eb9..8f4324f4343 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -5,7 +5,7 @@ let rev = "f6e19140201d6bf2f1274bf6567087bc25154210"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.20.0"; # Do not forget to update `rev` above + version = "0.50.0"; # Do not forget to update `rev` above buildFlagsArray = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -17,13 +17,13 @@ buildGoModule rec { ''; src = fetchFromGitHub { - sha256 = "11qawsv82i1pl4mwfc85wb4fbq961bplvmygnjfm79m8z87863ri"; + sha256 = "sha256-LhprsDlWZjNRE6pu7V9WBszy/+bNpn5KoRopIoWvdsg="; rev = "v${version}"; repo = "sonobuoy"; owner = "vmware-tanzu"; }; - vendorSha256 = "1kxzd4czv8992y7y47la5jjrbhk76sxcj3v5sx0k4xplgki7np6i"; + vendorSha256 = "sha256-0Vx74nz0djJB12UPybo2Z8KVpSyKHuKPFymh/Rlpv88="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 804659e084a..752274a5625 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k="; + sha256 = "sha256-6jUYntnMB/LxyZuRkSaOVcrzJOIoucdaY+5GVHwJL8Y="; }; - vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0="; + vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4ec886a34fc..9f5ced1d51c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -511,10 +511,12 @@ }, "kubernetes-alpha": { "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha", "repo": "terraform-provider-kubernetes-alpha", - "rev": "nightly20200608", - "sha256": "1g171sppf3kq5qlp6g0qqdm0x8lnpizgw8bxjlhp9b6cl4kym70m", - "version": "nightly20200608" + "rev": "v0.3.2", + "sha256": "0lgh42fvfwvj6cw8i7800k016ay4babqiz38q0y7apq4s7vs62sb", + "vendorSha256": null, + "version": "0.3.2" }, "launchdarkly": { "owner": "terraform-providers", @@ -1084,10 +1086,11 @@ "version": "2.3.0" }, "yandex": { - "owner": "terraform-providers", + "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.40.0", - "sha256": "0dymhdrdm00m9xn4xka3zbvjqnckhl06vz5zm6rqivkmw8m2q0mz", - "version": "0.40.0" + "rev": "v0.54.0", + "sha256": "0q9m7520zl7q1liri6x849xjp221wbc9l2w6dj19mmgfwspqv02l", + "vendorSha256": "0rzldsb8gyhvnsd26wg9byqngzzj64pi86v2hb4i63rlfmnn77xi", + "version": "0.54.0" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a74f5df58fd..d3aeee6bc68 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,8 +157,8 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.8"; - sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0"; + version = "0.14.9"; + sha256 = "0r9d28mbj7h9prr39gm5kd49l7sm8l1ab9rwrkpyhwgr119zf35b"; vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index c7097f6868f..9634e477e85 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.15"; + version = "0.28.16"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PhTFgYoSaGv54uak8QB7p963OBSgo9s1UM9/XBmYC8g="; + sha256 = "sha256-xt04gYxInW9UNxPG4kmMagfAQyQ+T0/u7m39grFCdAc="; }; vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc="; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 6b878cec927..daa9f486bf7 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -40,6 +40,6 @@ buildGoModule rec { "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index b032d3de332..38bc05b1f86 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,27 +3,23 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.22.1"; + version = "2.23"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "1j3z34dhqw0f1v6v2lfwcvzqnm2kr2940bgxibfi0npacp74izh3"; + sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144"; }; - cargoSha256 = "08ywaka1lib8yrqjmfx1i37f7b33y3i6jj7f50pwhw8n6lr9f7lc"; + cargoSha256 = "11dn1ixc7i29cv8kpqfkmikdqzr2v79vlyfxcvjwhgd0r34w4xhn"; - postPatch = '' - substituteInPlace Makefile --replace "|| true" "" - '' - # TODO: Check if that's still needed - + lib.optionalString stdenv.isDarwin '' - # Allow other ncurses versions on Darwin - substituteInPlace config.sh \ - --replace "ncurses5.4" "ncurses" - '' - ; + # TODO: Check if that's still needed + postPatch = lib.optionalString stdenv.isDarwin '' + # Allow other ncurses versions on Darwin + substituteInPlace config.sh \ + --replace "ncurses5.4" "ncurses" + ''; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index b4c1e95087e..f8e9fcc87b0 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.52.2"; + version = "3.53.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-wHiIFpKKJuiGPH3CaxWGROcb7ylAbffS7aN9xIENbN8="; + sha256 = "sha256-MJXnYN9PVADttNqj3hshLElHk2Dy9FzE67clMMh85CA="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 1a83a04a1fa..c5a718c3a70 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python2 , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; - buildInputs = [ gnutls libotr python ] + buildInputs = [ gnutls libotr python2 ] ++ optional enableLibPurple pidgin ++ optional enablePam pam; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 3ee835610f7..805278b4e45 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchdarcs, pythonPackages, libvncserver, zlib +{ lib, fetchdarcs, python2Packages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem, mkDerivationWith }: -mkDerivationWith pythonPackages.buildPythonApplication rec { +mkDerivationWith python2Packages.buildPythonApplication rec { pname = "blink"; version = "3.2.0"; @@ -17,7 +17,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ pyqt5_with_qtwebkit cjson sipsimple @@ -26,7 +26,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { ]; buildInputs = [ - pythonPackages.cython + python2Packages.cython zlib libvncserver libvpx diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index 396dec1cd09..0134fac0e20 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -2,12 +2,12 @@ let pname = "deltachat-electron"; - version = "1.15.3"; + version = "1.15.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "sha256-cYb0uruuWpNr1jF5WZ48quBZRIVXiHr99mLPLKMOX5M="; + sha256 = "sha256-BTGwgC0zSr1tq/X4v/fS/12E7/mGVYQ0m+Bt6o7VL4o="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index c7ddc495546..fe75418ebe3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,10 +7,10 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y"; + sha256 = "1rq490fdl5pinhxk8lkfcfmfq7apj79jzf3m14yql1rc9gpilrf2"; }; }; ptb = callPackage ./base.nix rec { diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 3dfbb69e83c..e266265291b 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.13.2"; + version = "3.13.3"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz" - else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g"; + then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw=" + else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c="; }; buildInputs = [ stdenv.cc.cc postgresql.lib ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 566e62ae7f0..4d6e22bd89c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,8 +1,8 @@ -{ mkDerivation, lib, fetchurl, callPackage +{ mkDerivation, lib, fetchurl, fetchpatch, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, hunspell +, tl-expected, hunspell, glibmm # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy , at-spi2-core, libXtst, libthai, libdatrie @@ -20,15 +20,19 @@ with lib; let tg_owt = callPackage ./tg_owt.nix {}; + tgcalls-gcc10-fix = fetchpatch { # "Fix build on GCC 10, second attempt." + url = "https://github.com/TelegramMessenger/tgcalls/commit/eded7cc540123eaf26361958b9a61c65cb2f7cfc.patch"; + sha256 = "19n1hvn44pp01zc90g93vq2bcr2gdnscaj5il9f82klgh4llvjli"; + }; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.6.1"; + version = "2.7.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0wwb18wnh9sbfc6h7m8lj8qmc2n2p0zmp2977ddif6k2gi6qr1y7"; + sha256 = "01fxzcfz3xankmdar55ja55pb9hkvlf1plgpgjpsda9xwqgbxgs1"; }; postPatch = '' @@ -36,6 +40,7 @@ in mkDerivation rec { --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' + patch -d Telegram/ThirdParty/tgcalls/ -p1 < "${tgcalls-gcc10-fix}" ''; # We want to run wrapProgram manually (with additional parameters) @@ -47,7 +52,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected hunspell + tl-expected hunspell glibmm tg_owt # Transitive dependencies: pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 7efac01c55a..6bd72134e02 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -4,8 +4,8 @@ }: let - rev = "a19877363082da634a3c851a4698376504d2eaee"; - sha256 = "03m6fkc3m2wbh821mr3ybsmd7sjllky44mizny96k4b249dkvzx7"; + rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; + sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; in stdenv.mkDerivation { pname = "tg_owt"; diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix new file mode 100644 index 00000000000..871dcc84c1d --- /dev/null +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -0,0 +1,23 @@ +{ ctags, fetchurl, lib, libressl, man, ncurses, pkg-config, stdenv }: + +stdenv.mkDerivation rec { + pname = "catgirl"; + version = "1.6"; + + src = fetchurl { + url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; + sha256 = "0shg02zidqqmvywqqsaazlgg9rd5lhhrvjx6n0lzmdfaawxywciv"; + }; + + nativeBuildInputs = [ ctags pkg-config ]; + buildInputs = [ libressl man ncurses ]; + strictDeps = true; + + meta = with lib; { + homepage = "https://git.causal.agency/catgirl/about/"; + license = licenses.gpl3Plus; + description = "A TLS-only terminal IRC client"; + platforms = platforms.unix; + maintainers = with maintainers; [ xfnw ]; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix index b55266e5f37..78f9fc082e3 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A WeeChat script that sends highlight and message notifications through notify-send"; - homepage = "https://github.com/s3rvac/weechat-notify-srnd"; + homepage = "https://github.com/s3rvac/weechat-notify-send"; license = licenses.mit; maintainers = with maintainers; [ tobim ]; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index f6bea3c8357..e17507366ff 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -10,6 +10,7 @@ , gtk3 , glib , libnotify +, libpst , gspell , evolution-data-server , libgdata @@ -80,6 +81,7 @@ stdenv.mkDerivation rec { libgweather libical libnotify + libpst librsvg libsecret nspr @@ -99,7 +101,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF" - "-DENABLE_PST_IMPORT=OFF" "-DENABLE_YTNEF=OFF" "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin" "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 18110dc7a36..e7b5496e910 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.8.1"; + version = "78.9.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/af/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/af/thunderbird-78.9.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "086a23b05a2baf8e8a1b44891017c6fef8c45d4e4802b519ceeda2bf62496649"; + sha256 = "58bc04e46def73b3530323e56d143db324a5a80f426b37ff396e2e43cf8b0042"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ar/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ar/thunderbird-78.9.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b5b643119f0d0336d61972d91f20764590d7453cb391165283e00dc980d3bdef"; + sha256 = "9520899691eb7e4e7dad95ce643da5cb966c1058b3cc952b55bd66d7a09473ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ast/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ast/thunderbird-78.9.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2e219961dc2b33f7680be0a6fbd03c0032fdbb557a3dedaf32773efb6cf7a061"; + sha256 = "769e7cd3699577a1f69e62492c8058eca635ffaf6acab6ca3a4112301aab751f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/be/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/be/thunderbird-78.9.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ce8a7e4f025b6064ff4eef01c634b2b7f52ec0ffa5eb7094f0483c7d6f31b939"; + sha256 = "c1b35990af2731b52da57b4b6b0e4a7733ea2e8d499e95b3b086dde3bdccb657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/bg/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/bg/thunderbird-78.9.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a7dff0d43d11473d47df6672da8515b5d1393eea581193fdb8b334cfd8c780e8"; + sha256 = "708709a3acb4689de7870d21c258ccbc03a1fdb92a43164841571e6643bf2988"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/br/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/br/thunderbird-78.9.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "70b0a987b1677fe1b78b4105dc15aea80448e71cde8a2a31f32429111b07c92b"; + sha256 = "e84f1dea6f550a1827399d0e7f658f376c816d3f7abe962ec58115d36c28c1c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ca/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ca/thunderbird-78.9.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0e311309e7a9b03afd92fb3f38582ad318c10d3342238db42d30504123bca080"; + sha256 = "8191514f74876406cf6f332a0063032206d1b6f29414941dee3082ce1bc6e711"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cak/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cak/thunderbird-78.9.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "86506acf4c23672469c6bc533019e0a2b4872efcad07468dd3c5a2f1b6ac7dd1"; + sha256 = "9626ab3117cb4567ba65b24c5800f39fe7dc9c372c60f88ba0906eb72d63ffb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cs/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cs/thunderbird-78.9.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6a63442f96a88c9b80b436eb280a5e67553751c946802bfe81db017eb1a11874"; + sha256 = "294f60b4efa04fcc9bdea8c4107ac572613d63c742ae9492eb63f5eadcef1448"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cy/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cy/thunderbird-78.9.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7b70af973f706976b87cac4e48623a3c3dad20538d2bc0bd4cdfd57bf1937f54"; + sha256 = "865d631746754969d7dd59b096306aaacdb189b967e295676a3a7253a5af8ed3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/da/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/da/thunderbird-78.9.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2b3eb2c351b4df91d2520ae4b93687eba47a6f7b6182086345cad0629ffc9538"; + sha256 = "cb8b05cf1938326a4246f670bc324d83179f3ce1f3d4f3d8de57599da031ec9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/de/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/de/thunderbird-78.9.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ecd00d0713704e323acd7a1a0da88bfc3c92a85a99611f6af1b5425387428af0"; + sha256 = "9dfc5b4490c8ba926ce30605e3575cf3b471fae1f1808fb5054667c2751956c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/dsb/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/dsb/thunderbird-78.9.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8808ff0c67014db313413aea3e8dbe7c0e0501c878572f2db1765d4b8c6ebe3b"; + sha256 = "1752031e919fc1604c1d70ff5a9036d8752a0de78c0d0539860c45390b09e13f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/el/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/el/thunderbird-78.9.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f83554e57ccf5a3c56b6111a928e2e983c07bac131ba8a74e9449250b644fafa"; + sha256 = "bc2c7b093dd00c352874c7ae6e3d88e455fe9b357caa0e358d51dde120398f41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-CA/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-CA/thunderbird-78.9.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "138384402cfedf4d725b5e74f1c3150d078fd422d5440246e841b9ee5c458128"; + sha256 = "5605286eb97815d5acfadc0a93888a1e8d08e9b8bb5e7b28328c9650f6a9d065"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-GB/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-GB/thunderbird-78.9.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9058897455dad34af97f1f3e1ccd517244de9c2f9a51ff3a8d222d8439b5865c"; + sha256 = "bc0a4c15cb3d4f1891e91a7bc5cde53065cca95fe5c72c18bd39e0bc618b5d01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-US/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-US/thunderbird-78.9.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "7ab2fdf949a7cfd7abbba7bb2307bad08fdebed24a0446514be89c308af587b7"; + sha256 = "65e1539602d206cfb78cb7bdf864d251670242d775f62aad25a1a52dcf1e9e55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-AR/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/es-AR/thunderbird-78.9.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "71396deb4b1148a20af83bf7bf62dca00ec43b8cb64b5902f8bf52d861dd861b"; + sha256 = "e246d1f0fda4091888dcac7c5e8d5367688d86e6f65237e942baee0c2c82136b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-ES/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/es-ES/thunderbird-78.9.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6dd479e524e4bfa7ab1488d808bfde041c34d2a13de1003f1c2a2ee0db0fc772"; + sha256 = "a24902cdd4eb9f70b435f52c9244769bc674fc16194a908976c28c8de3d94674"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/et/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/et/thunderbird-78.9.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "259ee045328d21c877ca67223f91e438496e6675cb97d825482a8213b3bbb161"; + sha256 = "891fb76d3f9044ea44230d72c6b8bd4db63c63c71dc83506e91b31329e1b0c11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/eu/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/eu/thunderbird-78.9.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "18a4fadc4a8d167489924042510c06d58c599997e28f652eacc3e4c85841a932"; + sha256 = "cfe8c0e314dffd57e653204aa5aebe790147f3a1060cc1f95da0045d1c188cd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fa/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fa/thunderbird-78.9.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "0b397cd272cd386dc4d0cca7999198098a8cf4dc9088b93b05a7de75de9a9397"; + sha256 = "66aba0dbc241d954b18da9c94c6c8d7b33dbc8721560a23def882cde249d17ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fi/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fi/thunderbird-78.9.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9f1b5bed03fcf37f0e3a5155c36a691766ab88cb9604821b4f07ee9f25cfbc9c"; + sha256 = "e05b5be90b40dd61a3686d3fb011745431f915a0d74e08a157668cfa1633d5f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fr/thunderbird-78.9.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ff806999956ffe547bd987870a804942462276a10f1334df00797e56482dc4a5"; + sha256 = "f4c80650f755a65c1371aa9bc35da6e1fc54f6c44dd6e6bed1f3ce8ce883656c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fy-NL/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fy-NL/thunderbird-78.9.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "50f7343fa2fa61fa46e7a05f86479743271bde3021efa27ba948923467fb0170"; + sha256 = "4ada1d224c11081bc7cf7fec51e6cbef695650cdb9b860320da9a070d01bcaed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ga-IE/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ga-IE/thunderbird-78.9.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e2912457c0e390f84f375fde8946c1eca15b036fb4016ca7cd608a9c61eb5060"; + sha256 = "e2b6437b4b10a636d585dd591c933df370a5b70bc0a447564ab8dbb4df5c22b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gd/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/gd/thunderbird-78.9.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c5b2f349c98fa51f5b6dc57cc9d16f408d9659fa979c4ee86b5c51f2c163f8a5"; + sha256 = "034b5dd31ac4df1ea8f19b52739fa632a53d063a6ca07e4d36194c55452aaef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/gl/thunderbird-78.9.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "0580beef930019c5312ba4ed38e6570f4d4b85857d4c002461b07f705e261b3e"; + sha256 = "1afb41188de30c672d3a15e7b8e8b0690ac8358069824edf7215f99f73333d32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/he/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/he/thunderbird-78.9.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d7ddfedb469437e7df9b0ef967e578047ca70b5d45dc5175ca08f5d1b920d5c1"; + sha256 = "492f33bbc7f6d6e53aaaa3587d22156afb32d0753609818eeefe7ea53bea788b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hr/thunderbird-78.9.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5c9c1535488e987113f356a94ffea5e5005f1eea92fb9eaa530793006d2df8cd"; + sha256 = "a61743f3661eb8ce93cc58dc80ce5950534dd7c89e067a3460daa4502761e3b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hsb/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hsb/thunderbird-78.9.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3dfc77687f2ad8f9bd9a452d519172953a44b3574057f871e466d3dfc2e78cc2"; + sha256 = "cb1d4f8da3071ecd4ce4f9ae43d1e4d7dcd8edbc6dbf4917bcd1730cc5a0477d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hu/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hu/thunderbird-78.9.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f043129670231c41cdeb8d742e50873306e34860fb702876105c88a80aef0629"; + sha256 = "a4ae0452d90d3c5c7778732811d97243b9b4767208239c8a24d4b4d368630d22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hy-AM/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hy-AM/thunderbird-78.9.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7c4e3df3c4115e3de684970d68c5a3aad8a5ac1151ce802d4adbb381f5d76529"; + sha256 = "cab2129d4c4e99592ce6f22d676a03ff1cc5d5bf579a2426d0079e0f86215ade"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/id/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/id/thunderbird-78.9.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "95776b92e84b5f1183129b3a7576542e807f701afbafd6e811522f709b30e933"; + sha256 = "a1df4c7e0c359cab8b10692bfee5161d3bd44696ee06774985642604304f9b93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/is/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/is/thunderbird-78.9.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ac74b9ecc8312aa833ba9db2ff7d017c0891105da5e64580b9af8797fb77ca84"; + sha256 = "bf6ec8c88f65d565f7dcecb1f3177a5a1e476da62d8aec82d3419e3ed1794798"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/it/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/it/thunderbird-78.9.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d3409725adfb192951a14569bf1d3c779162fbb1f33c7be944345e3df191ebe3"; + sha256 = "e028a6fa97dd9d37945137602d45230108fa30d63edea8df8531089724646e19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ja/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ja/thunderbird-78.9.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9c7bbe228994d06397cd4490b0e6c667b8ab14b94398ef9b0a0bc135d3c6c392"; + sha256 = "6435637e0582123c1b941b1c6209aa1bfdec471d3ce76a861c82e876b7637fee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ka/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ka/thunderbird-78.9.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "39681dd197986b4535b6f08904aa140f5517b3663dd16f055d514be509bea217"; + sha256 = "8d00d918c42450ac7a451a0a5a7407ecb334b51bd20c3f33871a29c82f338175"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kab/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/kab/thunderbird-78.9.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "30f473c45c5d2d60271469ee60174ce10989edea02bfe61503dca4be04f783c6"; + sha256 = "59af5f436ccf0d0914f800ff6cb31fb341d3d905d3d450ed43a09d8810e50bae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kk/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/kk/thunderbird-78.9.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "b5dc4df14dd5de27a32332af867c233089081d43514d36a6955fb34dc46b0955"; + sha256 = "70588dd395158e87bdf651a9ed2b1d92cc5792ed6c85160c2b1c2109d52a3ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ko/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ko/thunderbird-78.9.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "b151223ca74a4624912941ca5a33ea620ffadc4840a6b58b0459abc4b9fbcccf"; + sha256 = "7a3473a4bd51f6931326c30c387546d4b900fd70a837e8d45380afd4597c10e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/lt/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/lt/thunderbird-78.9.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9405ddf255265811d274bb1c5d05fa5066976d36f1a7e5687a9c4930488ec269"; + sha256 = "1e36db5d910184872af4e7623c59c79f8e522955c5dd5cba4a689a5bc2d857b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ms/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ms/thunderbird-78.9.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "63daf0a4f33b6e04ca92b1b6df187c0fa52fad97863e66356fe6fc592610be0e"; + sha256 = "058f825e44c24e837081bb05241c1ff47b390132dbd3cdb5b5d4ef51056bb2ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nb-NO/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nb-NO/thunderbird-78.9.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "94e855d4d4c7724cae5060f595ddc5c6afbbcce95a47544c4e13131fc5e6fed5"; + sha256 = "7f6335ff85c29aa634b7909e4b7a2da007f333648a98ad9f3bd8833d00f2f0da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nl/thunderbird-78.9.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d3fef411d76b25d4791814bc2c867df1ff4d6388514026a243715c0b01eb6cc8"; + sha256 = "0056c1250401f89ab8d9423f23d3148bcf34801b34247d4bc44b89e8edd0552f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nn-NO/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nn-NO/thunderbird-78.9.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b144ebaa2ec9a7596c671de0b00a2040b64681cbc92e6ede6f93b8dc85039f73"; + sha256 = "f63e4305ba814a46edc4316af6ad02acd479306f2f1c02c1b04065ea20baf59f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pa-IN/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pa-IN/thunderbird-78.9.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5231448246edb5051015c7f8f6f9c8b2d4373746d5a6dde94a9ebf4c672c60e8"; + sha256 = "654902d560df0648cd2e9b7b1271d3606071865dd1cc4490741a5777be2c72c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pl/thunderbird-78.9.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "8250c42c98c9f5c8c2b071b0eb31b7b27e019513585bf0154bd9ea5c901a2aa9"; + sha256 = "62c4352b987bef61f69bb0300c9cc37b95ca5e6fde57a06646b14bef6e58dd78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-BR/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pt-BR/thunderbird-78.9.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "625c7d2d6620c045b153866ee310d8d04fd9998cfc51f5f458de19d7fd7452b7"; + sha256 = "139606374df552562100c01e8a330fc1f4f9e6dcbc6a39396137d2f069ad0fcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-PT/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pt-PT/thunderbird-78.9.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2ead9fe00dd88dbf7245275f2cee002cf3205dd3256303f582635ca33b3aa60e"; + sha256 = "eb6526b6ee0f768949489ca587c321ed8aabd258296c58e596b7a5413b458ed7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/rm/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/rm/thunderbird-78.9.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b4b40e417a4bb52aed6bbb7f042d5e164ea2e9f4acf8cde680d4f19f37862e1f"; + sha256 = "36a22f1c8eb1a5c7fb0e9323a3c3eb03f8a63b2b6c62430780bf4508a7236c41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ro/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ro/thunderbird-78.9.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "cd0e8aa8e6b02cd7a432e2e943e1a61a65f152bdb9902a1f948e514c46cb8304"; + sha256 = "92ae47ebf2ab176d46e04172206241aeae8a6eebf72b5f32d021782aa1675be8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ru/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ru/thunderbird-78.9.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "00602137ac0d86bbc08ddac08cb2805daed3d8c2b78b2408b34107bbd61c4e32"; + sha256 = "97680d44fae135e90368adb75ac27b4f23f1186d1435ba265a80027334f320ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/si/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/si/thunderbird-78.9.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f1ad95430fcba364c0741c03fbbdbad602ad521959685ace7f3056fa801188af"; + sha256 = "6ddf49c8696deb3ab9ac55453b93116c923ad0025c9c8463b56bdc81e6d00bb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sk/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sk/thunderbird-78.9.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "30ebe0eaac08884d10f8cffa77d145600154b6969a212873bb189aea91187d54"; + sha256 = "5e2be4cab9101a67c61eee16c8c84513b196dd19f6d0dfee3559796a8a031138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sl/thunderbird-78.9.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "3f38b1934f6fd66efb97b83c83f76f09c649ef09108fe1a92515752b2d79c890"; + sha256 = "ab9293a2a5caf948bf2e4b4680b9cf7440e7a272f9f028568e260c40d5a031ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sq/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sq/thunderbird-78.9.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "79780bad07999285a3ad37d85b82d7037fe4784b3a83f79f6907c73ad1a7ee55"; + sha256 = "113171842441b9553e6da58c7ce3e3382fb9aa780892b8ee4436ff9b2bf3dc59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sr/thunderbird-78.9.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "68430529f488d89730864a267a20c5f86b1ffa0b473bdf153c43e06a95a81c5d"; + sha256 = "1b46f1597ab5aec2bca98adf9664cafd72ff51db23722108cbd4c0c89a1a8e70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sv-SE/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sv-SE/thunderbird-78.9.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3e2a8112b2da35af3402d0974a70c00ca6cde4cbf43f07141ff7b184d373d444"; + sha256 = "41284557a6ae1b267eb3c2fdcc4a547834e833f55b5c1ad9c8bd9121c9d39dc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/th/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/th/thunderbird-78.9.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9b94b35004bec519e8bc8fa152c677189fc37e78a3bdedc0d77afb81bffb0c58"; + sha256 = "99a342f303c3a890ee68514841d563fe493e2459a4d6f6769c42f986e122b7ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/tr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/tr/thunderbird-78.9.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b1f0281f5a1a2454a38ccc66510b4de44c19f4300a990f994d5c0ac76b002782"; + sha256 = "f827b3d8fb60540d00d20d4ec50dbd9e28af3798863fa4ccc1a862a08ebdd18d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uk/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/uk/thunderbird-78.9.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ae53f162d9016a3f2b3e104c86aefb34ed9e96ce14cc3feb1584ce61617c3b49"; + sha256 = "d8e30faa9f43308c31504437ae2187d5c1ce00c16cd430f31eaacf8dbed71604"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uz/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/uz/thunderbird-78.9.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "6d43cbdac67084253eda88d0cd58440229def6d03904b4e1a8c9b9133ed7bb55"; + sha256 = "00e3e3a43519fa8136d3cde8527f3e9c44732ef6d5aac9cc2e1f28feaf940a50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/vi/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/vi/thunderbird-78.9.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f29e5e685c3b072ece7ef6cd645b2596025848e9b72b00fbb49378b8f25ef3a9"; + sha256 = "f16b0fca32c85e648be8c8d4c9ddb6d8fde726f1386d0dd29ec050b39d827fe2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-CN/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/zh-CN/thunderbird-78.9.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e4789a8b85555be1fab438e694562bec0b2022a6955ad098b837c48d3954452c"; + sha256 = "51007e8318fbf673eb63bf20be8daa35ef8e2d6fee9fd9356dbba98d843dc813"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-TW/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/zh-TW/thunderbird-78.9.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7d4246056adf297ac1bf3c7de20d067453e41350b089841d617e2ac6ecaab0ac"; + sha256 = "ef7a5507b47725ba7bca853c1f5bf20eb36d31fbbc8c912596a5993f7dca57ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/af/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/af/thunderbird-78.9.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1c09247e43ebfd2cd10995e76ff791b6c78d4545ebcfa37959b154e5307e17a7"; + sha256 = "435ba6c5a5901fe1daa1b19c36f1071086d21e2f321a52afe1db0c03a0044635"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ar/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ar/thunderbird-78.9.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "bd7a46b42a8200f0515be9798bda145f398e2db32357ae8c46c1dc89cc823dd5"; + sha256 = "4ac307dbe93e69e6dbb629756363900256ec735c1927cad74acb0c5f8e255b92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ast/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ast/thunderbird-78.9.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "418fc4d19a9d4ce982e534c7be95b79dd2c15311040e2c50e5644f3a5e3cf245"; + sha256 = "3d9a01438e82350e5a60ee7944226d9a0f46384673ddae01f8f8fe445df40312"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/be/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/be/thunderbird-78.9.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "27b9271c984eb739cc4782050bf5f896da01ced7803dae8e81181ac4a8c0df86"; + sha256 = "9a5b22648d8c7c05d5f0be0d1f450baadccf791353a23bc1b6889e8911d90c5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/bg/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/bg/thunderbird-78.9.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b63ca81e05c4a16497339374f297ced5033daa275fd48fe9884d4945f216771a"; + sha256 = "77cf8d4912c2b5b34fa0235ddbb95cd90bcf83d1d528275b23de08dad59116c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/br/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/br/thunderbird-78.9.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f213c17427b907a21a3c4eb2976eccca91423a1400260b22ea59c588a2e1e9d1"; + sha256 = "9e7bcb749e0d88efd60e6bed2fc77e39deaf8a82db56c304529d44843657842d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ca/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ca/thunderbird-78.9.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8bd818f98c17b8e954883c462064994c469fa805aadf74b6e0915824e1ad929a"; + sha256 = "0206a127cbf5f9b1c4c4711d4d05591d175c9e96c2354790c220e9587c356aba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cak/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cak/thunderbird-78.9.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6213c8b217db157f40e008af10780edef5a02ffdc2442240597a00252f4f58ea"; + sha256 = "e47d892a90c3b9ec29365cc0173066234e21cd989c4b588e43fecb61b10d1f80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cs/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cs/thunderbird-78.9.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "22491715bd72408d7c15d8fc137ccc496a0ea075217485a8e31abf73ca09bad7"; + sha256 = "bdcfb9cf6e3207a41634eb54c472117c33b0df981d900c4dd0dbff0463ebe57a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cy/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cy/thunderbird-78.9.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3d4f07b0055d92dcbaaafa139959de7071b2b3d74c49452bbb2556b1ed3ae82e"; + sha256 = "5b0def675213d882ea653ffd7b5aa62f96000d4aaee8e06ad1fd5984ac99c8c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/da/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/da/thunderbird-78.9.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "409779e136c0efb3dff667e50b9ba318937d3e96ac918b8272741ea004ec3f5c"; + sha256 = "617579da2580a0d9a5a6e64ef7c4b028fde31f82dcf8139104c380e51ec50227"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/de/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/de/thunderbird-78.9.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ac5ca1fe2247cd4d05862c00592c86dda480108b7a40e284ccc67718a1762f78"; + sha256 = "5cdee984aa63595fbcb00303f14fd19d124ef9b267d490d5263c7554f4ea0dc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/dsb/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/dsb/thunderbird-78.9.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "769d47c388ef4dfced4ba770f78eeedcafdc834dc4fa4175eaa92710ddc2e0de"; + sha256 = "fa05969bcc025056b8ba9c056af0051fed91a967ebf9e21ccab7654aaaa6ba1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/el/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/el/thunderbird-78.9.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1a2daf5b0ccc36acae027da2281998b4333ea4e9981c7106243c68188517f482"; + sha256 = "03b58dbcabb41c0140c18f1ff31dd32e4d2d006c85af75d73bcd656587e787ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-CA/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-CA/thunderbird-78.9.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3a55772b7bec93bec83de289b5b36129e8e0d988d54db3d66ffcaf8326786ae3"; + sha256 = "6cd222aacb8eba184dc3eef308fe7b564c70da2ba6c38e6e4e328e999b7229a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-GB/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-GB/thunderbird-78.9.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f41b610c6a3f4f5d3e2c648d05ca210cf9bdbb998b94f298f81dd84601c00be9"; + sha256 = "9d3ca50977bd5c6f8a5bd998549db0dc2ccc6aa5d33c914e93d42e2ae69e8cbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-US/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-US/thunderbird-78.9.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9598fd9175cc0d641387f6ac7f475d970b4f0864872b5d875d170039d6c97b39"; + sha256 = "84721e190b6b95733a47a16853e1fe1e0c7b0e4693d3b7752aa59583fba92f97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-AR/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/es-AR/thunderbird-78.9.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "603106740e8db3a7c9220897b9146ef53937bd57a60258a04548e1afb41d983c"; + sha256 = "dcadcd68506406f718871d7576b47086d59ca159a5bc6d878d022141029df2db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-ES/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/es-ES/thunderbird-78.9.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e0f5f3d6aed26310bfee54099c73a13417be36eb737f6123526e94a5286f6336"; + sha256 = "46526dd5b4bb123e774d3a3fa8fd88a8982cfb36a252b09fa98aa6cb773ff0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/et/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/et/thunderbird-78.9.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "bc4a1dc96e8ba31d0817f369af4e3e10b672aa854538093ef1d02126bcff24bb"; + sha256 = "de0b695be00721244ff20b2046bb376342fba7c422980443b217f5d4cfa83d48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/eu/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/eu/thunderbird-78.9.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2c61d117e5fa23d62197f9b2c0512547356b65098eee5fd72285317caca6b51a"; + sha256 = "543d45e256951cbf21bc61359e99daf2c80789a88641ae2231c1eb0ade133198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fa/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fa/thunderbird-78.9.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6b93377b457ec1e0dd343bc4d2193c6bb3030450e76757ac042c67e353075310"; + sha256 = "6b95ebccf7ccca90c3310923f020ba6f05fa715d64c79acd770a491e15a9938f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fi/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fi/thunderbird-78.9.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9e07a2060b821047c494e03d9ab74b8f3aeea322aa1e1bdde080637187f89e05"; + sha256 = "145c2479a73955f9ffe6ebd2d41eced848770729f218381735aafe5c3cc0b3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fr/thunderbird-78.9.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d4ea501f5a42effdb758ca24f2da7bd4ca1d83a8ea6da467fd63cbef96f8b373"; + sha256 = "9178d90f346d62b6aa0bb4b081b6bebc214d333d6a042c46ee1af7661ffc3b03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fy-NL/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fy-NL/thunderbird-78.9.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9aa11144cf22a5db5200628ac5e55a55b83ffda35306cf1909aabac9fe4878c2"; + sha256 = "fe3574999f0d1fff276fdfd7d432859d495c2b64137d33ee418ef1e4329b1b72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ga-IE/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ga-IE/thunderbird-78.9.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "15af980b46c8cf80b60a999e2ca3b30c92719638af51d9e82133f58de61d7ed5"; + sha256 = "1570882cd8345f86de38179713a7f7acb94768c4874e571a20314fb01154e1bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gd/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/gd/thunderbird-78.9.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cdeb93b31a1a9521dd7f91081f28c1a64e0e6a218f1c0015ae9c54d73cc91f0d"; + sha256 = "9405a2a7ce52a48292bf4b6b20f3b1e96c12460a1e44a90ccdc31cdb21acda5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/gl/thunderbird-78.9.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "48d973991c0cbb9988339c185d1ea8fda4c6cea6f0667cfaf8f2bdeec4c55a23"; + sha256 = "930a9a3e06bc28ede54ec43e8bb92cc30329d7f0271629b37ac3753191f7e133"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/he/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/he/thunderbird-78.9.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c2f50a1fb3e877e3c08927eef96f104f5f970cb7629af21de3344e539617422b"; + sha256 = "eb08c16b7df47fd501f61049b19f3f8f827870c8681b9230564276bc0cc9ada8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hr/thunderbird-78.9.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ec3596067c8245cd5cef8fc649c3d1fd6d38bb802e2a05947ab9e62b8d393b91"; + sha256 = "c866290def37d2e16274820d5846bec52afc7c7da1f8df812df930f0c68c6b56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hsb/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hsb/thunderbird-78.9.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "0209d678b9353513bcab3c647100c35d772d25b1969bb9970266c09f2db01e05"; + sha256 = "0df5dc60047e68aadc7a96e194468d42e977c7a90d9faa8c4684f650763825f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hu/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hu/thunderbird-78.9.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "817cef3a34c40ed31a59421f89a94de5b7be165cd1bd93fca7b2560cad3e05eb"; + sha256 = "e76e78c1c77b59eb7a3ffad0da149dcc7f64d6b0305f5a5a607ad2745d224e17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hy-AM/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hy-AM/thunderbird-78.9.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ca49953791109563cdc81a3458a5b3dd15ebb49a255752052e927daad199b0fa"; + sha256 = "0dde11bb6c6ba186925010cee97b59d3c64890b108ef478be5578218954a39cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/id/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/id/thunderbird-78.9.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "33fb9d6c721f79e4808f077573828c26b671434b0308db9c33386dbd975c4a53"; + sha256 = "ceea16b87a7d8b44b187d950f4c9fc5326ed7a550c38e0f41645004a324669a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/is/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/is/thunderbird-78.9.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d498ac95c289612a253962d1988ac9d1526864926c9a4b9cc2985fe1d84ae03d"; + sha256 = "a98177d8f62b1ffe056ba3c1f2ec9d7b3f47ad8d47459328692e9bee5e1d02d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/it/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/it/thunderbird-78.9.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "cff73b132740bf3854977f62afe8076c7c660559cc8a96fbc36c4ffadd46d50e"; + sha256 = "259b8e4e08828b544ba61541629025d4a711f44dc4c476b3e3971a633301b298"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ja/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ja/thunderbird-78.9.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d8ffe86ccbc4de40a0909f55b750380454a2f51f450b4c8b49886612a49997fc"; + sha256 = "6f2511dab5530e58664f386cb65b26d82fe581faee01b1a76cdd29e3ee3a1955"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ka/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ka/thunderbird-78.9.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1bf02cd11b554b597b6f5facdd07b6ae7826ad24a2f1ceb432bca6fcd0396749"; + sha256 = "368a85fcb387703df7422d1ce199a499d0e4796f4fdd4775aef27c5b36272fa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kab/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/kab/thunderbird-78.9.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "aa0295643ee24b0e76d5567c4f43f94ddf4a820cde2bd5be5a6dbc0b2f1c7271"; + sha256 = "33bfd965c79bd6935516729f3eedd65be2b3f754c9225d6ffdb4af201b0d13a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kk/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/kk/thunderbird-78.9.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "265e5000114d7f3d204885a5c4eb5ef71780699f185f570da90737001023d4b5"; + sha256 = "20dfc052f78a58d4fd96a0df22b55559ca43d8792dfda372dfede1cb49c6b185"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ko/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ko/thunderbird-78.9.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a1622a295ab259400d61e9487f40b7e34c143b81afb1f354647a48cb56425d13"; + sha256 = "63479eb7fcaea17ea29c98b624c36ac20ff2ab9e42bae1a355c78f05d5f9e313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/lt/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/lt/thunderbird-78.9.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "423926d31fac238ec493de6f48d14530cf58bf0829b73505f7ea4138f6bdeb56"; + sha256 = "2d50db9e0698c991e10a6ec6e627b02d0aca9e18b857aa290e4aab926e8ee88b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ms/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ms/thunderbird-78.9.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "acdfdeecc6c5ff04c1428185bbe63a6e38b1545daa9e69888b78e2b5ba3b9194"; + sha256 = "66969627bd536d9a8e8d8717bab010ceb16350425d31ea114bc7e012ba1f0922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nb-NO/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nb-NO/thunderbird-78.9.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f62a4f2d2c8e93b58f3a0c35e6885c1e46a8b6ed1fd0414e719c480f99fa2cf8"; + sha256 = "1db46ff207d356adaf761db2fac7961b20633dc6578ce562154a1bdb308256e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nl/thunderbird-78.9.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c2dda812534a9155f79fc2249cafd8e77e572cc20bdaf1bbf637bea4daf5e612"; + sha256 = "0259c04b35bd30b5feb44da31b639938504f1402879205263eb63f7a59153f11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nn-NO/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nn-NO/thunderbird-78.9.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "84fae5d60ec7223c0404033ad2e2b776c4a9353b55e0256c7ca7122aebc031a2"; + sha256 = "1de52759f96302447829e0de40319394ac0b1802ec60c0c242cf85c0ca5110c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pa-IN/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pa-IN/thunderbird-78.9.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0fa48cf1ab0d1e23e4d230fb6f78e7f6d07d99360e341c239ea572c201204870"; + sha256 = "39e0f5794e508dbf02c6aaedaead4173f5ae55d350aa3caeb7a1ad300a69e4e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pl/thunderbird-78.9.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "90fa65f13718539a899dfae11aaaec05b9c1a4f56c8b835436f9401d7c453b01"; + sha256 = "25bc49f2225c8aca7ea467a240234fa9ec2c7ec34f751537a199f6cbb30b390b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-BR/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pt-BR/thunderbird-78.9.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f203c40580edbe2fc8645af1477bd1b750a64241702fda3bd0747efb7c44510b"; + sha256 = "6091c0e84d89312db11a3714027881243db708ce3f28187e86076351786a3d70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-PT/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pt-PT/thunderbird-78.9.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "42b5b7f39b75550e39accb221d0728cf6181e4251d130859c85a139bc4b2267c"; + sha256 = "45fae3c271d226dee2410f8f97eadb62783291c570bf12cd9f5fe5ab23acae23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/rm/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/rm/thunderbird-78.9.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "15165421181470218c152da68adea6e1f8a2abef4c7fd70f19d210620d29dab6"; + sha256 = "56387dea25d3bc4742c297e0609be55a2db938d10a5e94db192018c706e7f398"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ro/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ro/thunderbird-78.9.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "974f8139cf98576a588088fef03788f513e6e45fa054d4d53cc2131254e0b794"; + sha256 = "7e84c211675cbd59e805ffa499663b3c02dbc2075f2b734eaa9f41862e59c59f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ru/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ru/thunderbird-78.9.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "eae2f2f1e5bfcf389f34b9635c838cfcbfbc0d93e9daf6635c0faffea2df1d7f"; + sha256 = "c9374d0b813baa7aa837e2283d75c9c47d75fca7bfc640be4782d90b480fa145"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/si/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/si/thunderbird-78.9.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "cac0bdfbbc3b5cb21e38473aae44e4f8d2ebf192b6c35d7e075c47e25684da48"; + sha256 = "ac8ff38bf196886f8b95c34a07ed701416c58b78758517377f6d8eefc85050ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sk/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sk/thunderbird-78.9.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6a30b2b648b24e3cd4e2c3b668e73802796f296a2f81aa8e470ec0909f8dbc87"; + sha256 = "dd44494bec41af06317266ee7d8f8f16ac6c648728636aa68c93f57ca9594231"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sl/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sl/thunderbird-78.9.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0d4e597db5264bef212cdc3e86564acad1ed4cad3cae9eb61e583025b401bfa2"; + sha256 = "2be1af23f71b22812a90ab2be33649ad53bf2d14acbbcc9540b835eade0fd9bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sq/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sq/thunderbird-78.9.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8a4dd36ac981c89924755526fae8634f20d0d7dbdbb6fc9c324a5badbf7394db"; + sha256 = "5c65db4fcc190408aa8a1c5f0170ede3f86f1c9f07dacc6fd7a9aa54bff533d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sr/thunderbird-78.9.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6002d49812cbba0289db444e84b8a139c0784056a26e3a0592fd1806ce865cbe"; + sha256 = "7a42279c8a4352c18d583503b2324f5dd98b6c927582fa1d5e8cd72a5b1ca782"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sv-SE/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sv-SE/thunderbird-78.9.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "498303591a0d28ce2bbb59693fd55bdbf292c7feba8002c9cacdce7ec08b50d0"; + sha256 = "3f508f801f1f4afc477ee1a0bd81d49d957429360b9691b5945a88b609dc9a21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/th/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/th/thunderbird-78.9.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6c31f40537ba39bdba93eb46f480f8a1a446a6b028834f6886934b102ce1b861"; + sha256 = "bd50cac75236ee9e1ad7226c605b37cc2f4aa57eafc4978af9f2563aff7dda0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/tr/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/tr/thunderbird-78.9.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b8f5a0be988b89dc7e8b14750d6aa0ccbdbf2c1a1c3abee376b94b1443223757"; + sha256 = "af134487b9c2d6f84df56e2da1fcbc7b4abd3960fa3d11a366281768812fd9e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uk/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/uk/thunderbird-78.9.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "036065e1fc91907370ffe75883b1d1e8fd1a416a9a726583c758d7a0765b84ad"; + sha256 = "a094a6fe935b002805252ad4694a15231587a66c31cff3064c2842332f1e82ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uz/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/uz/thunderbird-78.9.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "3b5d683b237a88018e5b1999aee497d766007a3c1743517ab0b54e43f37e52b1"; + sha256 = "6b8b7622374c92036828990db1de3042e1a7cebf12974d30d73dcdd0e564d707"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/vi/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/vi/thunderbird-78.9.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "0d31b2bd82161ec51314e57405345a9a004b268371c16de06fa4d2160eda0230"; + sha256 = "4ffcd1d5f21145f857ee525169fe59ee8a1cdef6a1c4f3cc1918be1fc7c66e6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-CN/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/zh-CN/thunderbird-78.9.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3994c114510a6c7457c78d3755518b1332bcf1b48371d2b88c000f977b5bb3a0"; + sha256 = "8cd65c054b6fefcbd0ac9a057e277009c732af6baef08ccb3f57bee73b75ae20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-TW/thunderbird-78.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/zh-TW/thunderbird-78.9.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c38e5b2378bd0af57945e0e172e49b30fed491b91ffa79a946cce8f2bccf96f8"; + sha256 = "1e39b1e38bfcc1735801dcd6c073ba1eeb344b23d9e859495947a37d95a4b3b8"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 495cf3cf768..447c4b3f3b5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.8.1"; + version = "78.9.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "08dnjqcdd5bs7wpl5imir0nsmvaqkri67cas1sn7ab4nb1f61lfdz4xg4x5v6f39sm5yxw2cy6rg5fc5lbiqza5bgs00gfg79kgfn2i"; + "35n9l1kjx52davwf1k5gdx2y81hws3mfb5755464z9db48n0vfj756jlg9d8f2m2s29js27bdswl64mralw4j085dl11661g7p9ypzs"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index a488817a0cf..613226a2dc1 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.12"; + version = "1.4.13"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-X2NVtS2cNgYZYjpAxmwaVXHjk7Q/5YN1wN41QprDSAo="; + sha256 = "sha256-s0mEZsZbZQrdGm55IJsnuoY3VnOkXJalknvtaFoyfcE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 0174d133011..f86eefe668f 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libX11 , mkDerivation, qtbase, qttools, qtmultimedia, qtscript , libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }: @@ -14,30 +14,32 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext + buildInputs = [ qtbase qttools qtmultimedia qtscript bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext (perl.withPackages (p: with p; [ GetoptLong - RpcXML TermShellUI ])) ] ++ lib.optional stdenv.isDarwin libiconv; cmakeFlags = [ - "-DUSE_ASPELL=ON" + "-DDBUS_NOTIFY=ON" "-DFREE_SPACE_BAR_C=ON" + "-DLUA_SCRIPT=ON" + "-DPERL_REGEX=ON" + "-DUSE_ASPELL=ON" + "-DUSE_CLI_JSONRPC=ON" "-DUSE_MINIUPNP=ON" - "-DLOCAL_MINIUPNP=ON" - "-DDBUS_NOTIFY=ON" "-DUSE_JS=ON" - "-DPERL_REGEX=ON" - "-DUSE_CLI_XMLRPC=ON" - "-DWITH_SOUNDS=ON" - "-DLUA_SCRIPT=ON" "-DWITH_LUASCRIPTS=ON" + "-DWITH_SOUNDS=ON" ]; + postInstall = '' + ln -s $out/bin/$pname-qt $out/bin/$pname + ''; + preFixup = '' - substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \ + substituteInPlace $out/bin/eiskaltdcpp-cli-jsonrpc \ --replace "/usr/local" "$out" ''; diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix deleted file mode 100644 index 8eb0c2298fd..00000000000 --- a/pkgs/applications/networking/pyload/beautifulsoup.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pythonPackages, isPy3k, pkgs }: - -pythonPackages.buildPythonPackage { - name = "beautifulsoup-3.2.1"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; - sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = "http://www.crummy.com/software/BeautifulSoup/"; - license = "bsd"; - description = "Undemanding HTML/XML parser"; - }; -} diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix deleted file mode 100644 index f70359cf7ac..00000000000 --- a/pkgs/applications/networking/pyload/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: - -let - beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { - inherit pythonPackages; - }; - -in pythonPackages.buildPythonApplication rec { - version = "0.4.9-next"; - name = "pyLoad-" + version; - - src = fetchFromGitHub { - owner = "pyload"; - repo = "pyload"; - rev = "721ea9f089217b9cb0f2799c051116421faac081"; - sha256 = "1ad4r9slx1wgvd2fs4plfbpzi4i2l2bk0lybzsb2ncgh59m87h54"; - }; - - patches = - let - # gets merged in next release version of pyload - configParserPatch = fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2625.diff"; - sha256 = "1bisgx78kcr5c0x0i3h0ch5mykns5wx5wx7gvjj0pc71lfzlxzb9"; - }; - setupPyPatch = fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2638.diff"; - sha256 = "006g4qbl582262ariflbyfrszcx8ck2ac1cpry1f82f76p4cgf6z"; - }; - in [ configParserPatch setupPyPatch ]; - - buildInputs = [ - unrar rhino spidermonkey_38 gocr pythonPackages.paver - ]; - - propagatedBuildInputs = with pythonPackages; [ - pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter - beautifulsoup send2trash - ]; - - #remove this once the PR patches above are merged. Needed because githubs diff endpoint - #does not support diff -N - prePatch = '' - touch module/config/__init__.py - ''; - - preBuild = '' - ${pythonPackages.paver}/bin/paver generate_setup - ''; - - doCheck = false; - - meta = with lib; { - description = "Free and open source downloader for 1-click-hosting sites"; - homepage = "https://github.com/pyload/pyload"; - license = licenses.gpl3; - maintainers = [ maintainers.mahe ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index b8789c4c417..51e8e553ec7 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.32"; + version = "2.35"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-0VryhH0ELBLVZL2vLuAcjZ0a5otk/etr3riRyc+7YTk="; + sha256 = "sha256-J0vwc/sabc6T8+eh94luQdnVltmThapYwLCdyGjCnSc="; }; - vendorSha256 = "sha256-besXzqlmhFbWfnlacGildBbNATVrtMthf+BA/pL7R5I="; + vendorSha256 = "sha256-u1Aqcm6oJ1y2dVP9BJXV7/1nhNxEOtgZQppoA+cXbD0="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 7382e1aba4a..58ff92b5484 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "1g3sjkc6p9w3mm7lnr513zwjh7y945hx311b6g068q2lywisqf0x"; + sha256 = "0vdasz3qph73xb9y831bnr1hpcw0669n9zckqn95v1bsjc936313"; }; modRoot = "./agent"; - vendorSha256 = "1l8x9cvisjb8smnsg91v04j1vvawpjzp0lcq0ahw8slz8rfdm80c"; + vendorSha256 = "059772rd1l7zyf2vlqjm35hg8ibmjc1p6cfazqd47n8mqqlqkilw"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index 7c7d3a1f418..3479458088e 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, fetchurl }: rec { version = "3.2.3"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index c50ea08510a..a38352a328a 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -15,7 +15,7 @@ assert enableXXHash -> xxHash != null; assert enableZstd -> zstd != null; let - base = import ./base.nix { inherit lib stdenv fetchurl; }; + base = import ./base.nix { inherit lib fetchurl; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 5a4c2600569..83eb4658d2f 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, perl, rsync }: let - base = import ./base.nix { inherit stdenv lib fetchurl; }; + base = import ./base.nix { inherit lib fetchurl; }; in stdenv.mkDerivation { name = "rrsync-${base.version}"; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index bf45db92098..d1378598876 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "umurmur"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "sha256-86wveYlM493RIuU8aKac6XTOMPv0JxlZL4qH2N2AqRU="; + sha256 = "sha256-jp5+NbGmT90ksffvpLYIX2q5cPeVidDCYMPvLHCiP68="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix new file mode 100644 index 00000000000..c71c1eafa66 --- /dev/null +++ b/pkgs/applications/office/banking/default.nix @@ -0,0 +1,67 @@ +{ lib +, fetchurl +, fetchFromGitLab +, python3 +, appstream-glib +, desktop-file-utils +, glib +, gtk3 +, libxml2 +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gobject-introspection +, libhandy +, librsvg +}: + +python3.pkgs.buildPythonApplication rec { + pname = "banking"; + version = "0.3.0"; + format = "other"; + + src = fetchFromGitLab { + owner = "tabos"; + repo = "banking"; + rev = version; + sha256 = "1w5x9iczw5hb9bfdm1df37n8xhdrida1yfrd82k9l8hb1k4q3h9d"; + }; + + postPatch = '' + patchShebangs meson_post_install.py + ''; + + nativeBuildInputs = [ + appstream-glib # for appstream-util + desktop-file-utils # for desktop-file-validate + glib # for glib-compile-resources + gtk3 # for gtk-update-icon-cache + libxml2 # for xmllint + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libhandy + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ + cryptography + fints + mt-940 + pygobject3 + ]; + + meta = with lib; { + description = "Banking application for small screens"; + homepage = "https://tabos.gitlab.io/project/banking/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index f926391ac48..263a555ab4c 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.48"; + version = "1.12.49"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p"; + sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0b191f58041..2680a9a6a53 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: +{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.45.10"; + version = "0.46.6"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "06ykgcak7l3q812c4xrp720db3yq0v2lkrzkmwchlwp5rpwhqpck"; + sha256 = "0nxlph23gkxrn10gnm0ncsy54fzcmbqcrrk492ygfgw8a8pl4ah1"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1252zgyb23vfvy63cqd8jdjbm4w9ddwnp32z5vf1fqvd2rrz6lz9"; + sha256 = "0z9wg84sdbpk8zhljydm05z7cqqv2ly9s921cli7rs8hcpl175cz"; }; in { @@ -58,6 +58,7 @@ in { buildInputs = atomEnv.packages ++ [ gtk3 ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/share/trilium mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} @@ -67,6 +68,7 @@ in { ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg cp ${desktopItem}/share/applications/* $out/share/applications + runHook postInstall ''; # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) @@ -91,8 +93,6 @@ in { buildInputs = [ stdenv.cc.cc.lib - zlib - libxkbfile ]; patches = [ diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index e7da78034cc..4f8ca550490 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd -, hamlib, perl, python, udev }: +, hamlib, perl, python3, udev }: with lib; @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + strictDeps = true; + buildInputs = [ - espeak gpsd hamlib perl python + espeak gpsd hamlib perl python3 ] ++ (optionals stdenv.isLinux [alsaLib udev]); patches = [ diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index e15cac60295..80506bb79b6 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: +{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python3, bash }: stdenv.mkDerivation rec { pname = "bcftools"; @@ -9,7 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0r508mp15pqzf8r1269kb4v5naw9zsvbwd3cz8s1yj7carsf9viw"; }; - buildInputs = [ htslib zlib bzip2 lzma curl perl python ]; + nativeBuildInputs = [ + perl + python3 + ]; + + buildInputs = [ htslib zlib bzip2 lzma curl ]; + + strictDeps = true; makeFlags = [ "HSTDIR=${htslib}" diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index d0553bb0649..f5aad5d0554 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}: +{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, lzma}: stdenv.mkDerivation rec { pname = "bedtools"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ="; }; - buildInputs = [ zlib python bzip2 lzma ]; + strictDeps = true; + + nativeBuildInputs = [ + python3 + ]; + + buildInputs = [ zlib bzip2 lzma ]; cxx = if stdenv.cc.isClang then "clang++" else "g++"; cc = if stdenv.cc.isClang then "clang" else "gcc"; buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index 9fd3510dc9a..e6f33d6cde9 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-2wZzdFRZ7zyhWwYL+c/5qhKDgj+LPtnge3UNHWJ9Ykk="; + sha256 = "03cxz4m1n4rc81lqb4p1pz2ammms7f31wvi4daywfkc13aal6fz9"; }; nativeBuildInputs = [ cmake ]; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines"; - license = licenses.gpl2; + license = licenses.gpl2Only; homepage = "http://cab.spbu.ru/software/spades/"; - platforms = platforms.unix; + platforms = with platforms; [ "x86_64-linux" "x86_64-darwin"]; maintainers = [ maintainers.bzizou ]; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 93e8e62ac7b..bb523cddd19 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.34"; + version = "14.31.35"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-i+c4qS/IdLDPHk5ZHRhjOwkdvh8srU/mhOiHIkCN5Vo="; + sha256 = "sha256-uB7d27eicfmE1TpjLAxUoC8LBYAOrg3B48M1/CxWZdg="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 23635f8e6c6..b4f0d955d6b 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "21.2.0"; + version = "21.3.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-CLvMspk7HqrtNM5TD45mZIz6vsS32eUuxFDJiBDs9VY="; + sha256 = "sha256-PM4Exi4YD6WibxqtewLzE4dDRgSVHiTT36p68uoQP4g="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2ac5a7dd671..560e8dd733a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -8,7 +8,7 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses -, buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10") +, buildIde ? true , glib, gnome3, wrapGAppsHook , csdp ? null , version, coq-version ? null, diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 00000000000..b382e6f9e75 --- /dev/null +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,40 @@ +diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs +index fd9fe74..0fefa39 100644 +--- a/src/elan-dist/src/component/package.rs ++++ b/src/elan-dist/src/component/package.rs +@@ -50,11 +50,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) + }; + + try!(entry.unpack(&full_path).chain_err(|| ErrorKind::ExtractingPackage)); ++ nix_patchelf_if_needed(&full_path); + } + + Ok(()) + } + ++fn nix_patchelf_if_needed(dest_path: &Path) { ++ let (is_bin, is_lib) = if let Some(p) = dest_path.parent() { ++ (p.ends_with("bin"), p.ends_with("lib")) ++ } else { ++ (false, false) ++ }; ++ ++ if is_bin { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-interpreter") ++ .arg("@dynamicLinker@") ++ .arg(dest_path) ++ .output(); ++ } ++ else if is_lib { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-rpath") ++ .arg("@libPath@") ++ .arg(dest_path) ++ .output(); ++ } ++} ++ + #[derive(Debug)] + pub struct ZipPackage<'a>(temp::Dir<'a>); + diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index bb10998b2f4..fab930e2c7b 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,24 +1,46 @@ -{ lib, pkg-config, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl +, openssl, gmp, zlib, fetchFromGitHub, rustPlatform }: + +let + libPath = lib.makeLibraryPath [ gmp ]; +in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-YkGfuqtvVfPcxJ8UqD5QidcNEy5brTWGEK4fR64Yz70="; + sha256 = "1sl69ygdwhf80sx6m76x5gp1kwsw0rr1lv814cgzm8hvyr6g0jqa"; }; - cargoSha256 = "sha256-2fYicpoEERwD4OjdpseKQOkDvZlb7NnOZcb6Tu+rQdA="; + cargoSha256 = "1f881maf8jizd5ip7pc1ncbiq7lpggp0byma13pvqk7gisnqyr4r"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + OPENSSL_NO_VENDOR = 1; buildInputs = [ curl zlib openssl ]; cargoBuildFlags = [ "--features no-self-update" ]; + patches = lib.optionals stdenv.isLinux [ + # Run patchelf on the downloaded binaries. + # This necessary because Lean 4 now dynamically links to GMP. + (runCommand "0001-dynamically-patchelf-binaries.patch" { + CC = stdenv.cc; + patchelf = patchelf; + libPath = "$ORIGIN/../lib:${libPath}"; + } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath + '') + ]; + postInstall = '' pushd $out/bin mv elan-init elan @@ -27,6 +49,8 @@ rustPlatform.buildRustPackage rec { done popd + wrapProgram $out/bin/elan --prefix "LD_LIBRARY_PATH" : "${libPath}" + # tries to create .elan export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index d57db0fd0d7..b57ee0f61f1 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.27.0"; + version = "3.28.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "sha256-DSIWuMlweu9dsah5EdVCNQ9ADjYoEZongfw/Yh7/N/A="; + sha256 = "sha256-IzoFE92F559WeSUCiYZ/fx2hrsyRzgOACr3/pzJ4OOY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 04a49becc97..ce93c14b334 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -101,6 +101,9 @@ stdenv.mkDerivation rec { excludes = ["tst/testinstall/stringobj.tst"]; sha256 = "1mz5b4mbw2jdd1ypp5s0dy6pp0jsvwsxr2dm4kbkls20r1r192sc"; }) + + # fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965 + ./mark-genstackfuncbags-as-noinline.patch ]; postPatch = '' diff --git a/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch b/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch new file mode 100644 index 00000000000..3a2f7231c09 --- /dev/null +++ b/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch @@ -0,0 +1,13 @@ +diff --git a/src/gasman.c b/src/gasman.c +index 417811401..314a74190 100644 +--- a/src/gasman.c ++++ b/src/gasman.c +@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void ) + #endif + + +-void GenStackFuncBags ( void ) ++NOINLINE void GenStackFuncBags ( void ) + { + Bag * top; /* top of stack */ + Bag * p; /* loop variable */ diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 3e4ed900a92..1fb605b3599 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -87,6 +87,14 @@ stdenv.mkDerivation rec { rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6"; sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0="; }) + + # fix intermittent errors in doctest/test.py: https://trac.sagemath.org/ticket/26912 + (fetchSageDiff { + base = "9.3.beta8"; + name = "set-cysignals-crash-ndebug.patch"; + rev = "ca5257a5d0f32efc9f8f07e126020856270b1a18"; + sha256 = "sha256-KViw63xE3O0eUiOYzoxNrr4NL+csql9GPJLDJCf/EZs="; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -153,6 +161,14 @@ stdenv.mkDerivation rec { rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30"; sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0="; }) + + # cypari 2.1.2 update (https://trac.sagemath.org/ticket/31029) + (fetchSageDiff { + base = "9.3.beta3"; + name = "cypari-2.1.2-update.patch"; + rev = "b9aadfd08e81d74ca7c229bb80eb853b592887d0"; + sha256 = "sha256-eKaMy7kpu+YKdL8bPStgocxBCTfc2Z/10RrGy2LENFw="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix new file mode 100644 index 00000000000..e4a5f22891e --- /dev/null +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchurl +, gtk3 +, glib +, pkg-config +, libpng +, zlib +}: + +stdenv.mkDerivation rec { + pname = "xmedcon"; + version = "0.21.0"; + + src = fetchurl { + url = "https://prdownloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "0yfnbrcil5i76z1wbg308pb1mnjbcxy6nih46qpqs038v1lhh4q8"; + }; + + buildInputs = [ + gtk3 + glib + libpng + zlib + ]; + + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "An open source toolkit for medical image conversion "; + homepage = "https://xmedcon.sourceforge.io/Main/HomePage"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ arianvp flokli ]; + platforms = with platforms; [ darwin linux ]; + }; +} diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index edf26f7ec23..b2afc4701a5 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,13 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.28.0"; + version = "6.0.5"; propagatedBuildInputs = with python3Packages; [ appdirs ConfigArgParse datrie docutils + filelock GitPython jsonschema nbformat @@ -17,19 +18,20 @@ python3Packages.buildPythonApplication rec { pyyaml ratelimiter requests + smart_open toposort wrapt ]; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "2367ce91baf7f8fa7738d33aff9670ffdf5410bbac49aeb209f73b45a3425046"; + sha256 = "9441169034cce46086a8b45486d75175db645b932e766d28fed312ec837792d3"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json meta = with lib; { - homepage = "https://snakemake.readthedocs.io"; + homepage = "https://snakemake.github.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; longDescription = '' diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix new file mode 100644 index 00000000000..af252da04f8 --- /dev/null +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -0,0 +1,68 @@ +{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, + git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, + libpng, libtiff, openscenegraph , proj, python3, python37Packages, + stdenv, swig, xercesc, xorg, zlib }: + +stdenv.mkDerivation rec { + pname = "sumo"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "sumo"; + rev = "v${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1w9im1zz8xnkdwmv4v11kn1xcqm889268g1fw4y2s9f6shi41mxx"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + git + swig + ]; + + buildInputs = [ + bzip2 + eigen + ffmpeg + fox_1_6 + gdal + gl2ps + gpp + gtest + jdk + libGL + libGLU + libX11 + libjpeg + libpng + libtiff + openscenegraph + proj + python37Packages.setuptools + xercesc + zlib + python3 + ] ++ (with xorg; [ + libXcursor + libXext + libXfixes + libXft + libXrandr + libXrender + ]); + + meta = with lib; { + description = "The SUMO traffic simulator"; + longDescription = '' + Eclipse SUMO is an open source, highly + portable, microscopic and continuous traffic simulation package + designed to handle large networks. It allows for intermodal + simulation including pedestrians and comes with a large set of + tools for scenario creation. + ''; + homepage = "https://github.com/eclipse/sumo"; + license = licenses.epl20; + maintainers = with maintainers; [ mtreca ]; + }; +} diff --git a/pkgs/applications/science/physics/professor/default.nix b/pkgs/applications/science/physics/professor/default.nix new file mode 100644 index 00000000000..6d52951ee9c --- /dev/null +++ b/pkgs/applications/science/physics/professor/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, eigen, makeWrapper, python3 }: + +stdenv.mkDerivation rec { + pname = "professor"; + version = "2.3.3"; + + src = fetchurl { + name = "Professor-${version}.tar.gz"; + url = "https://professor.hepforge.org/downloads/?f=Professor-${version}.tar.gz"; + sha256 = "17q026r2fpfxzf74d1013ksy3a9m57rcr2q164n9x02ci40bmib0"; + }; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-shared -o' '-shared -install_name "$(out)/$@" -o' + ''; + + nativeBuildInputs = [ python3.pkgs.cython makeWrapper ]; + buildInputs = [ python3 eigen ]; + propagatedBuildInputs = with python3.pkgs; [ iminuit numpy matplotlib yoda ]; + + CPPFLAGS = [ "-I${eigen}/include/eigen3" ]; + PREFIX = placeholder "out"; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")" + done + ''; + + doInstallCheck = true; + installCheckTarget = "check"; + + meta = with lib; { + description = "A tuning tool for Monte Carlo event generators"; + homepage = "https://professor.hepforge.org/"; + license = licenses.unfree; # no license specified + maintainers = [ maintainers.veprbl ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index ded8f7ba699..756a031ae1e 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "bumpver"; - version = "2020.1108"; + version = "2021.1110"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1bhbrq8fk8rsr78vq9xjz8v9lgv571va0nmg86dwmv6qnj6dymzm"; + sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03"; }; prePatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/git-and-tools/bit/default.nix new file mode 100644 index 00000000000..e41c2569fcb --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/bit/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +}: + +buildGoModule rec { + pname = "bit"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "chriswalz"; + repo = pname; + rev = "v${version}"; + sha256 = "0dv6ma2vwb21cbxkxzrpmj7cqlhwr7a86i4g728m3y1aclh411sn"; + }; + + vendorSha256 = "1j6w7bll4zyp99579dhs2rza4y9kgfz3g8d5grfzgqck6cjj9mn8"; + + propagatedBuildInputs = [ git ]; + + # Tests require a repository + doCheck = false; + + meta = with lib; { + description = "Command-line tool for git"; + homepage = "https://github.com/chriswalz/bit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f2291882b2b..387a1cb59c5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz"; + sha256 = "sha256-ACuTb1DGft2/32Ezg23jhpl9yua5kUTZ2kKL8KHU+BU="; }; nativeBuildInputs = [ unixtools.column which ]; 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 9933535475a..99772f60bc5 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 @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "077xs3grjidahxz1gc93565b25blf97lwsljmkmr0yapps8z630d"; + sha256 = "0bb6ap8sdp4ad0xkh3y8vj46a363g5gdw0dzf9ycw0z9ah8ispfx"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index c73a9277138..5976f1de6a7 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.13.2"; + version = "2.13.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4"; + sha256 = "sha256-T4s/xnu5nL6dkEIo7xGywaE+EPH2OnzsaCF9OCGu7WQ="; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index c9570bb134d..64c98768fdd 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,12 @@ -{ lib, buildGoPackage, fetchurl, makeWrapper -, git, bash, gzip, openssh, pam +{ lib +, buildGoPackage +, fetchurl +, makeWrapper +, git +, bash +, gzip +, openssh +, pam , sqliteSupport ? true , pamSupport ? true , nixosTests @@ -9,11 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.4"; + version = "1.13.6"; + # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-Q9wM+TGgE9oFFzg6516bG7iFNjhxOxPMLKtTHghA/OU="; + sha256 = "1f0fsqcmmqygv0r796ddr2fjhh333i9nr0cqk9x2b2kbs1z264vf"; }; unpackPhase = '' @@ -36,16 +44,18 @@ buildGoPackage rec { buildInputs = optional pamSupport pam; - preBuild = let - tags = optional pamSupport "pam" + preBuild = + let + tags = optional pamSupport "pam" ++ optional sqliteSupport "sqlite sqlite_unlock_notify"; - tagsString = concatStringsSep " " tags; - in '' - export buildFlagsArray=( - -tags="${tagsString}" - -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"' - ) - ''; + tagsString = concatStringsSep " " tags; + in + '' + export buildFlagsArray=( + -tags="${tagsString}" + -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"' + ) + ''; outputs = [ "out" "data" ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4f87dfc7cb0..4199cf0910f 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.5.2"; + version = "7.5.3"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0qd83licmw3p7cl04dki510nsn3kxk31s18g2xlixl8zqs3h08lp"; + sha256 = "0vxvfq0dh6l1plqbq67gfydr8bh5w3q6d5y3bn3rdia10wa1dac6"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index beff147c374..9e844a1e01f 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' gem "bundler", ">= 1.5.0" -gem 'rails', '5.2.4.2' +gem 'rails', '5.2.4.5' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem "rouge", "~> 3.12.0" gem "request_store", "~> 1.4.1" @@ -12,8 +12,8 @@ gem "actionpack-xml_parser" gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") gem "mimemagic" gem "mail", "~> 2.7.1" -gem "csv", "~> 3.1.1" -gem "nokogiri", "~> 1.10.0" +gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') +gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') gem "i18n", "~> 1.6.0" gem "rbpdf", "~> 1.20.0" @@ -38,7 +38,7 @@ end # Optional Markdown support, not for JRuby group :markdown do - gem "redcarpet", "~> 3.5.0" + gem 'redcarpet', '~> 3.5.1' end # Include database gems for the database adapters NixOS supports diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 60aed5e1792..c71a1b7bdde 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.2) - actionpack (= 5.2.4.2) + actioncable (5.2.4.5) + actionpack (= 5.2.4.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) + actionmailer (5.2.4.5) + actionpack (= 5.2.4.5) + actionview (= 5.2.4.5) + activejob (= 5.2.4.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.2) - actionview (= 5.2.4.2) - activesupport (= 5.2.4.2) + actionpack (5.2.4.5) + actionview (= 5.2.4.5) + activesupport (= 5.2.4.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.4.2) - activesupport (= 5.2.4.2) + actionview (5.2.4.5) + activesupport (= 5.2.4.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.2) - activesupport (= 5.2.4.2) + activejob (5.2.4.5) + activesupport (= 5.2.4.5) globalid (>= 0.3.6) - activemodel (5.2.4.2) - activesupport (= 5.2.4.2) - activerecord (5.2.4.2) - activemodel (= 5.2.4.2) - activesupport (= 5.2.4.2) + activemodel (5.2.4.5) + activesupport (= 5.2.4.5) + activerecord (5.2.4.5) + activemodel (= 5.2.4.5) + activesupport (= 5.2.4.5) arel (>= 9.0) - activestorage (5.2.4.2) - actionpack (= 5.2.4.2) - activerecord (= 5.2.4.2) + activestorage (5.2.4.5) + actionpack (= 5.2.4.5) + activerecord (= 5.2.4.5) marcel (~> 0.3.1) - activesupport (5.2.4.2) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -48,7 +48,7 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) arel (9.0.0) - ast (2.4.0) + ast (2.4.2) builder (3.2.4) capybara (3.25.0) addressable @@ -59,21 +59,21 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) childprocess (3.0.0) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.8) crass (1.0.6) - css_parser (1.7.1) + css_parser (1.9.0) addressable - csv (3.1.2) - docile (1.3.2) - erubi (1.9.0) + csv (3.1.9) + docile (1.3.5) + erubi (1.10.0) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) i18n (1.6.0) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) - json (2.3.0) - loofah (2.5.0) + json (2.5.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -81,61 +81,63 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) - mimemagic (0.3.4) + mimemagic (0.3.5) mini_magick (4.9.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.0) - mocha (1.11.2) + mini_portile2 (2.5.0) + minitest (5.14.4) + mocha (1.12.0) mysql2 (0.5.3) - net-ldap (0.16.2) - nio4r (2.5.2) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.1.0) - ast (~> 2.4.0) + net-ldap (0.16.3) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + parallel (1.20.1) + parser (3.0.0.0) + ast (~> 2.4.1) pg (1.1.4) - public_suffix (4.0.4) - puma (3.12.4) - rack (2.2.2) + public_suffix (4.0.6) + puma (3.12.6) + racc (1.5.2) + rack (2.2.3) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.2) - actioncable (= 5.2.4.2) - actionmailer (= 5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) - activemodel (= 5.2.4.2) - activerecord (= 5.2.4.2) - activestorage (= 5.2.4.2) - activesupport (= 5.2.4.2) + rails (5.2.4.5) + actioncable (= 5.2.4.5) + actionmailer (= 5.2.4.5) + actionpack (= 5.2.4.5) + actionview (= 5.2.4.5) + activejob (= 5.2.4.5) + activemodel (= 5.2.4.5) + activerecord (= 5.2.4.5) + activestorage (= 5.2.4.5) + activesupport (= 5.2.4.5) bundler (>= 1.3.0) - railties (= 5.2.4.2) + railties (= 5.2.4.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.2) - actionpack (= 5.2.4.2) - activesupport (= 5.2.4.2) + railties (5.2.4.5) + actionpack (= 5.2.4.5) + activesupport (= 5.2.4.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rbpdf (1.20.1) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - redcarpet (3.5.0) - regexp_parser (1.7.0) + redcarpet (3.5.1) + regexp_parser (1.8.2) request_store (1.4.1) rack (>= 1.4) roadie (4.0.0) @@ -158,7 +160,7 @@ GEM rack (>= 1.1) rubocop (>= 0.72.0) ruby-openid (2.9.2) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) rubyzip (2.3.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) @@ -168,24 +170,24 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (4.0.0) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (1.6.1) - websocket-driver (0.7.1) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.24) + yard (0.9.26) PLATFORMS ruby @@ -204,14 +206,14 @@ DEPENDENCIES mocha (>= 1.4.0) mysql2 (~> 0.5.0) net-ldap (~> 0.16.0) - nokogiri (~> 1.10.0) + nokogiri (~> 1.11.1) pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.4.2) + rails (= 5.2.4.5) rails-dom-testing rbpdf (~> 1.20.0) - redcarpet (~> 3.5.0) + redcarpet (~> 3.5.1) request_store (~> 1.4.1) roadie-rails (~> 2.1.0) rouge (~> 3.12.0) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index ab5b4ffded5..37905e273da 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let - version = "4.1.1"; + version = "4.1.2"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5"; + sha256 = "13i2rlkpdwkdhidpdb5r2zxwxna00r71rh248kzfhgy5a5rkj8ky"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index a8fd6eba6f0..e110c1bf543 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v"; + sha256 = "1rlx5597621jmdzpf8mhfm52d0fcz1izdj94k58l4sln4gw0x73j"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z"; + sha256 = "19y5y2dypqakk39smcmyslic8wnffzc0670d2zjadsrgsg850gyp"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax"; + sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp"; + sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi"; + sha256 = "1mb4s49vbrxyg3pba76z3llbzclm8d4zcjhalf4yrfq5y357kkya"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di"; + sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5"; + sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9"; + sha256 = "12i3an3vxg0fqjvr4mi0b3nnsb8jpcphkmz1717nb7lsy3wm4081"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -135,10 +135,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; builder = { groups = ["default"]; @@ -176,10 +176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.8"; }; crass = { groups = ["default"]; @@ -197,40 +197,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; + sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; }; csv = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5"; + sha256 = "07mgyalwdxaxnff86j5p6n5szmhqz7nrlkb40826mzggrmva8v1m"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.9"; }; docile = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.5"; }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; globalid = { dependencies = ["activesupport"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.1"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -290,10 +290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; + sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; type = "gem"; }; - version = "2.5.0"; + version = "2.9.0"; }; mail = { dependencies = ["mini_mime"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p"; + sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.5"; }; mini_magick = { groups = ["minimagick"]; @@ -362,30 +362,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.4"; }; mocha = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4"; + sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.0"; }; mysql2 = { groups = ["default"]; @@ -410,41 +410,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; type = "gem"; }; - version = "0.16.2"; + version = "0.16.3"; }; nio4r = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"; + sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; type = "gem"; }; - version = "2.5.2"; + version = "2.5.7"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; + sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; type = "gem"; }; - version = "1.10.9"; + version = "1.11.2"; }; parallel = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -452,10 +452,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.1.0"; + version = "3.0.0.0"; }; pg = { groups = ["default"]; @@ -480,30 +480,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.4"; + version = "4.0.6"; }; puma = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs"; + sha256 = "1ypkyqhysb2vvdvkl4w923yvpmi228gld4kbargb1i2d4sa9s49a"; type = "gem"; }; - version = "3.12.4"; + version = "3.12.6"; + }; + racc = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; }; rack = { groups = ["default" "openid" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -533,10 +543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4"; + sha256 = "1nzsm1fqqnhlvgcfrrpsmcv2znldfkyq5c9z7k08p2p54jrd8kfd"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -566,10 +576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16"; + sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; rainbow = { groups = ["default" "test"]; @@ -586,10 +596,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; @@ -617,20 +627,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; + sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.1"; }; regexp_parser = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2"; + sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.2"; }; request_store = { dependencies = ["rack"]; @@ -723,10 +733,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; rubyzip = { groups = ["default" "test"]; @@ -776,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap"; + sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.2"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -787,20 +797,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; + sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; thread_safe = { groups = ["default" "test"]; @@ -818,10 +828,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; unicode-display_width = { groups = ["default" "test"]; @@ -839,20 +849,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; + sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.3"; }; websocket-extensions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; xpath = { dependencies = ["nokogiri"]; @@ -870,9 +880,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; + sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; type = "gem"; }; - version = "0.9.24"; + version = "0.9.26"; }; } diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index e60acf87da6..e4225963cb2 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "catt"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6RUeinHhAvvSz38hHQP5/MXNiY00rCM8k2ONaFYbwPc="; + sha256 = "fef58bf7a8ebaba98399d1077cc4615f53d0196aab2a989df369a66f7111963b"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 6dc42a47685..3d080c00555 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,25 +1,68 @@ -{ lib, buildPythonApplication, fetchFromGitHub, callPackage -, mpv, python-mpv-jsonipc, jellyfin-apiclient-python -, pillow, tkinter, pystray, jinja2, pywebview }: +{ lib +, buildPythonApplication +, copyDesktopItems +, fetchPypi +, makeDesktopItem +, flask +, jellyfin-apiclient-python +, jinja2 +, mpv +, pillow +, pydantic +, pyqtwebengine +, pystray +, python-mpv-jsonipc +, pywebview +, qt5 +, tkinter +, werkzeug +}: -let - shaderPack = callPackage ./shader-pack.nix {}; -in buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "1.7.1"; + version = "1.10.2"; - src = fetchFromGitHub { - owner = "iwalton3"; - repo = pname; - rev = "v${version}"; - sha256 = "0alrh5h3f8pq9mrq09jmpqa0yslxsjqwij6kwn24ggbwc10zkq75"; - fetchSubmodules = true; # needed for display_mirror css file + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ivNkVpC+uQfbcAyQZ0xIG1k1MLIgpkiqTMVnkoYlJyY="; }; - patches = [ - ./disable-desktop-client.patch - ./disable-update-check.patch + propagatedBuildInputs = [ + jellyfin-apiclient-python + mpv + pillow + pydantic + python-mpv-jsonipc + + # gui dependencies + pystray + tkinter + + # display_mirror dependencies + jinja2 + pywebview + + # desktop dependencies + flask + pyqtwebengine + werkzeug + ]; + + nativeBuildInputs = [ + copyDesktopItems + qt5.wrapQtAppsHook + ]; + + desktopItems = [ + (makeDesktopItem { + name = "Jellyfin Desktop"; + exec = "jellyfin-desktop"; + icon = "jellyfin-desktop"; + desktopName = "jellyfin-desktop"; + comment = "MPV-based desktop and cast client for Jellyfin"; + genericName = "MPV-based desktop and cast client for Jellyfin"; + categories = "Video;AudioVideo;TV;Player"; + }) ]; # override $HOME directory: @@ -34,31 +77,27 @@ buildPythonApplication rec { ''; postPatch = '' - # link the default shader pack - ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack + substituteInPlace jellyfin_mpv_shim/conf.py \ + --replace "check_updates: bool = True" "check_updates: bool = False" \ + --replace "notify_updates: bool = True" "notify_updates: bool = False" ''; - propagatedBuildInputs = [ - jellyfin-apiclient-python - mpv - pillow - python-mpv-jsonipc - - # gui dependencies - pystray - tkinter + postInstall = '' + mkdir -p $out/share/pixmaps + cp jellyfin_mpv_shim/integration/jellyfin-256.png $out/share/pixmaps/jellyfin-desktop.png + ''; - # display_mirror dependencies - jinja2 - pywebview - ]; + postFixup = '' + wrapQtApp $out/bin/jellyfin-desktop + wrapQtApp $out/bin/jellyfin-mpv-desktop + ''; # no tests doCheck = false; pythonImportsCheck = [ "jellyfin_mpv_shim" ]; meta = with lib; { - homepage = "https://github.com/iwalton3/jellyfin-mpv-shim"; + homepage = "https://github.com/jellyfin/jellyfin-desktop"; description = "Allows casting of videos to MPV via the jellyfin mobile and web app"; license = licenses.gpl3; maintainers = with maintainers; [ jojosch ]; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch b/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch deleted file mode 100644 index 996225efb3a..00000000000 --- a/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index a831959..2206e6e 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,7 +25,6 @@ setup( - entry_points={ - 'console_scripts': [ - 'jellyfin-mpv-shim=jellyfin_mpv_shim.mpv_shim:main', -- 'jellyfin-mpv-desktop=jellyfin_mpv_shim.mpv_shim:main_desktop', - ] - }, - classifiers=[ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch b/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch deleted file mode 100644 index 6941b956e85..00000000000 --- a/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/jellyfin_mpv_shim/conf.py b/jellyfin_mpv_shim/conf.py -index 0ab9326..ccedc17 100644 ---- a/jellyfin_mpv_shim/conf.py -+++ b/jellyfin_mpv_shim/conf.py -@@ -88,8 +88,8 @@ class Settings(object): - "sync_revert_seek": True, - "sync_osd_message": True, - "screenshot_menu": True, -- "check_updates": True, -- "notify_updates": True, -+ "check_updates": False, -+ "notify_updates": False, - "lang": None, - "desktop_scale": 1.0, - } diff --git a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix b/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix deleted file mode 100644 index 89a601af4ad..00000000000 --- a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "jellyfin-mpv-shim-shader-pack"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "iwalton3"; - repo = "default-shader-pack"; - rev = "v${version}"; - sha256 = "04y8gvjy4v3773b1kyan4dxqcf86b56x7v33m2k246jbn0rl2pgr"; - }; - - installPhase = '' - mkdir -p $out - cp -a . $out - ''; - - meta = with lib; { - homepage = "https://github.com/iwalton3/default-shader-pack"; - description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients"; - license = with licenses; [ mit lgpl3Plus unlicense ]; - maintainers = with maintainers; [ jojosch ]; - }; -} diff --git a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix new file mode 100644 index 00000000000..5d714cf1799 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix @@ -0,0 +1,26 @@ +{ lib, buildKodiAddon, fetchFromGitHub, requests, vfs-libarchive }: + +buildKodiAddon rec { + pname = "a4ksubtitles"; + namespace = "service.subtitles.a4ksubtitles"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "a4k-openproject"; + repo = "a4kSubtitles"; + rev = "${namespace}/${namespace}-${version}"; + sha256 = "0hxvxkbihfyvixmlxf5n4ccn70w0244hhw3hr44rqvx00a0bg1lh"; + }; + + propagatedBuildInputs = [ + requests + vfs-libarchive + ]; + + meta = with lib; { + homepage = "https://a4k-openproject.github.io/a4kSubtitles/"; + description = "Multi-Source Subtitles Addon"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix index 5c55873e819..32b4a035bfe 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "8.2.2"; + version = "8.2.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q"; + sha256 = "sha256-05RSB4ZwwZSzY2b1/MRw6zzl/HhMbeVhCVCOj3gSTWA="; }; meta = with lib; { diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix new file mode 100644 index 00000000000..c44db31f50c --- /dev/null +++ b/pkgs/applications/virtualization/catatonit/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }: + +stdenv.mkDerivation rec { + pname = "catatonit"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = pname; + rev = "v${version}"; + sha256 = "ciJ1MI7jr5P2PgxIykQ+BiwNUO8lQHGt0+U8CNbc5bI="; + }; + + patches = [ + # Fix compilation with musl + (fetchpatch { + url = "https://github.com/openSUSE/catatonit/commit/75014b1c3099245b7d0f44f24d7f6dc4888a45fd.patch"; + sha256 = "sha256-9VMNUT1U90ocjvE7EXYfLxuodDwTXXHYg89qqa5Jq0g="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + + doInstallCheck = true; + installCheckPhase = '' + readelf -d $out/bin/catatonit | grep 'There is no dynamic section in this file.' + ''; + + passthru.tests = { inherit (nixosTests) podman; }; + + meta = with lib; { + description = "A container init that is so simple it's effectively brain-dead"; + homepage = "https://github.com/openSUSE/catatonit"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ erosennin ] ++ teams.podman.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index f97f13dab2a..42e1eaf56d4 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, iasl, python }: +{ lib, stdenv, fetchurl, iasl, python3 }: stdenv.mkDerivation rec { @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b"; }; - buildInputs = [ iasl python ]; + nativeBuildInputs = [ python3 ]; + + buildInputs = [ iasl ]; + + strictDeps = true; hardeningDisable = [ "pic" "stackprotector" "fortify" ]; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index a1151dcf82e..ce0b40c0bb7 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc-full +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell , nixosTests }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; depsBuildBuild = [ - asciidoc-full + asciidoc ]; buildInputs = [ diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index fec289f0ff1..a73737cb123 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -729,6 +729,8 @@ rec { name, # Image tag, the Nix's output hash will be used if null tag ? null, + # Parent image, to append to. + fromImage ? null, # Files to put on the image (a nix store path or list of paths). contents ? [], # Docker config; e.g. what command to run on the container. @@ -791,7 +793,7 @@ rec { unnecessaryDrvs = [ baseJson overallClosure ]; conf = runCommand "${baseName}-conf.json" { - inherit maxLayers created; + inherit fromImage maxLayers created; imageName = lib.toLower name; passthru.imageTag = if tag != null @@ -821,6 +823,27 @@ rec { unnecessaryDrvs} } + # Compute the number of layers that are already used by a potential + # 'fromImage' as well as the customization layer. Ensure that there is + # still at least one layer available to store the image contents. + usedLayers=0 + + # subtract number of base image layers + if [[ -n "$fromImage" ]]; then + (( usedLayers += $(tar -xOf "$fromImage" manifest.json | jq '.[0].Layers | length') )) + fi + + # one layer will be taken up by the customisation layer + (( usedLayers += 1 )) + + if ! (( $usedLayers < $maxLayers )); then + echo >&2 "Error: usedLayers $usedLayers layers to store 'fromImage' and" \ + "'extraCommands', but only maxLayers=$maxLayers were" \ + "allowed. At least 1 layer is required to store contents." + exit 1 + fi + availableLayers=$(( maxLayers - usedLayers )) + # Create $maxLayers worth of Docker Layers, one layer per store path # unless there are more paths than $maxLayers. In that case, create # $maxLayers-1 for the most popular layers, and smush the remainaing @@ -838,18 +861,20 @@ rec { | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] | map(select(length > 0)) ' \ - --argjson maxLayers "$(( maxLayers - 1 ))" # one layer will be taken up by the customisation layer + --argjson maxLayers "$availableLayers" )" cat ${baseJson} | jq ' . + { "store_dir": $store_dir, + "from_image": $from_image, "store_layers": $store_layers, "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, "created": $created } ' --arg store_dir "${storeDir}" \ + --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \ --argjson store_layers "$store_layers" \ --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 9e33a42af23..9c7d4681214 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -188,7 +188,25 @@ rec { }; }; - # 12. example of running something as root on top of a parent image + # 12 Create a layered image on top of a layered image + layered-on-top-layered = pkgs.dockerTools.buildLayeredImage { + name = "layered-on-top-layered"; + tag = "latest"; + fromImage = layered-image; + extraCommands = '' + mkdir ./example-output + chmod 777 ./example-output + ''; + config = { + Env = [ "PATH=${pkgs.coreutils}/bin/" ]; + WorkingDir = "/example-output"; + Cmd = [ + "${pkgs.bash}/bin/bash" "-c" "echo hello > foo; cat foo" + ]; + }; + }; + + # 13. example of running something as root on top of a parent image # Regression test related to PR #52109 runAsRootParentImage = buildImage { name = "runAsRootParentImage"; @@ -197,7 +215,7 @@ rec { fromImage = bash; }; - # 13. example of 3 layers images This image is used to verify the + # 14. example of 3 layers images This image is used to verify the # order of layers is correct. # It allows to validate # - the layer of parent are below @@ -235,23 +253,36 @@ rec { ''; }; - # 14. Environment variable inheritance. + # 15. Environment variable inheritance. # Child image should inherit parents environment variables, # optionally overriding them. - environmentVariables = let - parent = pkgs.dockerTools.buildImage { - name = "parent"; - tag = "latest"; - config = { - Env = [ - "FROM_PARENT=true" - "LAST_LAYER=parent" - ]; - }; + environmentVariablesParent = pkgs.dockerTools.buildImage { + name = "parent"; + tag = "latest"; + config = { + Env = [ + "FROM_PARENT=true" + "LAST_LAYER=parent" + ]; }; - in pkgs.dockerTools.buildImage { + }; + + environmentVariables = pkgs.dockerTools.buildImage { + name = "child"; + fromImage = environmentVariablesParent; + tag = "latest"; + contents = [ pkgs.coreutils ]; + config = { + Env = [ + "FROM_CHILD=true" + "LAST_LAYER=child" + ]; + }; + }; + + environmentVariablesLayered = pkgs.dockerTools.buildLayeredImage { name = "child"; - fromImage = parent; + fromImage = environmentVariablesParent; tag = "latest"; contents = [ pkgs.coreutils ]; config = { @@ -262,14 +293,14 @@ rec { }; }; - # 15. Create another layered image, for comparing layers with image 10. + # 16. Create another layered image, for comparing layers with image 10. another-layered-image = pkgs.dockerTools.buildLayeredImage { name = "another-layered-image"; tag = "latest"; config.Cmd = [ "${pkgs.hello}/bin/hello" ]; }; - # 16. Create a layered image with only 2 layers + # 17. Create a layered image with only 2 layers two-layered-image = pkgs.dockerTools.buildLayeredImage { name = "two-layered-image"; tag = "latest"; @@ -278,7 +309,7 @@ rec { maxLayers = 2; }; - # 17. Create a layered image with more packages than max layers. + # 18. Create a layered image with more packages than max layers. # coreutils and hello are part of the same layer bulk-layer = pkgs.dockerTools.buildLayeredImage { name = "bulk-layer"; @@ -289,7 +320,19 @@ rec { maxLayers = 2; }; - # 18. Create a "layered" image without nix store layers. This is not + # 19. Create a layered image with a base image and more packages than max + # layers. coreutils and hello are part of the same layer + layered-bulk-layer = pkgs.dockerTools.buildLayeredImage { + name = "layered-bulk-layer"; + tag = "latest"; + fromImage = two-layered-image; + contents = with pkgs; [ + coreutils hello + ]; + maxLayers = 4; + }; + + # 20. Create a "layered" image without nix store layers. This is not # recommended, but can be useful for base images in rare cases. no-store-paths = pkgs.dockerTools.buildLayeredImage { name = "no-store-paths"; @@ -321,7 +364,7 @@ rec { }; }; - # 19. Support files in the store on buildLayeredImage + # 21. Support files in the store on buildLayeredImage # See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223 filesInStore = pkgs.dockerTools.buildLayeredImageWithNixDb { name = "file-in-store"; @@ -341,7 +384,7 @@ rec { }; }; - # 20. Ensure that setting created to now results in a date which + # 22. Ensure that setting created to now results in a date which # isn't the epoch + 1 for layered images. unstableDateLayered = pkgs.dockerTools.buildLayeredImage { name = "unstable-date-layered"; diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index 60d67442c16..d7c63eb43a7 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -33,6 +33,7 @@ function does all this. import io import os +import re import sys import json import hashlib @@ -126,10 +127,87 @@ class ExtractChecksum: return (self._digest.hexdigest(), self._size) +FromImage = namedtuple("FromImage", ["tar", "manifest_json", "image_json"]) # Some metadata for a layer LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) +def load_from_image(from_image_str): + """ + Loads the given base image, if any. + + from_image_str: Path to the base image archive. + + Returns: A 'FromImage' object with references to the loaded base image, + or 'None' if no base image was provided. + """ + if from_image_str is None: + return None + + base_tar = tarfile.open(from_image_str) + + manifest_json_tarinfo = base_tar.getmember("manifest.json") + with base_tar.extractfile(manifest_json_tarinfo) as f: + manifest_json = json.load(f) + + image_json_tarinfo = base_tar.getmember(manifest_json[0]["Config"]) + with base_tar.extractfile(image_json_tarinfo) as f: + image_json = json.load(f) + + return FromImage(base_tar, manifest_json, image_json) + + +def add_base_layers(tar, from_image): + """ + Adds the layers from the given base image to the final image. + + tar: 'tarfile.TarFile' object for new layers to be added to. + from_image: 'FromImage' object with references to the loaded base image. + """ + if from_image is None: + print("No 'fromImage' provided", file=sys.stderr) + return [] + + layers = from_image.manifest_json[0]["Layers"] + checksums = from_image.image_json["rootfs"]["diff_ids"] + layers_checksums = zip(layers, checksums) + + for num, (layer, checksum) in enumerate(layers_checksums, start=1): + layer_tarinfo = from_image.tar.getmember(layer) + checksum = re.sub(r"^sha256:", "", checksum) + + tar.addfile(layer_tarinfo, from_image.tar.extractfile(layer_tarinfo)) + path = layer_tarinfo.path + size = layer_tarinfo.size + + print("Adding base layer", num, "from", path, file=sys.stderr) + yield LayerInfo(size=size, checksum=checksum, path=path, paths=[path]) + + from_image.tar.close() + + +def overlay_base_config(from_image, final_config): + """ + Overlays the final image 'config' JSON on top of selected defaults from the + base image 'config' JSON. + + from_image: 'FromImage' object with references to the loaded base image. + final_config: 'dict' object of the final image 'config' JSON. + """ + if from_image is None: + return final_config + + base_config = from_image.image_json["config"] + + # Preserve environment from base image + final_env = base_config.get("Env", []) + final_config.get("Env", []) + if final_env: + # Resolve duplicates (last one wins) and format back as list + resolved_env = {entry.split("=", 1)[0]: entry for entry in final_env} + final_config["Env"] = list(resolved_env.values()) + return final_config + + def add_layer_dir(tar, paths, store_dir, mtime): """ Appends given store paths to a TarFile object as a new layer. @@ -248,17 +326,21 @@ def main(): mtime = int(created.timestamp()) store_dir = conf["store_dir"] + from_image = load_from_image(conf["from_image"]) + with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: layers = [] - for num, store_layer in enumerate(conf["store_layers"]): - print( - "Creating layer", num, - "from paths:", store_layer, - file=sys.stderr) + layers.extend(add_base_layers(tar, from_image)) + + start = len(layers) + 1 + for num, store_layer in enumerate(conf["store_layers"], start=start): + print("Creating layer", num, "from paths:", store_layer, + file=sys.stderr) info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime) layers.append(info) - print("Creating the customisation layer...", file=sys.stderr) + print("Creating layer", len(layers) + 1, "with customisation...", + file=sys.stderr) layers.append( add_customisation_layer( tar, @@ -273,7 +355,7 @@ def main(): "created": datetime.isoformat(created), "architecture": conf["architecture"], "os": "linux", - "config": conf["config"], + "config": overlay_base_config(from_image, conf["config"]), "rootfs": { "diff_ids": [f"sha256:{layer.checksum}" for layer in layers], "type": "layers", diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index ebd171c6545..6e212209187 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f54df832191..d31272c2a5f 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.10"; + version = "5.11"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "sha256-dRAlNboRny8iP2dNhOHc2uvwpf/WObPC5ssKDjR2h2I="; + sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo="; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix deleted file mode 100644 index 37b48f7ceb2..00000000000 --- a/pkgs/data/fonts/inter-ui/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchzip }: - -# XXX: IMPORTANT: -# For compat, keep this at the last version that used the name "Inter UI" -# For newer versions, which are now simply named "Inter", -# see the expression for `inter` (../inter/default.nix). -let - version = "3.2"; -in fetchzip { - name = "inter-ui-${version}"; - - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-UI-${version}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - - sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4"; - - meta = with lib; { - homepage = "https://rsms.me/inter/"; - description = "A typeface specially designed for user interfaces"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ demize ]; - }; -} - diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index d6929153bf4..88c80574e8f 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.071"; + version = "1.077"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z"; + sha256 = "sha256-deztulQ33TIMevEQOP5OS8tmf6UjXT8IiVpRjkdismY="; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 726f60938bb..4dea9253c02 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.8.2"; + version = "1.9.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "0195d8ssmd8hc0q941z6zwnccffxajv4vylypsndxf28f3ikawby"; + sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM="; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 20b5b673ccf..ca2ae302b3e 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,14 +1,22 @@ -{ lib, fetchzip, cabextract }: +{ lib, stdenvNoCC, fetchurl, cabextract }: -fetchzip { - name = "vista-fonts-1"; +stdenvNoCC.mkDerivation { + pname = "vista-fonts"; + version = "1"; - url = "https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe"; + src = fetchurl { + url = "mirror://sourceforge/mscorefonts2/cabs/PowerPointViewer.exe"; + sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4"; + }; + + nativeBuildInputs = [ cabextract ]; - postFetch = '' - ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile - ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' ppviewer.cab + unpackPhase = '' + cabextract --lowercase --filter ppviewer.cab $src + cabextract --lowercase --filter '*.TTF' ppviewer.cab + ''; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -21,8 +29,6 @@ fetchzip { done ''; - sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI="; - meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = "http://www.microsoft.com/typography/ClearTypeFonts.mspx"; diff --git a/pkgs/data/fonts/vollkorn/default.nix b/pkgs/data/fonts/vollkorn/default.nix new file mode 100644 index 00000000000..6c5836da5b0 --- /dev/null +++ b/pkgs/data/fonts/vollkorn/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchzip }: +let + pname = "vollkorn"; + version = "4.105"; +in +fetchzip { + name = "${pname}-${version}"; + url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; + sha256 = "0srff2nqs7353mqcpmvaq156lamfh621py4h1771n0l9ix2c8mss"; + stripRoot = false; + + postFetch = '' + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} + unzip $downloadedFile + cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ + cp -v PS-OTF/*.otf $out/share/fonts/opentype + cp -v TTF/*.ttf $out/share/fonts/truetype + cp -v WOFF/*.woff $out/share/fonts/WOFF + cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2 + ''; + + meta = with lib; { + homepage = "http://vollkorn-typeface.com/"; + description = "The free and healthy typeface for bread and butter use"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.schmittlauch ]; + }; +} diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix index f7da9381e61..cabc28a89ce 100644 --- a/pkgs/data/misc/conway_polynomials/default.nix +++ b/pkgs/data/misc/conway_polynomials/default.nix @@ -1,13 +1,13 @@ { lib, stdenv , fetchurl -, python +, python2 }: stdenv.mkDerivation rec { pname = "conway_polynomials"; version = "0.5"; - pythonEnv = python.withPackages (ps: with ps; [ six ]); + pythonEnv = python2.withPackages (ps: with ps; [ six ]); src = fetchurl { url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2"; diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix index 988716f5429..98259400021 100644 --- a/pkgs/data/misc/elliptic_curves/default.nix +++ b/pkgs/data/misc/elliptic_curves/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, python +, python2 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export SAGE_SHARE="$out/share" export PYTHONPATH=$PWD - ${python.interpreter} ${spkg-install} + ${python2.interpreter} ${spkg-install} ''; meta = with lib; { diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix index 96130b2de5e..7fcd2fbf516 100644 --- a/pkgs/data/misc/libkkc-data/default.nix +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, marisa, libkkc }: +{ lib, stdenv, fetchurl, python2, libkkc }: stdenv.mkDerivation rec { pname = "libkkc-data"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; }; - nativeBuildInputs = [ marisa ]; + nativeBuildInputs = [ python2.pkgs.marisa ]; + + strictDeps = true; meta = with lib; { description = "Language model data package for libkkc"; diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 24709d0f2a2..aaf8c92c672 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "sha256-xVoXVVEULZZnoYEXl1x96Tjs8hOvs9/sOAUVMj9kKCo="; + sha256 = "1nx1lgrrp3w5z5hymb91frjdvdkk7x677my5v4jjd330ihqa02dq"; }; # This package has a Makefile, but it's used for building a zip for diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index a6444025ebb..e58d8ce6e42 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -7,16 +7,17 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "32"; + version = "35"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l"; + sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs="; }; patches = [ + # Fix paths to libpulse and python (substituteAll { src = ./fix-paths.patch; libpulse = "${libpulseaudio}/lib/libpulse.so"; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME Shell extension adding audio device chooser to panel"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; homepage = "https://github.com/kgshank/gse-sound-output-device-chooser"; }; diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch index 5957cb956f7..1971bf1e5e7 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch @@ -2,20 +2,20 @@ diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-outp index 54ad06f..0860531 100644 --- a/sound-output-device-chooser@kgshank.net/convenience.js +++ b/sound-output-device-chooser@kgshank.net/convenience.js -@@ -129,7 +129,7 @@ function refreshCards() { - if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) { +@@ -142,7 +142,7 @@ function refreshCards() { + if (newProfLogic) { _log("New logic"); - let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path(); -- let pythonExec = 'python'; + let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path(); +- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd)); + let pythonExec = '@python@'; - let pyVer = 3; - while(!isCmdFound(pythonExec) && pyVer >=2){ - _log(pythonExec + " is not found. Try next"); + if (!pythonExec) { + _log("ERROR: Python not found. fallback to default mode"); + _settings.set_boolean(Prefs.NEW_PROFILE_ID, false); diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py index c4d2484..262608d 100644 --- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py +++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py -@@ -86,7 +86,7 @@ else: +@@ -82,7 +82,7 @@ else: _libraries = {} diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix index 1949b97fafb..e2f7f547579 100644 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: +{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "45"; + version = "48"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "sha256-ghmCnzlPvxHEy2ro1AL+T2yiavJVrPhRfIKbMBwMjac="; + sha256 = "1rc9h7zrg9pvyl619ychcp0w7wmnf4ndaq2knv490kzhy0idj18j"; }; uuid = "unite@hardpixel.eu"; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 0ea59c3fc42..2d66dabb5a0 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.0"; + version = "0.3.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj"; + sha256 = "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f"; }; passthru = { diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch new file mode 100644 index 00000000000..7216f54b6c8 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch @@ -0,0 +1,57 @@ +From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Tue, 16 Mar 2021 15:03:59 -0400 +Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search + +Why is this necessary even though -a "$0" is used in the wrapper? +Because it's completely bypassing argv0! This looks at the executable +file in-use according to the kernel! + +Wrappers cannot affect the `/proc/.../exe` symlink! +--- + service_utils.h | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) + +diff --git a/service_utils.h b/service_utils.h +index 8a70c1fad..6674f553b 100644 +--- a/service_utils.h ++++ b/service_utils.h +@@ -26,8 +26,34 @@ namespace KWin + const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces"); + const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces"); + +-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName) ++static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName) + { ++ // !! Start NixOS fix ++ // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does ++ // miscellaneous trickeries and mischievous things to make the programs work. ++ // In turn, programs often employs different mischievous schemes and trickeries to do *other things. ++ // It often happens that they conflict. ++ // Here, `kwin` tries to detect the .desktop file for a given process. ++ // `kwin` followed the process `/proc/.../exe` up to the actual binary running. ++ // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file. ++ // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped ++ // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !! ++ // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep ++ // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match. ++ // This should canonicalize the wrapper name to the expected name to look for in the desktop file. ++ ++ // Use a copy of the const string ++ QString executablePath(in_executablePath); ++ ++ // While the parts needed are present, "unwrap" one layer of wrapper names. ++ while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) { ++ // Approximately equivalent to s/-wrapped$// ++ executablePath.remove(executablePath.length() - 8, 8); ++ // Approximately equivalent to s;/\.;/; ++ executablePath.remove(executablePath.lastIndexOf("/")+1, 1); ++ } ++ // !! End NixOS fix ++ + // needed to be able to use the logging category in a header static function + static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg); + const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) { +-- +2.28.0 + diff --git a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch index 4861df46ca6..06b3653acee 100644 --- a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch +++ b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch @@ -1,17 +1,17 @@ -From 449896c45b23f50c168d8d2789832024c906ec36 Mon Sep 17 00:00:00 2001 +From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Mon, 27 Jan 2020 05:31:13 -0600 -Subject: [PATCH 1/2] follow symlinks +Subject: [PATCH 1/3] follow symlinks --- plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp -index fd723a8..fb95633 100644 +index 5242cb7..2e4ddae 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.cpp +++ b/plugins/kdecorations/aurorae/src/aurorae.cpp -@@ -211,7 +211,7 @@ void Helper::init() +@@ -201,7 +201,7 @@ void Helper::init() // so let's try to locate our plugin: QString pluginPath; for (const QString &path : m_engine->importPathList()) { @@ -21,5 +21,5 @@ index fd723a8..fb95633 100644 it.next(); QFileInfo fileInfo = it.fileInfo(); -- -2.23.1 +2.29.2 diff --git a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch index 0505810abe6..312daa09384 100644 --- a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch +++ b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch @@ -1,17 +1,17 @@ -From d584b075d71c4486710c0bbed6d44038f2ff5075 Mon Sep 17 00:00:00 2001 +From 5c90dd84f541bd4789525f12f12ad24411b99018 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Mon, 27 Jan 2020 05:31:23 -0600 -Subject: [PATCH 2/2] xwayland +Subject: [PATCH 2/3] xwayland --- xwl/xwayland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp -index 5f17d39..b4b69ba 100644 +index 57efdde..a211a58 100644 --- a/xwl/xwayland.cpp +++ b/xwl/xwayland.cpp -@@ -145,7 +145,7 @@ void Xwayland::init() +@@ -124,7 +124,7 @@ void Xwayland::start() m_xwaylandProcess = new Process(this); m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); @@ -21,5 +21,5 @@ index 5f17d39..b4b69ba 100644 env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM")); -- -2.23.1 +2.29.2 diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch new file mode 100644 index 00000000000..eaffaf59187 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch @@ -0,0 +1,26 @@ +From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001 +From: Yaroslav Bolyukin <iam@lach.pw> +Date: Wed, 23 Dec 2020 18:02:14 +0300 +Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper + +Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> +--- + plugins/qpa/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/qpa/main.cpp b/plugins/qpa/main.cpp +index efd236b..a69c046 100644 +--- a/plugins/qpa/main.cpp ++++ b/plugins/qpa/main.cpp +@@ -23,7 +23,7 @@ public: + QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) + { + Q_UNUSED(paramList) +- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { ++ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { + // Not KWin + return nullptr; + } +-- +2.29.2 + diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index f127cc37ee8..2008529a38b 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -37,6 +37,8 @@ mkDerivation { patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch + ./0003-plugins-qpa-allow-using-nixos-wrapper.patch + ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 69d7d508d50..b65bc7df8ed 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -53,9 +53,10 @@ mkDerivation { ./0002-absolute-wallpaper-install-dir.patch ]; + # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools postPatch = '' - substituteInPlace wallpapers/image/wallpaper.knsrc.cmake \ - --replace '@QtBinariesDir@/qdbus' ${getBin qttools}/bin/qdbus + substituteInPlace CMakeLists.txt \ + --replace 'query_qmake(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")' ''; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index b39090b1670..d90953c71d9 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15") +releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16") oses = ("mac", "linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix new file mode 100644 index 00000000000..b2bf2877c8a --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; }; + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; }; + jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; }; + jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix new file mode 100644 index 00000000000..738b31fe1d1 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.openj9; }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 36d1f62123c..22a893c7242 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -531,6 +531,148 @@ } } }, + "openjdk16": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "36", + "sha256": "7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + }, + "armv6l": { + "build": "36", + "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + }, + "armv7l": { + "build": "36", + "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + } + }, + "openj9": { + "aarch64": { + "build": "36", + "sha256": "f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", + "version": "16.0.0-ea" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "36", + "sha256": "9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", + "version": "16.0.0" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "36", + "sha256": "947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + }, + "armv6l": { + "build": "36", + "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + }, + "armv7l": { + "build": "36", + "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz", + "version": "16.0.0" + } + }, + "openj9": { + "aarch64": { + "build": "36", + "sha256": "13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", + "version": "16.0.0-ea" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "36", + "sha256": "302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", + "version": "16.0.0" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "b66761b55fd493ed2a5f4df35a32b338ec34a9e0a1244439e3156561ab27c511", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_mac_hotspot_16_36.tar.gz", + "version": "16.0.0" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "36", + "sha256": "e6075cbe939b4de165cc8b4b91352f8885d549873f5cd419e75eba737502542e", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", + "version": "16.0.0" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "92cb07e9e9d075996d1a9e0ccfc1d35e6f97f7e188e9bb78088ee1066062a428", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_mac_hotspot_16_36.tar.gz", + "version": "16.0.0" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "36", + "sha256": "9e5c31582778ca5c08fc221e185dc0f4dbce2091cbc69966a1e2617344b722f1", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", + "version": "16.0.0" + } + } + } + } + }, "openjdk8": { "linux": { "jdk": { diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index df674b67db8..c52ffa0bafd 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, runtimeShell }: +{ lib, stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation { name = "cmdstan-2.17.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; doCheck = true; - checkInputs = [ python ]; + checkInputs = [ python3 ]; checkPhase = "python ./runCmdStanTests.py src/test/interface"; # see #5368 installPhase = '' diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index c5d33590daa..245e5bf2f54 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,7 +1,9 @@ { stdenv, lib, fetchgit, flex, bison, pkg-config, which -, pythonSupport ? false, python, swig +, pythonSupport ? false, python ? null, swig }: +assert pythonSupport -> python != null; + stdenv.mkDerivation rec { pname = "dtc"; version = "1.6.0"; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index ebee80cba53..6981bcbd8fd 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -80,8 +80,8 @@ let # Needed for elm-format indents = self.callPackage ./packages/indents.nix {}; bimap = self.callPackage ./packages/bimap.nix {}; - avh4-lib = self.callPackage ./packages/avh4-lib.nix {}; - elm-format-lib = self.callPackage ./packages/elm-format-lib.nix {}; + avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {}); + elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {}); elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; }; diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 84d51a2bc3f..d67e0053bba 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -63,11 +63,11 @@ gccStdenv.mkDerivation rec { lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' - export CC=${gccStdenv.cc.targetPrefix}gcc \ - CXX=${gccStdenv.cc.targetPrefix}g++ \ - CPP=${gccStdenv.cc.targetPrefix}cpp \ - CXXCPP=${gccStdenv.cc.targetPrefix}cpp \ - LD=${gccStdenv.cc.targetPrefix}ld \ + export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ + CXX=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}g++ \ + CPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \ + CXXCPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \ + LD=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index b371cadb1db..50031f5acdc 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0="; + sha256 = "sha256-NCLPatJWpvYKM+QdJB/Gfldlz5MQynWZB8o4x4cf5cA="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY="; + cargoSha256 = "sha256-Tvb6QJubV8FS8UER++bEhst7Z0hVw42TCl+wOzZzi8Y="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 58451192396..73b82ff48db 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,20 +1,44 @@ -{ lib, stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }: - -let inherit (ocamlPackages) ocaml camlp4; in +{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls }: let - generic = { version, sha256, prePatch }: + ocamlDependencies = version: + if lib.versionAtLeast version "4.0" + then with ocaml-ng.ocamlPackages; [ + ocaml + findlib + sedlex_2 + xml-light + ptmap + camlp5 + sha + dune_2 + luv + ocaml_extlib + ] else with ocaml-ng.ocamlPackages_4_05; [ + ocaml + camlp4 + ]; + + defaultPatch = '' + substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \ + --replace '"neko"' '"${neko}/bin/neko"' + ''; + + generic = { sha256, version, prePatch ? defaultPatch }: stdenv.mkDerivation { pname = "haxe"; inherit version; - buildInputs = [ocaml zlib pcre neko camlp4]; + buildInputs = [ zlib pcre neko ] + ++ lib.optional (lib.versionAtLeast version "4.1") [ mbedtls ] + ++ ocamlDependencies version; - src = fetchgit { - url = "https://github.com/HaxeFoundation/haxe.git"; - inherit sha256; + src = fetchFromGitHub { + owner = "HaxeFoundation"; + repo = "haxe"; + rev = version; fetchSubmodules = true; - rev = "refs/tags/${version}"; + inherit sha256; }; inherit prePatch; @@ -77,8 +101,8 @@ let meta = with lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = "https://haxe.org"; - license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt - maintainers = [ maintainers.marcweber ]; + license = with licenses; [ gpl2Plus mit ]; # based on upstream opam file + maintainers = [ maintainers.marcweber maintainers.locallycompact ]; platforms = platforms.linux ++ platforms.darwin; }; }; @@ -89,15 +113,20 @@ in { sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3"; prePatch = '' sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' main.ml - sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/tools/haxelib/Main.hx + substituteInPlace extra/haxelib_src/src/tools/haxelib/Main.hx \ + --replace '"neko"' '"${neko}/bin/neko"' ''; }; haxe_3_4 = generic { version = "3.4.6"; sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if"; prePatch = '' + ${defaultPatch} sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml - sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx ''; }; + haxe_4_2 = generic { + version = "4.2.1"; + sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA="; + }; } diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 98d7ce90de3..5b1a4674a88 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { "prefix=$(out)" "SHELL=${stdenv.shell}" - "USE_SYSTEM_BLAS=1" + (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index da60fa8b988..5e431a55233 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { "prefix=$(out)" "SHELL=${stdenv.shell}" - "USE_SYSTEM_BLAS=1" + (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index a523336b7b9..b4c33faa44c 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub +{ lib, stdenv, fetchzip # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, cmake +, gfortran, m4, makeWrapper, patchelf, perl, which, python2, cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib # standard library dependencies @@ -19,8 +18,8 @@ with lib; let majorVersion = "1"; minorVersion = "5"; - maintenanceVersion = "3"; - src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i"; + maintenanceVersion = "4"; + src_sha256 = "1ba1v7hakgj95xvhyff0zcp0574qv6vailjl48wl1f8w5k54lsw2"; version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; in @@ -28,10 +27,10 @@ stdenv.mkDerivation rec { pname = "julia"; inherit version; - src = fetchzip { - url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - sha256 = src_sha256; - }; + src = fetchzip { + url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; + sha256 = src_sha256; + }; patches = [ ./use-system-utf8proc-julia-1.3.patch @@ -89,7 +88,7 @@ stdenv.mkDerivation rec { "prefix=$(out)" "SHELL=${stdenv.shell}" - "USE_SYSTEM_BLAS=1" + (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/update-1.5.py b/pkgs/development/compilers/julia/update-1.5.py new file mode 100755 index 00000000000..e37f37d456b --- /dev/null +++ b/pkgs/development/compilers/julia/update-1.5.py @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3 python3Packages.requests + +import os +import re +import requests +import subprocess + +latest = requests.get("https://api.github.com/repos/JuliaLang/julia/releases/latest").json()["tag_name"] +assert latest[0] == "v" +major, minor, patch = latest[1:].split(".") +assert major == "1" +# When a new minor version comes out we'll have to refactor/copy this update script. +assert minor == "5" + +sha256 = subprocess.check_output(["nix-prefetch-url", "--unpack", f"https://github.com/JuliaLang/julia/releases/download/v{major}.{minor}.{patch}/julia-{major}.{minor}.{patch}-full.tar.gz"], text=True).strip() + +nix_path = os.path.join(os.path.dirname(__file__), "1.5.nix") +nix0 = open(nix_path, "r").read() +nix1 = re.sub("maintenanceVersion = \".*\";", f"maintenanceVersion = \"{patch}\";", nix0) +nix2 = re.sub("src_sha256 = \".*\";", f"src_sha256 = \"{sha256}\";", nix1) +open(nix_path, "w").write(nix2) diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index a98314d1181..fe6984ee58b 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -36,6 +36,7 @@ let llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; + enableSharedLibraries = false; python3 = pkgs.python3; # don't use python-boot }); diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index 5f9dba0fc3c..135fcd2d25a 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-5mQ8tN7A045JCF7tHKgAZAbyVmXOd6Wf0CVUiPA80YM="; + hash = "sha256-DlId/dF5r0ULl2omYPCyu1Ic3XKlLL7ndiCA0RaF264="; }; in rec { clang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix index 2a05331f7a0..a6e993bb203 100644 --- a/pkgs/development/compilers/llvm/rocm/lld.nix +++ b/pkgs/development/compilers/llvm/rocm/lld.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ]; + postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 8b157fb4ca0..52606781935 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, boehmgc, zlib, sqlite, pcre, cmake, pkg-config , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { pname = "neko"; - version = "2.2.0"; + version = "2.3.0"; - src = fetchurl { - url = "https://nekovm.org/media/neko-${version}-src.tar.gz"; - sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g"; + src = fetchFromGitHub { + owner = "HaxeFoundation"; + repo = "neko"; + rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g"; }; nativeBuildInputs = [ cmake pkg-config git ]; @@ -31,8 +33,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-level dynamically typed programming language"; homepage = "https://nekovm.org"; - license = licenses.lgpl21; - maintainers = [ maintainers.marcweber ]; + license = [ + # list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE + licenses.gpl2Plus # nekoc, nekoml + licenses.lgpl21Plus # mysql.ndll + licenses.bsd3 # regexp.ndll + licenses.zlib # zlib.ndll + licenses.asl20 # mod_neko, mod_tora, mbedTLS + licenses.mit # overall, other libs + "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc + ]; + maintainers = [ maintainers.marcweber maintainers.locallycompact ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 75b1a0f0020..676e35b06bb 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,22 +1,10 @@ # https://nim-lang.github.io/Nim/packaging.html +# https://nim-lang.org/docs/nimc.html -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub, makeWrapper, gdb, openssl -, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }: +{ lib, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub, makeWrapper +, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped }: let - version = "1.4.4"; - src = fetchurl { - url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd"; - }; - - meta = with lib; { - description = "Statically typed, imperative programming language"; - homepage = "https://nim-lang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ ehmry ]; - }; - parseCpu = platform: with platform; # Derive a Nim CPU identifier @@ -83,197 +71,251 @@ let nimHost = parsePlatform stdenv.hostPlatform; nimTarget = parsePlatform stdenv.targetPlatform; - wrapperInputs = rec { + bootstrapCompiler = stdenv.mkDerivation rec { + pname = "nim-bootstrap"; + version = "0.20.0"; - bootstrap = stdenv.mkDerivation rec { - pname = "nim-bootstrap"; - version = "0.20.0"; + src = fetchgit { + # A Git checkout is much smaller than a GitHub tarball. + url = "https://github.com/nim-lang/csources.git"; + rev = "v${version}"; + sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis"; + }; - src = fetchgit { - # A Git checkout is much smaller than a GitHub tarball. - url = "https://github.com/nim-lang/csources.git"; - rev = "v" + version; - sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis"; - }; + enableParallelBuilding = true; - enableParallelBuilding = true; + installPhase = '' + runHook preInstall + install -Dt $out/bin bin/nim + runHook postInstall + ''; + }; - installPhase = '' - runHook preInstall - install -Dt $out/bin bin/nim - runHook postInstall - ''; - }; +in { - unwrapped = stdenv.mkDerivation { - pname = "nim-unwrapped"; - inherit version src; + nim-unwrapped = stdenv.mkDerivation rec { + pname = "nim-unwrapped"; + version = "1.4.4"; + strictDeps = true; - buildInputs = [ boehmgc openssl pcre readline sqlite ]; + src = fetchurl { + url = "https://nim-lang.org/download/nim-${version}.tar.xz"; + sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd"; + }; - patches = [ - ./NIM_CONFIG_DIR.patch - # Override compiler configuration via an environmental variable + buildInputs = [ boehmgc openssl pcre readline sqlite ]; - ./nixbuild.patch - # Load libraries at runtime by absolute path - ]; + patches = [ + ./NIM_CONFIG_DIR.patch + # Override compiler configuration via an environmental variable - configurePhase = '' - runHook preConfigure - cp ${bootstrap}/bin/nim bin/ - echo 'define:nixbuild' >> config/nim.cfg - runHook postConfigure - ''; + ./nixbuild.patch + # Load libraries at runtime by absolute path + ]; - kochArgs = [ - "--cpu:${nimHost.cpu}" - "--os:${nimHost.os}" - "-d:release" - "-d:useGnuReadline" - ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) - "-d:nativeStacktrace"; + configurePhase = '' + runHook preConfigure + cp ${bootstrapCompiler}/bin/nim bin/ + echo 'define:nixbuild' >> config/nim.cfg + runHook postConfigure + ''; - buildPhase = '' - runHook preBuild - local HOME=$TMPDIR - ./bin/nim c koch - ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES - ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES - runHook postBuild - ''; + kochArgs = [ + "--cpu:${nimHost.cpu}" + "--os:${nimHost.os}" + "-d:release" + "-d:useGnuReadline" + ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"; + + buildPhase = '' + runHook preBuild + local HOME=$TMPDIR + ./bin/nim c koch + ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES + ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES + runHook postBuild + ''; - installPhase = '' - runHook preInstall - install -Dt $out/bin bin/* - ln -sf $out/nim/bin/nim $out/bin/nim - ./install.sh $out - runHook postInstall - ''; + installPhase = '' + runHook preInstall + install -Dt $out/bin bin/* + ln -sf $out/nim/bin/nim $out/bin/nim + ./install.sh $out + runHook postInstall + ''; - inherit meta; + meta = with lib; { + description = "Statically typed, imperative programming language"; + homepage = "https://nim-lang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ ehmry ]; }; + }; - nimble-unwrapped = stdenv.mkDerivation rec { - pname = "nimble-unwrapped"; - version = "0.13.1"; - - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "nimble"; - rev = "v" + version; - sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8"; - }; + nimble-unwrapped = stdenv.mkDerivation rec { + pname = "nimble-unwrapped"; + version = "0.13.1"; + strictDeps = true; - nativeBuildInputs = [ nim-unwrapped ]; - buildInputs = [ openssl ]; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "nimble"; + rev = "v${version}"; + sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8"; + }; - nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ]; + depsBuildBuild = [ nim-unwrapped ]; + buildInputs = [ openssl ]; - buildPhase = '' - runHook preBuild - HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble - runHook postBuild - ''; + nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ]; - installPhase = '' - runHook preBuild - install -Dt $out/bin src/nimble - runHook postBuild - ''; - }; + buildPhase = '' + runHook preBuild + HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble + runHook postBuild + ''; + installPhase = '' + runHook preBuild + install -Dt $out/bin src/nimble + runHook postBuild + ''; }; - wrapped = let - nim' = nim-unwrapped; - nimble' = nimble-unwrapped; + nim = let + nim' = buildPackages.nim-unwrapped; + nimble' = buildPackages.nimble-unwrapped; inherit (stdenv) targetPlatform; in stdenv.mkDerivation { name = "${targetPlatform.config}-nim-wrapper-${nim'.version}"; inherit (nim') version; preferLocalBuild = true; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + patches = [ + ./nim.cfg.patch + # Remove configurations that clash with ours + ]; + unpackPhase = '' runHook preUnpack - tar xf ${nim'.src} nim-$version/config/nim.cfg + tar xf ${nim'.src} nim-$version/config cd nim-$version runHook postUnpack ''; dontConfigure = true; + buildPhase = + # Configure the Nim compiler to use $CC and $CXX as backends + # The compiler is configured by two configuration files, each with + # a different DSL. The order of evaluation matters and that order + # is not documented, so duplicate the configuration across both files. + '' + runHook preBuild + cat >> config/config.nims << WTF + + switch("os", "${nimTarget.os}") + switch("cpu", "${nimTarget.cpu}") + switch("define", "nixbuild") + + # Configure the compiler using the $CC set by Nix at build time + import strutils + let cc = getEnv"CC" + if cc.contains("gcc"): + switch("cc", "gcc") + elif cc.contains("clang"): + switch("cc", "clang") + WTF + + mv config/nim.cfg config/nim.cfg.old + cat > config/nim.cfg << WTF + os = "${nimTarget.os}" + cpu = "${nimTarget.cpu}" + define:"nixbuild" + WTF + + cat >> config/nim.cfg < config/nim.cfg.old + rm config/nim.cfg.old + + cat >> config/nim.cfg << WTF + + clang.cpp.exe %= "\$CXX" + clang.cpp.linkerexe %= "\$CXX" + clang.exe %= "\$CC" + clang.linkerexe %= "\$CC" + gcc.cpp.exe %= "\$CXX" + gcc.cpp.linkerexe %= "\$CXX" + gcc.exe %= "\$CC" + gcc.linkerexe %= "\$CC" + WTF + + runHook postBuild + ''; + wrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ stdenv.cc gdb ]}:${ + "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ placeholder "out" }/bin" - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ stdenv.cc.libc openssl ] - }" + # Used by nim-gdb + + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}" + # These libraries may be referred to by the standard library. + # This is broken for cross-compilation because the package + # set will be shifted back by nativeBuildInputs. + "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" + # Use the custom configuration + ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"'' # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds. ]; - buildPhase = with stdenv; - let - ccType = if cc.isGNU then - "gcc" - else if cc.isClang then - "clang" - else - abort "no Nim configuration available for ${cc.name}"; - in '' - runHook preBuild - cat >> config/nim.cfg << EOF - - define:nixbuild - os = ${nimTarget.os} - cpu = ${nimTarget.cpu} - cc = ${ccType} - EOF - - mkdir -p $out/bin $out/etc/nim - export cc=$CC - export cxx=$CXX - substituteAll config/nim.cfg $out/etc/nim/nim.cfg \ - --replace "cc = gcc" "" - - for binpath in ${nim'}/bin/nim?*; do - local binname=`basename $binpath` - makeWrapper \ - $binpath $out/bin/${targetPlatform.config}-$binname \ - $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname - done + installPhase = '' + runHook preInstall - makeWrapper \ - ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ - $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim + mkdir -p $out/bin $out/etc + + cp -r config $out/etc/nim + for binpath in ${nim'}/bin/nim?*; do + local binname=`basename $binpath` makeWrapper \ - ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \ + $binpath $out/bin/${targetPlatform.config}-$binname \ $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament + ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname + done - makeWrapper \ - ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \ - --suffix PATH : $out/bin - ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble + makeWrapper \ + ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ + $wrapperArgs + ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim - runHook postBuild - ''; + makeWrapper \ + ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \ + $wrapperArgs + ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament + + makeWrapper \ + ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \ + --suffix PATH : $out/bin + ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble - dontInstall = true; + runHook postInstall + ''; + + passthru = { + nim = nim'; + nimble = nimble'; + }; - meta = meta // { + meta = nim'.meta // { description = nim'.meta.description + " (${targetPlatform.config} wrapper)"; - platforms = lib.platforms.unix; + platforms = with lib.platforms; unix ++ genode; }; }; -in wrapped // wrapperInputs +} diff --git a/pkgs/development/compilers/nim/nim.cfg.patch b/pkgs/development/compilers/nim/nim.cfg.patch new file mode 100644 index 00000000000..a95b672d1c1 --- /dev/null +++ b/pkgs/development/compilers/nim/nim.cfg.patch @@ -0,0 +1,70 @@ +diff --git a/config/nim.cfg b/config/nim.cfg +index a33a2f0a9..e069193ff 100644 +--- a/config/nim.cfg ++++ b/config/nim.cfg +@@ -8,26 +8,12 @@ + # Environment variables can be accessed like so: + # gcc.path %= "$CC_PATH" + +-cc = gcc +- + # additional options always passed to the compiler: + --parallel_build: "0" # 0 to auto-detect number of processors + + hint[LineTooLong]=off + #hint[XDeclaredButNotUsed]=off + +-# Examples of how to setup a cross-compiler: +- +-# Cross-compiling for Raspberry Pi. +-# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu) +-arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" +-arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" +- +-# For OpenWRT, you will also need to adjust PATH to point to your toolchain. +-mips.linux.gcc.exe = "mips-openwrt-linux-gcc" +-mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" +- +- + path="$lib/deprecated/core" + path="$lib/deprecated/pure" + path="$lib/pure/collections" +@@ -111,7 +97,7 @@ path="$lib/pure" + @end + + @if unix: +- @if not bsd or haiku: ++ @if not bsd or genode or haiku: + # -fopenmp + gcc.options.linker = "-ldl" + gcc.cpp.options.linker = "-ldl" +@@ -295,29 +281,6 @@ vcc.cpp.options.size = "/O1" + # Configuration for the Tiny C Compiler: + tcc.options.always = "-w" + +-# Configuration for the Genode toolchain +-@if genode: +- noCppExceptions # avoid std C++ +- tlsEmulation:on # no TLS segment register magic +- @if i386 or amd64: +- gcc.exe = "genode-x86-gcc" +- gcc.cpp.exe = "genode-x86-g++" +- gcc.cpp.linkerexe = "genode-x86-ld" +- @elif arm: +- gcc.exe = "genode-arm-gcc" +- gcc.cpp.exe = "genode-arm-g++" +- gcc.cpp.linkerexe = "genode-arm-ld" +- @elif arm64: +- gcc.exe = "genode-aarch64-gcc" +- gcc.cpp.exe = "genode-aarch64-g++" +- gcc.cpp.linkerexe = "genode-aarch64-ld" +- @elif riscv64: +- gcc.exe = "genode-riscv-gcc" +- gcc.cpp.exe = "genode-riscv-g++" +- gcc.cpp.linkerexe = "genode-riscv-ld" +- @end +-@end +- + @if arm or arm64: + --define:nimEmulateOverflowChecks + @end diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 361bfdeb3c2..93821054760 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -7,10 +7,11 @@ let }; jdk = stdenv.mkDerivation rec { - name = "zulu15.28.51-ca-jdk15.0.1"; + pname = "zulu15.28.51-ca-jdk"; + version = "15.0.1"; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz"; sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index 8b74f46fd04..7381e7c89fe 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation { description = "Yet another Lisp variant which compiles to Lua"; license = licenses.bsd3; maintainers = with maintainers; [ CrazedProgrammer ]; + platforms = platforms.all; }; passthru = { diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 2a6bfc7ad36..c4dd7d74eb0 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -14,7 +14,7 @@ in mkCoqDerivation { defaultVersion = lib.switch coq.coq-version [ { case = "8.13"; out = "1.9.4"; } { case = "8.12"; out = "1.8.0"; } - { case = "8.11"; out = "1.6.0_8.11"; } + { case = "8.11"; out = "1.6.1_8.11"; } ] null; release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq"; release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z"; @@ -22,7 +22,10 @@ in mkCoqDerivation { release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; + release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53"; + release."1.6.1_8.11".version = "1.6.1"; release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; + release."1.6.0_8.11".version = "1.6.0"; release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix new file mode 100644 index 00000000000..4de6e2da8b5 --- /dev/null +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: +with lib; + +mkCoqDerivation { + pname = "fourcolor"; + owner = "math-comp"; + + release."1.2.3".rev = "v1.2.3"; + release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4="; + + inherit version; + defaultVersion = with versions; switch mathcomp.version [ + { case = pred.inter (isGe "1.11.0") (isLt "1.13"); out = "1.2.3"; } + ] null; + + propagatedBuildInputs = [ mathcomp.algebra ]; + + meta = { + description = "Formal proof of the Four Color Theorem "; + maintainers = with maintainers; [ siraben ]; + license = licenses.cecill-b; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 0770d83f21d..5ff4ffd7565 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , mkDerivation , fetchFromGitHub , cmake diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 18d85c5775e..a374229e53d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1675,4 +1675,8 @@ self: super: { # https://github.com/jgm/pandoc/issues/7163 pandoc = dontCheck super.pandoc; + # Too strict version bounds on cryptonite. + # Issue reported upstream, no bug tracker url yet. + darcs = doJailbreak super.darcs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 8f80d2f4ee6..dbc2751e789 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, python +, python3 , libffi , git , cmake @@ -38,9 +38,11 @@ let chmod -R a+w ./tools/cling ''; - nativeBuildInputs = [ python git cmake ]; + nativeBuildInputs = [ python3 git cmake ]; buildInputs = [ libffi llvmPackages_5.llvm zlib ]; + strictDeps = true; + cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=host;NVPTX" "-DLLVM_ENABLE_RTTI=ON" diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index baf83c64776..1809f9fd2dc 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { description = "A lightweight IDE for Clojure"; homepage = "https://github.com/arthuredelstein/clooj"; license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 89db33c5a8c..a96fb03aab2 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.2.774"; + version = "1.10.3.814"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "0z3j8m9k7prmx6n3kpyhj04pjdg7y0plyxv4kp7789shanr6y4qp"; + sha256 = "sha256-+jpnhuKPvxKJA8xDo9GiRKpFJdPYRJTssmZtafadEn4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 004d2732f3a..a8e73339ee1 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "0.15.7"; + version = "0.16.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "01mlizkflajad4759yl60ymibymrvanhc22jaffj50k9b77v97kq"; + sha256 = "sha256-ckbKxWzcISo9yOXuwgOiSfR2hs+5od0Ru0Ku2I52Gu8="; }; - vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl"; + vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA="; doCheck = false; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index e0c72d628a3..01b3e995f5e 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -171,11 +171,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.3.5"; # Jan 24, 2021 + crossVersion = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1sa2f8s1hc604g5y98w6m6y5q43s9jiyrpnp4b34zkfx1qs3w6l4"; + sha256 = "14vcpwjhq667yh0cs7ism70df8l7068vn4a0ww59hdjyj7yc84i6"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -211,7 +211,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.6"; - sha256 = "1fx6b2q7wzd0xwy7qkmkvd5bdm09d3zfnynrb6afl9ghd8ww56fv"; + version = "5.33.8"; + sha256 = "1zr6sdsfcmk86n3f8j65x07xkv29v0pi8bwc986ahmjx7x92xzgl"; }; } diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 659157e24c4..ad53e755835 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -124,7 +124,9 @@ let postBuild = '' ln -s ${extraInit} $out/lib/php.ini - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + if test -e $out/bin/php; then + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + fi if test -e $out/bin/php-fpm; then wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 42e82cd3a51..61008f242b9 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto="; + sha256 = "sha256-LLUAwqky/q9KvFltrcff5U2BSLvOk/BbDSj07QlePSg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix deleted file mode 100644 index 482561a901e..00000000000 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages -, libobjc }: - -with lib; - -stdenv.mkDerivation rec { - version = "38.8.0"; - pname = "spidermonkey"; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"; - sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl"; - }; - - buildInputs = [ libffi readline icu zlib ] - ++ lib.optional stdenv.isDarwin libobjc; - nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ]; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python2.interpreter}" - ''; - - configureFlags = [ - "--enable-threadsafe" - "--with-system-ffi" - "--enable-posix-nspr-emulation" - "--with-system-zlib" - "--with-system-icu" - "--enable-readline" - - # enabling these because they're wanted by 0ad. They may or may - # not be good defaults for other uses. - "--enable-gcgenerational" - "--enable-shared-js" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Spidermonkey seems to use different host/build terminology for cross - # compilation here. - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - configurePlatforms = []; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - # This addresses some build system bug. It's quite likely to be safe - # to re-enable parallel builds if the source revision changes. - enableParallelBuilding = true; - - postFixup = '' - # The headers are symlinks to a directory that doesn't get put - # into $out, so they end up broken. Fix that by just resolving the - # symlinks. - for i in $(find $out -type l); do - cp --remove-destination "$(readlink "$i")" "$i"; - done - ''; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - # TODO: MPL/GPL/LGPL tri-license. - - maintainers = [ maintainers.abbradar ]; - platforms = platforms.unix; - knownVulnerabilities = [ "SpiderMonkey 38 is outdated and contains known security vulnerabilities." ]; # as per https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 - }; -} diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index ca1446dd935..31434741126 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.6.0"; + version = "5.2.7.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz"; + sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0="; }; buildInputs = [ diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 24ad128a584..1d0256f3b27 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.5"; + version = "2021.Q1.6"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "OSX4alrR49jqIu2QZcTieurUnyWQJ0wheDwFiNd9QcY="; + sha256 = "FSQ/bYlvdw0Ih3Yl329o8Gizw0YcZTLtiI222Ju4M8w="; }; buildInputs = [ diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index c636d672332..a66db480017 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config , opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL -, freeimage, python, clfft, clblas +, freeimage, python3, clfft, clblas , doxygen, buildDocs ? false , cudaSupport ? false, cudatoolkit }: @@ -39,9 +39,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - python + python3 ]; + strictDeps = true; + buildInputs = [ opencl-clhpp fftw fftwFloat blas lapack diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 7aa4859ef0e..b1c6c6396c8 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkg-config, python, wafHook +, libsndfile, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkg-config python wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; + strictDeps = true; + meta = with lib; { description = "Library for audio labelling"; homepage = "https://aubio.org/"; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 540e152655f..ccfafd36a8a 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -37,14 +37,16 @@ stdenv.mkDerivation rec { url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; }) + (fetchpatch { + name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch"; + sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj"; + }) ]; postPatch = '' substituteInPlace rtmidi.pc.in \ --replace 'Requires:' 'Requires.private:' - substituteInPlace CMakeLists.txt \ - --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \ - --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi' ''; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 700fe4f4686..dc585217cea 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.24"; + version = "4.4.34"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0="; + sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix new file mode 100644 index 00000000000..de9c182df14 --- /dev/null +++ b/pkgs/development/libraries/bearssl/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchurl }: + +let + version = "0.6"; + sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; + +in +stdenv.mkDerivation { + pname = "bearssl"; + inherit version; + + src = fetchurl { + url = "https://www.bearssl.org/bearssl-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "bin" "lib" "dev" "out" ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + install -D build/brssl $bin/brssl + install -D build/testcrypto $bin/testcrypto + install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so + install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a + install -Dm644 -t $dev/include inc/*.h + touch $out + runHook postInstall + ''; + + meta = { + homepage = "https://www.bearssl.org/"; + description = "An implementation of the SSL/TLS protocol written in C"; + longDescription = '' + BearSSL is an implementation of the SSL/TLS protocol (RFC 5246) + written in C. It aims at offering the following features: + + * Be correct and secure. In particular, insecure protocol versions and + choices of algorithms are not supported, by design; cryptographic + algorithm implementations are constant-time by default. + + * Be small, both in RAM and code footprint. For instance, a minimal + server implementation may fit in about 20 kilobytes of compiled code + and 25 kilobytes of RAM. + + * Be highly portable. BearSSL targets not only “big” operating systems + like Linux and Windows, but also small embedded systems and even + special contexts like bootstrap code. + + * Be feature-rich and extensible. SSL/TLS has many defined cipher + suites and extensions; BearSSL should implement most of them, and + allow extra algorithm implementations to be added afterwards, + possibly from third parties. + ''; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.Profpatsch ]; + }; + +} diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 03f6e96e187..5ce7ad477bf 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.24"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops="; + sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; }; buildInputs = [ bctoolbox belr ]; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 833d200ffa3..8f0a116f1aa 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -2,15 +2,16 @@ , bctoolbox , cmake , fetchFromGitLab +, lib , libantlr3c , mbedtls -, lib, stdenv +, stdenv , zlib }: stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.26"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4="; + sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z"; }; nativeBuildInputs = [ antlr3_4 cmake ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index b38757525ab..acd2393f75e 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.3.2"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; + sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h"; }; buildInputs = [ bctoolbox ]; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 0369f603b8e..33f9daf7b50 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost +{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; inherit postPatch; - buildInputs = [ python bzip2 zlib gmp openssl boost ] + buildInputs = [ python3 bzip2 zlib gmp openssl boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 0adcb327cc4..f29295bb130 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.4.9"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 74d167144a9..73ffd6c12b2 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python }: +{ lib, stdenv, fetchurl, fetchpatch, python2 }: stdenv.mkDerivation rec { name = "clearsilver-0.10.5"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; }; - PYTHON_SITE = "$(out)/site-packages"; + PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}"; configureFlags = [ - "--with-python=${python}/bin/python" + "--with-python=${python2.interpreter}" "--disable-apache" "--disable-perl" "--disable-ruby" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out - mkdir -p $out/site-packages + mkdir -p $out/${python2.sitePackages} ''; patches = [ diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/development/libraries/coordgenlibs/default.nix index f0f0718ab10..267c7df9452 100644 --- a/pkgs/development/libraries/coordgenlibs/default.nix +++ b/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "1.4.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "18s3y9v6x246hapxy0cy4srnll4qqzqfx003j551l5f27b2ng8fn"; + sha256 = "sha256-lfA0y/tT64C/7NjBff4HEzIfhZ3piFBkQjX5xVbFXFc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index aceb2d61e38..e0f9ed59912 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: +{ lib, stdenv, fetchurl, cmake, pcre, zlib, python2, openssl }: stdenv.mkDerivation rec { pname = "cppcms"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ pcre zlib python openssl ]; + buildInputs = [ pcre zlib python2 openssl ]; + + strictDeps = true; cmakeFlags = [ "--no-warn-unused-cli" diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index f9456b8acac..3de84b684e5 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python2 ]; cmakeFlags = ["-DWITH_TESTS=ON"]; + strictDeps = true; + doCheck = true; postPatch = '' diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index be22e24044d..b3654087ffd 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.4"; + version = "1.1.6"; outputs = [ "out" "dev" ]; @@ -48,13 +48,9 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d"; + sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"; }; - # Add missing include - # https://github.com/NVIDIA/egl-wayland/pull/24 - patches = [ ./eglmesaext.patch ]; - nativeBuildInputs = [ meson ninja @@ -69,6 +65,13 @@ in stdenv.mkDerivation rec { wayland ]; + postFixup = '' + # Doubled prefix in pc file after postbuild hook replaces includedir prefix variable with dev output path + substituteInPlace $dev/lib/pkgconfig/wayland-eglstream.pc \ + --replace "=$dev/$dev" "=$dev" \ + --replace "Requires:" "Requires.private:" + ''; + meta = with lib; { description = "The EGLStream-based Wayland external platform"; homepage = "https://github.com/NVIDIA/egl-wayland/"; diff --git a/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/pkgs/development/libraries/egl-wayland/eglmesaext.patch deleted file mode 100644 index 9384ecff9b0..00000000000 --- a/pkgs/development/libraries/egl-wayland/eglmesaext.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c -index 01c9cb3..45736b0 100644 ---- a/src/wayland-eglsurface.c -+++ b/src/wayland-eglsurface.c -@@ -37,6 +37,7 @@ - #include <sys/types.h> - #include <netinet/in.h> - #include <fcntl.h> -+#include <EGL/eglmesaext.h> - - #define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3 - diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index 088354aecb2..47926e2ec0b 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -9,7 +9,7 @@ , wafHook , makeWrapper , qt4 -, pythonPackages +, pythonPackages ? null , pythonSupport ? false # Default to false since it breaks the build, see https://github.com/MTG/gaia/issues/11 , stlfacadeSupport ? false diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 888f26f2da7..4e28f84bacd 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -5,7 +5,7 @@ , fftw , fftwFloat , enablePython ? false -, pythonPackages +, pythonPackages ? null , llvmPackages }: let diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index bf6c030589b..d53206ca667 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ graphviz gtk2 gtkmm2 python ]; + nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ]; + buildInputs = [ graphviz gtkmm2 ]; + + strictDeps = true; meta = with lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index af451281402..d493f31d375 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -9,10 +9,8 @@ , doxygen , protobuf , crc32c -, c-ares , fetchurl , openssl -, zlib , libnsl }: let @@ -33,7 +31,7 @@ let }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ]; + buildInputs = [ grpc openssl protobuf ]; postPatch = '' sed -e 's,https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz,file://${googleapis},' \ @@ -55,7 +53,7 @@ in stdenv.mkDerivation rec { sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; }; - buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf libnsl ]; + buildInputs = [ curl crc32c googleapis-cpp-cmakefiles grpc protobuf libnsl ]; nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 937f73e95fc..5cdd9886690 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.36.4"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z"; + sha256 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz"; fetchSubmodules = true; }; patches = [ diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 72646fc198b..9ead894e0d2 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info , meson, ninja }: @@ -26,7 +26,16 @@ stdenv.mkDerivation rec { buildInputs = [ atk cairo glib pango fribidi libxml2 ]; - patches = [ ./4.x-nix_share_path.patch ]; + patches = [ + ./4.x-nix_share_path.patch + + # fixes intermittent "gtksourceview-gresources.h: no such file" errors + (fetchpatch { + name = "ensure-access-to-resources-in-corelib-build.patch"; + url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch"; + sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0="; + }) + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index b98588eb410..bcd0fcee92c 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -1,20 +1,43 @@ -{ stdenv, lib, fetchFromGitHub, - pkg-config, autoreconfHook, - flex, yacc, zlib, libxml2 }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, arpack +, bison +, blas +, cmake +, flex +, fop +, glpk +, gmp +, lapack +, libxml2 +, libxslt +, pkg-config +, python3 +, sourceHighlight +, suitesparse +, xmlto +}: stdenv.mkDerivation rec { pname = "igraph"; - version = "0.8.5"; + version = "0.9.1"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz"; + sha256 = "sha256-i6Zg6bfHZ9NHwqCouX9m9YqD0VtiWW8DEkxS0hdUyIE="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ flex yacc zlib libxml2 ]; + patches = [ + (fetchpatch { + name = "pkg-config-paths.patch"; + url = "https://github.com/igraph/igraph/commit/980521cc948777df471893f7b6de8f3e3916a3c0.patch"; + sha256 = "0mbq8v5h90c3dhgmyjazjvva3rn57qhnv7pkc9hlbqdln9gpqg0g"; + }) + ]; # Normally, igraph wants us to call bootstrap.sh, which will call # tools/getversion.sh. Instead, we're going to put the version directly @@ -22,16 +45,69 @@ stdenv.mkDerivation rec { # bootstrap. ~ C. postPatch = '' echo "${version}" > IGRAPH_VERSION + '' + lib.optionalString stdenv.isAarch64 '' + # https://github.com/igraph/igraph/issues/1694 + substituteInPlace tests/CMakeLists.txt \ + --replace "igraph_scg_grouping3" "" \ + --replace "igraph_scg_semiprojectors2" "" ''; + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ + cmake + fop + libxml2 + libxslt + pkg-config + python3 + sourceHighlight + xmlto + ]; + + buildInputs = [ + arpack + bison + blas + flex + glpk + gmp + lapack + libxml2 + suitesparse + ]; + + cmakeFlags = [ + "-DIGRAPH_USE_INTERNAL_BLAS=OFF" + "-DIGRAPH_USE_INTERNAL_LAPACK=OFF" + "-DIGRAPH_USE_INTERNAL_ARPACK=OFF" + "-DIGRAPH_USE_INTERNAL_GLPK=OFF" + "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" + "-DIGRAPH_USE_INTERNAL_GMP=OFF" + "-DIGRAPH_GLPK_SUPPORT=ON" + "-DIGRAPH_GRAPHML_SUPPORT=ON" + "-DIGRAPH_ENABLE_LTO=ON" + "-DIGRAPH_ENABLE_TLS=ON" + "-DBUILD_SHARED_LIBS=ON" + ]; + doCheck = true; - meta = { + preCheck = '' + # needed to find libigraph.so + export LD_LIBRARY_PATH="$PWD/src" + ''; + + postInstall = '' + mkdir -p "$out/share" + cp -r doc "$out/share" + ''; + + meta = with lib; { description = "The network analysis package"; homepage = "https://igraph.org/"; - license = lib.licenses.gpl2; - # NB: Known to fail tests on aarch64. - platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.MostAwesomeDude ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; } diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index 78cc48d8209..b2cc4ab08b4 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "jxrlib"; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { --replace '.so' '.dylib' ''; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; + + strictDeps = true; makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ]; diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix index b9f16d3cfae..3cebc05f3d8 100644 --- a/pkgs/development/libraries/kdiagram/default.nix +++ b/pkgs/development/libraries/kdiagram/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "kdiagram"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = pname; rev = "v${version}"; - sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc="; + sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8="; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtbase qtsvg ]; diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index 50ba2c300b3..93aa169737b 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.9.1"; + version = "1.10.0"; in mkDerivation { @@ -24,7 +24,7 @@ mkDerivation { }; src = fetchurl { url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850"; + sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 0a1dabef328..2a7fb196ea6 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -13,25 +13,28 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; - nativeBuildInputs = [] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildPhase = '' - make all + doCheck = true; + + buildFlags = [ "all" ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + # remove shared objects from "all" target + sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile ''; - installPhase = " - mkdir -p $out/{bin,lib,include} + installPhase = '' + runHook preInstall - cp -r include $out - mkdir -p $out/include/leveldb/helpers - cp helpers/memenv/memenv.h $out/include/leveldb/helpers + install -D -t $out/include/leveldb include/leveldb/* + install -D helpers/memenv/memenv.h $out/include/leveldb/helpers - cp out-shared/lib* $out/lib - cp out-static/lib* $out/lib + install -D -t $out/lib out-{static,shared}/lib* + install -D -t $out/bin out-static/{leveldbutil,db_bench} - cp out-static/leveldbutil $out/bin - "; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/google/leveldb"; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index d51eac7bdb6..6cbf1d20437 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -15,5 +15,12 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; + # The package failed to build with error: + # gcc: error: unrecognized command line option '-m64' + # + # See: + # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d + # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 81b84e0f181..99692f63d45 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI="; + sha256 = "sha256-HBZ/VMuTLAYpqcIPzQ4JbsMSXsI/sKc14ZFpbVhQF/g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 647fb6825af..2822b45f871 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.21"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; + sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 4ad60bcfb18..a26f0c3f3a4 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,17 +1,18 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libmspack-0.7.1alpha"; + pname = "libmspack"; + version = "0.10.1alpha"; src = fetchurl { - url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz"; - sha256 = "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp"; + url = "https://www.cabextract.org.uk/libmspack/${pname}-${version}.tar.gz"; + sha256 = "13janaqsvm7aqc4agjgd4819pbgqv50j88bh5kci1z70wvg65j5s"; }; meta = { description = "A de/compression library for various Microsoft formats"; homepage = "https://www.cabextract.org.uk/libmspack"; - license = lib.licenses.lgpl2; + license = lib.licenses.lgpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 6ad0435a84e..6afced2d6d1 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - hash = "sha256-+xC4wDEeWi3RteF04C/qjMmjM+lmhtrtXZZyM1UUli4="; + sha256 = "0d586c8mbk50hjslq32n70sdp2a7lbsjv9zhky4w6jy950rrdfqh"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index ba39926576d..41283ed7ccd 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "0brmzr863chybm5y0q5hld5mhf6kx0bl4dddr7j69adlraak7x6s"; + sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 40f6b3b1aee..f27b58a02bb 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf, - pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, bzip2 +, doxygen +, gettext +, imagemagick +, libgsf +, xmlto +}: stdenv.mkDerivation rec { name = "libpst-0.6.75"; @@ -9,14 +19,24 @@ stdenv.mkDerivation rec { sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + doxygen + gettext + xmlto + ]; + buildInputs = [ - boost libgsf bzip2 - xmlto gettext imagemagick doxygen + bzip2 + imagemagick + libgsf ]; configureFlags = [ "--enable-python=no" + "--disable-static" + "--enable-libpst-shared" ]; doCheck = true; @@ -24,8 +44,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.five-ten-sg.com/libpst/"; description = "A library to read PST (MS Outlook Personal Folders) files"; - license = licenses.gpl2; - maintainers = [maintainers.tohl]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.tohl ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index d108bf4e6df..6eb1bb93f6b 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.12.1"; + version = "0.12.2"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv"; + sha256 = "sha256-Tu/BHk9sIS/H2E2HHhzBOdoGaaRv8/2lV6b91NdMpns="; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index d47c7b50abe..8ef4513a18d 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,12 +1,8 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake -, opentracing-cpp, protobuf, zlib -, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null +, opentracing-cpp, protobuf +, enableGrpc ? false, grpc, openssl }: -assert enableGrpc -> grpc != null; -assert enableGrpc -> openssl != null; -assert enableGrpc -> c-ares != null; - stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; version = "0.14.0"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - opentracing-cpp protobuf zlib + opentracing-cpp protobuf ] ++ lib.optionals enableGrpc [ - grpc openssl c-ares c-ares.cmake-config + grpc openssl ]; cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ]; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index e6996a53c83..b9ca9405618 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -2,14 +2,15 @@ , belle-sip , cmake , fetchFromGitLab +, lib , soci , sqlite -, lib, stdenv +, stdenv }: stdenv.mkDerivation rec { pname = "lime"; - version = "4.4.21"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I="; + sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index a59b460734d..229e82c323a 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.25"; + version = "0.9.28"; src = fetchgit { url = "https://git.openldap.org/openldap/openldap.git"; rev = "LMDB_${version}"; - sha256 = "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w"; + sha256 = "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 6321e35f7f4..ad770046d33 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.32"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps="; + sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g"; }; patches = [ diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index e8053ce2702..958be905f83 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.7"; + version = "4.9.8"; pname = "nco"; - nativeBuildInputs = [ flex which ]; - buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ]; + nativeBuildInputs = [ flex which antlr ]; + buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4="; + sha256 = "sha256-fOdmM0I/UGhxacofEBfw9UmOOrMDUXs59ca8uvkQKqw="; }; prePatch = '' @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { --replace "/bin/mv" "${coreutils}/bin/mv" ''; + parallelBuild = true; + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; homepage = "http://nco.sourceforge.net/"; - license = lib.licenses.gpl3; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index a4201d0aa2a..9b5043a1e23 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -3,7 +3,7 @@ multimediaSupport ? true }: let - version = "2.2.2"; + version = "2.2.3"; in stdenv.mkDerivation { pname = "notcurses"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-PzSstz5jODWbMLSClm3yZSHJKMXuDfxwj/h9Qo6kAVg="; + sha256 = "sha256-O6bu/tEotsxHAx6rCi0xRaklmF0l6neYwwscF2w0HJg="; }; meta = { diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index ec40bc393d5..b6aa7149168 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, opencl-headers }: stdenv.mkDerivation rec { pname = "opencl-clhpp"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "04g3mg2cpbi048fxxkghra81bpxzqr4r3gspx5mvqipx1lzypsci"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; propagatedBuildInputs = [ opencl-headers ]; + strictDeps = true; + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_TESTS=OFF" diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 11872cd47cc..a65e978f981 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -18,7 +18,7 @@ , enableUnfree ? false , enableIpp ? false -, enablePython ? false, pythonPackages +, enablePython ? false, pythonPackages ? null , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk @@ -36,6 +36,8 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; +assert enablePython -> pythonPackages != null; + let version = "3.4.8"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2edf02e738f..49ac7954169 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -160,8 +160,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1j"; - sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma"; + version = "1.1.1k"; + sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 2b99f29f4c0..e760868524f 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.32"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q="; + sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 0247d12715f..d4af69532b3 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg }: stdenv.mkDerivation { pname = "partio"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "lib" ]; nativeBuildInputs = [ unzip cmake doxygen ]; - buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ]; + buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu ]; buildPhase = '' make partio @@ -32,6 +32,8 @@ stdenv.mkDerivation { mv $dev/include/*.h $dev/include/partio ''; + strictDeps = true; + meta = with lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 7cacab9bdf4..44065904d99 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -11,6 +11,38 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch # configure relies on impure sw_vers to -Dunix + + # fix compilation errors (fails depending on number of cores filesystem ordering?) + # https://gitlab.com/hepcedar/rivet/-/merge_requests/220 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff"; + sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc"; + }) + # https://gitlab.com/hepcedar/rivet/-/merge_requests/223 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff"; + sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc"; + }) + + # fix for new python and fix transparency gs 9.52 + # gs 9.52 opacity fix + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/25c4bee19882fc56407b0a438f86e1a11753d5e6.diff"; + sha256 = "18p2wk54r0qfq6l27z6805zq1z5jhk5sbxbjixgibzq8prj1a78v"; + }) + + # make-plots: fix wrong logic in Plot.set_xmax() + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/d371c6c10cf67a41c0e4e27c16ff5723d6276ad2.diff"; + sha256 = "0w622rd5darj7qafbbc84blznvy5rnhsdyr2n1i1fkz19mrf5h2p"; + }) + + # fix https://gitlab.com/hepcedar/rivet/-/issues/200 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/442dbd17dcb3bd6e30b26e54c50f6a8237f966f9.diff"; + includes = [ "bin/make-pgfplots" "bin/make-plots" "bin/make-plots-fast" ]; + sha256 = "0c3rysgcib49km1zdpgsdai3xi4s6ijqgxp4whn04mrh3qf4bmr3"; + }) ]; latex = texlive.combine { inherit (texlive) diff --git a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch index ce1085f37f7..a4fb8b41e7a 100644 --- a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch +++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -1,19 +1,19 @@ diff --git a/meson_options.txt b/meson_options.txt -index a6c8af72..8e5c3d73 100644 +index e2a1e028..310029f2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,6 +10,9 @@ option('media-session', description: 'Build and install pipewire-media-session', - type: 'boolean', - value: true) + type: 'feature', + value: 'auto') +option('media-session-prefix', + description: 'Install directory for pipewire-media-session and its support files', + type: 'string') option('man', description: 'Build manpages', - type: 'boolean', + type: 'feature', diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 4a70b0b0..84c9a19e 100644 +index 5c4d1af0..7296220f 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build @@ -10,7 +10,7 @@ install_data( diff --git a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 2a92711626b..cb695fa398c 100644 --- a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,29 +1,29 @@ diff --git a/meson.build b/meson.build -index ffee41b4..bab6f019 100644 +index 97d4d939..b17358e5 100644 --- a/meson.build +++ b/meson.build -@@ -318,8 +318,8 @@ alsa_dep = (get_option('pipewire-alsa') - ? dependency('alsa', version : '>=1.1.7') - : dependency('', required: false)) - +@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' + + alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) + -installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name) -installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name) +installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name) +installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name) - installed_tests_enabled = get_option('installed_tests') + installed_tests_enabled = not get_option('installed_tests').disabled() installed_tests_template = files('template.test.in') - + diff --git a/meson_options.txt b/meson_options.txt -index f03033c3..32df6c53 100644 +index fba0d647..8c6106cd 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -18,6 +18,9 @@ option('installed_tests', +@@ -26,6 +26,9 @@ option('installed_tests', description: 'Install manual and automated test executables', - type: 'boolean', - value: false) + type: 'feature', + value: 'disabled') +option('installed_test_prefix', + description: 'Prefix for installed tests', + type: 'string') option('gstreamer', description: 'Build GStreamer plugins', - type: 'boolean', + type: 'feature', diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 5c5578abc8d..955a4d9da6e 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -39,11 +39,11 @@ let fontDirectories = []; }; - mesonBool = b: if b then "true" else "false"; + mesonEnable = b: if b then "enabled" else "disabled"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.23"; + version = "0.3.24"; outputs = [ "out" @@ -61,7 +61,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - hash = "sha256:1HMUrE1NBmrdBRMKX3LRlXaCEH3wqP2jGtW8Rp9oyQA="; + hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI="; }; patches = [ @@ -103,22 +103,23 @@ let ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; mesonFlags = [ - "-Ddocs=true" - "-Dman=false" # we don't have xmltoman - "-Dexamples=${mesonBool withMediaSession}" # only needed for `pipewire-media-session` + "-Ddocs=enabled" + "-Dman=disabled" # we don't have xmltoman + "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session` "-Dudevrulesdir=lib/udev/rules.d" - "-Dinstalled_tests=true" + "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dgstreamer=${mesonBool gstreamerSupport}" - "-Dffmpeg=${mesonBool ffmpegSupport}" - "-Dbluez5=${mesonBool bluezSupport}" - "-Dbluez5-backend-hsp-native=${mesonBool nativeHspSupport}" - "-Dbluez5-backend-hfp-native=${mesonBool nativeHfpSupport}" - "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" - "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" + "-Dlibcamera=disabled" + "-Dgstreamer=${mesonEnable gstreamerSupport}" + "-Dffmpeg=${mesonEnable ffmpegSupport}" + "-Dbluez5=${mesonEnable bluezSupport}" + "-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}" + "-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}" + "-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}" + "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dpipewire_config_dir=/etc/pipewire" ]; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 15000564637..1c06020653e 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,20 +1,33 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }: +{ fetchFromGitHub +, lib +, stdenv +, cmake +}: stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.0"; + version = "1.14.1"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1wp9sz2ld4g6ak9v59i3s5mbsraxsphi9k91vw9xgrbzfmg8w0a6"; + sha256 = "sha256-QWwgtfgO+7zGW1M5qdfrIilVw6D/A/Er3l2bZ8V35kE="; }; - outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + cmake + ]; - hardeningDisable = [ "fortify" ]; + postPatch = '' + # Wrong paths in pkg-config file generated by CMake + # https://github.com/pupnp/pupnp/pull/205/files#r588946478 + substituteInPlace CMakeLists.txt \ + --replace '\''${exec_prefix}/' "" \ + --replace '\''${prefix}/' "" + ''; meta = { description = "An open source UPnP development kit for Linux"; @@ -26,9 +39,9 @@ stdenv.mkDerivation rec { UPnP Device Architecture Specification. ''; - license = "BSD-style"; + license = lib.licenses.bsd3; - homepage = "http://pupnp.sourceforge.net/"; + homepage = "https://pupnp.github.io/pupnp/"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index fdb68d89bc3..ef0d2c82c02 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchgit, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -48,6 +48,27 @@ let }; version = "5.212.0-alpha4"; }; + + # Even if developed in the public, QtWebEngine does not have official + # releases or new tags since the Qt company made 5.15.3 proprietary. + # Apparently they care more about licensing than the security of their users. + # See https://lists.qt-project.org/pipermail/interest/2021-March/036387.html + qtwebengine = + let + branchName = "5.15.3"; + rev = "a059e7404a6db799f4da0ad696e65ae9c854b4b0"; + in + { + version = "${branchName}-${lib.substring 0 8 rev}"; + + src = fetchgit { + url = "https://github.com/qt/qtwebengine.git"; + sha256 = "19l1i4sk3pvnwbvz5s97jchqawfz8k1xmjza29bgvkp1zz96r0jx"; + inherit rev branchName; + fetchSubmodules = true; + leaveDotGit = true; + }; + }; }; patches = { @@ -83,11 +104,16 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] - ++ optionals stdenv.isDarwin [ - ./qtwebengine-darwin-no-platform-check.patch - ./qtwebengine-mac-dont-set-dsymutil-path.patch - ]; + qtwebengine = [ + # Fix crashes with non en_US.UTF-8 locales + (fetchpatch { + url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch"; + sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2"; + }) + ] ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-mac-dont-set-dsymutil-path.patch + ]; qtwebkit = [ (fetchpatch { name = "qtwebkit-bison-3.7-build.patch"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 617b2c1d9d2..f994c7ef6c9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -2,6 +2,7 @@ , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel , bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which +, nodejs, qtbase, perl , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus, libdrm @@ -25,7 +26,15 @@ qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkg-config python2 which gn + bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs + + # qmake looks for syncqt instead of syncqt.pl and fails with a cryptic + # error if it can't find it. syncqt.pl also has a /usr/bin/env shebang, so + # it can't be directly used in a sandboxed build environment. + (writeScriptBin "syncqt" '' + #!${stdenv.shell} + exec ${perl}/bin/perl ${qtbase.dev}/bin/syncqt.pl "$@" + '') ] ++ optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -40,9 +49,17 @@ qtModule { hardeningDisable = [ "format" ]; postPatch = - # Patch Chromium build tools '' - ( cd src/3rdparty/chromium; patchShebangs . ) + # Patch Chromium build tools + ( + cd src/3rdparty/chromium; + + # Manually fix unsupported shebangs + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true + + patchShebangs . + ) '' # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` @@ -120,7 +137,7 @@ qtModule { if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fi - ''; + ''; qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index da56c07779b..b4a201c08cc 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -5,7 +5,7 @@ buildEnv { paths = [ qtbase ] ++ paths; pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" ]; - extraOutputsToInstall = [ "dev" ]; + extraOutputsToInstall = [ "out" "dev" ]; postBuild = '' rm "$out/bin/qmake" diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 278fdecc1a6..c93ea5ba78b 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-B27ff1b9JRhxFUsBt7CGuYaR87hvKbVSCERWD45d8tM="; + hash = "sha256-2DI/PL29aiZcxOrGZBzXwAnNgZQpSDjyyGKgl+vDErk="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 96f7108e3fe..b9a34b113eb 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M="; + hash = "sha256-LbQqyJxRqb6vpXiYSkRlF1FeqXJJXktPafGmYDDK02U="; }; sourceRoot = "source/lib/comgr"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 965d92179b6..e62d6f0076f 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo="; + hash = "sha256-9p6PIXdHFIgHgNWZzqVz5O9i2Np0z/iyxodG2cLrpGs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index ab0957474ad..d721cfece96 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE="; + hash = "sha256-+6h1E5uWNKjjaeO5ZIi854CWYi0QGQ5mVUHdi9+4vX4="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index beb0c61e683..c63e8249cfc 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro="; + hash = "sha256-Jxg3n203tV0L+UrmeQEuzX0TKpFu5An2cnuEA/F/SNY="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 5863e1f0a57..1339e035ebf 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-2kLSlGwX3pD8I5pXwV5L0k9l8OzJRkUvnAqv5E+gcd4="; + hash = "sha256-gdto7BbrSRa3UiRNvTW1KLkHyjrcxdah4+L+1Gdm0wA="; }; preConfigure = '' diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index 42c84b3ed61..1eea35a34e7 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -6,10 +6,10 @@ # Enable BLAS interface with 64-bit integer width. , blas64 ? false -# Target architecture, use "zen" or "zen2", optimization for Zen and -# other families is pretty much mutually exclusive in the AMD fork of -# BLIS. -, withArchitecture ? "zen" +# Target architecture. "amd64" compiles kernels for all Zen +# generations. To build kernels for specific Zen generations, +# use "zen", "zen2", or "zen3". +, withArchitecture ? "amd64" # Enable OpenMP-based threading. , withOpenMP ? true @@ -20,13 +20,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "amd-blis"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "amd"; repo = "blis"; rev = version; - sha256 = "1b2f5bwi0gkw2ih2rb7wfzn3m9hgg7k270kg43rmzpr2acpy86xa"; + hash = "sha256-bbbeo1yOKse9pzbsB6lQ7pULKdzu3G7zJzTUgPXiMZY="; }; inherit blas64; @@ -36,7 +36,10 @@ in stdenv.mkDerivation rec { python3 ]; - doCheck = true; + # Tests currently fail with non-Zen CPUs due to a floating point + # exception in one of the generic kernels. Try to re-enable the + # next release. + doCheck = false; enableParallelBuilding = true; @@ -51,8 +54,8 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libblas.so.3 - ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libcblas.so.3 + ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libblas.so.3 + ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 382f868a99a..23e44bf28b0 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , gfortran, blas, lapack, eigen }: stdenv.mkDerivation rec { pname = "arpack"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "opencollab"; repo = "arpack-ng"; rev = version; - sha256 = "1x7a1dj3dg43nlpvjlh8jzzbadjyr3mbias6f0256qkmgdyk4izr"; + sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA="; }; + patches = [ + # https://github.com/opencollab/arpack-ng/pull/301 + (fetchpatch { + name = "pkg-config-paths.patch"; + url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch"; + excludes = [ "CHANGES" ]; + sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = assert (blas.isILP64 == lapack.isILP64); [ gfortran @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}" + "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" ]; preCheck = if stdenv.isDarwin then '' @@ -36,12 +46,6 @@ stdenv.mkDerivation rec { export OMP_NUM_THREADS=2 ''; - postInstall = '' - mkdir -p $out/lib/pkgconfig - cp arpack.pc $out/lib/pkgconfig/ - ''; - - meta = { homepage = "https://github.com/opencollab/arpack-ng"; description = '' @@ -49,7 +53,7 @@ stdenv.mkDerivation rec { problems. ''; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel dotlambda ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index aca395001f9..fcb49d70a3b 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -4,7 +4,7 @@ , gfortran , blas , boost -, python +, python3 , ocl-icd , opencl-headers , Accelerate, CoreGraphics, CoreVideo, OpenCL @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran blas - python + python3 boost ] ++ lib.optionals (!stdenv.isDarwin) [ ocl-icd @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { OpenCL ]; + strictDeps = true; + meta = with lib; { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 166d0f2911d..cd737a82a29 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }: +{ lib, stdenv, fetchurl, pkg-config, freetype, cmake }: stdenv.mkDerivation rec { version = "1.3.14"; @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; - checkInputs = [ python ]; doCheck = false; # fails, probably missing something meta = with lib; { diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 2f1006404b7..e67cb1736b7 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.4"; + version = "2020.3.6"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h"; + sha256 = "sha256-7D7KRNIffgUr6vwbni1XwW+8GtXwM6vJZ7V6/QLDVmk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index f561864a750..2c87d421bab 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -6,17 +6,17 @@ stdenv.mkDerivation rec { pname = "soci"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "SOCI"; repo = pname; rev = version; - sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"; + sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM="; }; # Do not build static libraries - cmakeFlags = [ "-DSOCI_STATIC=OFF" ]; + cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 3a3f5c79763..01ec3a4fba2 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1"; + sha256 = "sha256-aoitTT9fwTIs3ovfqQjKGgrU+kT5mj+vDHt5lg49JHU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 553c42da7c4..27705c57858 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (rec { pname = "talloc"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g"; + sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index deed5b64d2c..b8ea203ef17 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -1,26 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, - texinfo, bison, flex, expat, file +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, expat +, file +, flex +, texinfo }: stdenv.mkDerivation rec { pname = "udunits"; - version = "2.2.27.6"; + version = "unstable-2021-03-17"; src = fetchFromGitHub { owner = "Unidata"; repo = "UDUNITS-2"; - rev = "v${version}"; - sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm"; + rev = "c83da987387db1174cd2266b73dd5dd556f4476b"; + hash = "sha256-+HW21+r65OroCxMK2/B5fe7zHs4hD4xyoJK2bhdJGyQ="; }; - nativeBuildInputs = [ autoreconfHook texinfo bison flex file ]; - buildInputs = [ expat ]; + nativeBuildInputs = [ + autoreconfHook + texinfo + bison + flex + file + ]; + buildInputs = [ + expat + ]; meta = with lib; { homepage = "https://www.unidata.ucar.edu/software/udunits/"; description = "A C-based package for the programatic handling of units of physical quantities"; - license = licenses.bsdOriginal; + longDescription = '' + The UDUNITS package supports units of physical quantities. Its C library + provides for arithmetic manipulation of units and for conversion of + numeric values between compatible units. The package contains an extensive + unit database, which is in XML format and user-extendable. The package + also contains a command-line utility for investigating units and + converting values. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ AndersonTorres pSub ]; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 490adf8e325..28722dc8fca 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -59,7 +59,7 @@ with lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.30.5"; + version = "2.30.6"; outputs = [ "out" "dev" ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx"; + sha256 = "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh"; }; patches = optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index a0d1378aa70..2037d815a81 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch -, pkg-config +, argp-standalone +, curl , meson , ninja +, pkg-config , zstd -, curl -, argp-standalone }: stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.8"; + version = "1.1.9"; outputs = [ "out" "lib" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - sha256 = "0q1jafxh5nqgn2w5ciljkh8h46xma0qia8a5rj9m0pxixcacqj6q"; + hash = "sha256-MqnHtqOjLl6R5GZ4f2UX1iLoO9FUT2IfZlSN58wW8JA="; }; nativeBuildInputs = [ @@ -29,25 +29,23 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - zstd curl + zstd ] ++ lib.optional stdenv.isDarwin argp-standalone; - # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS - # https://github.com/zchunk/zchunk/pull/35 - patches = [ - (fetchpatch { - name = "darwin-support.patch"; - url = "https://github.com/zchunk/zchunk/commit/f7db2ac0a95028a7f82ecb89862426bf53a69232.patch"; - sha256 = "0cm84gyii4ly6nsmagk15g9kbfa13rw395nqk3fdcwm0dpixlkh4"; - }) -]; - meta = with lib; { - description = "File format designed for highly efficient deltas while maintaining good compression"; homepage = "https://github.com/zchunk/zchunk"; + description = "File format designed for highly efficient deltas while maintaining good compression"; + longDescription = '' + zchunk is a compressed file format that splits the file into independent + chunks. This allows you to only download changed chunks when downloading a + new version of the file, and also makes zchunk files efficient over rsync. + + zchunk files are protected with strong checksums to verify that the file + you downloaded is, in fact, the file you wanted. + ''; license = licenses.bsd2; - maintainers = with maintainers; []; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 8cfec83af54..90758db16ed 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,80 +1,81 @@ -{ lib, stdenv -, perl -, pkg-config +{ lib +, stdenv , fetchFromGitHub , fetchpatch -, zip -, unzip +, cmake +, perl +, pkg-config , python3 , xmlto +, zip , zlib }: stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.71"; + version = "0.13.72"; src = fetchFromGitHub { owner = "gdraheim"; - repo = "zziplib"; + repo = pname; rev = "v${version}"; - sha256 = "P+7D57sc2oIABhk3k96aRILpGnsND5SLXHh2lqr9O4E="; + hash = "sha256-Ht3fBgdrTm4mCi5uhgQPNtpGzADoRVOpSuGPsIS6y0Q="; }; patches = [ - # Install man pages + # apply https://github.com/gdraheim/zziplib/pull/113 (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch"; - sha256 = "wVExEZN8Ml1/3GicB0ZYsLVS3KJ8BSz8i4Gu46naz1Y="; - excludes = [ "GNUmakefile" ]; + url = "https://github.com/gdraheim/zziplib/commit/82a7773cd17828a3b0a4f5f552ae80c1cc8777c7.diff"; + sha256 = "0ifqdzxwb5d19mziy9j6lhl8wj95jpxzm0d2c6y3bgwa931avd3y"; }) - - # Fix man page formatting (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/22ed64f13dc239f86664c60496261f544bce1088.patch"; - sha256 = "ScFVWLc4LQPqkcHn9HK/VkLula4b5HzuYl0b5vi4Ikc="; + url = "https://github.com/gdraheim/zziplib/commit/1cd611514c5f9559eb9dfc191d678dfc991f66db.diff"; + sha256 = "11w9qa46xq49l113k266dnv8izzdk1fq4y54yy5w8zps8zd3xfny"; + }) + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; + sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; }) ]; nativeBuildInputs = [ + cmake perl pkg-config - zip python3 xmlto + zip ]; - buildInputs = [ zlib ]; - checkInputs = [ - unzip - ]; - - # tests are broken (https://github.com/gdraheim/zziplib/issues/20), - # and test/zziptests.py requires network access + # test/zziptests.py requires network access # (https://github.com/gdraheim/zziplib/issues/24) - doCheck = false; - checkTarget = "check"; + cmakeFlags = [ + "-DZZIP_TESTCVE=OFF" + "-DBUILD_SHARED_LIBS=True" + "-DBUILD_STATIC_LIBS=False" + "-DBUILD_TESTS=OFF" + "-DMSVC_STATIC_RUNTIME=OFF" + "-DZZIPSDL=OFF" + "-DZZIPTEST=OFF" + "-DZZIPWRAP=OFF" + "-DBUILDTESTS=OFF" + ]; meta = with lib; { + homepage = "https://github.com/gdraheim/zziplib"; description = "Library to extract data from files archived in a zip file"; - longDescription = '' - The zziplib library is intentionally lightweight, it offers the ability - to easily extract data from files archived in a single zip - file. Applications can bundle files into a single zip archive and - access them. The implementation is based only on the (free) subset of - compression with the zlib algorithm which is actually used by the - zip/unzip tools. + The zziplib library is intentionally lightweight, it offers the ability to + easily extract data from files archived in a single zip file. + Applications can bundle files into a single zip archive and access them. + The implementation is based only on the (free) subset of compression with + the zlib algorithm which is actually used by the zip/unzip tools. ''; - license = with licenses; [ lgpl2Plus mpl11 ]; - - homepage = "http://zziplib.sourceforge.net/"; - - maintainers = [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = python3.meta.platforms; }; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d6ee818d43c..959cb20d10e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -135,6 +135,7 @@ , "json-refs" , "json-server" , "jsonlint" +, "kaput-cli" , "karma" , "lcov-result-merger" , "leetcode-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4090028c97e..950115f80bf 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1102.5" = { + "@angular-devkit/architect-0.1102.6" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.5"; + version = "0.1102.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.5.tgz"; - sha512 = "lVc6NmEAZZPzvc18GzMFLoxqKKvPlNOg4vEtFsFldZmrydLJJGFi4KAs2WaJd8qVR1XuY4el841cjDQAJSq6sQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.6.tgz"; + sha512 = "27+5tjoUOAcm2pzo6EJhQn3lK4s9Gk0RfZFc2ygVu8PHnukXZAd4ntclGi33aPgJmt4zA2qbWq4Ytn2a/G6FMg=="; }; }; "@angular-devkit/core-11.2.0" = { @@ -76,13 +76,13 @@ let sha512 = "2JEGXzFqjTqVls2uIZEE0sk4VY9a/alxBAq8BFYIVbvzKsL9gAY71Ztf21zrhQrZop9qeuLJtOAbp00QyYUaQA=="; }; }; - "@angular-devkit/core-11.2.5" = { + "@angular-devkit/core-11.2.6" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.2.5"; + version = "11.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.5.tgz"; - sha512 = "DRFvEHRKoC+hTwcOAJqLe6UQa+bpXc/1IGCMHWEbuply0KIFIGQOlmaYwFZKixz3HdFZlmoCMcAVkAXvyaWVsQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.6.tgz"; + sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; "@angular-devkit/schematics-11.2.0" = { @@ -103,13 +103,13 @@ let sha512 = "x/IKgZDn6z/MzQ28WF2GTP2N+n78iySQhLu6n6bpmdrFp9noi9QASzN+mAFiqSNO8XpO9oyIB5y2ERl8KBrU1g=="; }; }; - "@angular-devkit/schematics-11.2.5" = { + "@angular-devkit/schematics-11.2.6" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.2.5"; + version = "11.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.5.tgz"; - sha512 = "7RoWgpMvhljPhW9CMz1EtqkwNnGpnsPyy0N29ClHPUq+o8wLR0hvbLBDz1fKSF7j1AwRccaQSNTj8KWsjzQJLQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.6.tgz"; + sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; "@angular-devkit/schematics-cli-0.1102.0" = { @@ -328,13 +328,13 @@ let sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/compat-data-7.13.11" = { + "@babel/compat-data-7.13.12" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.13.11"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.11.tgz"; - sha512 = "BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz"; + sha512 = "3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ=="; }; }; "@babel/core-7.13.10" = { @@ -454,31 +454,31 @@ let sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g=="; }; }; - "@babel/helper-member-expression-to-functions-7.13.0" = { + "@babel/helper-member-expression-to-functions-7.13.12" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.13.0"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz"; - sha512 = "yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; + sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw=="; }; }; - "@babel/helper-module-imports-7.12.13" = { + "@babel/helper-module-imports-7.13.12" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.13"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; - sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; }; }; - "@babel/helper-module-transforms-7.13.0" = { + "@babel/helper-module-transforms-7.13.12" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.13.0"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz"; - sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz"; + sha512 = "7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ=="; }; }; "@babel/helper-optimise-call-expression-7.12.13" = { @@ -508,22 +508,22 @@ let sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; }; }; - "@babel/helper-replace-supers-7.13.0" = { + "@babel/helper-replace-supers-7.13.12" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.13.0"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz"; - sha512 = "Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; + sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw=="; }; }; - "@babel/helper-simple-access-7.12.13" = { + "@babel/helper-simple-access-7.13.12" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.12.13"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; - sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { @@ -589,13 +589,22 @@ let sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg=="; }; }; - "@babel/parser-7.13.11" = { + "@babel/parser-7.13.12" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.13.11"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz"; - sha512 = "PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.12.tgz"; + sha512 = "4T7Pb244rxH24yR116LAuJ+adxXXnHhZaLJjegJVKSdoNCe4x1eDBaud5YIcQFcqzsaD5BHvJw5BQ0AZapdCRw=="; + }; + }; + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { + name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; + packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; + sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -715,13 +724,13 @@ let sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.13.8" = { + "@babel/plugin-proposal-optional-chaining-7.13.12" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.13.8"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz"; - sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; + sha512 = "fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ=="; }; }; "@babel/plugin-proposal-private-methods-7.13.0" = { @@ -1138,13 +1147,13 @@ let sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.17" = { + "@babel/plugin-transform-react-jsx-7.13.12" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.17"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz"; - sha512 = "mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; + sha512 = "jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA=="; }; }; "@babel/plugin-transform-react-jsx-self-7.12.13" = { @@ -1273,13 +1282,13 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.13.10" = { + "@babel/preset-env-7.13.12" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.13.10"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.10.tgz"; - sha512 = "nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz"; + sha512 = "JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA=="; }; }; "@babel/preset-flow-7.12.13" = { @@ -1381,13 +1390,13 @@ let sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ=="; }; }; - "@babel/types-7.13.0" = { + "@babel/types-7.13.12" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.13.0"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz"; - sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz"; + sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1786,22 +1795,22 @@ let sha512 = "6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg=="; }; }; - "@emmetio/abbreviation-2.2.1" = { + "@emmetio/abbreviation-2.2.2" = { name = "_at_emmetio_slash_abbreviation"; packageName = "@emmetio/abbreviation"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.1.tgz"; - sha512 = "uUNwNgbH0JPlrdXhy8VQbNPLLG7abMvOaLVMblx22i68Rl9r+2N235ALgIYFUty1yXC9DkVw6xMbz/D4QVARcQ=="; + url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz"; + sha512 = "TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw=="; }; }; - "@emmetio/css-abbreviation-2.1.2" = { + "@emmetio/css-abbreviation-2.1.4" = { name = "_at_emmetio_slash_css-abbreviation"; packageName = "@emmetio/css-abbreviation"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz"; - sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ=="; + url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz"; + sha512 = "qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw=="; }; }; "@emmetio/extract-abbreviation-0.1.6" = { @@ -2101,13 +2110,13 @@ let sha512 = "SMyoMFCPRNoDeHB5MMIi8W3loDxjXsSBeQfQaaKqmph7gVN48DCky6K/xBHHDJDeqJjcmEgwPTRP8qsuuLWnqw=="; }; }; - "@fluentui/react-7.165.0" = { + "@fluentui/react-7.165.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.165.0"; + version = "7.165.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.165.0.tgz"; - sha512 = "fztahwnYIVB6hvb0VV11DKQK4jO4WJiTx2o3IFcxSPcOtZmjYtGDU8X0MXGadWRnzldfNLgkW+5NzqxZrwRD1w=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.165.1.tgz"; + sha512 = "2l/481URLxucUxQBKsXgHXPKBkhQEpJCCpGjfWf3uWwPz3X5PNMy+pujyYN6Di2LLPOfdpLf5sWTNw+DJjy2jA=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -2209,22 +2218,22 @@ let sha512 = "RNhQk0jMz6fZB4Ilu37PZj6YUQgSEZJrppXlaHpw/xYyDelcjYKZg/z9eMvYo6rxQPR2mGXjoj6by+zew1WgOw=="; }; }; - "@graphql-tools/batch-execute-7.0.0" = { + "@graphql-tools/batch-execute-7.1.0" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.0.0.tgz"; - sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.1.0.tgz"; + sha512 = "Yb4QRpHZqDk24+T4K3ARk/KFU26Dyl30XcbYeVvIrgIKcmeON/p3DfSeiB0+MaxYlsv+liQKvlxNbeC2hD31pA=="; }; }; - "@graphql-tools/delegate-7.0.10" = { + "@graphql-tools/delegate-7.1.1" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.10"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.10.tgz"; - sha512 = "6Di9ia5ohoDvrHuhj2cak1nJGhIefJmUsd3WKZcJ2nu2yZAFawWMxGvQImqv3N7iyaWKiVhrrK8Roi/JrYhdKg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.1.1.tgz"; + sha512 = "+uV0KZPI070sEykf3uxy+AhirHOqZnqbVqTqcfhH8/97+vdoLPE5oVceCTvMQsC7bDapbcbNiwcpYd8T6OQ4KQ=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -2263,13 +2272,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.10" = { + "@graphql-tools/merge-6.2.11" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.10"; + version = "6.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.10.tgz"; - sha512 = "dM3n37PcslvhOAkCz7Cwk0BfoiSVKXGmCX+VMZkATbXk/0vlxUfNEpVfA5yF4IkP27F04SzFQSaNrbD0W2Rszw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.11.tgz"; + sha512 = "temQABWkDTZb/qJwcIdrEbyJ5WkhaWZQeYxiuxGqZWlIOoFkYfqzfAP2qKl2Ry+ZkN+Q/Yozr1/ap//xjpwAlA=="; }; }; "@graphql-tools/schema-7.1.3" = { @@ -2299,13 +2308,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.6.0" = { + "@graphql-tools/utils-7.7.1" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.6.0"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.6.0.tgz"; - sha512 = "YCZDDdhfb4Yhie0IH031eGdvQG8C73apDuNg6lqBNbauNw45OG/b8wi3+vuMiDnJTJN32GQUb1Gt9gxDKoRDKw=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.7.1.tgz"; + sha512 = "SFT4/dTfrwWer1wSOLU+jqgv3oa/xTR8q+MiNbE9nCH2FXyMsqIOaXKm9wHfKIWFWHozqBdcnwFkQZrdD7H2TQ=="; }; }; "@graphql-tools/wrap-7.0.5" = { @@ -2326,13 +2335,13 @@ let sha512 = "wj6GkNiorWYaPiIZ767xImmw7avMMVUweTvPFg4mJWOxz2180DKwfuxhJJZ7rpc1+7D3mX/v8vJdxTuIo71Ieg=="; }; }; - "@grpc/grpc-js-1.2.11" = { + "@grpc/grpc-js-1.2.12" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.11.tgz"; - sha512 = "DZqx3nHBm2OGY7NKq4sppDEfx4nBAsQH/d/H/yxo/+BwpVLWLGs+OorpwQ+Fqd6EgpDEoi4MhqndjGUeLl/5GA=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.12.tgz"; + sha512 = "+gPCklP1eqIgrNPyzddYQdt9+GvZqPlLpIjIo+TveE+gbtp74VV1A2ju8ExeO8ma8f7MbpaGZx/KJPYVWL9eDw=="; }; }; "@grpc/proto-loader-0.5.6" = { @@ -2974,13 +2983,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.25.0" = { + "@jsii/spec-1.26.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.25.0.tgz"; - sha512 = "Zr56+uqZLoxI8qxIZZEweZdYBo0KqWf+q25m/okgwcKV4njCZuh0APXzeT/ebSkSOHQ3tneEE+g2EP/8IPP2og=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.26.0.tgz"; + sha512 = "wh9Z/wfQYcWE5IgUfKNBYQ9Lhye9Xh/lsRsxMQluqEsgObNqb/8JreenWviqzHzBBcvTcHHyl+G30mpmyO1PWQ=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3649,13 +3658,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-9.11.2" = { + "@netlify/build-9.13.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "9.11.2"; + version = "9.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-9.11.2.tgz"; - sha512 = "hnKDssHUnTSNibvK67lJ2hqZHutsUVSCWvLDV2ExEbSlqws0GdGjTunas39Vx6Vq/YKLEg/bLI+SXSsVyPKWxQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-9.13.2.tgz"; + sha512 = "XhTk7Wm/l+GpE+bw7zZQpPBKV3Jsxjo1k3qCkMO3sWufN+pKmm+Z4DFRLhAKE+Vbev0wMf52HGhXEheroM5M1w=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3667,13 +3676,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-4.2.0" = { + "@netlify/config-4.3.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-4.2.0.tgz"; - sha512 = "z145O9ZOklq6+C02wxS+NZanJAyHHmGS1v9OQ3uTtoE6U0H1W1y7lalxEBNTaVg4/TQTj1X7xOX81KfNuuQ0MA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-4.3.0.tgz"; + sha512 = "jS6u5Dm3asg8zF6cYNYWfvyH3+XB3dMMm0UpC/BOLrYuXKVjP6uiIoUoUI6IjIN7gxAcotTN6RKCA5jU2Ahy5w=="; }; }; "@netlify/framework-info-3.2.0" = { @@ -3712,22 +3721,22 @@ let sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.5" = { + "@netlify/plugin-edge-handlers-1.11.6" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.5"; + version = "1.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.5.tgz"; - sha512 = "R7oEvYjLOrvO8uSy484c4TrZeD5A1M2TN4dIM7dAdd2iHgpC+i3+RhlM9XFHFOqc8lsim+A+BcKMQYZ19z+j6A=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.6.tgz"; + sha512 = "7L5pkXlwPfyUrmm9cu2+nOQYW1FMx6waMbl2Uj5SmxjLz5Dvt2zkUYbNU2ImNmJ10mxziv3LABSFn2k2qy2nLw=="; }; }; - "@netlify/plugins-list-2.4.3" = { + "@netlify/plugins-list-2.5.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.4.3.tgz"; - sha512 = "xJ4o8IRwjjWrsFw/Ii4VSWQgmoBe/GFyWTj1q+ShOpC0BJUTZ22g7+rMwlEZXkisOT+Y/niPkikkrXcU9FCzZg=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.5.0.tgz"; + sha512 = "45BG3E6A+540BZDG4Dul5KmoOwzw+TwiwqQSP08bKiywWtyl3IDDFoozZRp+GjhRo1+CnNVN0L9FxdxvU82UDw=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -4108,13 +4117,13 @@ let sha512 = "2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA=="; }; }; - "@octokit/openapi-types-5.3.2" = { + "@octokit/openapi-types-6.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "5.3.2"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.3.2.tgz"; - sha512 = "NxF1yfYOUO92rCx3dwvA2onF30Vdlg7YUkMVXkeptqpzA3tRLplThhFleV/UKWFgh7rpKu1yYRbvNDUtzSopKA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.0.0.tgz"; + sha512 = "CnDdK7ivHkBtJYzWzZm7gEkanA7gKH6a09Eguz7flHw//GacPJLmkHA3f3N++MJmlxD1Fl+mB7B32EEpSCwztQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4162,13 +4171,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/plugin-rest-endpoint-methods-4.13.5" = { + "@octokit/plugin-rest-endpoint-methods-4.14.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "4.13.5"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.13.5.tgz"; - sha512 = "kYKcWkFm4Ldk8bZai2RVEP1z97k1C/Ay2FN9FNTBg7JIyKoiiJjks4OtT6cuKeZX39tqa+C3J9xeYc6G+6g8uQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.14.0.tgz"; + sha512 = "QoZ469GDvFALHuxhcRA4KFGTaPeu5Z0MILGPa7irTGfYE0WfL+LFqWmULm9tuFKaKNlTcEQ7c5uJ0p4k5uvmNQ=="; }; }; "@octokit/request-5.4.14" = { @@ -4207,13 +4216,13 @@ let sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ=="; }; }; - "@octokit/rest-18.3.5" = { + "@octokit/rest-18.4.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.3.5"; + version = "18.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.3.5.tgz"; - sha512 = "ZPeRms3WhWxQBEvoIh0zzf8xdU2FX0Capa7+lTca8YHmRsO3QNJzf1H3PcuKKsfgp91/xVDRtX91sTe1kexlbw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.4.0.tgz"; + sha512 = "3bFg0vyD3O+6EukYzLTu4tUapMofSR4nYgMEOJc25sefippsatiWfNoOnx0QNj3PIXVJdW0riUjQnDwgS0JNWA=="; }; }; "@octokit/types-2.16.2" = { @@ -4225,13 +4234,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.12.2" = { + "@octokit/types-6.13.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.12.2"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.12.2.tgz"; - sha512 = "kCkiN8scbCmSq+gwdJV0iLgHc0O/GTPY1/cffo9kECu1MvatLPh9E+qFhfRIktKfHEA6ZYvv6S1B4Wnv3bi3pA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.13.0.tgz"; + sha512 = "W2J9qlVIU11jMwKHUp5/rbVUeErqelCsO5vW5PKNb7wAXQVUz87Rc+imjlEvpvbH8yUb+KHmv8NEjVZdsdpyxA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4828,6 +4837,15 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@putdotio/api-client-8.15.1" = { + name = "_at_putdotio_slash_api-client"; + packageName = "@putdotio/api-client"; + version = "8.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.15.1.tgz"; + sha512 = "1ODxgqJJTWe+Sb6XL05oJWmHKt81nDerLtfbJH16LY5Z8dkzg9FS9K0DWrzPR8e9TmGg8rdnF4MBCDGzOJRgCA=="; + }; + }; "@react-native-community/cli-debugger-ui-4.13.1" = { name = "_at_react-native-community_slash_cli-debugger-ui"; packageName = "@react-native-community/cli-debugger-ui"; @@ -4945,13 +4963,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.2.5" = { + "@schematics/angular-11.2.6" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.5"; + version = "11.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.5.tgz"; - sha512 = "pjaK0gZyqhzgAVxMKElG6cDpAvNZ3adVCTA8dhEixpH+JaQdoczl59hMn7rH75yQW0PApe+8g7HMwVK6bLRmxQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.6.tgz"; + sha512 = "NUtoX6Dfo2mUWVHt2zXEtlBsz88mo9N9fIPFAEpSY6U9x/jGSs+4rZ6sGRpkqm5UgVtYHzRyQINH7608HuGUuA=="; }; }; "@schematics/schematics-0.1102.0" = { @@ -4963,13 +4981,13 @@ let sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA=="; }; }; - "@schematics/update-0.1102.5" = { + "@schematics/update-0.1102.6" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1102.5"; + version = "0.1102.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.5.tgz"; - sha512 = "iz9pM8mabieqQnPZjrqP5jfRFvPm81/uIg46kY3KjtDtSBi4GAF2dnFyX1dC2mG1rq+e+8zeQLvOvhdLifYlEA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.6.tgz"; + sha512 = "JJ9pwGWI5NfwK7d09uQ6zHV63Ms+8r0NsvJHjZlHFlolY04J6yFe0X7TF7/mcjKsaVKCjYIpe5VuTeam/wk5QQ=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4999,13 +5017,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.7.5" = { + "@serverless/components-3.7.7" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.7.5"; + version = "3.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.5.tgz"; - sha512 = "fD2Yxaxqt4WmlJquSu5AmWUqJxDTY7d1+u58hFIZyB5mwbFX3cTsHkEVMaLDlZtS6bWveSgGg14pFchLq+AV5A=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.7.tgz"; + sha512 = "GMo0wOyrfMiekRKZuOI046bxinM/cSsAkLivaT6J0rAG6DV+C8yZHLis5090kya50XndidiSdfshlaP0lv21lQ=="; }; }; "@serverless/core-1.1.2" = { @@ -5017,13 +5035,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.5.1" = { + "@serverless/enterprise-plugin-4.5.2" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.1.tgz"; - sha512 = "wDZ/Ulu6PZ30gfiwCZ+CxDDt7fZHgH1wbU3pkBOIWtXpksm2edv+eN4irWwVe93OVUqN3uWEtLZJVZH5YQzf1g=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.2.tgz"; + sha512 = "Y/7WK0BAL7oVK3QDV9nL1qUKTC4p/gKWI8W1Ozp+P4RA9RPIqDHmdqmu8Uhc/rUS0nD64LijfLlapeXq2qITVg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5035,13 +5053,13 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.1" = { + "@serverless/platform-client-4.2.2" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.1.tgz"; - sha512 = "Mb68YdkhKUs4LFsrluabE00ng08fLCslf07Ufy/kwN7LfFZKTpNTnuvc/pR59zk7v3s5XWBTlnGWKbID3IWLlQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.2.tgz"; + sha512 = "8jP72e0POFGEW7HKtDzK0qt1amYtvlB7bYSal8JUCXbeY2qk3xRJZuLWCZBBKRGz4ha4eBNjlz7iniACb9biLg=="; }; }; "@serverless/platform-client-china-2.1.9" = { @@ -5206,13 +5224,13 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; - "@snyk/code-client-3.1.4" = { + "@snyk/code-client-3.1.5" = { name = "_at_snyk_slash_code-client"; packageName = "@snyk/code-client"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.4.tgz"; - sha512 = "ZZWPWAaKgNii/HYtyO9guFDVpi5T/SoCWQIo/B/RbLbXLrdZ5VIHsn0E4ztY7Y69GjQCyrus5pu7adlYrwQtEQ=="; + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.5.tgz"; + sha512 = "bJb00zZ7956MzIjW/4DPaMolk2/r7eox+5Bvq0bpcu1NFUFYYQPZeEPsPgh5YzK4te2v6W5hZBtjUUNIY+AQYg=="; }; }; "@snyk/composer-lockfile-parser-1.4.1" = { @@ -5953,6 +5971,15 @@ let sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; }; }; + "@types/estree-0.0.47" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.47"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz"; + sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; + }; + }; "@types/express-4.17.11" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -6349,13 +6376,13 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/minimatch-3.0.3" = { + "@types/minimatch-3.0.4" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA=="; }; }; "@types/minimist-1.2.0" = { @@ -6952,13 +6979,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.18.0" = { + "@typescript-eslint/eslint-plugin-4.19.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.18.0.tgz"; - sha512 = "Lzkc/2+7EoH7+NjIWLS2lVuKKqbEmJhtXe3rmfA8cyiKnZm3IfLf51irnBcmow8Q/AptVV0XBZmBJKuUJTe6cQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz"; + sha512 = "CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6970,13 +6997,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.18.0" = { + "@typescript-eslint/experimental-utils-4.19.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.18.0.tgz"; - sha512 = "92h723Kblt9JcT2RRY3QS2xefFKar4ZQFVs3GityOKWQYgtajxt/tuXIzL7sVCUlM1hgreiV5gkGYyBpdOwO6A=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz"; + sha512 = "9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6988,22 +7015,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.18.0" = { + "@typescript-eslint/parser-4.19.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.18.0.tgz"; - sha512 = "W3z5S0ZbecwX3PhJEAnq4mnjK5JJXvXUDBYIYGoweCyWyuvAKfGHvzmpUzgB5L4cRBb+cTu9U/ro66dx7dIimA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.19.0.tgz"; + sha512 = "/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA=="; }; }; - "@typescript-eslint/scope-manager-4.18.0" = { + "@typescript-eslint/scope-manager-4.19.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz"; - sha512 = "olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz"; + sha512 = "GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7015,13 +7042,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.18.0" = { + "@typescript-eslint/types-4.19.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.18.0.tgz"; - sha512 = "/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.19.0.tgz"; + sha512 = "A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -7042,13 +7069,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.18.0" = { + "@typescript-eslint/typescript-estree-4.19.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz"; - sha512 = "wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz"; + sha512 = "3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7060,13 +7087,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.18.0" = { + "@typescript-eslint/visitor-keys-4.19.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz"; - sha512 = "Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz"; + sha512 = "aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8815,13 +8842,13 @@ let sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; - "ansi-escapes-4.3.1" = { + "ansi-escapes-4.3.2" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; "ansi-gray-0.1.1" = { @@ -10543,13 +10570,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.868.0" = { + "aws-sdk-2.871.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.868.0"; + version = "2.871.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.868.0.tgz"; - sha512 = "ZayPsA/ycaAXqqa2oDyf8iUpl1WOLODZS8ZdvYj77L5owMQm0XC7yqiD+WHj9nToUECF9VAD+AKQMIN6695tVQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.871.0.tgz"; + sha512 = "rFd2shGgYfCzQQQeqqgZRiLuPFUm3uUlHqM40nMtbqM1y7abuOUyuOMxTHsKsbY+Bu7gRESngPTf7Iknxq9/uQ=="; }; }; "aws-sign2-0.6.0" = { @@ -10588,6 +10615,15 @@ let sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; + "axios-0.19.2" = { + name = "axios"; + packageName = "axios"; + version = "0.19.2"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; + sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; + }; + }; "axios-0.21.1" = { name = "axios"; packageName = "axios"; @@ -13432,13 +13468,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-15.0.5" = { + "cacache-15.0.6" = { name = "cacache"; packageName = "cacache"; - version = "15.0.5"; + version = "15.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz"; - sha512 = "lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A=="; + url = "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz"; + sha512 = "g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w=="; }; }; "cache-base-1.0.1" = { @@ -13747,13 +13783,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001203" = { + "caniuse-lite-1.0.30001204" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001203"; + version = "1.0.30001204"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001203.tgz"; - sha512 = "/I9tvnzU/PHMH7wBPrfDMSuecDeUKerjCPX7D0xBbaJZPxoT9m+yYxt0zCTkcijCkjTdim3H56Zm0i5Adxch4w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz"; + sha512 = "JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ=="; }; }; "canvas-2.7.0" = { @@ -15331,13 +15367,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.25.0" = { + "codemaker-1.26.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.25.0.tgz"; - sha512 = "54qCHs6X6llXIAztHCo2IyzzvuH9GrEecwxxTU925M3EJV4z+7PMiI1AollZxSeyY2pGO5TjNlAQAyLXETI3NQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.26.0.tgz"; + sha512 = "oK0SdWi3CUHL7hVcDpXVBQc2xm31RCJSqg7I1wviMifD89zbvu3boAz/s5aoXbcVDKKxLOZn2w55WlGCih9HOw=="; }; }; "codepage-1.4.0" = { @@ -15853,6 +15889,15 @@ let sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg=="; }; }; + "commander-7.2.0" = { + name = "commander"; + packageName = "commander"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; + sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -16132,6 +16177,15 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; + "conf-6.2.4" = { + name = "conf"; + packageName = "conf"; + version = "6.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz"; + sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ=="; + }; + }; "conf-7.1.2" = { name = "conf"; packageName = "conf"; @@ -16357,13 +16411,13 @@ let sha512 = "5AKrTtmiioQWloJ3WRFZb0/uR1lrRboaVE9go++XZltvRnZkN2/kQjaZ0gtFxynU5u5k9mWVtk8mNcgJ9yoRbQ=="; }; }; - "constructs-3.3.68" = { + "constructs-3.3.71" = { name = "constructs"; packageName = "constructs"; - version = "3.3.68"; + version = "3.3.71"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.68.tgz"; - sha512 = "Fq029KuZo16NdYqlSuK1loIDiR1P2WwxsihZjjeK9hM5qoFXjcAAzMI7i5Z1LxZwWl9cUoutBNXSvhF7xHUG7Q=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.71.tgz"; + sha512 = "3KFtTsA7OV27m/+pJhN4iJkKzHbPIPvyvEX5BQ/JCAWjfCHOQEVpIgxHLpT4i8L1OFta+pJrzcEVAHo6UitwqA=="; }; }; "consume-http-header-1.0.0" = { @@ -17861,13 +17915,13 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-2.12.0" = { + "d3-array-2.12.1" = { name = "d3-array"; packageName = "d3-array"; - version = "2.12.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-2.12.0.tgz"; - sha512 = "T6H/qNldyD/1OlRkJbonb3u3MPhNwju8OPxYv0YSjDb/B2RUeeBEHzIpNrYiinwpmz8+am+puMrpcrDWgY9wRg=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz"; + sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; }; }; "d3-axis-1.0.12" = { @@ -18653,6 +18707,15 @@ let sha512 = "XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="; }; }; + "debounce-fn-3.0.1" = { + name = "debounce-fn"; + packageName = "debounce-fn"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz"; + sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q=="; + }; + }; "debounce-fn-4.0.0" = { name = "debounce-fn"; packageName = "debounce-fn"; @@ -20075,6 +20138,15 @@ let sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ=="; }; }; + "dockerfile-ast-0.2.0" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz"; + sha512 = "iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw=="; + }; + }; "dockerfile-language-service-0.2.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; @@ -20831,13 +20903,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.693" = { + "electron-to-chromium-1.3.699" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.693"; + version = "1.3.699"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.693.tgz"; - sha512 = "vUdsE8yyeu30RecppQtI+XTz2++LWLVEIYmzeCaCRLSdtKZ2eXqdJcrs85KwLiPOPVc6PELgWyXBsfqIvzGZag=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.699.tgz"; + sha512 = "fjt43CPXdPYwD9ybmKbNeLwZBmCVdLY2J5fGZub7/eMPuiqQznOGNXv/wurnpXIlE7ScHnvG9Zi+H4/i6uMKmw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20932,13 +21004,13 @@ let sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ=="; }; }; - "emmet-2.3.2" = { + "emmet-2.3.4" = { name = "emmet"; packageName = "emmet"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/emmet/-/emmet-2.3.2.tgz"; - sha512 = "PRHGy5RfLp7+WBgoNq0QYtjSbbG1g28PtnN8McPhlEMoPwZWBDftVIz4vDNUNvQFSBtekuYZxB7J0vLgodZxFw=="; + url = "https://registry.npmjs.org/emmet/-/emmet-2.3.4.tgz"; + sha512 = "3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A=="; }; }; "emoji-named-characters-1.0.2" = { @@ -21697,13 +21769,13 @@ let sha512 = "j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA=="; }; }; - "esbuild-0.9.6" = { + "esbuild-0.9.7" = { name = "esbuild"; packageName = "esbuild"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.9.6.tgz"; - sha512 = "F6vASxU0wT/Davt9aj2qtDwDNSkQxh9VbyO56M7PDWD+D/Vgq/rmUDGDQo7te76W5auauVojjnQr/wTu3vpaUA=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.9.7.tgz"; + sha512 = "VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg=="; }; }; "esc-exit-2.0.2" = { @@ -21922,13 +21994,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.7.0" = { + "eslint-plugin-vue-7.8.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.7.0"; + version = "7.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.7.0.tgz"; - sha512 = "mYz4bpLGv5jx6YG/GvKkqbGSfV7uma2u1P3mLA41Q5vQl8W1MeuTneB8tfsLq6xxxesFubcrOC0BZBJ5R+eaCQ=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.8.0.tgz"; + sha512 = "OGrnPz+PuYL2HmVyBHxm4mRjxW2kfFCQE6Hw9G6qOHs/Pcu0srOlCCW0FMa8SLzIEqxl8WuKoBSPcMnrjUG2vw=="; }; }; "eslint-scope-3.7.3" = { @@ -22516,13 +22588,13 @@ let sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; }; }; - "exec-sh-0.3.4" = { + "exec-sh-0.3.6" = { name = "exec-sh"; packageName = "exec-sh"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"; - sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A=="; + url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz"; + sha512 = "nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w=="; }; }; "execa-0.1.1" = { @@ -23389,13 +23461,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fastpriorityqueue-0.6.3" = { + "fastpriorityqueue-0.7.0" = { name = "fastpriorityqueue"; packageName = "fastpriorityqueue"; - version = "0.6.3"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.6.3.tgz"; - sha512 = "l4Whw9/MDkl/0XuqZEzGE/sw9T7dIxuUnxqq4ZJDLt8AE45j8wkx4/nBRZm50aQ9kN71NB9mwQzglLsvQGROsw=="; + url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.0.tgz"; + sha512 = "L5Je6LktYDK5aRJIAHO4NEyQXsihwe/+VEaI2qwyoxvuTPcyooLi9+MeLJnOzvEDwijxAXrrqqkV4cNgW55Rog=="; }; }; "fastq-1.11.0" = { @@ -24406,6 +24478,15 @@ let sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="; }; }; + "follow-redirects-1.5.10" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; + sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; + }; + }; "font-awesome-filetypes-2.1.0" = { name = "font-awesome-filetypes"; packageName = "font-awesome-filetypes"; @@ -26180,13 +26261,13 @@ let sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; - "globby-11.0.2" = { + "globby-11.0.3" = { name = "globby"; packageName = "globby"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; - sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; }; }; "globby-4.1.0" = { @@ -26315,13 +26396,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.0.2" = { + "google-auth-library-7.0.3" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.2.tgz"; - sha512 = "vjyNZR3pDLC0u7GHLfj+Hw9tGprrJwoMwkYGqURCXYITjCrP9HprOyxVV+KekdLgATtWGuDkQG2MTh0qpUPUgg=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.3.tgz"; + sha512 = "6wJNYqY1QUr5I2lWaUkkzOT2b9OCNhNQrdFOt/bsBbGb7T7NCdEvrBsXraUm+KTUGk2xGlQ7m9RgUd4Llcw8NQ=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -27665,13 +27746,13 @@ let sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw=="; }; }; - "hosted-git-info-4.0.1" = { + "hosted-git-info-4.0.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.1.tgz"; - sha512 = "eT7NrxAsppPRQEBSwKSosReE+v8OzABwEScQYk5d4uxaEPlzxTIku7LINXtBGalthkLhJnq5lBI89PfK43zAKg=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg=="; }; }; "hot-formula-parser-4.0.0" = { @@ -31239,13 +31320,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-2.3.3" = { + "jitdb-2.3.4" = { name = "jitdb"; packageName = "jitdb"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.3.tgz"; - sha512 = "wSB+iNzPm/Qcp1lKg8olKL0zeZdAhDVXLpWLKLWtqWN/vpHeu7vKmYxClsxhmV4YhZ/Hjzzi0oXBY8hVqKHQTA=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.4.tgz"; + sha512 = "KK20bNiuzIekY7KzH4DvKDMGOu4yGAfiPFLE6GbFZUWurXOQJAbfjvbqKmNHOTE6FA5o8pPg2dz8OvJyjByWEQ=="; }; }; "jju-1.4.0" = { @@ -31635,40 +31716,40 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.25.0" = { + "jsii-1.26.0" = { name = "jsii"; packageName = "jsii"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.25.0.tgz"; - sha512 = "5dchUvG+RTc48v8euUUNvxKxAlPMIaE9rG8BFp4RiXQiB3EFDTJeeM89cXK4w/vAhjgDlAxMDx3EJr7k6e461A=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.26.0.tgz"; + sha512 = "ZUu5N8+u12VyNkPgSgvVzIhZ+aEAd531zDZK4qkth7UsGNhSy4zBz9BJMSSKnaVV0oR6Pvehhg5DJ3dCu8qJrw=="; }; }; - "jsii-pacmak-1.25.0" = { + "jsii-pacmak-1.26.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.25.0.tgz"; - sha512 = "GEVdCYvnwYVnVNdcLDrvStaHqWIXBiZCpM9i4LS2rpA+qSsyXJUF8FV4cj2YFjdHsolUdY1EKY7njSs8XQ+1gg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.26.0.tgz"; + sha512 = "KOKOIazxddh8CuyuLMoBURW2bj3prhzyT0qF5ojUhHrbZeuH3eulF/Sn5PaIAadmQdmCiu69DYJe2JIwY/zwjw=="; }; }; - "jsii-reflect-1.25.0" = { + "jsii-reflect-1.26.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.25.0.tgz"; - sha512 = "ufBgOeGe6WVmx0CO7ABraEYOzhzxvmx6gJuUvOz/8XMe1dIIU2USLW3O1ArkEtIWchN4F2gITdd7I7jhdzzN1A=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.26.0.tgz"; + sha512 = "mlu97Xs2M+YCq3Z8z2vzLYOe3XVC3T0YBabvJjkKoNYdH6F/S5zQMVdGwfHEXv1asFv7PrrVu46Zf/dKnqULcw=="; }; }; - "jsii-rosetta-1.25.0" = { + "jsii-rosetta-1.26.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.25.0.tgz"; - sha512 = "2g+O5mkXrcsJPrHs71WPvLhcV4JERYUUzfG4rArZQ+YsGYSlpP2K6FdYlAk8haeCeEgyaedNgsbcW9NbxV8p3A=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.26.0.tgz"; + sha512 = "J/VQR8j/mD4Q5qGF0JmfvOJeNWIx0I158nvo6FsnC8aYmHyIpBPmlpKWZzUGC8fHxoD3mC8oeiFLp2Yv8BNtvQ=="; }; }; "jsii-srcmak-0.1.255" = { @@ -36262,13 +36343,13 @@ let sha512 = "SoO8y1B9NjMOYlNdwXMchuTVvqSTlUmXm1P5QvZNPv7OH7aa8qJV+3aA+vl1DHK9Vk1uZAlgwokjvDQhS6bINA=="; }; }; - "mdast-util-mdx-jsx-0.1.3" = { + "mdast-util-mdx-jsx-0.1.4" = { name = "mdast-util-mdx-jsx"; packageName = "mdast-util-mdx-jsx"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.3.tgz"; - sha512 = "MIAop4fMALAAVMpXIZqSq2T9/3d/hiiSTdPTJ9AOIZL1td2JBbUOBSnBSMfEk4GOyiQSsla+NFziJbNBwBH1sw=="; + url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.4.tgz"; + sha512 = "67KOAvCmypBSpr+AJEAVQg1Obig5Wnguo4ETTxASe5WVP4TLt57bZjDX/9EW5sWYQsO4gPqLxkUOlypVn5rkhg=="; }; }; "mdast-util-mdxjs-esm-0.1.1" = { @@ -39188,6 +39269,15 @@ let sha1 = "5f5665d93351335caabef8f1c554516cf5f1e4e5"; }; }; + "node-downloader-helper-1.0.17" = { + name = "node-downloader-helper"; + packageName = "node-downloader-helper"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.17.tgz"; + sha512 = "EnaY0uBSdVo4kYfSmkDlTJG8GqmS8fbfoOau/OsTnikCwt9vsU0w8REVxwWbVz7DzNtHSEBKpU6jV1hmtlx0Dg=="; + }; + }; "node-emoji-1.10.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -40657,13 +40747,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.165.0" = { + "office-ui-fabric-react-7.165.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.165.0"; + version = "7.165.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.165.0.tgz"; - sha512 = "alOv6F8ZRPaLkM9nEKSiuyAEE4y2OJLqCu9iadkjQykjypcAhDQSA6mrBN0nzS6helb1hxakNLkQja6rrVwjtg=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.165.1.tgz"; + sha512 = "a8H0KGwhfEps7v0Ia+kU9kQyRtj3qVMWbkDmMhZ2iTnPXcMs6gF1X+1x3xuMQblJXpp/fqyCLpuU1DUSOMbmhw=="; }; }; "omggif-1.0.10" = { @@ -40837,13 +40927,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.25.0" = { + "oo-ascii-tree-1.26.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.25.0.tgz"; - sha512 = "bV3aHhVkSc862VMMj1JV9y8yBqzhXCMNE9UFt8w9NwkM7tvw94O8niGlvmFzNx2Hf4+qhO4gYdtRAYQqUaH+1w=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.26.0.tgz"; + sha512 = "JcRUxvHG+QAheXnxx9cwtgDJY6aXc70UAvgoFxKtRz+KfWEU47z/X2HHb81O/aZ3mN4fRnnnnwQhaTUuQRw2Ag=="; }; }; "opal-runtime-1.0.11" = { @@ -42088,13 +42178,13 @@ let sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ=="; }; }; - "pacote-11.3.0" = { + "pacote-11.3.1" = { name = "pacote"; packageName = "pacote"; - version = "11.3.0"; + version = "11.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.0.tgz"; - sha512 = "cygprcGpEVqvDzpuPMkGVXW/ooc2ibpoosuJ4YHcUXozDs9VJP7Vha+41pYppG2MVNis4t1BB8IygIBh7vVr2Q=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.3.1.tgz"; + sha512 = "TymtwoAG12cczsJIrwI/euOQKtjrQHlD0k0oyt9QSmZGpqa+KdlxKdWR/YUjYizkixaVyztxt/Wsfo8bL3A6Fg=="; }; }; "pad-0.0.5" = { @@ -46175,13 +46265,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.123" = { + "pyright-1.1.125" = { name = "pyright"; packageName = "pyright"; - version = "1.1.123"; + version = "1.1.125"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.123.tgz"; - sha512 = "EYjELbm4G4icuIki6PfpzYrxNeGH78vNbXNmsbb/9XnnVQISdFcbc9oOBc2mU77enUwZctwZ6Nj2mZUMD9VibQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.125.tgz"; + sha512 = "MPaMGCnMR0i0VePXUPpXMHr23A2mkbW1Su+aTAWsqHho1rhQcxBtjeyhR0xqiwTxcC+c9eK9VwFHbd+OMGC6fQ=="; }; }; "q-0.9.7" = { @@ -46310,13 +46400,13 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "qs-6.10.0" = { + "qs-6.10.1" = { name = "qs"; packageName = "qs"; - version = "6.10.0"; + version = "6.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.0.tgz"; - sha512 = "yjACOWijC6L/kmPZZAsVBNY2zfHSIbpdpL977quseu56/8BZ2LoF5axK2bGhbzhVKt7V9xgWTtpyLbxwIoER0Q=="; + url = "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz"; + sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="; }; }; "qs-6.3.2" = { @@ -46454,13 +46544,13 @@ let sha512 = "iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA=="; }; }; - "queue-microtask-1.2.2" = { + "queue-microtask-1.2.3" = { name = "queue-microtask"; packageName = "queue-microtask"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz"; - sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg=="; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; "quick-format-unescaped-4.0.3" = { @@ -47615,13 +47705,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.7" = { + "regenerator-runtime-0.13.8" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.7"; + version = "0.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz"; + sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A=="; }; }; "regenerator-transform-0.14.5" = { @@ -47750,13 +47840,13 @@ let sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; - "regjsparser-0.6.7" = { + "regjsparser-0.6.9" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.7"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz"; - sha512 = "ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz"; + sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ=="; }; }; "rehype-parse-7.0.1" = { @@ -48911,13 +49001,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.42.1" = { + "rollup-2.42.4" = { name = "rollup"; packageName = "rollup"; - version = "2.42.1"; + version = "2.42.4"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.42.1.tgz"; - sha512 = "/y7M2ULg06JOXmMpPzhTeQroJSchy8lX8q6qrjqil0jmLz6ejCWbQzVnWTsdmMQRhfU0QcwtiW8iZlmrGXWV4g=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.42.4.tgz"; + sha512 = "Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -49793,6 +49883,15 @@ let sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; }; }; + "semver-7.3.5" = { + name = "semver"; + packageName = "semver"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + }; "semver-compare-1.0.0" = { name = "semver-compare"; packageName = "semver-compare"; @@ -50927,13 +51026,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.17.3" = { + "snyk-docker-plugin-4.19.3" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.17.3"; + version = "4.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.17.3.tgz"; - sha512 = "Egqkad3YTP41Dlu19/3A2gQfqf4nxa7C36USQGSXIC5JodPvptObiSLmyQssjxVJ7iCRpw6IxytZVf412KKJCg=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz"; + sha512 = "5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg=="; }; }; "snyk-go-parser-1.4.1" = { @@ -51044,13 +51143,13 @@ let sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg=="; }; }; - "snyk-python-plugin-1.19.5" = { + "snyk-python-plugin-1.19.7" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.5"; + version = "1.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.5.tgz"; - sha512 = "wgfhloo6PZ8V+6eIUU7pLcVfHx4yo5LQPPQX6rLfTSZ6p9uRYazIvw/NoUmIjb8Qrn9GdD3zUJY9/83TyTgKLw=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz"; + sha512 = "twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A=="; }; }; "snyk-resolve-1.1.0" = { @@ -51899,13 +51998,13 @@ let sha1 = "6c83aff3692fa61256e0cd197e05e9de157691a6"; }; }; - "split-lines-2.0.0" = { + "split-lines-2.1.0" = { name = "split-lines"; packageName = "split-lines"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz"; - sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA=="; + url = "https://registry.npmjs.org/split-lines/-/split-lines-2.1.0.tgz"; + sha512 = "8dv+1zKgTpfTkOy8XZLFyWrfxO0NV/bj/3EaQ+hBrBxGv2DwiroljPjU8NlCr+59nLnsVm9WYT7lXKwe4TC6bw=="; }; }; "split-on-first-1.1.0" = { @@ -54023,13 +54122,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.182" = { + "svelte2tsx-0.1.184" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.182"; + version = "0.1.184"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.182.tgz"; - sha512 = "c0Qnc8sebPt940boE4CvRcmwLu+XRyhQsm89ZPXlxvZ3ea7VQmtWOhWkReSVyxnEFRm7VnrKCrTitZHKGNCptA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.184.tgz"; + sha512 = "VhmzqF8p5LL390td9mngJ2l1BrlZCY5/4SgYu9NxgYWLo54gyamrC2VNe+y5ZxAC59oxjw6byKbPlIFx0acXjg=="; }; }; "sver-compat-1.5.0" = { @@ -56472,15 +56571,6 @@ let sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; }; }; - "type-fest-0.11.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; - sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; - }; - }; "type-fest-0.12.0" = { name = "type-fest"; packageName = "type-fest"; @@ -56535,6 +56625,15 @@ let sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; }; + "type-fest-0.21.3" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.21.3"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -56643,13 +56742,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.2.2" = { + "typegram-3.2.3" = { name = "typegram"; packageName = "typegram"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.2.2.tgz"; - sha512 = "PC7MclSZcLnCEnflubX61/YEwZph98EHbCsrL9tFhU5bZYz3uXm3Mc6iseKjiS3VyKOCCyoT3A4ZDtPkoYyucg=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.2.3.tgz"; + sha512 = "zlkY7vNTLcwQhLUyYXAUzRelzH752LBFl8m4u04d5g5P7lM9bGegeIRwzd3mVCHJH6R3s48pKeFTVSdVlN+omg=="; }; }; "typescript-2.9.2" = { @@ -56778,13 +56877,13 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.24" = { + "ua-parser-js-0.7.25" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.24"; + version = "0.7.25"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.24.tgz"; - sha512 = "yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.25.tgz"; + sha512 = "8NFExdfI24Ny8R3Vc6+uUytP/I7dpqk3JERlvxPWlrtx5YboqCgxAXYKPAifbPLV2zKbgmmPL53ufW7mUC/VOQ=="; }; }; "uc.micro-1.0.6" = { @@ -56814,13 +56913,13 @@ let sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; }; }; - "uglify-js-3.13.1" = { + "uglify-js-3.13.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.1.tgz"; - sha512 = "EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.2.tgz"; + sha512 = "SbMu4D2Vo95LMC/MetNaso1194M1htEA+JrqE9Hk+G2DhI+itfS9TRu9ZKeCahLDNa/J3n4MqUJ/fOHMzQpRWw=="; }; }; "uglify-js-3.4.10" = { @@ -59308,22 +59407,22 @@ let sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; }; }; - "vscode-debugadapter-testsupport-1.45.0" = { + "vscode-debugadapter-testsupport-1.46.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; - version = "1.45.0"; + version = "1.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.45.0.tgz"; - sha512 = "/5q/F2K1mNLfJWxXStG9pO86mgOeK73PoMJpOBZaniToplrzM7LgFEdXUPlzNH07//XZwzRsCFn7Eq3brqYk6Q=="; + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.46.0.tgz"; + sha512 = "6n+uu4+Q5sZvN2FgFLNJkyaE6AECYzFh+Hfv+IeJoVKA7KNiQ1SNd3yTsvSFxkS00LmVU6V00XGaqZRlwM15Jg=="; }; }; - "vscode-debugprotocol-1.45.0" = { + "vscode-debugprotocol-1.46.0" = { name = "vscode-debugprotocol"; packageName = "vscode-debugprotocol"; - version = "1.45.0"; + version = "1.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.45.0.tgz"; - sha512 = "xU6XtdKJ0waWIt79Zt4WVyIQ3oDkhilku9Shbv7Vc4KXEr/npsf8dhinyIZXSIlH2lzJiE3imp1xbYpyRTIrhg=="; + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.46.0.tgz"; + sha512 = "V10u1L679DJZfOtQXhKylJPMqNbhazav4mRxPrBE8/Jpznow1b1j1EGDDvJ4prQ623CLAnvpFfVkVQ+CX3xdtg=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -60244,13 +60343,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.115.4" = { + "webtorrent-0.116.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.115.4"; + version = "0.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.115.4.tgz"; - sha512 = "JJ3kZKZjM+3n0R0zyHZJARnqBLDfQHbMVarYieQFnZE4a2Ec/RpDP7c/NYeoKyBChsDOwrpxitk6FOmHdZkqyA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.116.0.tgz"; + sha512 = "jpptAAME7miPpoaywK+WZgn6CSLEvtqv9/7RUdr+M5vp1HbkVQDf5nX21funEWl955EIDdgzYvegU5JOm9W7cw=="; }; }; "well-known-symbols-2.0.0" = { @@ -60307,13 +60406,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.4.0" = { + "whatwg-url-8.5.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz"; - sha512 = "vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz"; + sha512 = "fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -62276,15 +62375,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.5"; + version = "11.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.5.tgz"; - sha512 = "GIwK8l6wtg/++8aDYW++LSf7v1uqDtB6so2rPjNlOm7oYk5iqM73KaorQb/1A52oxWE3IRSJLNQaSyUlWvHvSA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.6.tgz"; + sha512 = "67XH3wJgs1YuM4xW5PoouclT57AsfMhiOup2VPfGQn8GNINB4zauJfBotGyb3jQtRSFdwz+bXif6V9MSAw4oHA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1102.5" - sources."@angular-devkit/core-11.2.5" - sources."@angular-devkit/schematics-11.2.5" + sources."@angular-devkit/architect-0.1102.6" + sources."@angular-devkit/core-11.2.6" + sources."@angular-devkit/schematics-11.2.6" sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.6" // { dependencies = [ @@ -62300,8 +62399,8 @@ in sources."read-package-json-fast-2.0.2" ]; }) - sources."@schematics/angular-11.2.5" - sources."@schematics/update-0.1102.5" + sources."@schematics/angular-11.2.6" + sources."@schematics/update-0.1102.6" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -62310,7 +62409,7 @@ in sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" @@ -62333,7 +62432,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."builtins-1.0.3" - sources."cacache-15.0.5" + sources."cacache-15.0.6" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."chardet-0.7.0" @@ -62529,7 +62628,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" (sources."universal-analytics-0.4.23" // { @@ -62881,7 +62980,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -63161,7 +63260,7 @@ in sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-3.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" @@ -63176,7 +63275,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -63197,7 +63296,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -63347,7 +63446,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."schema-utils-2.7.0" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."serialize-javascript-5.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -63396,7 +63495,7 @@ in ]; }) sources."tslib-1.14.1" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."typescript-4.1.5" sources."universalify-2.0.0" sources."uri-js-4.4.1" @@ -63452,7 +63551,7 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" sources."@babel/core-7.13.10" sources."@babel/generator-7.13.9" sources."@babel/helper-annotate-as-pure-7.12.13" @@ -63465,14 +63564,14 @@ in sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.0" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" @@ -63480,7 +63579,8 @@ in sources."@babel/helper-wrap-function-7.13.0" sources."@babel/helpers-7.13.10" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.8" sources."@babel/plugin-proposal-class-properties-7.13.0" sources."@babel/plugin-proposal-dynamic-import-7.13.8" @@ -63491,7 +63591,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.12" sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -63542,7 +63642,7 @@ in sources."@babel/plugin-transform-typescript-7.13.0" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.13.10" + sources."@babel/preset-env-7.13.12" sources."@babel/preset-flow-7.12.13" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.13.0" @@ -63556,7 +63656,7 @@ in sources."@babel/runtime-7.13.10" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -63607,7 +63707,7 @@ in sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-14.14.35" (sources."@types/node-fetch-2.5.7" // { dependencies = [ @@ -63645,9 +63745,9 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."ansi-regex-4.1.0" @@ -63758,7 +63858,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -63887,7 +63987,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.693" + sources."electron-to-chromium-1.3.699" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -64217,7 +64317,7 @@ in dependencies = [ sources."is-wsl-2.2.0" sources."lru-cache-6.0.0" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."uuid-8.3.2" sources."which-2.0.2" ]; @@ -64325,7 +64425,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -64347,7 +64447,7 @@ in }) sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -64357,7 +64457,7 @@ in }) sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.7" // { + (sources."regjsparser-0.6.9" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -64609,7 +64709,7 @@ in sources."fast-glob-3.2.5" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."ignore-5.1.8" sources."is-number-7.0.0" sources."lru-cache-6.0.0" @@ -64789,9 +64889,9 @@ in sources."@babel/generator-7.13.9" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."@babel/template-7.12.13" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -64867,7 +64967,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" (sources."@babel/core-7.13.10" // { dependencies = [ sources."source-map-0.5.7" @@ -64881,21 +64981,21 @@ in sources."@babel/helper-compilation-targets-7.13.10" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helpers-7.13.10" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -64903,7 +65003,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."browserslist-4.16.3" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -64914,7 +65014,7 @@ in sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -65007,7 +65107,7 @@ in }; dependencies = [ sources."@types/glob-7.1.3" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-14.14.35" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -65334,7 +65434,7 @@ in sources."ini-2.0.0" (sources."inquirer-8.0.0" // { dependencies = [ - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -65584,12 +65684,12 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."tweetnacl-util-0.15.1" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.2.2" + sources."typegram-3.2.3" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -65597,7 +65697,7 @@ in sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."import-lazy-2.1.0" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."supports-color-7.2.0" ]; }) @@ -66533,7 +66633,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - (sources."semver-7.3.4" // { + (sources."semver-7.3.5" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -66716,7 +66816,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-7.1.0" + sources."commander-7.2.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -66910,7 +67010,7 @@ in sources."qap-3.3.1" sources."qs-6.5.2" sources."query-string-1.0.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -67066,7 +67166,7 @@ in sha512 = "9PI2OLv8PmnnZSNP3PN16gr/yMxBJinh/LMgjk66PBfVmAduojFzJ1pTYPE/vb4qBxHYP4BkEbR8Auxa+qyEvw=="; }; dependencies = [ - sources."@jsii/spec-1.25.0" + sources."@jsii/spec-1.26.0" sources."@types/node-10.17.55" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -67079,7 +67179,7 @@ in sources."cdk8s-1.0.0-beta.10" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.25.0" // { + (sources."codemaker-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -67137,25 +67237,25 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.25.0" // { + (sources."jsii-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.25.0" // { + (sources."jsii-pacmak-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.25.0" // { + (sources."jsii-reflect-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.25.0" // { + (sources."jsii-rosetta-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -67183,7 +67283,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.25.0" + sources."oo-ascii-tree-1.26.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -67192,7 +67292,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rfdc-1.3.0" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" @@ -67260,15 +67360,15 @@ in }; dependencies = [ sources."@cdktf/hcl2json-0.2.0" - sources."@jsii/spec-1.25.0" + sources."@jsii/spec-1.26.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.9.1" sources."@types/node-14.14.35" sources."@types/node-fetch-2.5.8" sources."@types/yoga-layout-1.9.2" - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."ansi-regex-4.1.0" @@ -67319,7 +67419,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.0" sources."concat-map-0.0.1" - sources."constructs-3.3.68" + sources."constructs-3.3.71" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -67399,7 +67499,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.25.0" // { + (sources."jsii-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67407,10 +67507,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.25.0" // { + (sources."jsii-pacmak-1.26.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.25.0" + sources."codemaker-1.26.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -67419,7 +67519,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.25.0" // { + (sources."jsii-reflect-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67427,7 +67527,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.25.0" // { + (sources."jsii-rosetta-1.26.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67477,7 +67577,7 @@ in sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.25.0" + sources."oo-ascii-tree-1.26.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -67503,7 +67603,7 @@ in sources."rfdc-1.3.0" sources."safe-buffer-5.1.2" sources."scheduler-0.18.0" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" @@ -67594,7 +67694,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."clean-css-5.1.2" - sources."commander-7.1.0" + sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -68141,7 +68241,7 @@ in sources."rfdc-1.3.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -68295,7 +68395,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.0" // { @@ -68393,7 +68493,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -68927,7 +69027,7 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-diff-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -69185,13 +69285,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.122"; + version = "1.1.123"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.122.tgz"; - sha512 = "On0ZR74g6wXH7BjSlfZdG35RYzIRHp7KF0V9gQG5f1cTlfy2T+pjzF5d9gO/cu0P6F1+i2RQ39anJ+FQ5P0wYA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.123.tgz"; + sha512 = "ebNooa4Wg94/jCNpiBi/+a6Kaci6hKUpcht2Ws548LSoI0a/rCAF+UMKfXQi5kVjIdTc8SNUC1pL6GYfna+y8Q=="; }; dependencies = [ - sources."pyright-1.1.123" + sources."pyright-1.1.125" ]; buildInputs = globalBuildInputs; meta = { @@ -69342,18 +69442,18 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" sources."@babel/core-7.13.10" sources."@babel/generator-7.13.9" sources."@babel/helper-compilation-targets-7.13.10" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" @@ -69363,10 +69463,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -69392,7 +69492,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -69430,7 +69530,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -69457,13 +69557,13 @@ in sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" @@ -69529,7 +69629,7 @@ in sources."node-releases-1.1.71" (sources."normalize-package-data-3.0.2" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."normalize-range-0.1.2" @@ -69570,7 +69670,7 @@ in sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -69877,7 +69977,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" sources."eslint-7.22.0" - sources."eslint-plugin-vue-7.7.0" + sources."eslint-plugin-vue-7.8.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -69958,7 +70058,7 @@ in sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -70352,7 +70452,7 @@ in sources."braces-3.0.2" sources."builtins-1.0.3" sources."bytes-3.0.0" - sources."cacache-15.0.5" + sources."cacache-15.0.6" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."lowercase-keys-2.0.0" @@ -70495,7 +70595,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" - sources."globby-11.0.2" + sources."globby-11.0.3" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -70508,7 +70608,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ @@ -70700,7 +70800,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.0" + sources."pacote-11.3.1" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."path-exists-3.0.0" @@ -70727,7 +70827,7 @@ in sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.5.2" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -70762,7 +70862,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -70894,7 +70994,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" sources."@types/node-14.14.35" sources."@types/normalize-package-data-2.4.0" @@ -71363,7 +71463,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -72261,7 +72361,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."graceful-fs-4.2.6" sources."ignore-5.1.8" sources."indent-string-4.0.0" @@ -72287,7 +72387,7 @@ in sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.2.2" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" @@ -72347,10 +72447,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.66.1"; + version = "6.66.2"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.66.1.tgz"; - sha512 = "Bz3addITPTKoIpVP7UVFlszh5JkqeuA7+6zIT9odBD5sJ/bHF3ZN5zQJ73WiY2nyifp0q2HzEwa1u1+ULDITAg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.66.2.tgz"; + sha512 = "9vWIUjRfuuOKu+qEgE1taqxx6yXX2OuD3yxxiwnCmiCTk+kq1QAu24rbDe5pdFvsBXzgTa6NT4dZ6i76uXgd6Q=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -72547,15 +72647,15 @@ in sources."@types/glob-7.1.3" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-14.14.35" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."ansi-regex-5.0.0" @@ -72981,7 +73081,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."semver-compare-1.0.0" sources."serialize-error-7.0.1" sources."set-blocking-2.0.0" @@ -73124,7 +73224,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" (sources."@babel/core-7.13.10" // { dependencies = [ sources."semver-6.3.0" @@ -73139,28 +73239,28 @@ in }) sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helpers-7.13.10" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.13.0" sources."@babel/plugin-transform-parameters-7.13.0" - sources."@babel/plugin-transform-react-jsx-7.12.17" + sources."@babel/plugin-transform-react-jsx-7.13.12" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -73172,9 +73272,9 @@ in sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."ansi-regex-5.0.0" @@ -73202,7 +73302,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -73218,7 +73318,7 @@ in sources."concat-map-0.0.1" (sources."conf-7.1.2" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."convert-source-map-1.7.0" @@ -73239,7 +73339,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -73500,7 +73600,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.14" - sources."@fluentui/react-7.165.0" + sources."@fluentui/react-7.165.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -73541,7 +73641,7 @@ in sources."@types/lodash-4.14.161" sources."@types/material-design-lite-1.1.16" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.0" sources."@types/mithril-2.0.3" sources."@types/mkdirp-1.0.1" @@ -73748,7 +73848,7 @@ in ]; }) sources."bytes-3.1.0" - (sources."cacache-15.0.5" // { + (sources."cacache-15.0.6" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -74541,7 +74641,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.165.0" + sources."office-ui-fabric-react-7.165.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -74701,7 +74801,7 @@ in sources."qs-6.7.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" @@ -74772,7 +74872,7 @@ in sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { dependencies = [ @@ -75295,7 +75395,7 @@ in sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -75463,7 +75563,7 @@ in sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -75531,7 +75631,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" @@ -75556,14 +75656,14 @@ in sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.0" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" @@ -75575,7 +75675,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.8" sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.13.8" @@ -75587,7 +75687,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.12" sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -75632,7 +75732,7 @@ in sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-react-display-name-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.12.17" + sources."@babel/plugin-transform-react-jsx-7.13.12" sources."@babel/plugin-transform-react-jsx-self-7.12.13" sources."@babel/plugin-transform-react-jsx-source-7.12.13" sources."@babel/plugin-transform-regenerator-7.12.13" @@ -75660,7 +75760,7 @@ in sources."@babel/runtime-7.13.10" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/bunyan-4.0.0" sources."@expo/config-3.3.33" @@ -75844,7 +75944,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-9.6.61" sources."@types/q-1.5.4" sources."@types/responselike-1.0.0" @@ -75914,9 +76014,9 @@ in ]; }) sources."ansi-colors-3.2.4" - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."ansi-html-0.0.7" @@ -76056,7 +76156,7 @@ in sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" - (sources."cacache-15.0.5" // { + (sources."cacache-15.0.6" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -76079,7 +76179,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -76352,7 +76452,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.693" + sources."electron-to-chromium-1.3.699" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -76985,17 +77085,17 @@ in sources."npm-packlist-2.1.4" (sources."npm-pick-manifest-6.1.1" // { dependencies = [ - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."npm-package-arg-8.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) (sources."npm-registry-fetch-9.0.0" // { dependencies = [ - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" sources."npm-package-arg-8.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."npm-run-path-2.0.2" @@ -77087,14 +77187,14 @@ in sources."semver-6.3.0" ]; }) - (sources."pacote-11.3.0" // { + (sources."pacote-11.3.1" // { dependencies = [ - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" sources."mkdirp-1.0.4" sources."npm-package-arg-8.1.2" sources."rimraf-3.0.2" - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."pako-1.0.11" @@ -77332,7 +77432,7 @@ in sources."querystring-0.2.1" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" @@ -77380,7 +77480,7 @@ in sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -77388,7 +77488,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.7" // { + (sources."regjsparser-0.6.9" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -78282,7 +78382,7 @@ in }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."globby-11.0.2" + sources."globby-11.0.3" sources."tslib-2.1.0" ]; }) @@ -78652,7 +78752,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -78673,7 +78773,7 @@ in sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -78807,10 +78907,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.6.1"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.6.1.tgz"; - sha512 = "Av2RMjTVJtFthl+XTfgtvbXY6K19GgjV/kyeqSkLklmWDpJle8dYhsodosx5tquBsLyOQQxrkpC4cZcGk3+IoA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.7.0.tgz"; + sha512 = "mQaNZ0EE/lOFIc7ycLRSsyWSWKqAAH1/0ND9V9A8HFqu3tAdfTfhxiUUj8dDv1u0u4YVG5hZjpco+AmxeJEnlg=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.7" @@ -78821,10 +78921,10 @@ in sources."@google-cloud/promisify-2.0.3" (sources."@google-cloud/pubsub-2.10.0" // { dependencies = [ - sources."google-auth-library-7.0.2" + sources."google-auth-library-7.0.3" ]; }) - (sources."@grpc/grpc-js-1.2.11" // { + (sources."@grpc/grpc-js-1.2.12" // { dependencies = [ sources."semver-6.3.0" ]; @@ -78835,7 +78935,7 @@ in sources."@opentelemetry/context-base-0.12.0" (sources."@opentelemetry/core-0.12.0" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."@opentelemetry/resources-0.12.0" @@ -78858,7 +78958,7 @@ in sources."@types/duplexify-3.6.0" sources."@types/glob-7.1.3" sources."@types/long-4.0.1" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-14.14.35" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -79011,6 +79111,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" + sources."cors-2.8.5" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" (sources."cross-env-5.2.1" // { @@ -79079,7 +79180,7 @@ in sources."events-listener-1.1.0" (sources."exegesis-2.5.6" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."exegesis-express-2.0.0" @@ -79183,7 +79284,7 @@ in sources."google-auth-library-6.1.6" (sources."google-gax-2.11.2" // { dependencies = [ - sources."google-auth-library-7.0.2" + sources."google-auth-library-7.0.3" ]; }) sources."google-p12-pem-3.0.3" @@ -79358,7 +79459,7 @@ in (sources."node-gyp-7.1.2" // { dependencies = [ sources."mkdirp-1.0.4" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."tar-6.1.0" sources."which-2.0.2" ]; @@ -79723,7 +79824,7 @@ in sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."arrify-2.0.1" @@ -79760,7 +79861,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."indent-string-4.0.0" @@ -79836,7 +79937,7 @@ in sources."run-async-2.4.1" sources."rxjs-6.6.6" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" @@ -79861,7 +79962,7 @@ in sources."tmp-0.0.33" sources."trim-newlines-3.0.0" sources."tslib-1.14.1" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."validate-npm-package-license-3.0.4" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -80632,7 +80733,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" @@ -80711,7 +80812,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" @@ -80838,7 +80939,7 @@ in sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -80863,7 +80964,7 @@ in sources."to-readable-stream-1.0.0" sources."trim-newlines-3.0.0" sources."tslib-1.14.1" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."update-notifier-5.1.0" @@ -80916,24 +81017,21 @@ in sources."@exodus/schemasafe-1.0.0-rc.3" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" - (sources."@graphql-tools/batch-execute-7.0.0" // { + (sources."@graphql-tools/batch-execute-7.1.0" // { dependencies = [ - (sources."@graphql-tools/utils-7.6.0" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) + sources."@graphql-tools/utils-7.7.1" + sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/delegate-7.0.10" // { + (sources."@graphql-tools/delegate-7.1.1" // { dependencies = [ - sources."@graphql-tools/utils-7.6.0" + sources."@graphql-tools/utils-7.7.1" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.6.0" + sources."@graphql-tools/utils-7.7.1" sources."tslib-2.1.0" ]; }) @@ -80944,7 +81042,7 @@ in }) (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - (sources."@graphql-tools/utils-7.6.0" // { + (sources."@graphql-tools/utils-7.7.1" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -80952,21 +81050,21 @@ in ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.10" // { + (sources."@graphql-tools/merge-6.2.11" // { dependencies = [ - sources."@graphql-tools/utils-7.6.0" + sources."@graphql-tools/utils-7.7.1" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/schema-7.1.3" // { dependencies = [ - sources."@graphql-tools/utils-7.6.0" + sources."@graphql-tools/utils-7.7.1" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/url-loader-6.8.2" // { dependencies = [ - sources."@graphql-tools/utils-7.6.0" + sources."@graphql-tools/utils-7.7.1" sources."cross-fetch-3.1.1" sources."form-data-4.0.0" sources."tslib-2.1.0" @@ -80983,7 +81081,7 @@ in }) (sources."@graphql-tools/wrap-7.0.5" // { dependencies = [ - (sources."@graphql-tools/utils-7.6.0" // { + (sources."@graphql-tools/utils-7.7.1" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -81002,9 +81100,9 @@ in sources."@types/websocket-1.0.2" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."ansi-regex-4.1.0" @@ -81353,7 +81451,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."querystringify-2.2.0" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."reftools-1.1.8" sources."regexp.prototype.flags-1.3.1" @@ -81883,7 +81981,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."ansi-term-0.0.2" @@ -81947,7 +82045,7 @@ in }) sources."systeminformation-4.34.19" sources."term-canvas-0.0.5" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."wordwrap-0.0.3" sources."x256-0.0.2" sources."xml2js-0.4.23" @@ -82841,7 +82939,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -82980,7 +83078,7 @@ in sources."object-inspect-1.9.0" sources."opener-1.5.2" sources."portfinder-1.0.28" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."side-channel-1.0.4" @@ -83752,7 +83850,7 @@ in sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."cli-cursor-3.1.0" @@ -83836,7 +83934,7 @@ in sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -83903,7 +84001,7 @@ in sources."tree-kill-1.2.2" sources."tslib-1.14.1" sources."type-check-0.3.2" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -84123,7 +84221,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semaphore-async-await-1.5.1" - (sources."semver-7.3.4" // { + (sources."semver-7.3.5" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -84381,7 +84479,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.868.0" // { + (sources."aws-sdk-2.871.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -84739,7 +84837,7 @@ in sources."debug-4.3.2" sources."html-minifier-4.0.0" sources."ms-2.1.2" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" ]; }) sources."minimatch-3.0.4" @@ -84879,7 +84977,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."saxes-3.1.11" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" @@ -85127,7 +85225,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -85298,7 +85396,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."side-channel-1.0.4" @@ -85497,7 +85595,7 @@ in sources."responselike-1.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."semver-compare-1.0.0" (sources."semver-diff-3.1.1" // { dependencies = [ @@ -85588,13 +85686,264 @@ in bypassCache = true; reconstructLock = true; }; + kaput-cli = nodeEnv.buildNodePackage { + name = "kaput-cli"; + packageName = "kaput-cli"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kaput-cli/-/kaput-cli-1.1.1.tgz"; + sha512 = "JbF3PiO1wNawJnOQlb4nJZ2rvDfDWnD7ROCdzqgFXhqi3XTNXBqjpoC7PT3ylfNR6BGibjchndH27VieqyMA0A=="; + }; + dependencies = [ + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + sources."@oclif/command-1.8.0" + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) + sources."@oclif/errors-1.3.4" + sources."@oclif/linewrap-1.0.0" + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + ]; + }) + (sources."@oclif/plugin-help-3.2.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + ]; + }) + sources."@oclif/screen-1.0.4" + sources."@putdotio/api-client-8.15.1" + sources."ajv-6.12.6" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" + sources."argparse-1.0.10" + sources."array-union-2.1.0" + sources."asynckit-0.4.0" + sources."axios-0.19.2" + sources."braces-3.0.2" + sources."call-bind-1.0.2" + sources."cardinal-2.1.1" + (sources."chalk-4.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chardet-0.7.0" + sources."clean-stack-3.0.1" + sources."cli-cursor-3.1.0" + sources."cli-progress-3.9.0" + (sources."cli-ux-5.5.1" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + sources."tslib-2.1.0" + ]; + }) + sources."cli-width-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + (sources."conf-6.2.4" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."d-1.0.1" // { + dependencies = [ + sources."type-1.2.0" + ]; + }) + sources."debounce-fn-3.0.1" + sources."debug-4.3.2" + sources."delayed-stream-1.0.0" + sources."dir-glob-3.0.1" + sources."dot-prop-5.3.0" + sources."dotenv-8.2.0" + sources."emoji-regex-8.0.0" + sources."env-paths-2.2.1" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-symbol-3.1.3" + sources."escape-string-regexp-4.0.0" + sources."esprima-4.0.1" + sources."event-emitter-0.3.5" + sources."ext-1.4.0" + sources."external-editor-3.1.0" + sources."extract-stack-2.0.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.5" + sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.11.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."fill-range-7.0.1" + sources."find-up-3.0.0" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + sources."form-data-3.0.1" + sources."fs-extra-8.1.0" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" + sources."graceful-fs-4.2.6" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."hyperlinker-1.0.0" + sources."iconv-lite-0.4.24" + sources."ignore-5.1.8" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."inquirer-7.3.3" + sources."is-docker-2.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + sources."is-typedarray-1.0.0" + sources."is-wsl-2.2.0" + sources."isexe-2.0.0" + sources."js-base64-2.6.4" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."json-schema-typed-7.0.3" + sources."jsonfile-4.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."merge2-1.4.1" + sources."micromatch-4.0.2" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" + sources."mimic-fn-2.1.0" + sources."moment-2.29.1" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."natural-orderby-2.0.3" + sources."next-tick-1.0.0" + sources."nice-try-1.0.5" + sources."node-downloader-helper-1.0.17" + sources."object-inspect-1.9.0" + sources."object-treeify-1.1.33" + sources."onetime-5.1.2" + sources."os-tmpdir-1.0.2" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + sources."pkg-up-3.1.0" + sources."punycode-2.1.1" + sources."qs-6.10.1" + sources."queue-microtask-1.2.3" + sources."redeyed-2.1.1" + sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + sources."rxjs-6.6.6" + sources."safer-buffer-2.1.2" + sources."semver-7.3.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + sources."sprintf-js-1.0.3" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."supports-color-5.5.0" + (sources."supports-hyperlinks-2.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-regex-range-5.0.1" + sources."tslib-1.14.1" + sources."type-2.5.0" + sources."type-fest-0.21.3" + sources."typedarray-to-buffer-3.1.5" + sources."universalify-0.1.2" + sources."uri-js-4.4.1" + sources."urijs-1.19.6" + sources."which-1.3.1" + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" + sources."write-file-atomic-3.0.3" + sources."yallist-4.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI tools for Put.io"; + homepage = "https://github.com/davidchalifoux/kaput-cli"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.2.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.2.0.tgz"; - sha512 = "pCB8eNxGgdIdZeC885rbhZ/VyuOPNHUIDNL9EaaMf1NVzpvTjMO8a7zRTn51ZJhOOOxCSpalUdT1A8x76LyVqg=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.1.tgz"; + sha512 = "Is71g0f1dIpbLTXA+ULpev1i1soczQ1Dr8oum3zSmBFsDl3IWUlTLytsCb9os4v9xvUVWGDz0sCmLO4veANnSw=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" @@ -85728,7 +86077,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.24" + sources."ua-parser-js-0.7.25" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" @@ -86226,21 +86575,21 @@ in ]; }) sources."@octokit/graphql-4.6.1" - sources."@octokit/openapi-types-5.3.2" + sources."@octokit/openapi-types-6.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.13.3" sources."@octokit/plugin-request-log-1.0.3" - sources."@octokit/plugin-rest-endpoint-methods-4.13.5" + sources."@octokit/plugin-rest-endpoint-methods-4.14.0" (sources."@octokit/request-5.4.14" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.0.5" - sources."@octokit/rest-18.3.5" - sources."@octokit/types-6.12.2" + sources."@octokit/rest-18.4.0" + sources."@octokit/types-6.13.0" sources."@tootallnate/once-1.1.2" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" @@ -86251,9 +86600,9 @@ in sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."ansi-regex-2.1.1" @@ -86287,7 +86636,7 @@ in sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-7.0.1" - sources."cacache-15.0.5" + sources."cacache-15.0.6" sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" @@ -86455,7 +86804,7 @@ in sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."graceful-fs-4.2.6" sources."handlebars-4.7.7" sources."har-schema-2.0.0" @@ -86466,7 +86815,7 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -86559,7 +86908,6 @@ in sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.ismatch-4.4.0" - sources."lodash.sortby-4.7.0" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."loud-rejection-1.6.0" @@ -86678,13 +87026,13 @@ in sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."p-waterfall-2.1.1" - sources."pacote-11.3.0" + sources."pacote-11.3.1" sources."parent-module-1.0.1" sources."parse-github-repo-url-1.4.1" sources."parse-json-5.2.0" (sources."parse-path-4.0.3" // { dependencies = [ - sources."qs-6.10.0" + sources."qs-6.10.1" ]; }) sources."parse-url-5.0.2" @@ -86710,7 +87058,7 @@ in sources."q-1.5.1" sources."qs-6.5.2" sources."query-string-6.14.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-2.0.0" @@ -86755,7 +87103,7 @@ in sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" @@ -86818,7 +87166,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.0" @@ -86836,7 +87184,7 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.4.0" + sources."whatwg-url-8.5.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" (sources."wide-align-1.1.3" // { @@ -87786,7 +88134,7 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" sources."@babel/core-7.13.10" sources."@babel/generator-7.13.9" sources."@babel/helper-annotate-as-pure-7.12.13" @@ -87799,14 +88147,14 @@ in sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.0" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" @@ -87818,7 +88166,8 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.13.8" sources."@babel/plugin-proposal-class-properties-7.13.0" @@ -87830,7 +88179,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.12" sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -87880,13 +88229,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.13.10" + sources."@babel/preset-env-7.13.12" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.13.10" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -87901,7 +88250,7 @@ in sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.11.1" - sources."@types/estree-0.0.46" + sources."@types/estree-0.0.47" sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" @@ -88080,7 +88429,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -88204,7 +88553,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -88235,7 +88584,7 @@ in sources."esutils-2.0.3" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - sources."exec-sh-0.3.4" + sources."exec-sh-0.3.6" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -88601,12 +88950,12 @@ in sources."realpath-native-2.0.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.7" // { + (sources."regjsparser-0.6.9" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -89529,7 +89878,7 @@ in sources."through-2.3.8" sources."try-catch-2.0.1" sources."try-to-catch-1.1.1" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" sources."unbzip2-stream-1.4.3" sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" @@ -89559,7 +89908,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.14" - sources."@fluentui/react-7.165.0" + sources."@fluentui/react-7.165.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -89699,7 +90048,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.165.0" + sources."office-ui-fabric-react-7.165.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -89756,7 +90105,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."scheduler-0.19.1" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -89992,7 +90341,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."side-channel-1.0.4" @@ -90051,7 +90400,7 @@ in sources."process-nextick-args-2.0.1" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" @@ -90081,14 +90430,14 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.13.5"; + version = "3.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.13.5.tgz"; - sha512 = "H077yu7Tt7uPqTnN6ZEtKrFwVsvkAyiPDmHzOxA13g9h/5Ho9tUEFhOrxsYRo/CNqdYDqvun5edBcyvNmif+ow=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.13.7.tgz"; + sha512 = "I5aY4yOi3R5yNzhMy3RK9LG42jD422Eni/iiwv7+As9EpkYYcWXFwPLy7mE1bxE9xtyxkE1zKxKqEqDjLqt2kA=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" (sources."@babel/core-7.13.10" // { dependencies = [ sources."semver-6.3.0" @@ -90113,14 +90462,14 @@ in sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.0" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" @@ -90128,7 +90477,8 @@ in sources."@babel/helper-wrap-function-7.13.0" sources."@babel/helpers-7.13.10" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.8" sources."@babel/plugin-proposal-class-properties-7.13.0" sources."@babel/plugin-proposal-dynamic-import-7.13.8" @@ -90139,7 +90489,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.12" sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -90186,7 +90536,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.13.10" // { + (sources."@babel/preset-env-7.13.12" // { dependencies = [ sources."semver-6.3.0" ]; @@ -90195,7 +90545,7 @@ in sources."@babel/runtime-7.13.10" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@bugsnag/browser-7.9.0" sources."@bugsnag/core-7.9.0" sources."@bugsnag/cuid-3.0.0" @@ -90205,7 +90555,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-9.11.2" // { + (sources."@netlify/build-9.13.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -90220,7 +90570,7 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-4.2.0" // { + (sources."@netlify/config-4.3.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -90244,7 +90594,7 @@ in ]; }) sources."@netlify/open-api-1.3.0" - (sources."@netlify/plugin-edge-handlers-1.11.5" // { + (sources."@netlify/plugin-edge-handlers-1.11.6" // { dependencies = [ sources."@nodelib/fs.stat-2.0.4" sources."array-union-2.1.0" @@ -90254,7 +90604,7 @@ in sources."fast-glob-3.2.5" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."ignore-5.1.8" sources."is-number-7.0.0" sources."micromatch-4.0.2" @@ -90263,7 +90613,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/plugins-list-2.4.3" + sources."@netlify/plugins-list-2.5.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -90332,7 +90682,7 @@ in sources."fast-glob-3.2.5" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."ignore-5.1.8" sources."is-number-7.0.0" sources."micromatch-4.0.2" @@ -90408,7 +90758,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-5.3.2" + sources."@octokit/openapi-types-6.0.0" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -90433,7 +90783,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.12.2" + sources."@octokit/types-6.13.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -90470,7 +90820,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/mkdirp-0.5.2" sources."@types/node-14.14.35" sources."@types/node-fetch-2.5.8" @@ -90545,7 +90895,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.868.0" // { + (sources."aws-sdk-2.871.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -90619,7 +90969,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -90679,7 +91029,7 @@ in }) (sources."cli-ux-5.5.1" // { dependencies = [ - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."chalk-4.1.0" @@ -90689,7 +91039,7 @@ in sources."js-yaml-3.14.1" sources."supports-hyperlinks-2.1.0" sources."tslib-2.1.0" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."cli-width-2.2.1" @@ -90877,7 +91227,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -90888,7 +91238,7 @@ in sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.9.6" + sources."esbuild-0.9.7" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -91188,10 +91538,10 @@ in }) (sources."inquirer-autocomplete-prompt-1.3.0" // { dependencies = [ - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) sources."into-stream-3.1.0" @@ -91437,7 +91787,7 @@ in sources."@netlify/zip-it-and-ship-it-2.7.1" sources."esbuild-0.8.57" sources."locate-path-5.0.0" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" ]; @@ -91638,7 +91988,7 @@ in sources."qs-6.7.0" sources."query-string-5.1.1" sources."querystring-0.2.0" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" sources."random-item-3.1.0" sources."randombytes-2.1.0" @@ -91661,14 +92011,14 @@ in sources."redeyed-2.1.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.7" // { + (sources."regjsparser-0.6.9" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -91695,7 +92045,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.42.1" + sources."rollup-2.42.4" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -91718,7 +92068,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -92161,7 +92511,7 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."sshpk-1.16.1" @@ -92979,7 +93329,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-1.1.14" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" (sources."request-2.88.0" // { @@ -93222,7 +93572,7 @@ in sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."slasp-0.0.4" @@ -93485,7 +93835,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."any-observable-0.5.1" @@ -93582,7 +93932,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" - sources."globby-11.0.2" + sources."globby-11.0.3" (sources."got-10.7.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -93771,7 +94121,7 @@ in }) (sources."normalize-package-data-3.0.2" // { dependencies = [ - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" ]; }) sources."normalize-url-4.5.0" @@ -93863,7 +94213,7 @@ in sources."escape-goat-2.1.1" ]; }) - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" sources."rc-1.2.8" (sources."read-pkg-5.2.0" // { @@ -93898,7 +94248,7 @@ in sources."rxjs-6.6.6" sources."safer-buffer-2.1.2" sources."scoped-regex-2.1.0" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -93929,7 +94279,7 @@ in sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" sources."tslib-1.14.1" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" (sources."update-notifier-5.1.0" // { @@ -93974,10 +94324,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.6.3"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.6.3.tgz"; - sha512 = "+Cs8TEtkfdQGTIPw8AeqVtNNHyo1Zw8HATzAFFWYnK7jQYgT/CatEy85+BlEoEpqvga2uaKqVrXsTAYj28emjg=="; + url = "https://registry.npmjs.org/npm/-/npm-7.7.4.tgz"; + sha512 = "+gUjp4hbUnN7S1z2S3uDTnac94uRiztzFkMLNimHsB4KpuvhO+xjg30ARoptq7UYqF6KTXA4L8XLDMuriyB9Fg=="; }; buildInputs = globalBuildInputs; meta = { @@ -94049,7 +94399,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."builtins-1.0.3" - sources."cacache-15.0.5" + sources."cacache-15.0.6" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -94120,7 +94470,7 @@ in sources."ini-2.0.0" ]; }) - sources."globby-11.0.2" + sources."globby-11.0.3" sources."got-9.6.0" sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" @@ -94128,7 +94478,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -94241,7 +94591,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.0" + sources."pacote-11.3.1" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -94259,7 +94609,7 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."qs-6.5.2" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" sources."read-package-json-fast-2.0.2" @@ -94276,7 +94626,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -94577,7 +94927,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" (sources."@babel/core-7.13.10" // { dependencies = [ sources."json5-2.2.0" @@ -94608,14 +94958,14 @@ in sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.0" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" @@ -94623,7 +94973,8 @@ in sources."@babel/helper-wrap-function-7.13.0" sources."@babel/helpers-7.13.10" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.8" sources."@babel/plugin-proposal-class-properties-7.13.0" sources."@babel/plugin-proposal-dynamic-import-7.13.8" @@ -94634,7 +94985,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.12" sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -94675,7 +95026,7 @@ in sources."@babel/plugin-transform-object-super-7.12.13" sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.12.17" + sources."@babel/plugin-transform-react-jsx-7.13.12" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" sources."@babel/plugin-transform-shorthand-properties-7.12.13" @@ -94685,7 +95036,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.13.10" // { + (sources."@babel/preset-env-7.13.12" // { dependencies = [ sources."semver-6.3.0" ]; @@ -94694,7 +95045,7 @@ in sources."@babel/runtime-7.13.10" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -94816,7 +95167,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -94951,7 +95302,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.693" + sources."electron-to-chromium-1.3.699" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95352,7 +95703,7 @@ in sources."readdirp-2.2.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -95362,7 +95713,7 @@ in }) sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.7" // { + (sources."regjsparser-0.6.9" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -95794,7 +96145,7 @@ in sources."serve-static-1.14.1" (sources."service-runner-2.8.1" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" sources."yargs-14.2.3" ]; }) @@ -95815,7 +96166,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -96133,7 +96484,7 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.1" sources."pump-2.0.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -96482,7 +96833,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-bytes-1.0.0" @@ -96840,7 +97191,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - (sources."semver-7.3.4" // { + (sources."semver-7.3.5" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -96993,7 +97344,7 @@ in sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."ignore-5.1.8" @@ -97030,7 +97381,7 @@ in sources."postcss-load-config-3.0.1" sources."postcss-reporter-7.0.2" sources."pretty-hrtime-1.0.3" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" @@ -97448,10 +97799,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.123"; + version = "1.1.125"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.123.tgz"; - sha512 = "EYjELbm4G4icuIki6PfpzYrxNeGH78vNbXNmsbb/9XnnVQISdFcbc9oOBc2mU77enUwZctwZ6Nj2mZUMD9VibQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.125.tgz"; + sha512 = "MPaMGCnMR0i0VePXUPpXMHr23A2mkbW1Su+aTAWsqHho1rhQcxBtjeyhR0xqiwTxcC+c9eK9VwFHbd+OMGC6fQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -97930,7 +98281,6 @@ in sources."jsprim-1.4.1" sources."levn-0.3.0" sources."lodash-4.17.21" - sources."lodash.sortby-4.7.0" sources."mime-db-1.46.0" sources."mime-types-2.1.29" sources."nwsapi-2.2.0" @@ -97977,7 +98327,7 @@ in sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.4.0" + sources."whatwg-url-8.5.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."ws-7.4.4" @@ -98014,15 +98364,15 @@ in sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."@babel/runtime-7.13.10" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -98252,7 +98602,7 @@ in sources."readdirp-3.5.0" sources."redoc-2.0.0-rc.48" sources."reftools-1.1.8" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."ripemd160-2.0.2" @@ -98289,7 +98639,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.1.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -98390,10 +98740,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.42.1"; + version = "2.42.4"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.42.1.tgz"; - sha512 = "/y7M2ULg06JOXmMpPzhTeQroJSchy8lX8q6qrjqil0jmLz6ejCWbQzVnWTsdmMQRhfU0QcwtiW8iZlmrGXWV4g=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.42.4.tgz"; + sha512 = "Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -98441,19 +98791,19 @@ in sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/mocha-8.2.2" sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.8" sources."@types/resolve-1.17.1" sources."@types/vscode-1.54.0" - sources."@typescript-eslint/eslint-plugin-4.18.0" - sources."@typescript-eslint/experimental-utils-4.18.0" - sources."@typescript-eslint/parser-4.18.0" - sources."@typescript-eslint/scope-manager-4.18.0" - sources."@typescript-eslint/types-4.18.0" - sources."@typescript-eslint/typescript-estree-4.18.0" - sources."@typescript-eslint/visitor-keys-4.18.0" + sources."@typescript-eslint/eslint-plugin-4.19.0" + sources."@typescript-eslint/experimental-utils-4.19.0" + sources."@typescript-eslint/parser-4.19.0" + sources."@typescript-eslint/scope-manager-4.19.0" + sources."@typescript-eslint/types-4.19.0" + sources."@typescript-eslint/typescript-estree-4.19.0" + sources."@typescript-eslint/visitor-keys-4.19.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -98595,7 +98945,7 @@ in sources."type-fest-0.20.2" ]; }) - sources."globby-11.0.2" + sources."globby-11.0.3" sources."graceful-fs-4.2.6" sources."growl-1.10.5" sources."has-1.0.3" @@ -98697,7 +99047,7 @@ in sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."punycode-2.1.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."read-1.0.7" (sources."readable-stream-2.3.7" // { @@ -98713,10 +99063,10 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.42.1" + sources."rollup-2.42.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."serialize-javascript-5.0.1" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" @@ -98987,10 +99337,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; - sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; dependencies = [ sources."lru-cache-6.0.0" @@ -99115,10 +99465,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.30.3"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.30.3.tgz"; - sha512 = "a/81mGvXwzw90iBGKRcXdVw0lKMWzECh/3BpX8BJvgjCSINmUPjA/HSTota2UWTFp7Ne1vuiBEiLT4x8E/6kgQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.31.0.tgz"; + sha512 = "gqjiMemQKvOEYgAQB8IuPA4v6GMg83kkxREy8i55oHnv4xwMJQ2RX11Z83Sk05qPR5fl59e3ZNuLgvXZKoOgBA=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -99150,7 +99500,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.7.5" // { + (sources."@serverless/components-3.7.7" // { dependencies = [ (sources."@serverless/utils-3.1.0" // { dependencies = [ @@ -99177,13 +99527,13 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-4.5.1" // { + (sources."@serverless/enterprise-plugin-4.5.2" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.1" // { + (sources."@serverless/platform-client-4.2.2" // { dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" @@ -99233,7 +99583,7 @@ in sources."string-width-3.1.0" ]; }) - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -99272,7 +99622,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.868.0" // { + (sources."aws-sdk-2.871.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -99545,7 +99895,7 @@ in sources."github-from-package-0.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" (sources."got-11.8.2" // { dependencies = [ sources."@sindresorhus/is-4.0.0" @@ -99791,7 +100141,7 @@ in sources."qs-6.5.2" sources."query-string-5.1.1" sources."querystring-0.2.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."ramda-0.26.1" sources."rc-1.2.8" @@ -99822,7 +100172,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" @@ -99941,7 +100291,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-2.5.0" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" sources."universalify-0.1.2" @@ -100641,10 +100991,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.503.0"; + version = "1.509.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.503.0.tgz"; - sha512 = "CCDlwvQJ/TyR6cbG38p/TxzE313CIvtPJe8LIxplfoLj6yswRtwspY5iYCOW4wdUzbZQyXk/Y4A7VSjXhBL9qQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.509.0.tgz"; + sha512 = "3vdfa79Phr16O6Laun5zkNOxhQ7VIPeqb+aWwREkY3xOldLiZmOgQxfwKkllc/kImDmxB1CdDmRRwSJvPGMJ3Q=="; }; dependencies = [ sources."@deepcode/dcignore-1.0.2" @@ -100656,7 +101006,7 @@ in sources."@sindresorhus/is-2.1.1" sources."@snyk/cli-interface-2.11.0" sources."@snyk/cocoapods-lockfile-parser-3.6.2" - (sources."@snyk/code-client-3.1.4" // { + (sources."@snyk/code-client-3.1.5" // { dependencies = [ sources."uuid-8.3.2" ]; @@ -100664,7 +101014,7 @@ in sources."@snyk/composer-lockfile-parser-1.4.1" (sources."@snyk/dep-graph-1.28.0" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."@snyk/docker-registry-v2-client-1.13.9" @@ -100674,7 +101024,7 @@ in sources."@snyk/graphlib-2.1.9-patch.3" (sources."@snyk/inquirer-7.3.3-patch" // { dependencies = [ - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."chalk-4.1.0" sources."strip-ansi-6.0.0" ]; @@ -100826,7 +101176,7 @@ in sources."string_decoder-1.3.0" ]; }) - sources."dockerfile-ast-0.1.0" + sources."dockerfile-ast-0.2.0" sources."dot-prop-5.3.0" sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" @@ -101071,7 +101421,7 @@ in }) sources."pupa-2.1.1" sources."queue-6.0.2" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."raw-body-2.4.1" sources."rc-1.2.8" @@ -101109,9 +101459,10 @@ in sources."tslib-2.1.0" ]; }) - (sources."snyk-docker-plugin-4.17.3" // { + (sources."snyk-docker-plugin-4.19.3" // { dependencies = [ sources."rimraf-3.0.2" + sources."semver-7.3.5" sources."snyk-nodejs-lockfile-parser-1.30.2" sources."tmp-0.2.1" sources."uuid-8.3.2" @@ -101178,7 +101529,7 @@ in sources."yallist-3.1.1" ]; }) - sources."snyk-python-plugin-1.19.5" + sources."snyk-python-plugin-1.19.7" sources."snyk-resolve-1.1.0" (sources."snyk-resolve-deps-4.7.2" // { dependencies = [ @@ -101257,7 +101608,7 @@ in sources."tslib-1.14.1" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."unpipe-1.0.0" @@ -101538,7 +101889,7 @@ in sources."random-access-storage-1.3.0" ]; }) - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."abstract-leveldown-6.0.3" sources."aligned-block-file-1.2.2" sources."ansi-escapes-1.4.0" @@ -101727,7 +102078,7 @@ in sources."extend.js-0.0.2" sources."extglob-0.3.2" sources."fastintcompression-0.0.4" - sources."fastpriorityqueue-0.6.3" + sources."fastpriorityqueue-0.7.0" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" @@ -101881,7 +102232,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-2.3.3" // { + (sources."jitdb-2.3.4" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.0" @@ -102576,7 +102927,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.868.0" // { + (sources."aws-sdk-2.871.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -103168,7 +103519,7 @@ in dependencies = [ sources."debug-3.2.7" sources."form-data-2.5.1" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -103181,7 +103532,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.14.1" sources."lodash-3.10.1" - sources."qs-6.10.0" + sources."qs-6.10.1" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -103353,18 +103704,18 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.11" + sources."@babel/compat-data-7.13.12" sources."@babel/core-7.13.10" sources."@babel/generator-7.13.9" sources."@babel/helper-compilation-targets-7.13.10" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.13.12" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" @@ -103374,10 +103725,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.11" + sources."@babel/parser-7.13.12" sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -103403,7 +103754,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -103441,7 +103792,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -103467,13 +103818,13 @@ in sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-4.0.1" + sources."hosted-git-info-4.0.2" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" @@ -103539,7 +103890,7 @@ in sources."node-releases-1.1.71" (sources."normalize-package-data-3.0.2" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."normalize-range-0.1.2" @@ -103579,7 +103930,7 @@ in sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -103674,17 +104025,17 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.12.22"; + version = "0.12.24"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.22.tgz"; - sha512 = "Wb1gazaGXc2efzq6x+RUHA1BXNnYikFPHHN4eIO1Ju3Gl1OJ4oHpzOloKGN+dH3awche6xQjlo4Uo7ONrWPwOw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.24.tgz"; + sha512 = "kArBDbgiSj24dgd+u9KU9XgmN6plEETUQDgXcj9o/XEYp6Ii2VBZwxTbIxHAa4AFcOwIUxq5B6gX8zzt3y7v+Q=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.13.10" - sources."@emmetio/abbreviation-2.2.1" - sources."@emmetio/css-abbreviation-2.1.2" + sources."@emmetio/abbreviation-2.2.2" + sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" sources."@types/node-14.14.35" sources."@types/parse-json-4.0.0" @@ -103702,7 +104053,7 @@ in sources."cosmiconfig-7.0.0" sources."dedent-js-1.0.1" sources."detect-indent-6.0.0" - sources."emmet-2.3.2" + sources."emmet-2.3.4" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" @@ -103739,7 +104090,7 @@ in sources."supports-color-5.5.0" sources."svelte-3.35.0" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.182" + sources."svelte2tsx-0.1.184" sources."to-regex-range-5.0.1" sources."tslib-2.1.0" sources."typescript-4.2.3" @@ -103780,7 +104131,7 @@ in sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-7.1.0" + sources."commander-7.2.0" sources."css-select-3.1.2" sources."css-tree-1.1.2" sources."css-what-4.0.0" @@ -104208,7 +104559,7 @@ in dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" - sources."qs-6.10.0" + sources."qs-6.10.1" sources."superagent-3.8.3" ]; }) @@ -104386,7 +104737,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -105100,7 +105451,7 @@ in sources."mdast-comment-marker-1.1.2" sources."mdast-util-mdx-0.1.1" sources."mdast-util-mdx-expression-0.1.1" - sources."mdast-util-mdx-jsx-0.1.3" + sources."mdast-util-mdx-jsx-0.1.4" sources."mdast-util-mdxjs-esm-0.1.1" sources."mdast-util-to-markdown-0.6.5" sources."mdast-util-to-nlcst-4.0.1" @@ -105572,7 +105923,7 @@ in sources."@textlint/types-1.5.4" sources."boundary-1.0.1" sources."lodash-4.17.21" - sources."split-lines-2.0.0" + sources."split-lines-2.1.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."unist-util-is-3.0.0" @@ -106043,7 +106394,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-2.0.0" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -106285,7 +106636,7 @@ in sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."sprintf-0.1.5" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -106646,10 +106997,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.1.tgz"; - sha512 = "EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.2.tgz"; + sha512 = "SbMu4D2Vo95LMC/MetNaso1194M1htEA+JrqE9Hk+G2DhI+itfS9TRu9ZKeCahLDNa/J3n4MqUJ/fOHMzQpRWw=="; }; buildInputs = globalBuildInputs; meta = { @@ -106884,7 +107235,7 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."semver-7.3.4" // { + (sources."semver-7.3.5" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -106998,7 +107349,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."d3-array-2.12.0" + sources."d3-array-2.12.1" sources."d3-color-2.0.0" sources."d3-delaunay-5.3.0" sources."d3-dispatch-2.0.0" @@ -108105,8 +108456,8 @@ in sources."v8-compile-cache-2.3.0" sources."vm-browserify-1.1.2" sources."vsce-1.87.0" - sources."vscode-debugadapter-testsupport-1.45.0" - sources."vscode-debugprotocol-1.45.0" + sources."vscode-debugadapter-testsupport-1.46.0" + sources."vscode-debugprotocol-1.46.0" (sources."watchpack-1.7.5" // { dependencies = [ sources."chokidar-3.5.1" @@ -108433,7 +108784,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.13.1" + sources."uglify-js-3.13.2" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -109434,7 +109785,7 @@ in sources."@mdn/browser-compat-data-3.1.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-14.14.35" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" @@ -109896,7 +110247,7 @@ in }) sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."regexp.prototype.flags-1.3.1" sources."regexpp-3.1.0" sources."registry-auth-token-4.2.1" @@ -110040,10 +110391,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.27.1"; + version = "5.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.27.1.tgz"; - sha512 = "rxIDsPZ3Apl3JcqiemiLmWH+hAq04YeOXqvCxNZOnTp8ZgM9NEPtbu4CaMfMEf9KShnx/Ym8uLGmM6P4XnwCoA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz"; + sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg=="; }; dependencies = [ sources."@types/eslint-7.2.7" @@ -110073,11 +110424,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.3" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001203" + sources."caniuse-lite-1.0.30001204" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.693" + sources."electron-to-chromium-1.3.699" sources."enhanced-resolve-5.7.0" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" @@ -110152,7 +110503,7 @@ in sources."ansi-colors-4.1.1" sources."clone-deep-4.0.1" sources."colorette-1.2.2" - sources."commander-7.1.0" + sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."enquirer-2.3.6" sources."envinfo-7.7.4" @@ -110217,7 +110568,7 @@ in }; dependencies = [ sources."@types/glob-7.1.3" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-14.14.35" sources."accepts-1.3.7" sources."ajv-6.12.6" @@ -110791,10 +111142,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.0.0.tgz"; - sha512 = "sqGe2FsB67wV/De+sz5azQklADe4thN016od6m7iK9KbjrSc1SEgg5QZ0LN+jGx5aZR52CbuXbqOhoIbqzzXlA=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.1.0.tgz"; + sha512 = "Soiq8kXI2AZkpw3dSp18u6oU2JonC7UKv3UdXsKOmT1A5QT46ku9+6c0Qy29JDbSavQJNN1/eKGpd3QNw+cZWg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -110812,7 +111163,7 @@ in sources."fastq-1.11.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.3" sources."ignore-5.1.8" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" @@ -110825,7 +111176,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."punycode-2.1.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" @@ -111055,7 +111406,7 @@ in sources."protobufjs-6.10.2" sources."pump-3.0.0" sources."qap-3.3.1" - sources."queue-microtask-1.2.2" + sources."queue-microtask-1.2.3" sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -111136,7 +111487,7 @@ in sources."utp-native-2.3.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.115.4" // { + (sources."webtorrent-0.116.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -111292,7 +111643,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" - sources."@types/minimatch-3.0.3" + sources."@types/minimatch-3.0.4" sources."@types/node-14.14.35" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" @@ -111544,7 +111895,7 @@ in sources."glob-to-regexp-0.3.0" (sources."global-agent-2.1.12" // { dependencies = [ - sources."semver-7.3.4" + sources."semver-7.3.5" ]; }) sources."global-dirs-0.1.1" @@ -111869,7 +112220,7 @@ in sources."indent-string-2.1.0" ]; }) - sources."regenerator-runtime-0.13.7" + sources."regenerator-runtime-0.13.8" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" @@ -112132,7 +112483,7 @@ in sources."yeoman-doctor-4.0.0" (sources."yeoman-environment-2.10.3" // { dependencies = [ - sources."ansi-escapes-4.3.1" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."cli-cursor-3.1.0" @@ -112159,7 +112510,7 @@ in sources."onetime-5.1.2" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."string-width-4.2.2" // { @@ -112173,7 +112524,7 @@ in ]; }) sources."supports-color-7.2.0" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."which-2.0.2" ]; }) @@ -112211,7 +112562,7 @@ in sources."pify-4.0.1" sources."read-pkg-5.2.0" sources."read-pkg-up-5.0.0" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."slash-2.0.0" sources."type-fest-0.6.0" ]; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 4c845273d71..92d89afe398 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, +{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib +, ocaml-migrate-parsetree , ppx_tools_versioned , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt @@ -22,7 +23,17 @@ stdenv.mkDerivation rec sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz"; }; - buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline + patches = [ + # Compatibility with js_of_ocaml >= 3.9.0, remove at next release + (fetchpatch { + url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch"; + sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p"; + }) + ]; + + buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild + ocaml-migrate-parsetree + js_of_ocaml-ppx_deriving_json opaline ppx_tools_versioned ]; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 2a437cd29d3..5c7d36fcc08 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,35 +1,29 @@ -{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, cppo, minimal ? true }: +{ stdenv, lib, fetchurl, ocaml, findlib, cppo +# De facto, option minimal seems to be the default. See the README. +, minimal ? true +}: -assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.7"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-extlib"; + version = "1.7.8"; src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; - sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; + url = "https://ygrek.org/p/release/ocaml-extlib/extlib-${version}.tar.gz"; + sha256 = "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k"; }; - patches = [ - (fetchpatch { - url = "https://github.com/ygrek/ocaml-extlib/pull/55.patch"; - sha256 = "0mj3xii56rh8j8brdyv5d06rbs6jjjcy4ib9chafkq3f3sbq795p"; - }) - ]; - buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true; + dontConfigure = true; - dontConfigure = true; # Skip configure - # De facto, option minimal=1 seems to be the default. See the README. - buildPhase = "make ${if minimal then "minimal=1" else ""} build"; - installPhase = "make ${if minimal then "minimal=1" else ""} install"; + makeFlags = lib.optional minimal "minimal=1"; meta = { homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; platforms = ocaml.meta.platforms or []; + maintainers = [ lib.maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix new file mode 100644 index 00000000000..666eb684925 --- /dev/null +++ b/pkgs/development/ocaml-modules/faraday/async.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, faraday, core, async }: + +buildDunePackage rec { + pname = "faraday-async"; + inherit (faraday) version src useDune2; + + minimumOCamlVersion = "4.08"; + + propagatedBuildInputs = [ faraday core async ]; + + meta = faraday.meta // { + description = "Async support for Faraday"; + }; +} diff --git a/pkgs/development/ocaml-modules/faraday/lwt-unix.nix b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix new file mode 100644 index 00000000000..23914de2657 --- /dev/null +++ b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, faraday, faraday-lwt, lwt }: + +buildDunePackage rec { + pname = "faraday-lwt-unix"; + inherit (faraday) version src useDune2 minimumOCamlVersion; + + propagatedBuildInputs = [ lwt faraday-lwt ]; + + meta = faraday.meta // { + description = "Lwt + Unix support for Faraday"; + }; +} diff --git a/pkgs/development/ocaml-modules/faraday/lwt.nix b/pkgs/development/ocaml-modules/faraday/lwt.nix new file mode 100644 index 00000000000..7fe7319575c --- /dev/null +++ b/pkgs/development/ocaml-modules/faraday/lwt.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, faraday, lwt }: + +buildDunePackage rec { + pname = "faraday-lwt"; + inherit (faraday) version src useDune2 minimumOCamlVersion; + + propagatedBuildInputs = [ faraday lwt ]; + + meta = faraday.meta // { + description = "Lwt support for Faraday"; + }; +} diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 0fd66226e36..b8d73178d09 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.3.2"; + version = "3.3.3"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv"; + sha256 = "0j8pw9w74bfhrjsqr8zm8g7h1az94z9vg7qgc6z6649zm9yjiax3"; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 0bcdd78095c..738828e8308 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -182,7 +182,8 @@ rec { base_quickcheck = janePackage { pname = "base_quickcheck"; - hash = "1lmp1h68g0gqiw8m6gqcbrp0fn76nsrlsqrwxp20d7jhh0693f3j"; + version = "0.14.1"; + hash = "0apq3d9xb0zdaqsl4cjk5skyig57ff1plndb2mh0nn3czvfhifxs"; minimumOCamlVersion = "4.04.2"; meta.description = "Randomized testing framework, designed for compatibility with Base"; propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ]; @@ -450,7 +451,8 @@ rec { ppx_custom_printf = janePackage { pname = "ppx_custom_printf"; - hash = "0p9hgx0krxqw8hlzfv2bg2m3zi5nxsnzhyp0fj5936rapad02hc5"; + version = "0.14.1"; + hash = "0c1m65kn27zvwmfwy7kk46ga76yw2a3ik9jygpy1b6nn6pi026w9"; minimumOCamlVersion = "4.04.2"; meta.description = "Printf-style format-strings for user-defined string conversion"; propagatedBuildInputs = [ ppx_sexp_conv ]; @@ -466,7 +468,8 @@ rec { ppx_expect = janePackage { pname = "ppx_expect"; - hash = "05v6jzn1nbmwk3vzxxnb3380wzg2nb28jpb3v5m5c4ikn0jrhcwn"; + version = "0.14.1"; + hash = "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv"; minimumOCamlVersion = "4.04.2"; meta.description = "Cram like framework for OCaml"; propagatedBuildInputs = [ ppx_here ppx_inline_test re ]; @@ -559,7 +562,8 @@ rec { ppx_optcomp = janePackage { pname = "ppx_optcomp"; - hash = "1wav3zgh4244x1ll562g735cwwrzyk5jj72niq9jgz9qjlpsprlk"; + version = "0.14.1"; + hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4"; minimumOCamlVersion = "4.04.2"; meta.description = "Optional compilation for OCaml"; propagatedBuildInputs = [ ppxlib ]; @@ -591,16 +595,17 @@ rec { ppx_sexp_conv = janePackage { pname = "ppx_sexp_conv"; - version = "0.14.1"; + version = "0.14.3"; minimumOCamlVersion = "4.04.2"; - hash = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2"; + hash = "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj"; meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; propagatedBuildInputs = [ ppxlib sexplib0 base ]; }; ppx_sexp_message = janePackage { pname = "ppx_sexp_message"; - hash = "17xnq345xwfkl9ydn05ljsg37m2glh3alnspayl3fgbhmcjmav3i"; + version = "0.14.1"; + hash = "1lvsr0d68kakih1ll33hy6dxbjkly6lmky4q6z0h0hrcbd6z48k4"; minimumOCamlVersion = "4.04.2"; meta.description = "A ppx rewriter for easy construction of s-expressions"; propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; @@ -634,9 +639,9 @@ rec { ppx_typerep_conv = janePackage { pname = "ppx_typerep_conv"; - version = "0.14.1"; + version = "0.14.2"; minimumOCamlVersion = "4.04.2"; - hash = "1r0z7qlcpaicas5hkymy2q0gi207814wlay4hys7pl5asd59wcdh"; + hash = "0yk9vkpnwr8labgfncqdi4rfkj88d8mb3cr8m4gdqpi3f2r27hf0"; meta.description = "Generation of runtime types from type declarations"; propagatedBuildInputs = [ ppxlib typerep ]; }; diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix index 87fd72b7567..5ba6cb08cc6 100644 --- a/pkgs/development/ocaml-modules/npy/default.nix +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -2,15 +2,17 @@ buildDunePackage rec { pname = "npy"; - version = "unstable-2019-04-02"; + version = "0.0.9"; + + useDune2 = true; minimumOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "${pname}-ocaml"; - rev = "c051086bfea6bee58208098bcf1c2f725a80a1fb"; - sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb"; + rev = version; + sha256 = "1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1"; }; propagatedBuildInputs = [ camlzip ]; diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch b/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch new file mode 100644 index 00000000000..25a7b92f01f --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch @@ -0,0 +1,49 @@ +commit b273c9f7ab10475787db4d6e09bd4b71b374d0ec +Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> +Date: Thu Mar 18 01:28:46 2021 +0100 + + Let user specify solo5-binding to use + + This is a little feature for the configure script I wanted to have for + the NixOS package: It allows the user to set PKG_CONFIG_DEPS before + running configure.sh to disable the autodetection mechanism. This is + useful for NixOS as we have all bindings bundled in the solo5 package, + so the result would also be solo5-bindings-xen. Additionally, it allows + us to do the binding selection declaratively and minimize the risk of + accidentally switching backend. + + PKG_CONFIG_DEPS seems like a bit of an unappropriate variable name for a + user “interface”, let me know if you want a dedicated environment + variable for this in case there will be more PKG_CONFIG_DEPS. + +diff --git a/configure.sh b/configure.sh +index c254f7b..c675a02 100755 +--- a/configure.sh ++++ b/configure.sh +@@ -11,13 +11,19 @@ if pkg_exists solo5-bindings-hvt solo5-bindings-spt solo5-bindings-virtio solo5- + echo "ERROR: Only one of solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode, solo5-bindings-xen can be installed." 1>&2 + exit 1 + fi +-PKG_CONFIG_DEPS= +-pkg_exists solo5-bindings-hvt && PKG_CONFIG_DEPS=solo5-bindings-hvt +-pkg_exists solo5-bindings-spt && PKG_CONFIG_DEPS=solo5-bindings-spt +-pkg_exists solo5-bindings-muen && PKG_CONFIG_DEPS=solo5-bindings-muen +-pkg_exists solo5-bindings-virtio && PKG_CONFIG_DEPS=solo5-bindings-virtio +-pkg_exists solo5-bindings-genode && PKG_CONFIG_DEPS=solo5-bindings-genode +-pkg_exists solo5-bindings-xen && PKG_CONFIG_DEPS=solo5-bindings-xen ++if [ -z "${PKG_CONFIG_DEPS}" ]; then ++ PKG_CONFIG_DEPS= ++ pkg_exists solo5-bindings-hvt && PKG_CONFIG_DEPS=solo5-bindings-hvt ++ pkg_exists solo5-bindings-spt && PKG_CONFIG_DEPS=solo5-bindings-spt ++ pkg_exists solo5-bindings-muen && PKG_CONFIG_DEPS=solo5-bindings-muen ++ pkg_exists solo5-bindings-virtio && PKG_CONFIG_DEPS=solo5-bindings-virtio ++ pkg_exists solo5-bindings-genode && PKG_CONFIG_DEPS=solo5-bindings-genode ++ pkg_exists solo5-bindings-xen && PKG_CONFIG_DEPS=solo5-bindings-xen ++else ++ pkg_exists "${PKG_CONFIG_DEPS}" \ ++ || (echo "ERROR: ${PKG_CONFIG_DEPS} is not installed" 1>&2; exit 1) \ ++ || exit 1 ++fi + if [ -z "${PKG_CONFIG_DEPS}" ]; then + echo "ERROR: No supported Solo5 bindings package found." 1>&2 + echo "ERROR: solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode or solo5-bindings-xen must be installed." 1>&2 diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix new file mode 100644 index 00000000000..a777b7b22b9 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, fetchFromGitHub +, ocaml +, pkg-config +, solo5 +, target ? "xen" +}: + +# note: this is not technically an ocaml-module, +# but can be built with different compilers, so +# the ocamlPackages set is very useful. + +let + pname = "ocaml-freestanding"; +in + +if lib.versionOlder ocaml.version "4.08" +then builtins.throw "${pname} is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-${pname}-${version}"; + inherit pname; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = pname; + rev = "v${version}"; + sha256 = "0w3x2wfd04qr6mci4cp1gfqw33yysp8gamgkpgbgwslr0skryiq5"; + }; + + postUnpack = '' + # get ocaml-src from the ocaml drv instead of via ocamlfind + mkdir -p "${src.name}/ocaml" + tar --strip-components=1 -xf ${ocaml.src} -C "${src.name}/ocaml" + ''; + + patches = [ + ./no-opam.patch + ./configurable-binding.patch + ]; + + nativeBuildInputs = [ + ocaml + pkg-config + ]; + + buildInputs = [ solo5 ]; + + configurePhase = '' + runHook preConfigure + env PKG_CONFIG_DEPS=solo5-bindings-${target} sh configure.sh + runHook postConfigure + ''; + + preBuild = '' + # perform substitutions, so opam isn't needed + for flags in flags/cflags.tmp flags/libs.tmp; do + substitute "$flags.in" "$flags" \ + --replace "%{prefix}%" "$out" \ + --replace "%{ocaml-freestanding:lib}%" "$out/lib" + done + ''; + + installPhase = '' + runHook preInstall + ./install.sh "$out" + runHook postInstall + ''; + + meta = with lib; { + description = "Freestanding OCaml runtime"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/mirage/ocaml-freestanding"; + platforms = builtins.map ({ arch, os }: "${arch}-${os}") + (cartesianProductOfSets { + arch = [ "aarch64" "x86_64" ]; + os = [ "linux" ]; + } ++ [ + { arch = "x86_64"; os = "freebsd"; } + { arch = "x86_64"; os = "openbsd"; } + ]); + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch new file mode 100644 index 00000000000..43141b1472a --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch @@ -0,0 +1,84 @@ +commit 637b7ce639d54e617170433aa9596176b167d085 +Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> +Date: Thu Mar 18 01:07:49 2021 +0100 + + Allow building without ocamlfind and opam + + This change is the result of my first go at packaging ocaml-freestanding + for NixOS. Our build infrastructure for ocaml there is completely + independent of opam at the moment, so depending on opam for the build + time is not an option, especially in this case where the information it + would give us would be garbage. + + Fortunately the build environment plays nicely with pkg-config which is + already heavily used by ocaml-freestanding. This patch leaves pkg-config + to its own devices if opam is not present (it can be assisted by a + manually set PKG_CONFIG_PATH environment variable). + + Additionally, in configure.sh we check if the target ocaml source + directory already exists. This allows for building ocaml-freestanding + without the ocaml-src package (which would be unnecessarily cumbersome + to package for NixOS) and ocamlfind (one less dependency is always a + nice bonus). The Makefile needs no fix since the target ocaml/Makefile + won't be built if it's already present. + +diff --git a/Makefile b/Makefile +index b07b8c6..a68b31d 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,6 +2,12 @@ + + include Makeconf + ++ifneq ($(shell command -v opam),) ++ # only set if opam is available and PKG_CONFIG_PATH isn't ++ # already set in the environment or on the command line ++ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig ++endif ++ + FREESTANDING_LIBS=openlibm/libopenlibm.a \ + ocaml/runtime/libasmrun.a \ + nolibc/libnolibc.a +@@ -73,8 +79,7 @@ flags/libs.tmp: flags/libs.tmp.in + opam config subst $@ + + flags/libs: flags/libs.tmp Makeconf +- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \ +- pkg-config $(PKG_CONFIG_DEPS) --libs >> $< ++ pkg-config $(PKG_CONFIG_DEPS) --libs >> $< + awk -v RS= -- '{ \ + sub("@@PKG_CONFIG_EXTRA_LIBS@@", "$(PKG_CONFIG_EXTRA_LIBS)", $$0); \ + print "(", $$0, ")" \ +@@ -84,8 +89,7 @@ flags/cflags.tmp: flags/cflags.tmp.in + opam config subst $@ + + flags/cflags: flags/cflags.tmp Makeconf +- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \ +- pkg-config $(PKG_CONFIG_DEPS) --cflags >> $< ++ pkg-config $(PKG_CONFIG_DEPS) --cflags >> $< + awk -v RS= -- '{ \ + print "(", $$0, ")" \ + }' $< >$@ +diff --git a/configure.sh b/configure.sh +index 4d154ed..c254f7b 100755 +--- a/configure.sh ++++ b/configure.sh +@@ -1,6 +1,8 @@ + #!/bin/sh + +-export PKG_CONFIG_PATH=$(opam config var prefix)/lib/pkgconfig ++if command -v opam &> /dev/null; then ++ export PKG_CONFIG_PATH=$(opam config var prefix)/lib/pkgconfig ++fi + pkg_exists() { + pkg-config --exists "$@" + } +@@ -21,7 +23,7 @@ if [ -z "${PKG_CONFIG_DEPS}" ]; then + echo "ERROR: solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode or solo5-bindings-xen must be installed." 1>&2 + exit 1 + fi +-ocamlfind query ocaml-src >/dev/null || exit 1 ++[ -e "$(dirname "$0")/ocaml" ] || ocamlfind query ocaml-src >/dev/null || exit 1 + + FREESTANDING_CFLAGS="$(pkg-config --cflags ${PKG_CONFIG_DEPS})" + BUILD_ARCH="$(uname -m)" diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 7ff18822e93..a56621465f3 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, jsonrpc, lsp }: +{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }: buildDunePackage { pname = "ocaml-lsp-server"; @@ -9,6 +9,12 @@ buildDunePackage { buildInputs = lsp.buildInputs ++ [ lsp ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/ocamllsp --prefix PATH : ${dot-merlin-reader}/bin + ''; + meta = jsonrpc.meta // { description = "OCaml Language Server Protocol implementation"; }; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f67d614af3a..5c00f2c8991 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -4,12 +4,12 @@ buildDunePackage rec { pname = "pgocaml"; - version = "4.2.2"; + version = "4.2.2-dev-20210111"; src = fetchFromGitHub { owner = "darioteixeira"; repo = "pgocaml"; - rev = version; - sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n"; + rev = "1bb0025deeb3d14029afdcc69aaa7847026e243e"; + sha256 = "11inbjf87gclc2xmpq56ag4cm4467y9q9hjgbdn69fa1bman2zn2"; }; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/pkgs/development/ocaml-modules/pgocaml/ppx.nix index 35c19622f88..dce2e2b0c99 100644 --- a/pkgs/development/ocaml-modules/pgocaml/ppx.nix +++ b/pkgs/development/ocaml-modules/pgocaml/ppx.nix @@ -1,8 +1,8 @@ -{ buildDunePackage, pgocaml, ppx_optcomp, ppx_tools, ppx_tools_versioned, rresult }: +{ buildDunePackage, pgocaml, ppx_optcomp }: buildDunePackage { pname = "pgocaml_ppx"; inherit (pgocaml) src version useDune2 meta; - propagatedBuildInputs = [ pgocaml ppx_optcomp ppx_tools ppx_tools_versioned rresult ]; + propagatedBuildInputs = [ pgocaml ppx_optcomp ]; } diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 11b608e6ef5..c92992197d2 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,5 +1,8 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml -, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0" +, version ? + if lib.versionAtLeast ocaml.version "4.07" + then if lib.versionAtLeast ocaml.version "4.08" + then "0.22.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , stdlib-shims, ocaml-migrate-parsetree-2-1 }: @@ -19,11 +22,13 @@ let param = { "0.15.0" = { sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn"; min_version = "4.07"; + max_version = "4.12"; useOMP2 = false; }; "0.18.0" = { sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm"; min_version = "4.07"; + max_version = "4.12"; }; "0.22.0" = { sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q"; diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 6e639f984cb..80fa01066f1 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl -, bisect_ppx, ppx_cstruct, pkg-config +, bisect_ppx, ppx_cstruct , rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock , mirage-random, mirage-stack, mirage-protocols, mirage-time , ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt @@ -11,23 +11,18 @@ buildDunePackage rec { pname = "tcpip"; - version = "6.1.0"; + version = "6.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8"; + sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s"; }; - patches = [ - ./no-opam-pkg-config-path.patch - ]; - nativeBuildInputs = [ bisect_ppx ppx_cstruct - pkg-config ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch b/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch deleted file mode 100644 index a7e9155ce5a..00000000000 --- a/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/freestanding/Makefile b/freestanding/Makefile -index f22d220d..4bb3ac57 100644 ---- a/freestanding/Makefile -+++ b/freestanding/Makefile -@@ -1,6 +1,4 @@ --PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig -- --EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) -+EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?) - - .PHONY: all clean - all: libtcpip_freestanding_stubs.a -@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a: - touch $@ - else - CC ?= cc --FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding) -+FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding) - CFLAGS := $(FREESTANDING_CFLAGS) - - OBJS=checksum_stubs.o diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index bda50bdb78e..a47cd414fb1 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -2,18 +2,18 @@ buildDunePackage rec { pname = "visitors"; - version = "20210127"; + version = "20210316"; useDune2 = true; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; src = fetchFromGitLab { owner = "fpottier"; repo = pname; rev = version; domain = "gitlab.inria.fr"; - sha256 = "0b73h7d4yv04a0b5x2i222jknbcgf9vvxzfjxzy2jwanxz9d873z"; + sha256 = "12d45ncy3g9mpcs6n58aq6yzs5qz662msgcr7ccms9jhiq44m8f7"; }; propagatedBuildInputs = [ ppxlib ppx_deriving result ]; diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 84fbc4f7a46..1422e1b176d 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pcov"; - version = "1.0.6"; - sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; + version = "1.0.8"; + sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ="; buildInputs = [ pcre' ]; diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 9f1ce65db0a..c2e6a1292c7 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "2.18.3"; + version = "2.18.4"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-Bdk1+X+SKcVS/zxEqlgnR3zjq/l0ht7icE4sQ1hjn8g="; + sha256 = "sha256-ZgnWv7Xd+0XgZ/IPdjVpAEraNNJq2KHB3aUUIG1SirU="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 0e536d57132..902529806a3 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "0.12.81"; + version = "0.12.82"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-mdqVrTrxWE2AuLVqgumA7V+JjzGW9ukkFM7klJSLeDE="; + sha256 = "sha256-fX7YK4z6xUhSJ2jTCy7bRK13TxXSn/qo7E5DeZlv2Nw="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/python-modules/Pygments/2_5.nix b/pkgs/development/python-modules/Pygments/2_5.nix index a0c40550c9a..aa59c370d2e 100644 --- a/pkgs/development/python-modules/Pygments/2_5.nix +++ b/pkgs/development/python-modules/Pygments/2_5.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , docutils }: @@ -13,6 +14,15 @@ buildPythonPackage rec { sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-27291.patch"; + url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch"; + sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa"; + excludes = ["CHANGES"]; + }) + ]; + propagatedBuildInputs = [ docutils ]; # Circular dependency with sphinx diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 3879aed84de..8f1b9d2ffce 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -5,12 +5,13 @@ }: buildPythonPackage rec { - pname = "Adafruit-PlatformDetect"; - version = "3.4.0"; + pname = "adafruit-platformdetect"; + version = "3.4.1"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-+rZUIZA2P7NZ4jbJsenGlD0OZi5fXFQ/Y5vJo4bmvMo="; + pname = "Adafruit-PlatformDetect"; + inherit version; + sha256 = "31275dcf949c8b00598aaf2b0da65d970a0cba28e7cb45691d5f354b8e82fe85"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix new file mode 100644 index 00000000000..49c67a0aa04 --- /dev/null +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -0,0 +1,44 @@ +{ lib +, asysocks +, buildPythonPackage +, fetchPypi +, minikerberos +, prompt_toolkit +, pythonOlder +, six +, tqdm +, winacl +, winsspi +}: + +buildPythonPackage rec { + pname = "aiosmb"; + version = "0.2.37"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0daf1fk7406vpywc0yxv0wzf4nw986js9lc2agfyfxz0q7s29lf0"; + }; + + propagatedBuildInputs = [ + minikerberos + winsspi + six + asysocks + tqdm + prompt_toolkit + winacl + ]; + + # Project doesn't have tests + doCheck = false; + pythonImportsCheck = [ "aiosmb" ]; + + meta = with lib; { + description = "Python SMB library"; + homepage = "https://github.com/skelsec/aiosmb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix new file mode 100644 index 00000000000..319c9514183 --- /dev/null +++ b/pkgs/development/python-modules/android-backup/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycrypto +, pythonOlder +, enum34 +, python +}: + +buildPythonPackage rec { + pname = "android-backup"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bluec0re"; + repo = "android-backup-tools"; + rev = "v${version}"; + sha256 = "0c436hv64ddqrjs77pa7z6spiv49pjflbmgg31p38haj5mzlrqvw"; + }; + + propagatedBuildInputs = [ + pycrypto + ] ++ lib.optional (pythonOlder "3.4") enum34; + + checkPhase = '' + ${python.interpreter} -m android_backup.tests + ''; + + pythonImportsCheck = [ "android_backup" ]; + + meta = with lib; { + description = "Unpack and repack android backups"; + homepage = https://github.com/bluec0re/android-backup-tools; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index ac6eb095777..13fb71d7f2f 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "fbbd069caa22c0270bc71a5330b46b5a4e1984d8345b9236ca02fbca23094647"; + sha256 = "5ec0fe72f1422a1198973fcbb48d0eb5c7390f4b0fbe55474fce999ad6826a9b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index a03b051b11d..a6bb0584018 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -1,34 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage, fetchpatch +{ lib, fetchPypi, buildPythonPackage , configobj, six, traitsui -, nose, tables, pandas +, pytestCheckHook, tables, pandas +, pythonOlder, importlib-resources }: buildPythonPackage rec { pname = "apptools"; - version = "4.5.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6"; + sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh"; }; - # PyTables issue; should be merged in next post-4.5.0 release (#117) - patches = [ (fetchpatch { - url = "https://github.com/enthought/apptools/commit/3734289d1a0ebd8513fa67f75288add31ed0113c.patch"; - sha256 = "001012q1ib5cbib3nq1alh9ckzj588bfrywr8brkd1f6y1pgvngk"; - }) + propagatedBuildInputs = [ + configobj + six + traitsui + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; - propagatedBuildInputs = [ configobj six traitsui ]; - checkInputs = [ - nose tables pandas + pytestCheckHook ]; - doCheck = true; - checkPhase = "HOME=$TMP nosetests"; + preCheck = '' + export HOME=$TMP + ''; meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications."; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 0f090d14aba..ecbbfa90911 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, +{ lib, fetchPypi, fetchpatch, buildPythonPackage, setuptools_scm, toml, six, astroid, pytest }: @@ -11,6 +11,16 @@ buildPythonPackage rec { sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; }; + patches = [ + # Fixes compatibility with python 3.9, will be included in the next release + # after 2.0.4 + (fetchpatch { + url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch"; + sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj"; + excludes = [ "setup.cfg" ]; + }) + ]; + propagatedBuildInputs = [ setuptools_scm toml six astroid ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix index c248c81da75..3783f9776cd 100644 --- a/pkgs/development/python-modules/awkward0/default.nix +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -2,33 +2,31 @@ , buildPythonPackage , fetchFromGitHub , numpy -, pandas , pytestrunner , pytestCheckHook }: buildPythonPackage rec { pname = "awkward0"; - version = "0.15.2"; + version = "0.15.5"; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward-0.x"; rev = version; - sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU="; + sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ numpy ]; - checkInputs = [ pandas pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - # Almost all tests in this file fail - rm tests/test_persist.py - py.test - ''; + # Can't find a fixture + disabledTests = [ "test_import_pandas" ]; + + pythonImportsCheck = [ "awkward0" ]; meta = with lib; { description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 9d413cf7a69..3d8e4df5654 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a8b1d4aa9386efa923bad1a07da9f9098facd3b654d036a900a54de77d06eabe"; + sha256 = "c4f29b2d9b717dad7919048f0a458dd84f83637c3d5c8f5a7e64634b22086719"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index c277122755f..be011a1ed00 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.6.0"; + version = "0.6.2"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d805a91b295edf52057ffab26b714160905406bdd5d7a1a3f93f6cdc3ede8412"; + sha256 = "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index b287e7be98e..dc09aa2c6bc 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.7.1"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "e4de977d708b7024760266d827b8285e4405dce4293f25508c4556970139018a"; + sha256 = "e02f79fba7a470d438eb39017d503498faaf760b17b6b46af1a9de12fd58d311"; }; pythonImportsCheck = [ "bitarray" ]; diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index f4842981c4a..0986a5dc7c4 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -1,19 +1,35 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +}: buildPythonPackage rec { pname = "boltons"; - version = "20.2.0"; + version = "20.2.1"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "08rd6av8dp5n1vz6nybmayl1mfsmj66cskiaybfshcgix29ca803"; + sha256 = "0vw0h0z81gfxgjfijqiza92ic0siv9xy65mklgj5d0dzr1k9waw8"; }; - checkInputs = [ pytest ]; - checkPhase = "pytest tests"; + patches = [ + (fetchpatch { + url = "https://github.com/mahmoud/boltons/commit/754afddf141ea26956c88c7e13fe5e7ca7942654.patch"; + sha256 = "14kcq8pl4pmgcnlnmj1sh1yrksgym0kn0kgz2648g192svqkbpz8"; + }) + ]; + + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # This test is broken without this PR, which has not yet been merged + # https://github.com/mahmoud/boltons/pull/283 + "test_frozendict_ior" + ]; meta = with lib; { homepage = "https://github.com/mahmoud/boltons"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index cdd6af447b4..4f4aece6761 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.30"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.34"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-05wEtR5gGX9VA/hInwQ7yQSYFWfMhDHTiTZ3Z9w/1a4="; + sha256 = "sha256-jzPLPS/EKwVHpVYKbXOXqpMzb1CJk4Z2KyRQaCwOmSs="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index ca8ef220c9f..e04c2e5aeff 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.30"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.34"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-mP8eshDTlKH/5zazPIp75o8w8KA1ULVZxbtv3wwpMo0="; + sha256 = "sha256-dJvbFR40AynxslYAv+nSI+kw+LomvXS3FHjKV4Hy/q8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 8a915d520e5..9a01a030e68 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -18,6 +18,26 @@ buildPythonPackage rec { sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n"; }; + patches = [ + # 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6 + (fetchpatch { + url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch"; + sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0"; + }) + # 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6 + (fetchpatch { + url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch"; + sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4"; + }) + # 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6 + (fetchpatch { + url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch"; + sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q"; + }) + ]; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile @@ -26,8 +46,6 @@ buildPythonPackage rec { routes ]; - nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ objgraph pytest pytestcov pathpy requests_toolbelt pytest-services ]; diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index 5b94dc78cd6..7379d6dc6c9 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -1,25 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, cffi, pytest }: +{ lib +, buildPythonPackage +, cffi +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "e7d65b90645faa55c28886d01f658235af08b4c4edbf9d959518a17007dd20b4"; + sha256 = "sha256-tqVJq6Mnq9mG1nSM8hyGN9dBx2hQ5/773vjSi/4TjjI="; }; propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ "cmarkgfm" ]; meta = with lib; { description = "Minimal bindings to GitHub's fork of cmark"; homepage = "https://github.com/jonparrott/cmarkgfm"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 0740ee33b5f..daff7bc76d3 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.7.2"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q"; + sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 30807035579..577fef8d79d 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , python-dateutil -, pytest +, pytestCheckHook , pytz , natsort , tzlocal @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "0.3.37"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "12ced475dfc107bf7c6c1440af031f34be14cd97bbbfaf0f62221a9c11e86404"; + sha256 = "708532f70584207e23ef2989ca40f367e6238bfe050133a1aff43e1e0e6f6092"; }; propagatedBuildInputs = [ @@ -23,15 +23,11 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytz tzlocal ]; - checkPhase = '' - pytest src/croniter - ''; - meta = with lib; { description = "croniter provides iteration for datetime object with cron like format"; homepage = "https://github.com/kiorky/croniter"; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index d4b42ac83e8..f5d262f0b8f 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,33 +1,35 @@ { lib, buildPythonPackage -, fetchPypi, isPy3k, linuxPackages -, fastrlock, numpy, six, wheel, pytest, mock, setuptools +, fetchPypi, isPy3k, cython +, fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools , cudatoolkit, cudnn, cutensor, nccl +, addOpenGLRunpath }: buildPythonPackage rec { pname = "cupy"; - version = "8.4.0"; + version = "8.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "58d19af6b2e83388d4f0f6ca4226bae4b947920d2ca4951c2eddc8bc78abf66b"; + sha256 = "fb3f8d3b3454beb249b9880502a45fe493c5a44efacc4c72914cbe1a5dbdf803"; }; - checkInputs = [ - pytest - mock - ]; - preConfigure = '' - export CUDA_PATH=${cudatoolkit} + export CUDA_PATH=${cudatoolkit} ''; + nativeBuildInputs = [ + addOpenGLRunpath + cython + ]; + + LDFLAGS = "-L${cudatoolkit}/lib/stubs"; + propagatedBuildInputs = [ cudatoolkit cudnn cutensor - linuxPackages.nvidia_x11 nccl fastrlock numpy @@ -36,8 +38,20 @@ buildPythonPackage rec { wheel ]; - # In python3, test was failed... - doCheck = !isPy3k; + checkInputs = [ + pytestCheckHook + mock + ]; + + # Won't work with the GPU, whose drivers won't be accessible from the build + # sandbox + doCheck = false; + + postFixup = '' + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + addOpenGLRunpath "$lib" + done + ''; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index a7115d1e940..a553aeab65c 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , python +, fetchpatch , fetchPypi , pari , gmp @@ -11,13 +12,23 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db"; + sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a"; }; + patches = [ + # patch to avoid some segfaults in sage's totallyreal.pyx test. + # (https://trac.sagemath.org/ticket/27267). depends on Cython patch. + (fetchpatch { + name = "use-trashcan-for-gen.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555"; + sha256 = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8="; + }) + ]; + # This differs slightly from the default python installPhase in that it pip-installs # "." instead of "*.whl". # That is because while the default install phase succeeds to build the package, @@ -48,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cython bindings for PARI"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.sage.members; homepage = "https://github.com/defeo/cypari2"; }; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index 201a8c42d68..d075360d1a4 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchPypi , buildPythonPackage , cython @@ -10,23 +9,13 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.10.2"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1"; + sha256 = "sha256-XEYGxDV3UCgxb3Jf23y4lOPK4Lb9L4YqDSlxdIRptDo="; }; - patches = [ - # fixes intermittent crashes in Sage tests (including in interfaces/singular.py) - # will be included in cysignals 1.10.3: https://github.com/sagemath/cysignals/pull/127 - (fetchpatch { - name = "fix-verify_exc_value.patch"; - url = "https://github.com/sagemath/cysignals/commit/49a7eee4bba3ab8f340cf56c371fa4f5ed702dcc.patch"; - sha256 = "sha256-Pfc5tL9VDSP6ftDoHoIb+MDi5rjYqr0PRfIajFuuYVs="; - }) - ]; - # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index f4a94955681..17116eb130f 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.3.10"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8aa75740900f9b4bcc6d3f2bd815408dba30dc9a512bcc950b93e7353ec45133"; + sha256 = "3726c648cc60796294356e2617acc534d2503824ccfbdff26abbea595eb83135"; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index a4c8cb7227f..9c7f62edf11 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "0.20.20"; + version = "0.20.21"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QmlZuXBfrcxsgg5a3zKR1xpIq6CvzPdBFCLjMI8RX4c="; + sha256 = "sha256-rHZMmpuA+mGv40BNUnDFBgqlf38IexGpU5XTt287cf0="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix new file mode 100644 index 00000000000..6699050035d --- /dev/null +++ b/pkgs/development/python-modules/dwdwfsapi/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, ciso8601 +}: + +buildPythonPackage rec { + pname = "dwdwfsapi"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PX1b1msaZH8HKVBo3GU7TOr8Lo7INLjjJBkDHHs6mzk="; + }; + + propagatedBuildInputs = [ + requests + ciso8601 + ]; + + # All tests require network access + doCheck = false; + + pythonImportsCheck = [ "dwdwfsapi" ]; + + meta = with lib; { + description = "Python client to retrieve data provided by DWD via their geoserver WFS API"; + homepage = "https://github.com/stephan192/dwdwfsapi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index 4a85e5b8836..108c5287eb6 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, tkinter }: buildPythonPackage rec { pname = "easygui"; @@ -9,8 +9,18 @@ buildPythonPackage rec { sha256 = "073f728ca88a77b74f404446fb8ec3004945427677c5618bd00f70c1b999fef2"; }; + postPatch = '' + substituteInPlace setup.py --replace README.md README.txt + ''; + + propagatedBuildInputs = [ + tkinter + ]; + doCheck = false; # No tests available + pythonImportsCheck = [ "easygui" ]; + meta = with lib; { description = "Very simple, very easy GUI programming in Python"; homepage = "https://github.com/robertlugg/easygui"; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 745b7a7b105..c98937804a3 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.2.0"; + version = "2.2.1"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1xfn5yasi849vs06ffxq6phapm6gc3p8yvdyvqmb47gbnji5mpb5"; + sha256 = "15yjl18n81zddd27789mcy12gnja3cqycjdykybwgd9i0ysj96gl"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 84026d7374c..f0c67f3ae59 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -1,15 +1,27 @@ -{ lib, buildPythonPackage, fetchzip, pytest, asttokens }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, asttokens +}: buildPythonPackage rec { pname = "executing"; - version = "0.4.3"; + version = "0.5.4"; - src = fetchzip { - url = "https://github.com/alexmojaki/executing/archive/v${version}.tar.gz"; - sha256 = "1fqfc26nl703nsx2flzf7x4mgr3rpbd8pnn9c195rca648zhi3nh"; + src = fetchFromGitHub { + owner = "alexmojaki"; + repo = pname; + rev = "v${version}"; + sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv"; }; - checkInputs = [ pytest asttokens ]; + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + # Tests appear to run fine (Ran 22 tests in 4.076s) with setuptoolsCheckPhase + # but crash with pytestCheckHook + checkInputs = [ asttokens ]; meta = with lib; { description = "Get information about what a frame is currently doing, particularly the AST node being executed"; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 8513c168cfd..b0cf3b546fd 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.4.5"; + version = "1.5.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0slb23zxn47a4z8b7jq7gq40g4zsn52y9h29zdqs29b85394gjq1"; + sha256 = "1ac0cef767c37f51718874a33afb5413e69d132988cb6a80c6e6dbeddf8c7623"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 6ad99a12581..13c46ba1e8a 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , nose }: @@ -8,13 +8,20 @@ buildPythonPackage rec { version = "0.1.4"; pname = "forbiddenfruit"; - src = fetchPypi { - inherit pname version; - sha256 = "e3f7e66561a29ae129aac139a85d610dbf3dd896128187ed5454b6421f624253"; + src = fetchFromGitHub { + owner = "clarete"; + repo = "forbiddenfruit"; + rev = version; + sha256 = "16chhrxbbmg6lfbzm532fq0v00z8qihcsj0kg2b5jlgnb6qijwn8"; }; checkInputs = [ nose ]; + preBuild = '' + export FFRUIT_EXTENSION="true"; + ''; + + # https://github.com/clarete/forbiddenfruit/pull/47 required to switch to pytest checkPhase = '' find ./build -name '*.so' -exec mv {} tests/unit \; nosetests @@ -22,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Patch python built-in objects"; - homepage = "https://pypi.python.org/pypi/forbiddenfruit"; + homepage = "https://github.com/clarete/forbiddenfruit"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 65ad31af2eb..be935935041 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4a77a79e990004af96e789565b174f9b971f00afa23142f6673722dae0910b0c"; + sha256 = "013279a411644545ee0d67a5c077d0f19db58b846d758f36a8cc759f9c9e0a19"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 6e381794cff..d2590d14955 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage +, fetchpatch , cython , numpy -, nose +, pytestCheckHook , scipy , scikitlearn , fetchPypi @@ -18,11 +19,22 @@ buildPythonPackage rec { inherit pname version; sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26"; }; - - checkInputs = [ nose ]; + patches = [ + # This patch fixes compatibility with numpy 1.20. It will be in the next release + # after 0.8.27 + (fetchpatch { + url = "https://github.com/scikit-learn-contrib/hdbscan/commit/5b67a4fba39c5aebe8187a6a418da677f89a63e0.patch"; + sha256 = "07d7jdwk0b8kgaqkifd529sarji01j1jiih7cfccc5kxmlb5py9h"; + }) + ]; nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ]; + preCheck = '' + cd hdbscan/tests + rm __init__.py + ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 0b52402ed44..5da15fa3e23 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; rev = version; - sha256 = "0m8maxhjpfxnkry2l0x8143m1gmds8mbwyd9flnkfipxz0r0xwbr"; + sha256 = "148m0vgwm6l8drcx6j3fjs2zpdzvslk4w2nkb8nm0g8qdlm6gjlw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix new file mode 100644 index 00000000000..5bfb66fe4c6 --- /dev/null +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, cmake, numpy, pytestCheckHook }: + +buildPythonPackage rec { + pname = "iminuit"; + version = "2.4.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "350c13d33f3ec5884335aea1cc11a17ae49dd8e6b2181c3f1b3c9c27e2e0b228"; + }; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ numpy ]; + + dontUseCmakeConfigure = true; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/scikit-hep/iminuit"; + description = "Python interface for the Minuit2 C++ library"; + license = with licenses; [ mit lgpl2Only ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 33c14dbaeb2..b06db621b73 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -1,24 +1,23 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests +{ lib, buildPythonPackage, fetchPypi, requests , websocket_client, pythonOlder }: buildPythonPackage rec { pname = "jellyfin-apiclient-python"; - version = "1.6.1"; + version = "1.7.2"; disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "iwalton3"; - repo = "jellyfin-apiclient-python"; - rev = "v${version}"; - sha256 = "0f7czq83ic22fz1vnf0cavb7l3grcxxd5yyw9wcjz3g1j2d76735"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A="; }; propagatedBuildInputs = [ requests websocket_client ]; + doCheck = false; # no tests pythonImportsCheck = [ "jellyfin_apiclient_python" ]; meta = with lib; { - homepage = "https://github.com/iwalton3/jellyfin-apiclient-python"; + homepage = "https://github.com/jellyfin/jellyfin-apiclient-python"; description = "Python API client for Jellyfin"; license = licenses.gpl3; maintainers = with maintainers; [ jojosch ]; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index e5cd3d3828e..1b1aea2ab11 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchPypi -, pyasn1, pyasn1-modules, pytest +, pyasn1, pyasn1-modules +, pythonAtLeast, pytestCheckHook , openldap, cyrus_sasl, lib, stdenv }: buildPythonPackage rec { @@ -13,20 +14,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; + checkInputs = [ pytestCheckHook ]; buildInputs = [ openldap cyrus_sasl ]; - checkInputs = [ pytest ]; - - checkPhase = '' + preCheck = '' # Needed by tests to setup a mockup ldap server. export BIN="${openldap}/bin" export SBIN="${openldap}/bin" export SLAPD="${openldap}/libexec/slapd" export SCHEMA="${openldap}/etc/schema" - - py.test ''; + disabledTests = lib.optionals (pythonAtLeast "3.9") [ + # See https://github.com/python-ldap/python-ldap/issues/407 + "test_simple_bind_noarg" + ]; + doCheck = !stdenv.isDarwin; meta = with lib; { diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 47be977755c..5334513e23c 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Using hardware wallets as SSH/GPG agent"; homepage = "https://github.com/romanz/trezor-agent"; - license = licenses.gpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ np ]; }; } diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 4e68beba532..44aa9136b07 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,44 +1,53 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which -, contextlib2, macfuse-stubs, DiskArbitration +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, contextlib2 +, cython +, fuse +, pkg-config +, pytestCheckHook +, python +, which }: buildPythonPackage rec { pname = "llfuse"; - version = "1.3.8"; + version = "1.4.1"; - src = fetchPypi { - inherit pname version; - sha256 = "1g2cdhdqrb6m7655qp61pn61pwj1ql61cdzhr2jvl3w4i8877ddr"; - }; - - patches = [ - # fix tests with pytest 6 - (fetchpatch { - url = "https://github.com/python-llfuse/python-llfuse/commit/1ed8b280d2544eedf8bf209761bef0d2519edd17.diff"; - sha256 = "0wailfrr1i0n2m9ylwpr00jh79s7z3l36w7x19jx1x4djcz2hdps"; - }) - ]; + disabled = pythonOlder "3.5"; - nativeBuildInputs = [ pkg-config ]; + src = fetchFromGitHub { + owner = "python-llfuse"; + repo = "python-llfuse"; + rev = "release-${version}"; + sha256 = "1dcpdg6cpkmdbyg66fgrylj7dp9zqzg5bf23y6m6673ykgxlv480"; + }; - buildInputs = - lib.optionals stdenv.isLinux [ fuse ] - ++ lib.optionals stdenv.isDarwin [ DiskArbitration macfuse-stubs ]; + nativeBuildInputs = [ cython pkg-config ]; - checkInputs = [ pytest which ] ++ - lib.optionals stdenv.isLinux [ attr ]; + buildInputs = [ fuse ]; propagatedBuildInputs = [ contextlib2 ]; - checkPhase = '' - py.test -k "not test_listdir" ${lib.optionalString stdenv.isDarwin ''-m "not uses_fuse"''} + preBuild = '' + ${python.interpreter} setup.py build_cython ''; + # On Darwin, the test requires macFUSE to be installed outside of Nix. + doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook which ]; + + disabledTests = [ + "test_listdir" # accesses /usr/bin + ]; + meta = with lib; { description = "Python bindings for the low-level FUSE API"; homepage = "https://github.com/python-llfuse/python-llfuse"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor dotlambda ]; }; } diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 458d2ca5032..8146f8b183e 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -1,19 +1,36 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, isPy27 +, colorama +, pytestCheckHook +, pythonAtLeast +}: buildPythonPackage rec { pname = "loguru"; version = "0.5.3"; - disabled = isPy27; + # python3.9 compatibility should be in the next release after 0.5.3 + disabled = isPy27 || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"; }; - checkInputs = [ pytestCheckHook colorama ]; + patches = [ + # Fixes tests with pytest>=6.2.2. Will be part of the next release after 0.5.3 + (fetchpatch { + url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch"; + sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67"; + }) + ]; - pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ]; + checkInputs = [ pytestCheckHook colorama ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] ++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; @@ -21,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Delgan/loguru"; description = "Python logging made (stupidly) simple"; license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; + maintainers = with maintainers; [ jakewaksbaum rmcgibbo ]; }; } diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix index 8559339b012..fd2eac2b2c7 100644 --- a/pkgs/development/python-modules/managesieve/default.nix +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "managesieve"; - version = "0.7"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1dx0j8hhjwip1ackaj2m4hqrrx2iiv846ic4wa6ymrawwb8iq8m6"; + sha256 = "44930a3b48332d23b35a5305ae7ba47904d4485ed1b7a22208b7d5ad9d60427a"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 6632b88b723..6a6e3536733 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder -, sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch +, sqlalchemy, ruamel_yaml, CommonMark, lxml }: buildPythonPackage rec { pname = "mautrix"; - version = "0.8.16"; + version = "0.8.17"; src = fetchPypi { inherit pname version; - sha256 = "ccaa1691affa5f257e13d61f7c46088ff0affdd782331b01bfdcbd0b3eb5e10e"; + sha256 = "9a15a8e39f9d0b36c91dfe0f5dd1efc8752cc1d317057840a3dbffd6ee90e068"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 73f50d32a5f..97681291a63 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "ac2d737d8ff27ed01ea3825ed8806970e8137d7b342cef37b39b6dd17e6eb3a4"; + sha256 = "05ef4c89e307e3031dd1d85a3a557cd7f9f900f7dbbbcb33dde454940ca38460"; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 60440ff4b48..45adc7adb74 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.15"; + version = "0.0.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IVlzAsnl1KhErxWPi96hUFlIX4IN3Y9t8OicckdYUv0="; + sha256 = "65a71ca1da2b73ee96daa9d52e4fb9c9b80a849475502c6a1c2a80a68bd149b0"; }; # Upstream doesn't have tests diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 2ad3b9fd6df..47f4d80ad92 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage { - inherit (pkgs.mxnet) name version src meta; + inherit (pkgs.mxnet) pname version src meta; buildInputs = [ pkgs.mxnet ]; propagatedBuildInputs = [ requests numpy graphviz ]; diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix index 715a1989b45..b69e8401eb5 100644 --- a/pkgs/development/python-modules/ndjson/default.nix +++ b/pkgs/development/python-modules/ndjson/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { homepage = "https://github.com/rhgrant10/ndjson"; description = "JsonDecoder"; platforms = platforms.unix; + license = licenses.gpl3Only; maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix index c93f5bda983..bbc164c85e2 100644 --- a/pkgs/development/python-modules/nose-timer/default.nix +++ b/pkgs/development/python-modules/nose-timer/default.nix @@ -1,20 +1,44 @@ -{ buildPythonPackage, fetchPypi, lib, nose, }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, mock +, parameterized +, termcolor +}: buildPythonPackage rec { pname = "nose-timer"; - version = "1.0.0"; + version = "1.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "09hwjwbczi06bfqgiylb2yxs5h88jdl26zi1fdqxdzvamrkksf2c"; + src = fetchFromGitHub { + owner = "mahmoudimus"; + repo = pname; + rev = "v${version}"; + sha256 = "0xsai2l5i1av62y9y0q63wy2zk27klmf2jizgghhxg2y8nfa8x3x"; }; propagatedBuildInputs = [ nose ]; + checkInputs = [ + mock + nose + parameterized + termcolor + ]; + + checkPhase = '' + runHook preCheck + nosetests --verbosity 2 tests + runHook postCheck + ''; + + pythonImportsCheck = [ "nosetimer" ]; + meta = with lib; { + description = "A timer plugin for nosetests"; homepage = "https://github.com/mahmoudimus/nose-timer"; license = licenses.mit; - description = "A timer plugin for nosetests (how much time does every test take?)"; maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix deleted file mode 100644 index 624f32fd337..00000000000 --- a/pkgs/development/python-modules/numtraits/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, six -, numpy -, traitlets -}: - -buildPythonPackage rec { - pname = "numtraits"; - version = "0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ six numpy traitlets]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Numerical traits for Python objects"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ fridh ]; - homepage = "https://github.com/astrofrog/numtraits"; - }; -} diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 807b6cf5f5e..90683a84f46 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -46,7 +46,8 @@ buildPythonPackage rec { ]; postPatch = '' - patchShebangs tools/protoc-gen-mypy.py + chmod +x tools/protoc-gen-mypy.sh.in + patchShebangs tools/protoc-gen-mypy.sh.in tools/protoc-gen-mypy.py ''; preBuild = '' diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 7661295ba23..7b806ecebe2 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openwrt-luci-rpc"; - version = "1.1.8"; + version = "1.1.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bo9HLT0q0yiLJI7i5v/36G82FHbGCtnAI50iGniyKSU="; + sha256 = "sha256-DkitN+mwCZ14QEn2fTOqUrQTtoncR1ifP3WDSQ6qkkk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index dbf5475bab3..1183c09e62e 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,28 +1,40 @@ -{ lib, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, isPy3k +, mock +, nose +}: buildPythonPackage rec { pname = "parameterized"; - version = "0.7.5"; + version = "0.8.1"; + disable = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b5e6af67b9e49485e30125b1c8f031ffa81a265ca08bfa73f31551bf03cf68c4"; + sha256 = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; }; - # Tests require some python3-isms but code works without. - # python38 is not fully supported yet - doCheck = isPy3k && (!isPy38); - - checkInputs = [ nose mock glibcLocales ]; + checkInputs = [ + nose + mock + glibcLocales + ]; checkPhase = '' + runHook preCheck LC_ALL="en_US.UTF-8" nosetests -v + runHook postCheck ''; + pythonImportsCheck = [ "parameterized" ]; + meta = with lib; { description = "Parameterized testing with any Python test framework"; - homepage = "https://pypi.python.org/pypi/parameterized"; - license = licenses.bsd3; + homepage = "https://github.com/wolever/parameterized"; + license = licenses.bsd2; maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index aacd9e314cb..c99f408db62 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -3,11 +3,13 @@ , fetchPypi , nose , pygments +, isPy3k }: buildPythonPackage rec { version = "0.9.2"; pname = "piep"; + disabled = isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix index d674e876b14..c383f5ff86c 100644 --- a/pkgs/development/python-modules/pkutils/default.nix +++ b/pkgs/development/python-modules/pkutils/default.nix @@ -1,5 +1,4 @@ { lib -, pythonOlder , buildPythonPackage , isPy3k , fetchFromGitHub diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 1686887a151..1fbdd6773e6 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "4.4.1"; + version = "4.5.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "11zarqnrpis6xpsjdvfl3pczv1l9rzbgkawkv2lhfvzlnc00d7df"; + sha256 = "sha256-MjV1JUHrIHTu3UHy4HnMtTEjSCx3U9kMgUkbCJOAZr0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 3c9bc5c7c5b..f9d5b6f80b1 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -6,10 +6,9 @@ , requests , six , semver -, pytest +, pytestCheckHook , pytestcov , pytestrunner -, sphinx , openapi-spec-validator }: @@ -35,18 +34,28 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytestcov openapi-spec-validator ]; postPatch = '' substituteInPlace setup.py \ - --replace "tests_require = dev_require," "tests_require = None," + --replace "tests_require = dev_require," "tests_require = None," \ + --replace "chardet~=4.0" "" \ + --replace "semver~=2.13" "" + substituteInPlace setup.cfg \ + --replace "--cov-fail-under=90" "" ''; - # many tests require network connection - doCheck = false; + # Disable tests that require network + disabledTestPaths = [ + "tests/test_convert.py" + ]; + disabledTests = [ + "test_fetch_url_http" + ]; + pythonImportsCheck = [ "prance" ]; meta = with lib; { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix new file mode 100644 index 00000000000..b2cf038f798 --- /dev/null +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pydeconz"; + version = "77"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Kane610"; + repo = "deconz"; + rev = "v${version}"; + sha256 = "0qpipw3si3a23c3nafagfx3zl3v481ha8yakcz1d42mbwsc6hkk4"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pydeconz" ]; + + meta = with lib; { + description = "Python library wrapping the Deconz REST API"; + homepage = "https://github.com/Kane610/deconz"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index e152002cdd1..75bbcde09cd 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -1,36 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , six -, fetchpatch , icu }: buildPythonPackage rec { pname = "PyICU"; - version = "2.3.1"; + version = "2.6"; src = fetchPypi { inherit pname version; - sha256 = "ddb2b453853b4c25db382bc5e8c4cde09b3f4696ef1e1494f8294e174f459cf4"; + sha256 = "0wb3v421i2fnnxdywam4ay8hqvnxlz0r2nrpx5lqy3rn6dlbz9d9"; }; - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/python-team/modules/pyicu/raw/debian/2.2-2/" - + "debian/patches/icu_test.patch"; - sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9"; - }) - ]; - nativeBuildInputs = [ icu ]; # for icu-config buildInputs = [ icu ]; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ six ]; + checkInputs = [ pytestCheckHook six ]; meta = with lib; { - homepage = "https://pypi.python.org/pypi/PyICU/"; + homepage = "https://github.com/ovalhub/pyicu/"; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pykodi/default.nix b/pkgs/development/python-modules/pykodi/default.nix new file mode 100644 index 00000000000..24450270a83 --- /dev/null +++ b/pkgs/development/python-modules/pykodi/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, aiohttp, jsonrpc-async, jsonrpc-websocket }: + +buildPythonPackage rec { + pname = "pykodi"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "099xyn5aql5mdim6kh4hwx0fg1a3bx73qdvwr48nz23cljmmk1m8"; + }; + + propagatedBuildInputs = [ aiohttp jsonrpc-async jsonrpc-websocket ]; + + pythonImportsCheck = [ "pykodi" ]; + + meta = with lib; { + description = "An async python interface for Kodi over JSON-RPC"; + homepage = "https://github.com/OnFreund/PyKodi"; + license = licenses.mit; + maintainers = with maintainers; [ sephalon ]; + }; +} diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index 6e72309a58d..45c193899fe 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -1,31 +1,50 @@ -{ buildPythonPackage, - fetchFromGitHub, - isPy27, - lib, - opuslib, - protobuf, +{ buildPythonPackage +, fetchFromGitHub +, fetchpatch +, isPy27 +, lib +, opuslib +, protobuf +, pytestCheckHook +, pycrypto }: buildPythonPackage rec { pname = "pymumble"; - version = "0.3.1"; + version = "1.6"; disabled = isPy27; src = fetchFromGitHub { owner = "azlux"; repo = "pymumble"; - rev = "1dd6d6d4df2fdef33202f17e2acf3ba9678a5737"; - sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz"; + rev = version; + sha256 = "04nc66d554a98mbmdgzgsg6ncaz0jsn4zdr3mr14w6wnhrxpjkrs"; }; + patches = [ + # Compatibility with pycryptodome (which is what our pycrypto really is) + # See https://github.com/azlux/pymumble/pull/99 + (fetchpatch { + url = "https://github.com/azlux/pymumble/pull/99/commits/b85548a0e1deaac820954b1c0b308af214311a14.patch"; + sha256 = "0w9dpc87rny6vmhi634pih1p97b67jm26qajscpa9wp6nphdlxlj"; + }) + ]; + + postPatch = '' + # Changes all `library==x.y.z` statements to just `library` + # So that we aren't constrained to a specific version + sed -i 's/\(.*\)==.*/\1/' requirements.txt + ''; propagatedBuildInputs = [ opuslib protobuf ]; + checkInputs = [ pytestCheckHook pycrypto ]; + pythonImportsCheck = [ "pymumble_py3" ]; meta = with lib; { description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot."; homepage = "https://github.com/azlux/pymumble"; - license = licenses.gpl3; - maintainers = with maintainers; [ thelegy ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ thelegy infinisil ]; }; } diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index bf9a9eecfb8..8bb82fa330a 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynmea2"; - version = "1.16.0"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0w9g5qh573276404f04b46684ydlakv30ds0x0r4kcl370ljmfsg"; + sha256 = "0x5xrk51dpzsvky1ncikadm80a44a82j3mjjykmhmx7jddc5qh9d"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 4b52d3b290c..e98e2bc3dbc 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -1,7 +1,8 @@ { lib +, aiosmb , aiowinreg , buildPythonPackage -, fetchFromGitHub +, fetchPypi , minidump , minikerberos , msldap @@ -10,16 +11,15 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.4.3"; + version = "0.4.7"; - src = fetchFromGitHub { - owner = "skelsec"; - repo = pname; - rev = version; - sha256 = "sha256-ows6zJyygdAwgKNKKCURWX+kl42f3CN23/xZrLjkfrw="; + src = fetchPypi { + inherit pname version; + sha256 = "0il5sj47wyf9gn76alm8v1l63rqw2vsd27v6f7q1dpn0wq209syi"; }; propagatedBuildInputs = [ + aiosmb aiowinreg minikerberos msldap diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 367c258b5f7..ce25bc04a13 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -14,12 +14,12 @@ let in buildPythonPackage rec { pname = "PyQtWebEngine"; - version = "5.15.2"; + version = "5.15.4"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0d56ak71r14w4f9r96vaj34qcn2rbln3s6ildvvyc707fjkzwwjd"; + sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f"; }; inherit patches; diff --git a/pkgs/development/python-modules/pyradios/default.nix b/pkgs/development/python-modules/pyradios/default.nix new file mode 100644 index 00000000000..f95988063dd --- /dev/null +++ b/pkgs/development/python-modules/pyradios/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, appdirs, requests }: +buildPythonPackage rec { + pname = "pyradios"; + version = "0.0.22"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bgfb8vz7jybswss16pdzns0qpqfrwa9f2g8qrh1r4mig4xh2dmi"; + }; + + propagatedBuildInputs = [ + appdirs + requests + ]; + + doCheck = false; + + meta = with lib; { + description = "Python client for the https://api.radio-browser.info"; + homepage = "https://github.com/andreztz/pyradios"; + license = licenses.mit; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 86a5ef6bfe0..6d33e18e4f9 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fetchpatch , pyparsing , numpy , cython , astropy , astropy-helpers -, pytest +, pytestCheckHook , pytest-astropy }: @@ -15,15 +15,18 @@ buildPythonPackage rec { pname = "pyregion"; version = "2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "a8ac5f764b53ec332f6bc43f6f2193ca13e8b7d5a3fb2e20ced6b2ea42a9d094"; + # pypi src contains cython-produced .c files which don't compile + # with python3.9 + src = fetchFromGitHub { + owner = "astropy"; + repo = pname; + rev = version; + sha256 = "1izar7z606czcyws9s8bjbpb1xhqshpv5009rlpc92hciw7jv4kg"; }; propagatedBuildInputs = [ pyparsing numpy - cython astropy ]; @@ -36,9 +39,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ astropy-helpers ]; + nativeBuildInputs = [ astropy-helpers cython ]; - checkInputs = [ pytest pytest-astropy ]; + checkInputs = [ pytestCheckHook pytest-astropy ]; # Disable automatic update of the astropy-helper module postPatch = '' @@ -46,9 +49,11 @@ buildPythonPackage rec { ''; # Tests must be run in the build directory - checkPhase = '' - cd build/lib.* - pytest + preCheck = '' + pushd build/lib.* + ''; + postCheck = '' + popd ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index f1005fe0b7a..5cc86e909f0 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.3.5"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16"; + sha256 = "sha256-BOVALVFb/p2q3A4NkvgtwmL5fNvwMCk0hb1L5MRWzHY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 728d47b1f96..8e90ce5190f 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -1,32 +1,54 @@ -{ buildPythonPackage, fetchPypi, lib, isPy3k -, pkg-config, igraph -, texttable }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pkg-config +, igraph +, texttable +, python +}: buildPythonPackage rec { pname = "python-igraph"; - version = "0.8.3"; - disabled = !isPy3k; # fails to build + version = "0.9.1"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ igraph ]; - propagatedBuildInputs = [ texttable ]; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "e1f27622eddeb2bd5fdcbadb41ef048e884790bb050f9627c086dc609d0f1236"; + src = fetchFromGitHub { + owner = "igraph"; + repo = "python-igraph"; + rev = version; + sha256 = "1ldyzza25zvwh144lw8x856z76s8gfvnbdm56fcmwkvm7aj81npw"; }; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + igraph + igraph.dev + ]; + + propagatedBuildInputs = [ + texttable + ]; + # NB: We want to use our igraph, not vendored igraph, but even with # pkg-config on the PATH, their custom setup.py still needs to be explicitly # told to do it. ~ C. setupPyGlobalFlags = [ "--use-pkg-config" ]; - doCheck = !isPy3k; + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + pythonImportsCheck = [ "igraph" ]; - meta = { + meta = with lib; { description = "High performance graph data structures and algorithms"; homepage = "https://igraph.org/python/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.MostAwesomeDude ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; } diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 78c89408ac2..07d7ba9b3c1 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -1,51 +1,75 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi -, appdirs +, poetry , click -, construct -, croniter , cryptography -, importlib-metadata -, pytest -, pytest-mock +, construct , zeroconf , attrs , pytz +, appdirs , tqdm , netifaces +, android-backup +, importlib-metadata +, croniter +, defusedxml +, pytestCheckHook +, pytest-mock +, pyyaml }: buildPythonPackage rec { pname = "python-miio"; - version = "0.5.4"; + version = "0.5.5.2"; + disabled = pythonOlder "3.6"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "5a6fd3bb2cc2f75cdfe5673f36a5a418144d08add6e53b384cb146e99f27bd39"; + sha256 = "sha256-lk7egCyj+vSsaXmxuWxlQuom8n3JEs/RIWwCuwTOXeI="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "zeroconf>=0.25.1,<0.26.0" "zeroconf" - substituteInPlace setup.py \ - --replace "pytz>=2019.3,<2020.0" "pytz" - substituteInPlace setup.py \ - --replace "cryptography>=2.9,<3.0" "cryptography" - ''; - - checkInputs = [ pytest pytest-mock]; - propagatedBuildInputs = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ]; - - checkPhase = '' - pytest + substituteInPlace pyproject.toml \ + --replace 'croniter = "^0"' 'croniter = "*"' \ + --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' ''; + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + click + cryptography + construct + zeroconf + attrs + pytz + appdirs + tqdm + netifaces + android-backup + croniter + defusedxml + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata; + + checkInputs = [ + pytestCheckHook + pytest-mock + pyyaml + ]; + + pythonImportsCheck = [ "miio" ]; + meta = with lib; { description = "Python library for interfacing with Xiaomi smart appliances"; homepage = "https://github.com/rytilahti/python-miio"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ flyfloh ]; }; } diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 700188f15dd..87f6b9756ed 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , nose , lxml , requests @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyxnat"; version = "1.4"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -19,6 +19,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml requests ]; + # future is not used, and pathlib is installed part of python38+ + # w/o an external package + prePatch = '' + substituteInPlace setup.py \ + --replace "pathlib>=1.0" "" \ + --replace "future>=0.16" "" + ''; + checkInputs = [ nose ]; checkPhase = "nosetests pyxnat/tests"; doCheck = false; # requires a docker container running an XNAT server diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 9346fae9743..80f060c6681 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -39,7 +39,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.12.1"; + version = "0.12.2"; disabled = pythonOlder "3.6"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx"; + sha256 = "0yil363mqssq0453nrwxgkjivzk3a4jgbnaf21bp7lwfcl2jdhqm"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 5051c6541cd..97603dc3cde 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ 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.24.0"; + version = "0.24.1"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h"; + sha256 = "0qfz69n8sl7sk4hzygni9qars9q1cyz0n3bv1lca00ia5qsc72d2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 0de5d6de3bb..57c52ff49ba 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -38,6 +38,10 @@ buildPythonPackage rec { description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; homepage = "https://pypi.python.org/pypi/rabbitpy"; license = licenses.bsd3; + + # broken by pamqp==3, tracked in + # https://github.com/gmr/rabbitpy/issues/125 + broken = true; }; } diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index acce48c45d0..b2fc2d9beae 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -7,38 +7,32 @@ , packaging , pygments , mock +, pytestCheckHook }: buildPythonPackage rec { pname = "restview"; - version = "2.9.1"; + version = "2.9.2"; src = fetchPypi { inherit pname version; - sha256 = "de87c84f19526bd4a76505f6d40b51b7bb03ca43b6067c93f82f1c7237ac9e84"; + sha256 = "1p1jgdvc04ws8kga3r0vrq3m0b52qw3clwyydl96a13wb3mrf03r"; }; - propagatedBuildInputs = [ docutils readme_renderer packaging pygments ]; - checkInputs = [ mock ]; - patches = [ - # fix tests after readme_renderer update - # TODO remove on next update (fetchpatch { - url = "https://github.com/mgedmin/restview/commit/541743ded13ae55dea4c437046984a5f13d06e8b.patch"; - sha256 = "031b1dlqx346bz7afpc011lslnq771lnxb6iy1l2285pph534bci"; + url = "https://github.com/mgedmin/restview/commit/a1ded30a87c65f3ce59a18497a7fc5099317c2be.patch"; + sha256 = "1ax7pih456a3nbj8qrrq7hqigbyag4ihzpn6bm0z4y74d0r3v8a5"; }) ]; - postPatch = '' - # dict order breaking tests - sed -i 's@<a href="http://www.example.com" rel="nofollow">@...@' src/restview/tests.py - ''; + propagatedBuildInputs = [ docutils readme_renderer packaging pygments ]; + checkInputs = [ mock pytestCheckHook ]; meta = { description = "ReStructuredText viewer"; homepage = "https://mg.pov.lt/restview/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ koral ]; }; } diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index c4e451aade5..21d5886efe2 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }: buildPythonPackage rec { pname = "rope"; @@ -9,6 +9,15 @@ buildPythonPackage rec { sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04"; }; + patches = [ + # Python 3.9 ast changes + (fetchpatch { + url = "https://github.com/python-rope/rope/pull/333.patch"; + excludes = [ ".github/workflows/main.yml" ]; + sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0"; + }) + ]; + checkInputs = [ nose ]; checkPhase = '' # tracked upstream here https://github.com/python-rope/rope/issues/247 @@ -19,6 +28,6 @@ buildPythonPackage rec { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; maintainers = with maintainers; [ goibhniu ]; - license = licenses.gpl2; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index f95696e20b9..8476701d47a 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.30.0"; + version = "2.31.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3BxRDoaKxaXlKYGYQqhQ2DUO3XONvf6dlofE0pbXIho="; + sha256 = "sha256-RMw7l3s0QBzB+exiZg2aBQYeprHUJM+f0Rf+N8ywaBU="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 0b8edf8bdd9..52aa8a98e1e 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://salmon-mail.readthedocs.org/"; description = "Pythonic mail application server"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 06d2d40d180..08c9e7ce3eb 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -1,20 +1,30 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils -, pyopencl, opencl-headers +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytest_5 +, numpy +, scipy +, matplotlib +, docutils +, pyopencl +, opencl-headers }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; rev = "v${version}"; - sha256 = "1qvh7q0fkls5r8r9mrph6igcvv8x3qsslqsc5jf1n20alcs5zjrl"; + sha256 = "0h2k81dm92sm0z086qy3ipw6y6cfgpb7ppl7lhjmx6816s3k50sa"; }; buildInputs = [ opencl-headers ]; - checkInputs = [ pytest ]; + # Note: the 1.0.5 release should be compatible with pytest6, so this can + # be set back to 'pytest' at that point + checkInputs = [ pytest_5 ]; propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ]; checkPhase = '' diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index c281a6d6b0d..cb4578671b9 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,27 +1,34 @@ { lib -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub +, pytest-cov , pytestCheckHook -, pytestcov }: buildPythonPackage rec { pname = "semver"; - version = "2.10.2"; + version = "2.13.0"; src = fetchFromGitHub { owner = "python-semver"; repo = "python-semver"; rev = version; - sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3"; + sha256 = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; - preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + # Confuses source vs dist imports in pytest + preCheck = "rm -r dist"; + + pythonImportsCheck = [ "semver" ]; meta = with lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = "https://python-semver.readthedocs.io/en/latest/"; + homepage = "https://python-semver.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 958fc613f6f..d973bc70bcd 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; patches = [ - # Fix for newer versions of scikit-learn. See: https://github.com/rsteca/sklearn-deap/pull/62 + # Fix for scikit-learn v0.21.1. See: https://github.com/rsteca/sklearn-deap/pull/62 (fetchpatch { url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch"; sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk"; @@ -31,6 +31,8 @@ buildPythonPackage rec { homepage = "https://github.com/rsteca/sklearn-deap"; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; + # broken by scikit-learn 0.24.1 + broken = true; }; } diff --git a/pkgs/development/python-modules/solaredge/default.nix b/pkgs/development/python-modules/solaredge/default.nix new file mode 100644 index 00000000000..f593ff50162 --- /dev/null +++ b/pkgs/development/python-modules/solaredge/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, pythonOlder +, pytz +, requests +}: + +buildPythonPackage rec { + pname = "solaredge"; + version = "0.0.4"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0q4gib0l3qnlpncg84ki027vr1apjlr47vd6845rpk7zkm8lqgfz"; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "solaredge" ]; + + meta = with lib; { + description = "Python wrapper for Solaredge monitoring service"; + homepage = "https://github.com/bertouttier/solaredge"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 739ea2afa82..94047b359aa 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Rebuild Sphinx documentation on changes, with live-reload in the browser"; homepage = "https://github.com/executablebooks/sphinx-autobuild"; license = with licenses; [ mit ]; - maintainer = with maintainers; [holgerpeters]; + maintainers = with maintainers; [holgerpeters]; }; } diff --git a/pkgs/development/python-modules/sphinx-navtree/default.nix b/pkgs/development/python-modules/sphinx-navtree/default.nix index 02e5711e888..ae56a9fdce1 100644 --- a/pkgs/development/python-modules/sphinx-navtree/default.nix +++ b/pkgs/development/python-modules/sphinx-navtree/default.nix @@ -14,5 +14,7 @@ buildPythonPackage rec { description = "Navigation tree customization for Sphinx"; homepage = "https://github.com/bintoro/sphinx-navtree"; license = lib.licenses.mit; + # not compatible with sphinx 3.3, not updated since 2016 + broken = true; }; } diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index ac80be2fe0c..6ed265f6561 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -1,38 +1,49 @@ { lib -, buildPythonPackage -, fetchFromGitHub , aiohttp , asynctest -, stdiomask +, buildPythonPackage , cryptography -, pytestcov +, fetchFromGitHub , pytest-asyncio , pytestCheckHook +, pythonOlder +, stdiomask }: buildPythonPackage rec { pname = "subarulink"; - version = "0.3.12"; + version = "0.3.13"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; rev = "subaru-v${version}"; - sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6"; + sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g"; }; - propagatedBuildInputs = [ aiohttp stdiomask ]; + propagatedBuildInputs = [ + aiohttp + stdiomask + ]; checkInputs = [ asynctest cryptography pytest-asyncio - pytestcov pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg --replace "--cov=subarulink" "" + ''; + __darwinAllowLocalNetworking = true; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "subarulink" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 3a72b5c3102..d5dfda53c08 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,31 +1,26 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, colorama, mypy, pyyaml, regex -, dataclasses, typing -, pytestrunner, pytest-mypy +, colorama, regex +, pytestrunner, pytestCheckHook, pytest-mypy }: buildPythonPackage rec { - pname = "TatSu"; - version = "5.5.0"; + pname = "tatsu"; + version = "5.6.1"; src = fetchFromGitHub { owner = "neogeny"; - repo = pname; + repo = "TatSu"; rev = "v${version}"; - sha256 = "07bmdnwh99p60cgzhlb8s5vwi5v4r5zi8shymxnnarannkc66hzn"; + sha256 = "149ra1lwax5m1svlv4dwjfqw00lc5vwyfj6zw2v0ammmfm1b94x9"; }; disabled = pythonOlder "3.8"; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ colorama mypy pyyaml regex ] - ++ lib.optionals (pythonOlder "3.7") [ dataclasses ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; - checkInputs = [ pytest-mypy ]; + propagatedBuildInputs = [ colorama regex ]; + checkInputs = [ pytestCheckHook pytest-mypy ]; - checkPhase = '' - pytest test/ - ''; + pythonImportsCheck = [ "tatsu" ]; meta = with lib; { description = "Generates Python parsers from grammars in a variation of EBNF"; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index b91289e5061..d5b257abedf 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -1,28 +1,56 @@ -{ lib, fetchPypi, buildPythonPackage, setuptools_scm -, requests, requests-file, idna, filelock, pytest +{ lib +, buildPythonPackage +, fetchPypi +, filelock +, idna +, pytest-mock +, pytestCheckHook +, pythonOlder +, requests +, requests-file , responses +, setuptools-scm }: buildPythonPackage rec { pname = "tldextract"; version = "3.1.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea"; }; - propagatedBuildInputs = [ requests requests-file idna filelock ]; - checkInputs = [ pytest responses ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + filelock + idna + requests + requests-file + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + responses + ]; + + postPatch = '' + substituteInPlace pytest.ini --replace " --pylint" "" + ''; - # No tests included - doCheck = false; pythonImportsCheck = [ "tldextract" ]; - meta = { + meta = with lib; { + description = "Python module to accurately separate the TLD from the domain of an URL"; + longDescription = '' + tldextract accurately separates the gTLD or ccTLD (generic or country code top-level domain) + from the registered domain and subdomains of a URL. + ''; homepage = "https://github.com/john-kurkowski/tldextract"; - description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List"; - license = lib.licenses.bsd3; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/urllib3/2.nix b/pkgs/development/python-modules/urllib3/2.nix index b44993c71b2..a67ebd62f7e 100644 --- a/pkgs/development/python-modules/urllib3/2.nix +++ b/pkgs/development/python-modules/urllib3/2.nix @@ -1,5 +1,4 @@ { lib -, stdenv , brotli , buildPythonPackage , certifi diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index fa323fb960b..b4fb9a0e71c 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , brotli , buildPythonPackage , certifi diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 280470957dc..3da25743594 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "5.0.5"; + version = "5.0.8"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "01248nh8y5szin6ymd3hrl8qnsg4xijsk3lxyks8zk9cjh008lmq"; + sha256 = "01g1bk7rscwmvr2i183z0y2bs1iw7bxk7c5rcf9gf25242nppv6a"; }; checkInputs = [ pytest ]; @@ -22,10 +22,11 @@ buildPythonPackage rec { checkPhase = '' make check ''; + pythonImportsCheck = [ "xdis" ]; meta = with lib; { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = "https://github.com/rocky/python-xdis/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index b1a1afbe201..26f6516829b 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.17.2"; + version = "0.17.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-DJglvcpqGBVkycEjq+Oa9gz9Keop39+UR9SctX0lg/A="; + sha256 = "sha256-QMtpGd7JFPGTLHbhyjOsan1Ow32v8B2ss84GpHA0qqs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index ed4a4165680..f84db4ff624 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.14.3"; + version = "0.15.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "83251a95d5bd74116353d29dfda2d0c5055b88276a0876a313a66f8b9c691344"; + sha256 = "sha256-pVQqoMvuuFc/1QNG5z/AspGlgIGPi9aqjZ3/3eVNhis="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 02af8eaa967..20667988548 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -18,7 +18,7 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, fetchurl, fetchgit, makeWrapper, git, darwin +{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, darwin , ruby, bundler } @ defs: @@ -89,7 +89,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { buildInputs = [ ruby makeWrapper - ] ++ lib.optionals (type == "git") [ git ] + ] ++ lib.optionals (type == "git") [ gitMinimal ] ++ lib.optionals (type != "gem") [ bundler ] ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 77992b9909c..49b711c2c19 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.4.5"; + version = "2.4.6"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-FM7fcjbZilp1spy0HxDhEAzs7Qe2r/HObKB80o4mSiw="; + sha256 = "sha256-lJ/N9oduWGZAc70wl7ATBd1mnaUkeTXAW/RfqbAthsI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 30c0614446e..600d0efc92e 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3"; + sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo="; }; buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0c6c9dbad08..47c7b0fac9f 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.146.0"; + version = "0.147.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0kxws51hri0b4z7k05li6vg1arcdc7i5jzfibi0iplsfyy14159q"; + sha256 = "sha256-3U8BOYUHl1YiOnxAIV2V6Ib+LZ0DydtSfwAxN2Hj09g="; }; installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ]) + buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; - broken = stdenv.isAarch64; # https://github.com/facebook/flow/issues/7556 maintainers = with maintainers; [ marsam puffnfresh ]; }; } diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 3623893ea63..287321804e2 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -105,12 +105,12 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "25480"; - gittap = "5.0.0"; - gittip = "a476454c00f64acbb7425c178c98714ef76e26d7"; - rev = "5.0.0"; - version = "5.0.0"; - sha256 = "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"; + version_commit = "25741"; + gittap = "5.1.1"; + gittip = "a86f8077fc148abd6443384362a3717cd4310e64"; + rev = "5.1.1"; + version = "5.1.1"; + sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3"; cs_ver = "4.0.2"; cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index ebd6e073fe5..a9a0a234317 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -124,6 +124,7 @@ def main() -> None: radare2_info = get_repo_info(dirname, radare2_rev) + git(dirname, "fetch", r2_cutter_rev) git(dirname, "checkout", r2_cutter_rev) timestamp = git(dirname, "log", "-n1", "--format=%at") diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 87143766d42..03f6954d5a1 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.39.10"; + version = "0.39.14"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T2soogk5KcNSeluNyJ4b2GjLkvauvvznaLSMQVgVZgI="; + sha256 = "sha256-Peq51XN8EEvHWdSL3ngBx74t7V4RUrZa4RpGnvZ0Ml8="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index c93b864b70f..dca74fa76b7 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -1,12 +1,11 @@ { buildGoPackage , lib , fetchFromGitHub -, fetchpatch }: buildGoPackage rec { pname = "asmfmt"; - version = "1.2.1"; + version = "1.2.3"; goPackagePath = "github.com/klauspost/asmfmt"; @@ -14,7 +13,7 @@ buildGoPackage rec { owner = "klauspost"; repo = "asmfmt"; rev = "v${version}"; - sha256 = "0qwxb4yx12yl817vgbhs7acaj98lgk27dh50mb8sm9ccw1f43h9i"; + sha256 = "0f2cgwxs2b2kpq5348h8hjkcqc40p8ajapzpcy9ia2fsmsn2a2s4"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix new file mode 100644 index 00000000000..cc5d3aca2c3 --- /dev/null +++ b/pkgs/development/tools/bashate/default.nix @@ -0,0 +1,43 @@ +{ lib +, Babel +, buildPythonApplication +, fetchPypi +, fixtures +, mock +, pbr +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonApplication rec { + pname = "bashate"; + version = "2.0.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "05qsaaqfpvr6h4g19prbkpznwb9a4dwzyzivdzh9x80cgkq0r6gb"; + }; + + propagatedBuildInputs = [ + Babel + pbr + setuptools + ]; + + checkInputs = [ + fixtures + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "bashate" ]; + + meta = with lib; { + description = "Style enforcement for bash programs"; + homepage = "https://opendev.org/openstack/bashate"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index bc3a2828f6c..657704a653c 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , git , go -, python +, python3 , lib, stdenv }: @@ -22,7 +22,7 @@ buildBazelPackage rec { sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r"; }; - nativeBuildInputs = [ go git python ]; + nativeBuildInputs = [ go git python3 ]; removeRulesCC = false; bazelTarget = "//ibazel"; diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix new file mode 100644 index 00000000000..fc232d55da6 --- /dev/null +++ b/pkgs/development/tools/buf/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, protobuf +}: + +buildGoModule rec { + pname = "buf"; + version = "0.40.0"; + + src = fetchFromGitHub { + owner = "bufbuild"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-N6o+1cfer8rgKJ3+CL25axJSjGV/YSG1sLIHXJzsC6o="; + }; + + patches = [ + ./skip_test_requiring_network.patch + ]; + + preCheck = '' + export PATH=$PATH:$GOPATH/bin + ''; + + nativeBuildInputs = [ protobuf ]; + + vendorSha256 = "sha256-vl+WqtpegoAvylx/lcyfJk8DAOub8U4Lx3Pe3eW4M/E="; + + meta = with lib; { + description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; + homepage = "https://buf.build"; + license = licenses.asl20; + maintainers = with maintainers; [ raboof ]; + }; +} diff --git a/pkgs/development/tools/buf/skip_test_requiring_network.patch b/pkgs/development/tools/buf/skip_test_requiring_network.patch new file mode 100644 index 00000000000..8d3e15c17ff --- /dev/null +++ b/pkgs/development/tools/buf/skip_test_requiring_network.patch @@ -0,0 +1,15 @@ +diff --git a/internal/buf/internal/buftesting/buftesting.go b/internal/buf/internal/buftesting/buftesting.go +index dc8da0c..70ad299 100644 +--- a/internal/buf/internal/buftesting/buftesting.go ++++ b/internal/buf/internal/buftesting/buftesting.go +@@ -100,6 +100,10 @@ func RunActualProtoc( + + // GetGoogleapisDirPath gets the path to a clone of googleapis. + func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string { ++ // Requires network access, which is not available during ++ // the nixpkgs sandboxed build ++ t.Skip() ++ + googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath) + require.NoError( + t, diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index a828c57b8c0..556725cca6c 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lua5_3, python }: +{ lib, stdenv, fetchFromGitHub, lua5_3, python3 }: stdenv.mkDerivation rec { pname = "bam"; @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"; }; - buildInputs = [ lua5_3 python ]; + nativeBuildInputs = [ lua5_3 python3 ]; buildPhase = "${stdenv.shell} make_unix.sh"; - checkPhase = "${python.interpreter} scripts/test.py"; + checkPhase = "${python3.interpreter} scripts/test.py"; + + strictDeps = true; installPhase = '' mkdir -p "$out/share/bam" diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index 2ec244e502b..f03f42be389 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper , zip, unzip, bash, writeCBin, coreutils -, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils +, which, python3, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils # Apple dependencies , cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -210,8 +210,8 @@ stdenv'.mkDerivation rec { # Substitute python's stub shebang to plain python path. (see TODO add pr URL) # See also `postFixup` where python is added to $out/nix-support substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ - --replace "/usr/bin/env python" "${python}/bin/python" \ - --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \ + --replace "/usr/bin/env python" "${python3.interpreter}" \ + --replace "NIX_STORE_PYTHON_PATH" "${python3.interpreter}" \ # md5sum is part of coreutils sed -i 's|/sbin/md5|md5sum|' \ @@ -287,11 +287,13 @@ stdenv'.mkDerivation rec { buildJdk ]; + strictDeps = true; + # when a command can’t be found in a bazel build, you might also # need to add it to `defaultShellPath`. nativeBuildInputs = [ zip - python + python3 unzip makeWrapper which @@ -380,7 +382,7 @@ stdenv'.mkDerivation rec { echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends # The templates get tar’d up into a .jar, # so nix can’t detect python is needed in the runtime closure - echo "${python}" >> $out/nix-support/depends + echo "${python3}" >> $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 41ae9ce2112..5b20ece7680 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -62,6 +62,7 @@ let srcs.rules_cc srcs.rules_java srcs.rules_proto + srcs.com_google_protobuf ]); distDir = runCommand "bazel-deps" {} '' @@ -527,6 +528,13 @@ stdenv.mkDerivation rec { --output=./bazel_src/output/bazel-complete.bash \ --prepend=./bazel_src/scripts/bazel-complete-header.bash \ --prepend=./bazel_src/scripts/bazel-complete-template.bash + + # need to change directory for bazel to find the workspace + cd ./bazel_src + # build execlog tooling + export HOME=$(mktemp -d) + ./output/bazel build src/tools/execlog:parser_deploy.jar + cd - ''; installPhase = '' @@ -537,7 +545,15 @@ stdenv.mkDerivation rec { # The binary _must_ exist with this naming if your project contains a .bazelversion # file. cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + + mkdir $out/share + cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + cat <<EOF > $out/bin/bazel-execlog + #!${runtimeShell} -e + ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ + EOF + chmod +x $out/bin/bazel-execlog # shell completion files installShellCompletion --bash \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 4f92f8448af..31dbc2779cd 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -560,6 +560,13 @@ stdenv.mkDerivation rec { ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ --bazel=./bazel_src/output/bazel \ --output=./bazel_src/output/bazel-complete.fish + + # need to change directory for bazel to find the workspace + cd ./bazel_src + # build execlog tooling + export HOME=$(mktemp -d) + ./output/bazel build src/tools/execlog:parser_deploy.jar + cd - ''; installPhase = '' @@ -572,6 +579,14 @@ stdenv.mkDerivation rec { cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + mkdir $out/share + cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar + cat <<EOF > $out/bin/bazel-execlog + #!${runtimeShell} -e + ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ + EOF + chmod +x $out/bin/bazel-execlog + # shell completion files installShellCompletion --bash \ --name bazel.bash \ diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 5942e20ec92..4538c212da5 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.3"; + version = "0.9.5"; src = fetchurl { - url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77"; + url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; + sha256 = "142vr40p60mapvvb5amn8hz6a8930kxsz510baql40hai4yhga7z"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 9ef0cfe10e7..16ea0dc2831 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-1T0S2GWA/ojRZMRyWgtFQ2rzmIqvMvaa19jI4Fl9R44="; + hash = "sha256-uK060F7d7/pTCNbGqdKCzxgPrPPbGjNwuUOt176z7EM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index e5763e6aa91..4ca0343d8fa 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.8"; + version = "1.20.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-xhnhc4vhKw5T93076vS+pszIOpj22KzaPyzCvuHMaPE="; + sha256 = "12gmn61mfrr58071x3cdsksad6swn1b23ghih128hjdpdzk1zxs3"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index aa60d7be5b5..0f31f7b1b37 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VTQ3NOskBp7ic8a/nn/ZbALJVff+Pb/ZHHbld/OxQdo="; + sha256 = "sha256-+fYw5dIDJJKGQKBL6RQh1SCQufbAkKeuJpPlywzbbnM="; }; - vendorSha256 = "sha256-n8X2NyQiOpEQ0d/ek1kdxKFfaCFf0EucflVLZjOGMfY="; + vendorSha256 = "sha256-fSUTl5W/DyloCuCpEqA5z4bhB7wYxzPt6E0SfjorfQ0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 886d435b811..1c5f316cea9 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, emacs }: +{ lib, stdenv, fetchurl, python3, emacs }: stdenv.mkDerivation rec { pname = "cask"; @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ] ++ [ - python + python3 ]; + strictDeps = true; + buildPhase = '' emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el ''; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 5ba6718a6bd..4a402111b08 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,16 +2,16 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.27.0"; + version = "3.28.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-JfOCht+awc0I22vtRD5hgowgdVkcJR3qSxnxLoc3XZY="; + sha256 = "sha256-5YOXYOAh/0fOagcqdK2IEwm5XDCxyfTeTzwBGtsQRCs="; }; - vendorSha256 = "sha256-4zKe8y+9fedvCt/XmPf0HxtyqLz+FP4Ylt6k9KBjaIw="; + vendorSha256 = "sha256-3UXZxeiL0WO4X/3/hW8ubL1TormGbn9X/k0PX+/cLuM="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix new file mode 100644 index 00000000000..a2e7b739718 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "drone-runner-docker"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "drone-runners"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WI3pr0t6EevIBOQwCAI+CY2O8Q7+W/CLDT/5Y0+tduQ="; + }; + + vendorSha256 = "15lpdliqz129yq5zgzjvndwdxngxa96g0ska4zkny7ycb3vwq0xm"; + + meta = with lib; { + maintainers = with maintainers; [ endocrimes ]; + license = licenses.unfreeRedistributable; + homepage = "https://github.com/drone-runners/drone-runner-docker"; + description = "Drone pipeline runner that executes builds inside Docker containers"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ad886e0c3c6..eeffee057d4 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.9.0"; + version = "13.10.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0zgnp6l0p1i7x6lppd24nfb6kqa8mw7rnr2p5gmwbmjv9i9zkycs"; + sha256 = "0lw087xcbzf4d68mq0h0s31na7lww2d9nv43icw9qx05aknlcddv"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "06b5p9ygcnrjrisp6bcgw9s3j2zlycp8jsri259bjf7rrfbwpkma"; + sha256 = "1mf3w85ivc8r2rmb78r4b87rrxmbb1zda9pp8n4nvd0igg23xqk8"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0wzqrfjg43wnf9lr34jn3ydlxi7vsnqs55pm5igba592q8ykfbxk"; + sha256 = "0xy5mpcpxcmwfdrspd29z8nyn1m9i4ma7d5kbihwa2yxznylydpx"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index bb5f8a4c9cd..64c48b702cf 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.14"; + version = "2.0.16"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-mGVOg+I42O3VYj7RStEOfZajS9RZo9hLWKap6UdjJCE="; + sha256 = "sha256-Yx6PvBo763GnEwU5s7AYUs++Au25TF6cZ4WYGgruHpw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index 86d55ab0780..26124b1054f 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "drm_info"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ascent12"; repo = "drm_info"; rev = "v${version}"; - sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; + sha256 = "sha256-UTDYLe3QezPCyG9CIp+O+KX716JDTL9mn+OEjjyTwlg="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9d4c7d6e692..518eef2d1a0 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -86,30 +86,30 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - electron_10 = mkElectron "10.4.0" { - x86_64-linux = "6246481577bc0bfa719e0efb3144e8d7ca53e3f20defce7b5e1be4d9feb0becb"; - x86_64-darwin = "bc9e201643db3dae803db934fa4e180d13b707de6be1c3348ca5ed2c21d30bf4"; - i686-linux = "aa6a9042097b964230b519c158e369a249a668cc6c7654b30ddd02ced4bad9d1"; - armv7l-linux = "7e99a9c6aeedd7cc0b25260ac4630730629f363a09b72bd024b42837ab9777bd"; - aarch64-linux = "ef671fe3cbb7c84e277d885ed157552602bc88d326dc95b322953c6b193f59a1"; - headers = "1vsvna2zr7qxnk2qsdjzgkv5v2svrllbsjj08qrilly7nbksk9fg"; + electron_10 = mkElectron "10.4.2" { + x86_64-linux = "3d613b413f01c8af1600be42c82941761452407e1160125eca60feec0d7dd0c0"; + x86_64-darwin = "87b18811d165f2fd64606ae13a567b737f54bd41c7e2204a047a3532f4fa2d9c"; + i686-linux = "297083ca9b21554ea1f729ed17c0c8b13aaea24e77194f9c1b340489fcfc0fa6"; + armv7l-linux = "3d93ec220824cce5d99b3a7511604b89c63935bd1130fc64ce08b8436e34c096"; + aarch64-linux = "0060e37eada91bac51945ae325ab04309438609089d31ab3f8bbfda73cc26166"; + headers = "13cpkblkvhvd3sww8n1gw4rhva84x2fkkg81yr3n2mb0virlfgpn"; }; - electron_11 = mkElectron "11.3.0" { - x86_64-linux = "136794f9ecc1c6ea38fe9b85682e8fcc8c4afd559f5cd6b4059339b017279917"; - x86_64-darwin = "7569db1d2e470b0db512735f27f99498f631da3cd86374345139f18df88789fe"; - i686-linux = "48ab133cab380c564529ea605d4521404b9bd07d80dad6346e1756a0952081cd"; - armv7l-linux = "5774c2995c6dcf911ece00a94ace0f37d55132da91b1fd242c69e047872ef137"; - aarch64-linux = "fad31c6fba7aba54db19a2aaedb03b514c51dd58bf301afab5265126833feb15"; - headers = "123g3dgsb4vp8w1bm4apbp973ppzx4i4y35lhhmqjbp51jhrm9f0"; + electron_11 = mkElectron "11.4.1" { + x86_64-linux = "3efd3d3b5a9f71323320288aece65fcec89ea0331c3d6d3afc2495d3b0dc95d3"; + x86_64-darwin = "6ff91613c51b2ebaf280eb86b826f47d62639081a0f38c2012c428a17619a163"; + i686-linux = "513e1bc7a3e546dc0e712836886ac89c9f76bb7fb1e4b7a1f9d9cbc7347d8569"; + armv7l-linux = "838fc96d90cfcc5e1e892287008f9d9d2dbe27f3d4cf2479e6275ecdd140fb65"; + aarch64-linux = "a3de4208b5033a19ffa9dd8130d440909b181c0ef57cb51c8f9c8dbbb1267a26"; + headers = "1bpsmmlxl4gk9yn5w7f8m6g8k1gmvwk0jwpqlk5islpkcy6x7107"; }; - electron_12 = mkElectron "12.0.1" { - x86_64-linux = "495cd0df420becbd9581b8833fa8bdefaef397fc3590d064932722d55cf5ff82"; - x86_64-darwin = "af2adac0b5b32c95ad2b834d5521bd301983954e986048b46cdf5c739423de17"; - i686-linux = "4a41d03ef38eda8d50dc57774f49f676398a2130783c2c9a3411e7018ef77e2b"; - armv7l-linux = "ae06d70d34abc06c7127a468ab0956a4a26752cc313ab1b802972748e952a3a7"; - aarch64-linux = "95716be616ab690c2e78236715fe52ae57b4213fe1c19dc08593ae1e75b8767e"; - headers = "1gxzafzi47wrvwrzmll5zff7dzw4jk2p5pdkzgazr2yxkhw9qvca"; + electron_12 = mkElectron "12.0.2" { + x86_64-linux = "fc3ff888d8cd4ada8368420c8951ed1b5ad78919bdcb688abe698d00e12a2e0a"; + x86_64-darwin = "766ca8f8adc4535db3069665ea8983979ea79dd5ec376e1c298f858b420ec58f"; + i686-linux = "78ab55db275b85210c6cc14ddf41607fbd5cefed93ef4d1b6b74630b0841b23c"; + armv7l-linux = "8be8c6ea05da669d79179c5969ddee853710a1dd44f86e8f3bbe1167a2daf13c"; + aarch64-linux = "9ef70ab9347be63555784cac99efbaff1ef2d02dcc79070d7bccd18c38de87ef"; + headers = "07095b5rylilbmyd0syamm6fc4pngazldj5jgm7blgirdi8yzzd2"; }; } diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index d9633e88f34..2ba0f494c21 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/pkgs/development/tools/fedpkg/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: +{ lib, python2Packages, fetchurl }: + +with python2Packages; let fedora_cert = buildPythonPackage rec { diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/development/tools/flawfinder/default.nix new file mode 100644 index 00000000000..28805b4abe4 --- /dev/null +++ b/pkgs/development/tools/flawfinder/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, installShellFiles +, python3 +}: + +stdenv.mkDerivation rec { + pname = "flawfinder"; + version = "2.0.15"; + + src = fetchurl { + url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz"; + sha256 = "01j4szy8gwvikrfzfayfayjnc1za0jxsnxp5fsa6d06kn69wyr8a"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp ${pname} $out/bin + installManPage flawfinder.1 + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to examines C/C++ source code for security flaws"; + homepage = "https://dwheeler.com/flawfinder/"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 1fa027ae72b..b463ecd5dee 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "1kf1d7xmyjvy0z6j5czp6nqyvj9zrk6liv6znif08927xqfrzyln"; + sha256 = "sha256-TYx7nAyUE70hoCNKnR74FzWhrQyWG17VPoKH3vR+qOM="; }; - vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; + vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE="; doCheck = false; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index e6d34ba4139..d2ea8a4f6bd 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "0x94z023rsl7h9prw0i4zkwb5xf2frjz8f15mmcknw48r9ymw598"; + sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk="; }; - vendorSha256 = "05sh4jbva23ggg2viknl49bwgkhf8dfvsv3rqkl4wwi9ag64qgha"; + vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { ]; postInstall = '' - mv $out/bin/task $out/bin/go-task + ln -s $out/bin/task $out/bin/go-task ''; meta = with lib; { diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 4336ba76a20..83bc3f473d3 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-hJGyK+hrP6CuSkODNsN8d2IhteKe/fXTF9GxbF7TQOk="; + sha256 = "0c9yka27k4v1waijk7mn7k31l5a373sclykypflchy7xnlrsa18v"; }; - vendorSha256 = "sha256-zTWipGoWFndBSH8V+QxWmGv+8RoFa+OGT4BhAq/yIbE="; + vendorSha256 = "1685iv1lsal462c8xqvs76x9dwvbwazrak902j0p12s0fyb66lpl"; doCheck = false; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 1e1e3b66101..4c35aaaae05 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.67.3"; + version = "0.69.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-/3kQnHshmf3ZnA4xQNJaXeThFvk/SKq0/B6BaTv5Yws="; + sha256 = "sha256-FuwivcF1SpGbLcoQshVNSWSQ7PgWC0XPCQF+i9zHb/w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 7f8a193551f..c00304c1ec5 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.12.1"; + version = "0.13.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-y4/azFr2fngmUxQw3c2xAhAppYHeD6Bz7IvZ6GTdsEQ="; + sha256 = "sha256-ZD63Xtnw7qzTrzFxzzZ37N177/PnRaMEzBbhz7h/zCY="; }; - cargoSha256 = "sha256-/Vg3qojBWN2tp8QaKmHrzy3cDWlkT6067Wprcjlu31U="; + cargoSha256 = "sha256-c6veaasuwRtaO8TwHS0tNxjbBfekQOa52I9INcE1Jn0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index ad267e6bcdd..c1e0a356df3 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.5.4"; + version = "2.5.5"; in stdenv.mkDerivation { pname = "minizinc"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-/vJyh2WdESimJTCASsg6xjVzG2EkL4V87B+xvIUBcMM="; + sha256 = "sha256-9z2E6KqOys9UUXlXWB4eDhg34kS3PhUB1Dd1F6iGYoE="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 780b2a8906f..e9bc5287401 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -18,11 +18,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.49.1"; + version = "1.53.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU="; + sha256 = "ApKj5gulTCzWh7oSAM+JWQnWviHCnHV3OJHegpXJL54="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index fc1af1a4d68..080bc7a7f74 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub , gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config -, python, pythonPackages +, python3 }: with lib; @@ -21,15 +21,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gcc-arm-embedded pkg-config + python3 ]; buildInputs = [ libftdi1 libusb-compat-0_1 - python - pythonPackages.intelhex ]; + strictDeps = true; + postPatch = '' # Prevent calling out to `git' to generate a version number: substituteInPlace src/Makefile \ diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 03c3e51cb89..d62ad413e1a 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -3,7 +3,7 @@ fetchFromGitHub, cmake, gtest, - python, + python3, boost }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - checkInputs = [ boost python ]; + checkInputs = [ boost python3 ]; doCheck = true; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index cad9fe0960b..38ddc1ff431 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand +{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc @@ -18,7 +18,7 @@ let }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static]; + buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 8b771788111..0692d84b454 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, python}: +{lib, stdenv, fetchurl, python3}: stdenv.mkDerivation { name = "doclifter-2.19"; @@ -6,7 +6,9 @@ stdenv.mkDerivation { url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz"; sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; - buildInputs = [ python ]; + buildInputs = [ python3 ]; + + strictDeps = true; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix index 1919e26ddec..7f73fb9a1bc 100644 --- a/pkgs/development/tools/misc/nimlsp/default.nix +++ b/pkgs/development/tools/misc/nimlsp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \ c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \ - -d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp + -d:debugLogging -d:explicitSourcePath=${srcOnly nim.passthru.nim} -d:tempDir=/tmp src/nimlsp ''; installPhase = '' diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index c6c984f9699..2c55a6f03a7 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.7.3"; + version = "1.7.4"; nativeBuildInputs = [ removeReferencesTo ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq"; + sha256 = "sha256-1z8ywkikWRE5prF3d8gNTeq2tBTsKz0h0KJL40jEdqs="; }; # Debian has outputs like these too: diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index ccadaa8aeb4..4379efd5071 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; - cargoBuildFlags = [ "--features=dist-client,dist-server" ]; + cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mozilla/sccache"; maintainers = with maintainers; [ doronbehar ]; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index f1398c2f7c7..12306d2a305 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,16 +1,16 @@ { lib, fetchurl, buildDunePackage -, cmdliner, cppo, yojson, ppxlib +, ocaml, cmdliner, cppo, yojson, ppxlib , menhir }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.8.0"; + version = "3.9.1"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy"; + sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6"; }; nativeBuildInputs = [ cppo menhir ]; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix new file mode 100644 index 00000000000..77595169565 --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -0,0 +1,77 @@ +{ lib +, substituteAll +, fetchurl +, ocaml +, dune_2 +, buildDunePackage +, yojson +, csexp +, result +, dot-merlin-reader +, jq +, menhir +}: + +let + merlinVersion = "4.1"; + + hashes = { + "4.1-411" = "9e2e6fc799c93ce1f2c7181645eafa37f64e43ace062b69218e1c29ac459937d"; + "4.1-412" = "fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d"; + }; + + ocamlVersionShorthand = lib.concatStrings + (lib.take 2 (lib.splitVersion ocaml.version)); + + version = "${merlinVersion}-${ocamlVersionShorthand}"; +in + +if !lib.hasAttr version hashes +then builtins.throw "merlin ${merlinVersion} is not available for OCaml ${ocaml.version}" +else + +buildDunePackage { + pname = "merlin"; + inherit version; + + src = fetchurl { + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + sha256 = hashes."${version}"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; + dune = "${dune_2}/bin/dune"; + }) + ]; + + useDune2 = true; + + buildInputs = [ + dot-merlin-reader + yojson + csexp + result + ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + patchShebangs tests/merlin-wrapper + dune runtest # filtering with -p disables tests + runHook postCheck + ''; + checkInputs = [ + jq + menhir + ]; + + meta = with lib; { + description = "An editor-independent tool to ease the development of programs in OCaml"; + homepage = "https://github.com/ocaml/merlin"; + license = licenses.mit; + maintainers = [ maintainers.vbgl maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index ce168084f2c..1c9b549d612 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,8 +3,14 @@ buildDunePackage rec { pname = "merlin"; + version = "3.4.2"; - inherit (dot-merlin-reader) src version useDune2; + src = fetchurl { + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + sha256 = "e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81"; + }; + + useDune2 = true; minimumOCamlVersion = "4.02.3"; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 009998a3f85..894fe6f75ae 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -1,18 +1,16 @@ -{ lib, fetchurl, ocamlPackages }: - -with ocamlPackages; +{ lib, fetchurl, yojson, csexp, result, buildDunePackage }: buildDunePackage rec { pname = "dot-merlin-reader"; - version = "3.4.2"; + version = "4.1"; useDune2 = true; - minimumOCamlVersion = "4.02.1"; + minimumOCamlVersion = "4.06"; src = fetchurl { - url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "109ai1ggnkrwbzsl1wdalikvs1zx940m6n65jllxj68in6bvidz1"; + url = "https://github.com/ocaml/merlin/releases/download/v${version}/dot-merlin-reader-v${version}.tbz"; + sha256 = "14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd"; }; buildInputs = [ yojson csexp result ]; diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 2c5deffc2d1..913009f6b2b 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -8,7 +8,7 @@ GEM rainbow (3.0.0) regexp_parser (2.1.1) rexml (3.2.4) - rubocop (1.11.0) + rubocop (1.12.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 46d920bc657..fc919235e2b 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zrzsgx35mcr81c51gyx63s7yngcfgk33dbkx5j0npkaks4fcm7r"; + sha256 = "1i3y0h6awywx4rdmjdan908jmnyk589pndbjypxkfbkqvjx514fw"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; rubocop-ast = { dependencies = ["parser"]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index d89bad18e32..9fadea3f31c 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0XE1w/FZmy0iMm5LI885S7F6GxgeHwh57t8N4hreSKw="; + sha256 = "sha256-1gAkc8x9rl80xkFWR2iKYOjkHplWUPWQZDbE8U5gkOM="; }; - cargoSha256 = "sha256-7pfGMCChOMSLlZ/bvaHfpksru5bCHfBQUN+sGyI1M8E="; + cargoSha256 = "sha256-APUQYqC0MYNeeuehkQvxQsjOnXBgvEMNBqfoUy2KH0U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index 1c1a4c32c62..177b12aea0c 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,18 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "1.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; - # repo lacks the 1.3.0 tag - # https://github.com/jfrimmel/cargo-valgrind/issues/33 - rev = "d47dd810e3971d676cde5757df8b2e05ed563e41"; - sha256 = "163ch5bpwny1di758rpfib1ddqclxm48j0lmmv741ji3l4nqid32"; + rev = version; + sha256 = "0knsq6n3wrsd3ir2r1wpxm6ks7rgkw33bk008s8fq33m3bq2yvm7"; }; - cargoSha256 = "008s1y3pkn8613kp1gqf494fs93ix0nrwhrkqi5q9bim2mixgccb"; + cargoSha256 = "09mhdi12wgg7s4wdnn0vfxhj7hwj5hjrq32mjgjr2hwm6yzhkzr2"; passthru = { updateScript = nix-update-script { @@ -33,6 +31,9 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} ''; + # Disable check phase as there are failures (2 tests fail) + doCheck = false; + meta = with lib; { description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner''; homepage = "https://github.com/jfrimmel/cargo-valgrind"; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index 9432c4fd85d..b5a3486da71 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; version = "0.9.0"; - src = fetchFromGitHub - { - owner = "kolloch"; - repo = pname; - rev = version; - sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; - } + "/crate2nix"; + src = fetchFromGitHub { + owner = "kolloch"; + repo = pname; + rev = version; + sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; + }; + + sourceRoot = "source/crate2nix"; cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik="; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 09e24775a35..d8b31810c54 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-03-15"; + rev = "2021-03-22"; version = "unstable-${rev}"; - sha256 = "150gydm0mg72bbhgjjks8qc5ldiqyzhai9z4yfh4f1s2bwdfh3yf"; - cargoSha256 = "10l0lk5p11002q59dqa5yrrz6n6s11i7bmr1wnl141bxqvm873q2"; + sha256 = "sha256-Q8yr5x4+R9UCk5kw/nJgBtGVBeZTDwyuwpyNJUKSPzA="; + cargoSha256 = "sha256-cJ5KPNrX1H4IfHENDGyU2rgxl5TTqvoeXk7558oqwuA="; inherit CoreServices; }; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index c6f34a9e20d..5c4f40bbd09 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p sqlx-cli" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ]; meta = with lib; { description = diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index eea5dc9b10f..9cb70db3c7f 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.26"; + version = "1.0.27"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JQeqCvnGWE0VesLQ6HbH7gikwAP3im19nBnwr1ruQqk="; + sha256 = "sha256-aJxSLOUmTuPzBJCnXv2d09Kdh/jPPBUmFnuq8629PWY="; }; vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20="; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index f74698bb11e..85d64890180 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.4"; + version = "0.9.5"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm"; + sha256 = "1wlx5k0v464fr1ifjv04v7ccwb559s54xpsbxdda4whyx1v0fbq4"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://git.codemadness.org/stagit/file/README.html"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 sikmir ]; }; } diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index f18be619f26..49265d22f8d 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,20 +1,23 @@ { stdenv, lib, fetchurl, unzip }: let - version = "3.2.63"; + version = "3.3.101"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchurl { - url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; - sha256 = "0y0wb3jdr2qk4k21c11w8c9a5fl0h2rm1wm7m8hqdywy4lz9ppgy"; - } + fetchurl + { + url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; + sha256 = "KrFDQSs7hMCioeqPKTNODe3RKnwNV8XafdYDUaxou/Y="; + } else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; - sha256 = "0zzk2w5azk5f0svjxlj2774x01xdflb767xxvbglj4223dgyx2x5"; - } + fetchurl + { + url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; + sha256 = "vbeuZf/phOj83xTha+AzpKIvvrjwMar7q2teAmr5ESQ="; + } else throw "Not supported on ${stdenv.hostPlatform.system}"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "tabnine"; inherit version src; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 1f101882b5b..2f1d6618d3f 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "vultr"; - version = "2.0.2"; + version = "2.0.3"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "v${version}"; - sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg"; + sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro="; }; meta = { diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 27b11870a89..aaffa4f8213 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -1,20 +1,19 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.20"; + version = "1.0.23"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "1wwyljppxz03slvgx809g87mdrglpimz4xaici71a9mqwjpgj0l8"; + sha256 = "1drjngcqkaahzk92jysrzv86fhj02c074xffd7kn3k6q8fxc0976"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; - buildInputs = [ python3 ]; meta = with lib; { description = "The WebAssembly Binary Toolkit"; diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 0458f63fddb..5fc7b6a1807 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, libiconv }: rustPlatform.buildRustPackage rec { pname = "wrangler"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ]; + ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 9ea5dcc55fa..26e93614336 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "mikefarah"; rev = "v${version}"; repo = "yq"; - sha256 = "sha256-Hv1o1MzkpapmeIsZJ4peyG5kSHt0EXjTA+gE0iq1XF8="; + sha256 = "sha256-+qSGdskv8qUZRl7wYKn8WsgAcD8DYw1BwZnVKK6g/sI="; }; vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw="; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 17a3ae58f2a..8e45b0b337a 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tyqZ/vjQ9gjLoK+Juj30It3H6+2sT9Fj/s0kEv0HRwI="; + sha256 = "sha256-fZuhI+ZvYsFz2gDpHkRRqmmHRyEiEO+vWfqKYdeNtaU="; }; - cargoSha256 = "sha256-LpBQztMqw7IbgTJkfiD+6Fcy5XXmN58HO/zhVen3oCI="; + cargoSha256 = "sha256-us0Kzst7iq+H/WBAlSBQJSpnirsl4zImse2bFREoW4I="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 31dbce08922..41c06fbf7ce 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.20.0"; + version = "0.21.0"; shas = { - x86_64-linux = "sha256-pTWNYQzChyYJh+afn1AMw/MxUE+Cv4k2FnM3+KDYCvg="; - aarch64-linux = "sha256-SPRtQO0tnuEf49GuSsuo403QO0Y6ioRkOp4cjohXRhw="; - x86_64-darwin = "sha256-k0kS5NiITqW/WEFWe/Bnt7Z9HZp2YN19L7DvVlptrj4="; - aarch64-darwin = "sha256-CDGxSv7fPR+5kF3+5NVTOH8ugLaM07Kv5mjoEW6/g/8="; + x86_64-linux = "sha256-oxGCM6jlqafjAfTtFwARxBv/8tiUaD9A2TlLyj/3LlQ="; + aarch64-linux = "sha256-yeDcrxEp3qeE6/NWEc1v7VoHjlgppIOkcHTNVksXNsM="; + x86_64-darwin = "sha256-QqdBa59xPxM8eDRzvPxvv9HFVgp2rt+5jiwIOgsi8JE="; + aarch64-darwin = "sha256-aq2Kjn8QSDMhNg8pEbXkJCHUKmDTNnitq42SDDVyRd4="; }; } diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix index 092e0e4eac2..0cc61367e28 100644 --- a/pkgs/games/20kly/default.nix +++ b/pkgs/games/20kly/default.nix @@ -1,16 +1,19 @@ { lib -, fetchurl -, python }: +, fetchFromGitHub +, python3Packages +}: -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "20kly"; - version = "1.4"; + version = "1.5.0"; + format = "other"; - disabled = !(python.isPy2 or false); - src = fetchurl { - url = "http://jwhitham.org.uk/20kly/lightyears-${version}.tar.bz2"; - sha256 = "13h73cmfjqkipffimfc4iv0hf89if490ng6vd6xf3wcalpgaim5d"; + src = fetchFromGitHub { + owner = "20kly"; + repo = "20kly"; + rev = "v${version}"; + sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx"; }; patchPhase = '' @@ -20,21 +23,24 @@ python.pkgs.buildPythonApplication rec { "LIGHTYEARS_DIR = \"$out/share\"" ''; - propagatedBuildInputs = with python.pkgs; [ pygame ]; + propagatedBuildInputs = with python3Packages; [ + pygame + ]; - buildPhase = "python -O -m compileall ."; + buildPhase = '' + python -O -m compileall . + ''; installPhase = '' mkdir -p "$out/share" - cp -r audio code data lightyears "$out/share" + cp -r data lib20k lightyears "$out/share" install -Dm755 lightyears "$out/bin/lightyears" ''; meta = with lib; { description = "A steampunk-themed strategy game where you have to manage a steam supply network"; homepage = "http://jwhitham.org.uk/20kly/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ fgaz ]; }; } - diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 432600e879f..04c0868510f 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: +{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python2 }: stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.10.0"; + version = "5.10.1"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-hRdd5ZrcVBU7tn1juvrLdbenULzu6OsXefG0oLjjFIg="; + sha256 = "sha256-5doytVxemqaXWXiqDSQUEAe71xmY0pOLASj/NJNyM5g="; }; postPatch = '' @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { for script in $(grep -lr '^#!/usr/bin/env python$'); do patchShebangs $script; done ''; - nativeBuildInputs = [ autoreconfHook pkg-config python ]; + nativeBuildInputs = [ autoreconfHook pkg-config python2 ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; + strictDeps = true; + meta = { homepage = "http://fabiangreffrath.github.io/crispy-doom"; description = "A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 1f8b2010226..6460e262d0d 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.27.tar.xz", + "name": "factorio_alpha_x64-1.1.30.tar.xz", "needsAuth": true, - "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", + "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/alpha/linux64", + "version": "1.1.30" }, "stable": { - "name": "factorio_alpha_x64-1.1.27.tar.xz", + "name": "factorio_alpha_x64-1.1.30.tar.xz", "needsAuth": true, - "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", + "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/alpha/linux64", + "version": "1.1.30" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.27.tar.xz", + "name": "factorio_demo_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", + "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/demo/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/demo/linux64", + "version": "1.1.30" }, "stable": { - "name": "factorio_demo_x64-1.1.27.tar.xz", + "name": "factorio_demo_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", + "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/demo/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/demo/linux64", + "version": "1.1.30" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.27.tar.xz", + "name": "factorio_headless_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", + "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/headless/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/headless/linux64", + "version": "1.1.30" }, "stable": { - "name": "factorio_headless_x64-1.1.27.tar.xz", + "name": "factorio_headless_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", + "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/headless/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/headless/linux64", + "version": "1.1.30" } } } diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 727945ff2b4..ab208dfa003 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -5,8 +5,8 @@ let gimx-config = fetchFromGitHub { owner = "matlo"; repo = "GIMX-configurations"; - rev = "f31bba7d3be57519540be290cd69ba6a8dc4e4d4"; - sha256 = "0wpxx2qxyiiblz2qrl5swg00ls1aq7i5vzlk0qlnqdq8ss8jssax"; + rev = "c20300f24d32651d369e2b27614b62f4b856e4a0"; + sha256 = "02wcjk8da188x7y0jf3p0arjdh9zbb0lla3fxdb28b1xyybfvx5p"; }; in stdenv.mkDerivation rec { @@ -51,15 +51,15 @@ in stdenv.mkDerivation rec { mkdir -p $out/share cp -r ./loader/firmware $out/share/firmware cp -r ${gimx-config}/Linux $out/share/config - patch ${gimx-config}/Linux/Dualshock4.xml ${./ds4.patch} -o $out/share/DS4_noff.xml + patch ${gimx-config}/Linux/Dualshock4.xml ${./noff.patch} -o $out/share/ds4.xml makeWrapper $out/bin/gimx $out/bin/gimx-with-confs \ - --set GIMXCONF $out/share + --set GIMXCONF $out/share/config makeWrapper $out/bin/gimx $out/bin/gimx-test-ds4 \ --set GIMXCONF $out/share \ --add-flags "--nograb" --add-flags "--curses" \ - --add-flags "-p /dev/ttyUSB0" --add-flags "-c DS4_noff.xml" + --add-flags "-p /dev/ttyUSB0" --add-flags "-c ds4.xml" ''; meta = with lib; { diff --git a/pkgs/games/gimx/ds4.patch b/pkgs/games/gimx/noff.patch index 86b36adda23..86b36adda23 100644 --- a/pkgs/games/gimx/ds4.patch +++ b/pkgs/games/gimx/noff.patch diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 5a1f42ee130..bedf78102b6 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -5,12 +5,12 @@ let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; in mkDerivation rec { pname = "multimc"; - version = "unstable-2021-01-17"; + version = "0.6.12"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "02887536f773643313f15442fc82cebf616da54a"; - sha256 = "1aykvavcv415lq488hx4ig2a79g5a561jg92gw14fb964r43782i"; + rev = version; + sha256 = "h2T023vrqemWhHiA2/gFleuUhIOucjwTgoExliFiYig="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 90901bf2ee4..a700f2bc4fd 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.312.0"; + version = "2021.320.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "xMq4KrEfSNuXpi4h+BDaHOuWBBPcWNByiKxxsR6EJwA="; + sha256 = "jFroWbNvJRD+r5w6BPj8QBnHJ9uXJZdx4kzmu5gmVSY="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index c378e817e2e..7b13fa41570 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -20,6 +20,11 @@ sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { + name = "HidSharpCore"; + version = "1.2.1.1"; + sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; + }) + (fetchNuGet { name = "Humanizer"; version = "2.8.26"; sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; @@ -426,18 +431,13 @@ }) (fetchNuGet { name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.5.0"; - sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { name = "Microsoft.Data.Sqlite.Core"; - version = "2.2.6"; - sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; + version = "5.0.4"; + sha256 = "0cpcw1mgxm47s6bn181iswrd41c7jyqxv1zwk0xw0hag0jy80xwm"; }) (fetchNuGet { name = "Microsoft.Diagnostics.NETCore.Client"; @@ -451,63 +451,53 @@ }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; - version = "2.1.0"; - sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; + version = "3.1.6"; + sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; - version = "2.2.6"; - sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; + version = "5.0.4"; + sha256 = "17r5knq984j6mgbv7w4lyl12ma15pii09zmvf7zw651k46a7lmdz"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "2.2.6"; - sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; + version = "5.0.4"; + sha256 = "0ilj2625nmr8l9al7xk1q1kxcx5p52wlsh8x3qvs8kf2dgvvckn6"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "2.2.6"; - sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc"; + version = "5.0.4"; + sha256 = "193c63kqgrdiy0wwsbd5hc9b7cjmngiy6rbam24cilafm68nhiif"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Design"; - version = "2.2.6"; - sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f"; + version = "5.0.4"; + sha256 = "1xb50lrdyrxa6yi2a8k71znqw2cpjr6qpwx7z5wa5fabdjlywdxh"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; - version = "2.2.6"; - sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; + version = "5.0.4"; + sha256 = "0by7is7h3i3w4a1bsffls81dyklp2k4jlysjv1wh3l2wp76c42xa"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "2.2.6"; - sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; + version = "5.0.4"; + sha256 = "0pf55yqjlrjmh8hdcd55awxykhqwzzi5cc447232sa0fdn8a2yh8"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "2.2.6"; - sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; + version = "5.0.4"; + sha256 = "0ma6y292hgh7bgaancmvvyv0fl6hibjbcbfhn35h01dg6bnz00wr"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; - version = "2.2.0"; - sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; + version = "5.0.0"; + sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; }) (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"; + version = "5.0.0"; + sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; @@ -515,39 +505,19 @@ sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "2.2.0"; - sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "2.2.0"; - sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; - }) - (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.1"; sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) (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"; - version = "2.2.0"; - sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; + version = "5.0.0"; + sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; @@ -556,11 +526,6 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.2.0"; - sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) @@ -571,21 +536,11 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Options"; - version = "2.2.0"; - sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; - version = "2.2.0"; - sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) @@ -616,21 +571,11 @@ }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; - version = "3.1.0"; - sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) @@ -646,11 +591,6 @@ }) (fetchNuGet { name = "NETStandard.Library"; - version = "1.6.0"; - sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; - }) - (fetchNuGet { - name = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) @@ -670,11 +610,6 @@ sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) (fetchNuGet { - name = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) - (fetchNuGet { name = "NuGet.Common"; version = "5.8.0"; sha256 = "17l1gqxfcpazadg6wqgwkzg37x8c97sgmk9nr4f9yn3d50zj9hlm"; @@ -725,9 +660,19 @@ sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9"; }) (fetchNuGet { + name = "OpenTabletDriver"; + version = "0.5.2.1"; + sha256 = "0czbgxjkc5ryrnn9hl68wp464p4xp0883517iq87d1f7qb32gppl"; + }) + (fetchNuGet { + name = "OpenTabletDriver.Plugin"; + version = "0.5.2.1"; + sha256 = "199yasnq5dsb5c37vl8vry8lf536gpgclsk402sxdw9lz11xmmqd"; + }) + (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.309.0"; - sha256 = "1da0jgdcxd4zq0fzqhbm31gg66l8sgdgypis8xlch2xny1g854z6"; + version = "2021.317.0"; + sha256 = "1nych95lrxs2hb3bcnw9h0f843k9lrn1f4hwdnaf5q3p8ny1pmph"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -755,11 +700,6 @@ sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) (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"; @@ -776,40 +716,20 @@ }) (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"; @@ -890,34 +810,29 @@ sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; }) (fetchNuGet { - name = "SQLitePCLRaw.bundle_green"; - version = "1.1.12"; - sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9"; + name = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.4"; + sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; }) (fetchNuGet { name = "SQLitePCLRaw.core"; - version = "1.1.12"; - sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.linux"; - version = "1.1.12"; - sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5"; + version = "2.0.4"; + sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; }) (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.osx"; - version = "1.1.12"; - sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1"; + name = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.4"; + sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; }) (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp"; - version = "1.1.12"; - sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7"; + name = "SQLitePCLRaw.provider.dynamic_cdecl"; + version = "2.0.4"; + sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; }) (fetchNuGet { - name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11"; - version = "1.1.12"; - sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4"; + name = "SQLitePCLRaw.provider.e_sqlite3"; + version = "2.0.4"; + sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7"; }) (fetchNuGet { name = "StbiSharp"; @@ -926,21 +841,11 @@ }) (fetchNuGet { name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { name = "System.Buffers"; - version = "4.0.0"; - sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; - }) - (fetchNuGet { - name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) @@ -966,11 +871,6 @@ }) (fetchNuGet { name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) @@ -991,11 +891,6 @@ }) (fetchNuGet { name = "System.ComponentModel.Annotations"; - version = "4.5.0"; - sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; - }) - (fetchNuGet { - name = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -1031,11 +926,6 @@ }) (fetchNuGet { name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }) - (fetchNuGet { - name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) @@ -1051,28 +941,18 @@ }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; - version = "4.5.0"; - sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + name = "System.Diagnostics.DiagnosticSource"; + version = "5.0.1"; + sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; }) (fetchNuGet { name = "System.Diagnostics.Tools"; @@ -1081,20 +961,10 @@ }) (fetchNuGet { name = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) - (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; @@ -1106,30 +976,15 @@ }) (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.Interactive.Async"; - version = "3.2.0"; - sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; - }) - (fetchNuGet { name = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; @@ -1141,41 +996,21 @@ }) (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"; }) @@ -1201,25 +1036,10 @@ }) (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.Memory"; - version = "4.5.1"; - sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; - }) - (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; @@ -1231,31 +1051,16 @@ }) (fetchNuGet { name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) - (fetchNuGet { - name = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) @@ -1271,11 +1076,6 @@ }) (fetchNuGet { name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - name = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) @@ -1291,11 +1091,6 @@ }) (fetchNuGet { name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) @@ -1306,21 +1101,11 @@ }) (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"; }) @@ -1331,11 +1116,6 @@ }) (fetchNuGet { name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) @@ -1361,11 +1141,6 @@ }) (fetchNuGet { name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) @@ -1391,11 +1166,6 @@ }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.1"; - sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) @@ -1446,51 +1216,26 @@ }) (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.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"; }) (fetchNuGet { name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) @@ -1501,31 +1246,16 @@ }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) (fetchNuGet { name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) @@ -1536,11 +1266,6 @@ }) (fetchNuGet { name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) @@ -1551,11 +1276,6 @@ }) (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) @@ -1586,11 +1306,6 @@ }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) @@ -1611,11 +1326,6 @@ }) (fetchNuGet { name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) @@ -1646,11 +1356,6 @@ }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) @@ -1671,31 +1376,16 @@ }) (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.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"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index e159ead0f47..35397e262ea 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.13.8"; + version = "3.13.11"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-upT0ZtVYzbrQolik0c/2URNwU2LDLgiMWyFEiOZFijc="; + sha256 = "sha256-U0kTkdcEC1cu+UFmQmgadNn1bIZ5Rq4+bBqjFU3c4+M="; }; dontUnpack = true; diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index edee0db2617..1925d641717 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "zaz"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "15q3kxzl71m50byw37dshfsx5wp240ywah19ccmqmqarcldcqcp3"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1r3bmwny05zzmdalxm5ah2rray0nnsg1w00r30p47q6x2lpwj8ml"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/misc/emulators/cen64/default.nix index 0153ed11cd2..ddf45547337 100644 --- a/pkgs/misc/emulators/cen64/default.nix +++ b/pkgs/misc/emulators/cen64/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { pname = "cen64"; - version = "unstable-2020-02-20"; + version = "unstable-2021-03-12"; src = fetchFromGitHub { owner = "n64dev"; repo = "cen64"; - rev = "6f9f5784bf0a720522c4ecb0915e20229c126aed"; - sha256 = "08q0a3b2ilb95zlz4cw681gwz45n2wrb2gp2z414cf0bhn90vz0s"; + rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8"; + sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libGL libiconv openal libX11 ]; installPhase = '' - mkdir -p $out/bin - mv cen64 $out/bin + runHook preInstall + install -D {,$out/bin/}${pname} + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 24f827b25ff..6def48b4f59 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -44,7 +44,7 @@ sdlSupport ? false, faudioSupport ? false, vkd3dSupport ? false, - mingwSupport ? false, + mingwSupport ? wineRelease != "stable", }: let wine-build = build: release: diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 1bcd08e6f40..fb3d430114e 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.3"; + version = "6.4"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-aCp3wf0S9WNHyiCA2F/hfe8bZV0yQdlFgvh1kdnQzDs="; + sha256 = "sha256-Gy0rRT2Q1sLXEk5H+urlDlxUwl9pvuHQZTGEMmECTI8="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-Fok0jdGBQtH84PL6LVnuCR7ZVSUIHECqPUI/2lLXs44="; + sha256 = "sha256-gTt75rRoP/HTeD5k/8bW3jjnn8M5atmP9RFqmBQaAfk="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/scimark/default.nix b/pkgs/misc/scimark/default.nix new file mode 100644 index 00000000000..7558c676ba5 --- /dev/null +++ b/pkgs/misc/scimark/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, unzip +}: + +stdenv.mkDerivation rec { + pname = "scimark"; + version = "4c"; + + src = fetchurl { + url = "https://math.nist.gov/scimark2/${pname}${version}.zip"; + hash = "sha256-kcg5vKYp0B7+bC/CmFMO/tMwxf9q6nvuFv0vRSy3MbE="; + }; + + nativeBuildInputs = [ + unzip + ]; + + dontConfigure = true; + + installPhase = '' + install -d $out/bin/ + install scimark4 $out/bin/ + ''; + + meta = with lib; { + homepage = "https://math.nist.gov/scimark2/index.html"; + description = "Scientific and numerical computing benchmark (ANSI C version)"; + license = licenses.publicDomain; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; + }; +} +# TODO [ AndersonTorres ]: Java version diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 21e2d4516cb..15a129246e1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,11 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, ccnet , curl -, fuse -, glib -, intltool , libevent , libsearpc , libuuid @@ -13,7 +9,6 @@ , python3 , sqlite , vala -, which }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 96d70f2ff39..82014f6c698 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-03-21"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f7852dbd0a063d6d82ee17a5057fea53cb79b21d"; - sha256 = "16cslwkc8kcr2z0crchl9w5p5vsbzfwpfa103wysyvq9d0q309xk"; + rev = "b1f95dc4fb15efb1d5238845c99548f2906e2ba3"; + sha256 = "0sx2k1wqv0cl3a489cqz1mf0bvr8xsjbqax8pgw1d0c4kdz17py6"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-03-21"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "74e928c9a98c20f024f78703a7d54386cf6f4469"; - sha256 = "0z52f4dq1jgzwy4qw278h6ig07rr09l9affhmfliz0m7mb9r7b71"; + rev = "e52b59c999bb713ea6ee4d7e88c40f9c8ca76567"; + sha256 = "0pccr6rqgk1m291pa8505y246p00fkvdzkgb9hz63qnab29h08l0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-03-19"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "0f73118b752cf7be86c3be9923675df0aff30d64"; - sha256 = "1q04kibi2vhw1ibxhzbr5yvyg8484yb07h103442bpc4a2pzcz7i"; + rev = "67fb4d138f34c12c6b44d87be66ede26d51b95c2"; + sha256 = "0nnh0gnc6g0a67na3zar6zvpc3i2qlna3l783hhy3832ih79v9s9"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -894,12 +894,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-03-21"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "e47bba4e37c26908568ff137416d297b54459bd8"; - sha256 = "1p5nl7iqcpc0vpmhng0yqm440kb79sdl6gaxzsjgp4j7wngm4kqa"; + rev = "e5a757e2dc2f3409f5ccc4e4df384df93b0ef09d"; + sha256 = "1qfwpwb7r94hnjidggn1fwcshikac8j0ckf1qb0fppfx1akyf78q"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -942,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-03-18"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "8c44de41ec46c44f84dd70907a5763112df2eacb"; - sha256 = "1y235ap3hchkf3hc85frcjl5kwr56lz3vw12qzhhzhrl2k7k5ziw"; + rev = "4c8eb502feb8e9601cbcd82ea937aa620a6626b4"; + sha256 = "1hgcdl29rn0ag12k663qfx9z3drl94xi0n50jcisk5z4y8xpi6r4"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1366,12 +1366,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-03-21"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "6cbabfc9e6829c6cda25fa1309cd7f9806990647"; - sha256 = "1mbbl83mzlv4pv48j8r7kd1mb4w7b0qal3dmm7ngbm92833bfqyp"; + rev = "f6be01e8642dc8ccc7ed1f37b23f4b0dfa2c6f8c"; + sha256 = "1w4ld5dvy0jxgjvp6yf8qibc4x82hn490vfg0hpln67nr6mhq1iw"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1414,12 +1414,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-03-14"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "31c76b351f6d995009dcd117d7910b80df96928a"; - sha256 = "1qkf6bsff6cfrqyhdrmn91diq9p53i3i3fvgcb5m9az33p42fqgn"; + rev = "3f9f1957699346f240a9e71eee83fcb67c8fc0e5"; + sha256 = "1wkxih5glkpvjy6ka42y0x1di2iqm1y7rc93av4gfqhhskryfv0h"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1535,12 +1535,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-03-14"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "1ef72b14ccd05fdbdb01d253b91a74c4760ae655"; - sha256 = "1yrj8dq0n3wfdrl5c93cfzsjyv175b9h65iwxkincag926m6sr06"; + rev = "caf7754b2636eabdf1bc11d30daccc5de66951ef"; + sha256 = "1743br19x41rycc1iqh2jiwaa2z80bi2zcd0lr9n17dc733ww5n2"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1643,12 +1643,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-03-17"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "18d0a4bab12193460e6443d02d22218b5ce05a35"; - sha256 = "0qizdphmady0baz5wgi92vdy9wbz1npgahsx0kmpx8c4vfvcdv10"; + rev = "2e371a3b89a85ea74afcd2f2926b23919a96e1c8"; + sha256 = "0bw2sc02w8ln9sj86p0iwfcwi51n4xyxkby9ib37y3mdiz623vig"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1811,12 +1811,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-03-18"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "8d1a199236590a6e6667a45e0084d26aaeb32fb6"; - sha256 = "1skya8iqkf9bblpdf1vvkl73i9rqm0lqd40114a8ppk8vbqjp53x"; + rev = "a0e9e229bbd0e493511fb9d27d917f55c5e4191a"; + sha256 = "090waig8fqq1s9z66ykr64ns3g9yb6qy32jf5fwamx43m9xcws2s"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2340,12 +2340,12 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-03-19"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "f80d5adb415812484c1b86692846feb3a8ce7e46"; - sha256 = "0gp0nw173ryn6mn9z98jvrk9y7fyhm08r90qc1zv7z85lngd9226"; + rev = "62c22d0f05c79a1bc890b15c1a1a5a0215936e2f"; + sha256 = "1j3f4i48bi54ck14sv8vnknz68v21jggf1gw8p7vq77h08il7gbi"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2412,12 +2412,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-03-20"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "adc19481ceececc53b4a6e3157bae7ebf7b9bb66"; - sha256 = "14hjfnqh9wvbhgf55arjhwbcsm1d91x9mhglz2qdmln6nr66ayz4"; + rev = "31e22971ba5f5f3e5955fa8e2247b6cd22c3f7b1"; + sha256 = "19hg4nnwdr6mj9wyrcapg91vm2bzvcsfbvjkirdsxp2v3ca83w2i"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2724,12 +2724,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-03-21"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "0b969a8f6a7d38aed32ca7bddfeb19f80a2b1a29"; - sha256 = "1x9q4kl5595dq7ydpv21apbff5pr15diyww8cd600ibjwybmlm8v"; + rev = "84768d4ab4df212c7fe96785a007382218e0fc56"; + sha256 = "0z86l7bwr6s3rmamhjyy5hg51f75ca2laki3pwpczfhllxbnwax5"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2868,12 +2868,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-03-01"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2"; - sha256 = "1lm4dqp8rxr5sl6faxyncz5jibkgzjwjxadvgcja81wnm71sr0xa"; + rev = "81f3eaba295b3fceb2d032db57e5eae99ae480f8"; + sha256 = "0zws0b20n8ak2s3hffsb0rrwdjh8sx3sgrilmmmvr0d2ivsfqwlb"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2940,12 +2940,12 @@ let nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-02-28"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "edfc91e1189a36a5f0d5438d7f9c575571f759fa"; - sha256 = "11dzqhd2kp537ig8zcny0j56644mmrgygiw3wvfh1ly9gb9l2r9f"; + rev = "6408b859f9fac3880d82109d25874fb6656026d9"; + sha256 = "0r5s89882hj54qyi5rcwmf8g54jkjmap5c2rd2mhfjs3j4dfny72"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -2976,12 +2976,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-03-20"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "e22ce2c391e0fe82f66c767cf2b99ff1e044d428"; - sha256 = "1dl967mc8slsfm8c8dk7kbzsrnr6ll7y8m36aq5v827f49f1byak"; + rev = "18b21cd97d8675d0a37ea7a0de1b767c51418f19"; + sha256 = "18gzdax70hcjs7ckfq6c4b0kplh9q5fsay9hwz5kyqym28ndrvx3"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -3000,28 +3000,40 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-02-08"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "1596756a90114cbe25d0f383825a1ae2145b459b"; - sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd"; + rev = "b8272f539017ffb6de6a05247e7c333b3721279b"; + sha256 = "11ng14pb14l0hsv27r24wwkjkw2l77kvd114pij3k5dl8b9zdgv2"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-03-16"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "fae71d14f2cd61becc87bae223f0c3a6fb72245c"; - sha256 = "054v62pp33kxfx9rcqh7dqa2glpi1fsm0z4gsh9nwf4y60hx0fhs"; + rev = "ba1acb0440e3ddc96b1835ce89d910bae216e98b"; + sha256 = "1kx5a5zngk8bw7qsklmhzvwqpc0nnhfcj9wasp28dayh3f35m5s0"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; + nvim-bufferline-lua = buildVimPluginFrom2Nix { + pname = "nvim-bufferline-lua"; + version = "2021-03-22"; + src = fetchFromGitHub { + owner = "akinsho"; + repo = "nvim-bufferline.lua"; + rev = "437aa7cacc8eb6b7840e298f55666f4a6dea20e7"; + sha256 = "15df8l8mx9cbm5mirn511d965nlxh5gj17d0b6rffxjlzc5ciai3"; + }; + meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -3034,14 +3046,26 @@ let meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; + nvim-colorizer-lua = buildVimPluginFrom2Nix { + pname = "nvim-colorizer-lua"; + version = "2020-06-11"; + src = fetchFromGitHub { + owner = "norcalli"; + repo = "nvim-colorizer.lua"; + rev = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6"; + sha256 = "0gvqdfkqf6k9q46r0vcc3nqa6w45gsvp8j4kya1bvi24vhifg2p9"; + }; + meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua/"; + }; + nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-03-21"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "08dbc5f47d2be27cbc92c9684ec876b1eb778a4f"; - sha256 = "09fnzidcmknkrmls3wmjfa6drp5i8hmcbfs3hrvvp8jywgfyrpr3"; + rev = "a39284243014c1414134b99ee2f7ae1fdd070273"; + sha256 = "0648gz8rc6l79hg3xqkr0049fn762v7rcyvq50ya81ljrs2jl004"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3060,12 +3084,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-03-15"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "492849bf57425d005c4a13ee2a5d6f3c8207cc02"; - sha256 = "1jspnzkb9371jfkppj77f95zccbnyw6gn0i4jlqpbci2p0ppp0gz"; + rev = "cd0afafc788f9d4d9df5fef5d348841906b295d6"; + sha256 = "1zh35qjxmkf37khagn8722byzjq2pns20cbmc821hfqdkj6q3pc8"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3108,12 +3132,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-03-18"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "8724c4a0defb70c32c6bbfed37607b9d03a3272d"; - sha256 = "1w4mszvckjmx0ajp8sxcf4f02x8nyhsdx6k2syrhzasj32pv1qmn"; + rev = "fdce47e0bd9669e2424cc2a0112ecb47ba571d13"; + sha256 = "1dn9wr23dizhs7byrim9zd3yi22g629jc2aqfx0q1v1i2i9g107v"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3132,12 +3156,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-03-20"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "c4199f88d5f6bf269b91ae5d775a082aef05f9bd"; - sha256 = "18cnhhybhzw20l6v4rxzk5a5jcgv8l7jhbmzl529rd9jdhxqikfa"; + rev = "b29410eff3459fc415048cd5569ad03d5e959296"; + sha256 = "060ig6w3lhfp4lb83hmk7v33mfk6k5hs8ifpx5fvxk0v5g0cd9g1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3156,12 +3180,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-03-20"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "00e9a7450eac88121768df21fde7d21f43de7529"; - sha256 = "0qqr6zz4a1i13hmj4hvcx08m5ipy28iz3hlaa239jf5yx9rw0y1h"; + rev = "f9785053a4ef4aaa2d0aac958bc09a1a289d2fbf"; + sha256 = "182ys6zrwjw1jqs6rjqz3lbv51jw0ija5jmrpj4rs7psin7mcx0j"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3204,12 +3228,12 @@ let nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-03-21"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "693b93d273c4c0c0670d364cab9f3ab880d2f306"; - sha256 = "04dsjc6f8ag0vfr4sa6nmpfqimx48cvadwv7dd3m9g2mwivkfgyi"; + rev = "902f24503ab7a754be2a1c483de1cd3428bd85ec"; + sha256 = "0b31lpzdx1z88fm60p7d5gs442h4apm2n9h098n4j0ghcs5ppvnf"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3226,26 +3250,38 @@ let meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; + nvim-toggleterm-lua = buildVimPluginFrom2Nix { + pname = "nvim-toggleterm-lua"; + version = "2021-03-23"; + src = fetchFromGitHub { + owner = "akinsho"; + repo = "nvim-toggleterm.lua"; + rev = "84980bd3f549821fe58d1821fdc1e7c54d1ebf3a"; + sha256 = "09dcajyfbimfzgxj57c988rqr6y6ah4p97j04gyvg1mrvlj95dg4"; + }; + meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; + }; + nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-03-16"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "f7ad4ce5f4c93c91aca00f0d9f10316c98471798"; - sha256 = "0l7ixschycw3lvg488bxgbbzsba59k0zkm8yrjdh63dp2nk2p2kj"; + rev = "e0b9882a8a8ecce8b58076091217d3643f215da3"; + sha256 = "1i8mqa45gg0lagcd4q5qwp97zlynkdw42ajw0wh8r92i5bs9crd8"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-03-20"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "db67f5e517642eafe77be3714171880ea0372f80"; - sha256 = "1x69adnhdbda4hharfdq4pzwliskmihfs0p6b6nsrd8i9g3iqwj7"; + rev = "88ac3d23653a27973be8ff60e500848cacfcf968"; + sha256 = "1diy0j045kcr38nwi641ccq89bzahfacicny2zphyrml1ff7hgff"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3288,24 +3324,24 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-03-21"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "280d324111b114f3649743179ccfc496663cdfec"; - sha256 = "12y7jglbsl0lydx2a8syc9i02h21pzg3dcn4xspij41qblinv1g2"; + rev = "8714eade54870231b1df247453a5535a40b0a7b4"; + sha256 = "192376c6nbx5kgj96wvpmds7ird8hfk4v8ayg1gay18vljyszxj9"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-03-10"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "1fb0962b8c4a217eec8166b03d683aa070115ed7"; - sha256 = "1rqswcjqrg6ckp7vyzqlncfabkggnhjvp3b0sq7y2g333z925sjm"; + rev = "6e32d113d848c76ddbcc824038244657f170a97a"; + sha256 = "02m8bsq7172sm9vkq3shh87xv4c3jxkgvhwhd3vv0na86kl9sqd6"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3420,12 +3456,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-03-15"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "6d7be3232ed0dcbbd040bf92ba70b997fe4fd840"; - sha256 = "0k1ydkplqpizyqn56bdwhpsdib384ikv2lqfmk8j11r7p6m0xvir"; + rev = "df33faeef884d55ca8f97479ea55b8d9bd2ffb3f"; + sha256 = "1pizzzmb551c2pr0srw27ya8a4awfgq14k2dswmk8i8vra54vsj6"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3504,12 +3540,12 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-02-17"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "444eab728ecaf337629a45a733535e94a3efc04a"; - sha256 = "0r10fmk90wdc9hj3kdfkb93vvw1kdxwkl20f9zs3rfs5vs7p9i97"; + rev = "d96cef521d22afd1a409449a890f20f50b436ee1"; + sha256 = "1j1iqzi9q8fnl02hvazl8szg84iz8dqy0n52ngh1lvl78s9qa393"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -3731,6 +3767,18 @@ let meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; + registers-nvim = buildVimPluginFrom2Nix { + pname = "registers-nvim"; + version = "2021-03-21"; + src = fetchFromGitHub { + owner = "tversteeg"; + repo = "registers.nvim"; + rev = "ba84c085ca868515520310073d922132fd811a24"; + sha256 = "02qadqyppn7w2ssc7m7zqr5s9iknhj0fbg88w2mdn7s4kcf8jyim"; + }; + meta.homepage = "https://github.com/tversteeg/registers.nvim/"; + }; + Rename = buildVimPluginFrom2Nix { pname = "Rename"; version = "2011-08-31"; @@ -3973,12 +4021,12 @@ let sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-02-28"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "86298232f4f5ab418d5d9d18a336d7ab8b167b68"; - sha256 = "060k664gm4857nfmxaj0v6sz50mb3y9v8489jnv1bhqplzqf8gmy"; + rev = "78f1b14ad18b043eb888a173f4c431dbf79462d8"; + sha256 = "0spnpzr874ad9jpawcgydfm242wq55ychcky14f1qa09svsrdiv0"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4226,12 +4274,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-02-18"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "51ff7a05404e2f5c83799dd6c38134ed4aaca85c"; - sha256 = "0i7qzn3vlvjjd5qvf230r7aaqz84rn30zkn643fdvpni7pxfywdv"; + rev = "f6012cb65da4bda46b0779a36840df36ad01483e"; + sha256 = "08vb3ffm1f47q5gxyqmmfv75x12001qpkqml7v612wnnfpclcqf5"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4924,12 +4972,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-02-10"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b"; - sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby"; + rev = "e9104aeece94652b064a15ae220bd4926a715dbd"; + sha256 = "1kvnmzs1wbqaiswsjra13f06m8dpdn62h8zqrnr9vv13rm8a2326"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -5104,12 +5152,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-03-13"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "b7b1d078f4556a6829400185bbfb47be171e6828"; - sha256 = "1vncq3ypp5x3v9vq90zwg12ih45nph6g5mrl0xh2m82llqsp5r7c"; + rev = "fc5060933e9f35a107d1646c90d4e1216301ab48"; + sha256 = "0g36p0wqrvm6v4ga64z84jri5c8n5hq6y7f5yig7kszk01wvc6hh"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5152,12 +5200,12 @@ let vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; - version = "2020-10-09"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "alvan"; repo = "vim-closetag"; - rev = "bd6bbc33c7e178673aa1dd17a5d249bbd4e3a6a6"; - sha256 = "0nqzjma6mqg19cxq0ck2lym51ajb1x97z497zf9pbp47hkg5875j"; + rev = "c0779ef575d5c239162f4ca3506cfb4a95d45a58"; + sha256 = "1mkn6d7m23ak06pl8i328hd9x6qx5fzrg8ijz32lgd4a56k98n6i"; }; meta.homepage = "https://github.com/alvan/vim-closetag/"; }; @@ -5236,12 +5284,12 @@ let vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2019-11-18"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "f8238d70f873969fb41bf6a6b07ca63a4c0b82b1"; - sha256 = "09d81q9na7pvvrmxxqy09ffdzsx5v5dikinb704c9wm4ys2bidr9"; + rev = "349340debb34f6302931f0eb7139b2c11dfdf427"; + sha256 = "01lpfcn2hmvxddcf97f4qx5vksxj1hwrxb0c8ri59z9lb9z2hgjd"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -5752,12 +5800,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-03-17"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "2d9107b1e1ceb3d4f118647f2cd5f9165172ccf9"; - sha256 = "1ja58d2x8a5af7vhvbjp8x7l4bzbvndr2nd97p115q89l2zy6ayp"; + rev = "ae7eea5c5c6c082fe66410e72306b5b1bcb693dd"; + sha256 = "1lvaww22rj9jnd8b8fjcaclvj8n6vqc390l3z5d7ivm6fc5h1k1j"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5812,12 +5860,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-03-21"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "58d2b25836f420cf2fe20cc0b6f988165ae33782"; - sha256 = "0550dq20axl1qj6rasws2hsar7x4kjx9fspqzmkisv4wzrxr1kp5"; + rev = "7de9b5a04b9ab63bba381d3cc2c48331ba8e4e7f"; + sha256 = "0d33gzblnz4gzd6grfmyb5rfp59jcj86n95ajwn9q2d4snk45h4n"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5932,12 +5980,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-03-21"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a60ff48be1d57991866320886569d012cdfb9e6f"; - sha256 = "1w3cbvdl08vf7d9w4d3vaw3l4ccvzvgfkamk7qxanmcg2vd0k1rg"; + rev = "00c5f2dad170131c0c850dbf331d63ddf515116d"; + sha256 = "07ckmqxl25hzv10iarj6xdhg65q8450zriqc9wd6c2hlldj45ys3"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6582,12 +6630,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-03-21"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "d2b394c0033014288daac317c32918bed469ff66"; - sha256 = "0a8hd20v5q3bjq5pcs8p708f5jmh1y87aqa0f7ip4snldnf6gq2d"; + rev = "2f0cbbfb8ea8997b408e447a2bc9554a3de33617"; + sha256 = "1y3r5a5mcjf8dp0pkmhgnbay10hh48w1b3wd795wwbm6nx4izjjq"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; @@ -6799,12 +6847,12 @@ let vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2020-12-29"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "4f8628caebe393ac1b84564e965f894d89a7582d"; - sha256 = "0hmww1xln0rvvi8hy7sv9arjwlp40ks0b07irzqpm5xi93hgyq2n"; + rev = "c6dcea90166750bb5ed40321749966b1a8020a1a"; + sha256 = "1bd9xab96m2j6zcp6bh7k958wj95m8w40hczmn2qzpq3cvpy8nb0"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -6907,12 +6955,12 @@ let vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2020-01-19"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "96a3f837c112cb64e0a9857b69f6d6a71041155e"; - sha256 = "11h7jyg7fhjmq3pmpc93nrsxm175ra14407rs3558h8p04snc159"; + rev = "82c9ac5e130c92a46e043dd9cd9e5b48d15e286d"; + sha256 = "0lfcba8sk25l5yp3agh6pwniddf8jx627ikpr8i2z9ary2fqsj98"; }; meta.homepage = "https://github.com/tpope/vim-obsession/"; }; @@ -7243,12 +7291,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2021-01-22"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "348e070867d02bd471df486bfbe25e2e2ce13061"; - sha256 = "0fyp1zikw16kzjcs7a6g3kjk74xr46bdhwrwfi9ppfqlhb936kgr"; + rev = "7d2853e7550e6ff6459096c211a4177303a2e5d2"; + sha256 = "0qvsm0bd5nbd0dcgcrsa45vxmb4ccsm6yn4j3xiwd52gnyacp14s"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -7531,12 +7579,12 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2021-03-08"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "9450c4ea654649b6199750edc9f3f84637268d7b"; - sha256 = "0nkxcykn63187jwzw0anl3chzhm31yzgmkhqra0c9071jzi149xg"; + rev = "dbdc88f2ca38613a089354823fb2cec4d87d104d"; + sha256 = "0i89vrnfphr32qcix9ah9cf68xnw6n8jm03xmgys29gkfim4v7sq"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -7711,12 +7759,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-03-15"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a8ac81b8922ac621e7043813d98e69ad0ac265a4"; - sha256 = "0gl77mnajzvmnxwnbzb5fqzzljb59lbfv23gzbz1h493gfm0f04n"; + rev = "67e506c5598c19de4fcdf8780377a92aaddfdbad"; + sha256 = "1gabnzgrjkrf2x32i55js8xf6zm0vzwnzmlbwqkjf1xi25wgbx1n"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7795,12 +7843,12 @@ let vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-02-23"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "af70d17a863c9a33def9cafbb3911195a571c686"; - sha256 = "078xq6bwkbwsjajyq3c9bn8b3r0da6j70vp1ba934a6jjdv6vrj4"; + rev = "cee157ee4f73ddacfe1a70bb833b96f7a47a10c2"; + sha256 = "1y049vbjhsg80am0hxyrcq0d0p7qfyvb1z38nc7yd7bcgwsqc5ac"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -7940,12 +7988,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-03-03"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "f5619460b77b9b444311aa3b6f31ecd9ffdaa6d8"; - sha256 = "1izzpfvppiyf4pcxdny0na634bl147rwiijyaj7rg679w9lv6qwg"; + rev = "a0a3f130dddfde95700f8d07e51884a2bc0a53c4"; + sha256 = "07qv8l3rz63ksrv8shphqk42p1yzcjjck6s5sv3sz2z1xwr2dy0x"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -8108,12 +8156,12 @@ let vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-03-11"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "327944d0d7824e6de4dda33bc2b008708a6cb447"; - sha256 = "16nsick3p5nj9vmi6h531l8lc5c6gy2c1zd83xbgav38x655kjws"; + rev = "b36abe2613191912e12b9562b209f157a8b927de"; + sha256 = "1ly3iy1c05ry7yfsph0rribiagcyw07daj2dbfj0la3pbfmvip24"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8240,12 +8288,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-03-21"; + version = "2021-03-24"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "fe1f56cb924a67ce3b3b70583f00e05e780509e5"; - sha256 = "0kd4pfjrjcssql154pnrzvw3kgp6rnll2p0d4bgph1b0lc5xp1nk"; + rev = "4eb5f669c11c497fa075912eb03294b11fca2c07"; + sha256 = "1imrkir6ir2fl63wh91yh5jp64kxd3zh1m7p05dcfbyd7rc2l9c1"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -8516,12 +8564,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-03-20"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "35e5b3d56e193ee6129eabedcd48fd17b8293b2d"; - sha256 = "0njs7bn3hzr44sn04lg44baia5khpxra0l1llshx42bkdidcj1s1"; + rev = "054ea35428e5e8d6abe12b6a535a3b0426d4874e"; + sha256 = "0cx35hbyhrzmbfzsikbpa4jh0gr3sbdhk27v2nsbwj4i3rg9767p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8529,12 +8577,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-03-16"; + version = "2021-03-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "96d716b98cf6ebd5056b6cd770d304a8c2007dac"; - sha256 = "1fy9wg8iq3dd8qb36f1jn678kqd3hpgq1qk0yxfigha2w2rarh6b"; + rev = "428906647a22fdb30409554935eacdd9932726cb"; + sha256 = "1kyg2j06b6677pfaj2aqw9ivdlrg02hhpy2jyr11xrqy83k461hi"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8710,12 +8758,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-03-20"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "3352684bfb6a08be8e864a46b0773e459d4d201f"; - sha256 = "03mqrprmiain4n9aw5388msq4smczw1avcls71rj0c7igzpdc4vw"; + rev = "ed423e8a1d2a5842a126d33b824ad3b65f85f3ba"; + sha256 = "19c238sdc6i3ky374v52g13csnbmdcm9d97iji6fmklmzsyrq4cr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -8759,12 +8807,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-03-18"; + version = "2021-03-23"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "05315a214fc0b4681e596cbcb40045d54564ff8c"; - sha256 = "0bapbwyvvbvqd8ggcyns2y5iya44jvb0jxq14xh5qfnxiycrwrgi"; + rev = "79e273ed8ff386a81e6a88ae888ec6d878a9dcbc"; + sha256 = "00x0b2lwrfkmny6rhwjrb1kyp2lai597f6f62whhwgw7iq9j5b5k"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index af90bbee409..18abd14118d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -3,6 +3,8 @@ aca/completion-tabnine ackyshake/Spacegray.vim@main airblade/vim-gitgutter airblade/vim-rooter +akinsho/nvim-bufferline.lua +akinsho/nvim-toggleterm.lua aklt/plantuml-syntax altercation/vim-colors-solarized alvan/vim-closetag @@ -418,6 +420,7 @@ nishigori/increment-activator nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script +norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim npxbr/glow.nvim @@ -635,6 +638,7 @@ travitch/hasksyn tremor-rs/tremor-vim@main triglav/vim-visual-increment troydm/zoomwintab.vim +tversteeg/registers.nvim@main twerth/ir_black twinside/vim-haskellconceal Twinside/vim-hoogle diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index a8a9f8bf1c4..3f77906bce3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -48,6 +48,18 @@ let }; }; + alygin.vscode-tlaplus = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tlaplus"; + publisher = "alygin"; + version = "1.5.3"; + sha256 = "1cy0qn8iyjrinscn9p5ckpsa2hyryapxfi7is6s2zk2mpligbb1d"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + antfu.icons-carbon = buildVscodeMarketplaceExtension { mktplcRef = { name = "icons-carbon"; @@ -75,6 +87,18 @@ let }; }; + baccata.scaladex-search = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "scaladex-search"; + publisher = "baccata"; + version = "0.0.1"; + sha256 = "1y8p4rr8qq5ng52g4pbx8ayq04gi2869wrx68k69rl7ga7bzcyp9"; + }; + meta = { + license = lib.licenses.asl20; + }; + }; + bbenoist.Nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; @@ -111,6 +135,18 @@ let }; }; + codezombiech.gitignore = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gitignore"; + publisher = "codezombiech"; + version = "0.6.0"; + sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + CoenraadS.bracket-pair-colorizer = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; @@ -201,6 +237,20 @@ let }; }; + dotjoshjohnson.xml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "xml"; + publisher = "dotjoshjohnson"; + version = "2.5.1"; + sha256 = "1v4x6yhzny1f8f4jzm4g7vqmqg5bqchyx4n25mkgvw2xp6yls037"; + }; + meta = { + description = "XML Tools"; + homepage = "https://github.com/DotJoshJohnson/vscode-xml"; + license = lib.licenses.mit; + }; + }; + dracula-theme.theme-dracula = buildVscodeMarketplaceExtension { mktplcRef = { name = "theme-dracula"; @@ -229,6 +279,18 @@ let }; }; + edonet.vscode-command-runner = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-command-runner"; + publisher = "edonet"; + version = "0.0.116"; + sha256 = "0fxvplyk080m0cdsvzynp6wjillrd4flr5qz7af7fibb2jbmfdkn"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + elmtooling.elm-ls-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "elm-ls-vscode"; @@ -345,19 +407,33 @@ let }; }; - github.github-vscode-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "github-vscode-theme"; - publisher = "github"; - version = "1.1.5"; - sha256 = "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2"; + github = { + github-vscode-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-vscode-theme"; + publisher = "github"; + version = "1.1.5"; + sha256 = + "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2"; + }; + meta = with lib; { + description = "GitHub theme for VS Code"; + downloadPage = + "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + homepage = "https://github.com/primer/github-vscode-theme"; + license = licenses.mit; + maintainers = with maintainers; [ hugolgst ]; + }; }; - meta = with lib; { - description = "GitHub theme for VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; - homepage = "https://github.com/primer/github-vscode-theme"; - license = licenses.mit; - maintainers = with maintainers; [ hugolgst ]; + + vscode-pull-request-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pull-request-github"; + publisher = "github"; + version = "0.22.0"; + sha256 = "13p3z86vkra26npp5a78pxdwa4z6jqjzsd38arhgdnjgwmi6bnrw"; + }; + meta = { license = lib.licenses.mit; }; }; }; @@ -389,8 +465,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.206"; - sha256 = "1xalwk2bndb73p8p2b4w5qz7m1n80xyw67wb5qlq1rrfjchhicyv"; + version = "0.0.208"; + sha256 = "1yjz7i3f2f9a3i797vwa9vnxsh9lyxqr4k0ixx8v55h628kvafr9"; }; meta = with lib; { license = licenses.mit; @@ -512,6 +588,18 @@ let }; }; + mishkinf.goto-next-previous-member = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "goto-next-previous-member"; + publisher = "mishkinf"; + version = "0.0.5"; + sha256 = "0kgzap1k924i95al0a63hxcsv8skhaapgfpi9d7vvaxm0fc10l1i"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "one-dark-theme"; @@ -540,8 +628,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "0.8.1"; - sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s"; + version = "1.9.1"; + sha256 = "1l7pm3s5kbf2vark164ykz4qbpa1ac9ls691hham36f6v91dmff9"; }; meta = { license = lib.licenses.mit; @@ -604,7 +692,7 @@ let buildInputs = [ jdk ]; meta = { license = lib.licenses.epl20; - broken = lib.versionAtLeast "11" jdk.version; + broken = lib.versionOlder jdk.version "11"; }; }; @@ -691,8 +779,8 @@ let mktplcRef = { name = "scala"; publisher = "scala-lang"; - version = "0.4.5"; - sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw"; + version = "0.5.1"; + sha256 = "0p9nhds2xn08xz8x822q15jdrdlqkg2wa1y7mk9k89n8n2kfh91g"; }; meta = { license = lib.licenses.mit; @@ -703,8 +791,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.9.10"; - sha256 = "1afmqzlw3bl9bv59l9b2jrljhbq8djb7vl8rjv58c5wi7nvm2qab"; + version = "1.9.13"; + sha256 = "0vrg25ygmyjx1lwif2ypyv688b290ycfn1qf0izxbmgi2z3f0wf9"; }; meta = { license = lib.licenses.asl20; @@ -723,6 +811,19 @@ let }; }; + + shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-spotify"; + publisher = "shyykoserhiy"; + version = "3.2.1"; + sha256 = "14d68rcnjx4a20r0ps9g2aycv5myyhks5lpfz0syr2rxr4kd1vh6"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; @@ -730,8 +831,20 @@ let version = "0.2.1"; sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; + }; + }; + + slevesque.vscode-multiclip = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-multiclip"; + publisher = "slevesque"; + version = "0.1.5"; + sha256 = "1cg8dqj7f10fj9i0g6mi3jbyk61rs6rvg9aq28575rr52yfjc9f9"; + }; + meta = { + license = lib.licenses.mit; }; }; @@ -771,6 +884,18 @@ let }; }; + timonwong.shellcheck = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "shellcheck"; + publisher = "timonwong"; + version = "0.12.3"; + sha256 = "1i9rszgnac2z1kyahmgxmz05ib7z14s458fvvjlzmvl64fa1fdvf"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tomoki1207.pdf = buildVscodeMarketplaceExtension { mktplcRef = { name = "pdf"; @@ -848,6 +973,42 @@ let }; }; + xyz.local-history = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "local-history"; + publisher = "xyz"; + version = "1.8.1"; + sha256 = "1mfmnbdv76nvwg4xs3rgsqbxk8hw9zr1b61har9c3pbk9r4cay7v"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + yzhang.markdown-all-in-one = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-all-in-one"; + publisher = "yzhang"; + version = "3.4.0"; + sha256 = "0ihfrsg2sc8d441a2lkc453zbw1jcpadmmkbkaf42x9b9cipd5qb"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + zhuangtongfa.material-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "material-theme"; + publisher = "zhuangtongfa"; + version = "3.9.12"; + sha256 = "017h9hxplf2rhmlhn3vag0wypcx6gxi7p9fgllj5jzwrl2wsjl0g"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + llvm-org.lldb-vscode = llvmPackages_8.lldb; WakaTime.vscode-wakatime = callPackage ./wakatime {}; diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 7c9eaa65618..fbfb7c06dc5 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.8.3"; + version = "2.9.1"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; - sha256 = "1cng82q9079qmn5q71h9knh9qzhqrl3phaamkqfjy1jallgi43b1"; + sha256 = "1i4pzxw57hf2g7x62hfsb588b1lz3zjjh8ny96qqrif2bj2h887z"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 9c076d06df4..d91ffcc17ab 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,25 +1,38 @@ diff --git a/out/extension.js b/out/extension.js -index 4a2c6a9..158fe28 100644 +index e44cef2..fba0899 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -215,19 +215,7 @@ function pathToBinary() { - if (!_pathToBinaryPromise) { - let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary'); - if (!command) { // Skip install/upgrade if user has set custom binary path -- const installDir = `${extensionPath}/lsp`; -- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter); +@@ -141,24 +141,6 @@ function updateLanguageServer() { + return __awaiter(this, void 0, void 0, function* () { + const delay = 1000 * 60 * 24; + setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs +- // skip install if a language server binary path is set +- if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) { +- const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter); +- const install = yield installer.needsInstall(); +- if (install) { +- yield stopClients(); - try { -- yield installer.install(installDir); +- yield installer.install(); - } - catch (err) { - reporter.sendTelemetryException(err); - throw err; - } - finally { -- yield installer.cleanupZips(installDir); +- yield installer.cleanupZips(); - } -- command = `${installDir}/terraform-ls`; -+ command = 'TERRAFORM-LS-PATH'; +- } +- } + return startClients(); // on repeat runs with no install, this will be a no-op + }); + } +@@ -256,7 +238,7 @@ function pathToBinary() { + reporter.sendTelemetryEvent('usePathToBinary'); } else { - reporter.sendTelemetryEvent('usePathToBinary'); +- command = path.join(installPath, 'terraform-ls'); ++ command = 'TERRAFORM-LS-PATH'; + } + _pathToBinaryPromise = Promise.resolve(command); + } diff --git a/pkgs/os-specific/darwin/macfuse/default.nix b/pkgs/os-specific/darwin/macfuse/default.nix index a5162b3aed2..7e1b4ed7763 100644 --- a/pkgs/os-specific/darwin/macfuse/default.nix +++ b/pkgs/os-specific/darwin/macfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi }: +{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi, DiskArbitration }: stdenv.mkDerivation rec { pname = "macfuse-stubs"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cpio xar undmg libtapi ]; + propagatedBuildInputs = [ DiskArbitration ]; postUnpack = '' xar -xf 'Install macFUSE.pkg' @@ -40,6 +41,11 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://osxfuse.github.io"; description = "Build time stubs for FUSE on macOS"; + longDescription = '' + macFUSE is required for this package to work on macOS. To install macFUSE, + use the installer from the <link xlink:href="https://osxfuse.github.io/"> + project website</link>. + ''; platforms = platforms.darwin; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index b79f0bd84f2..f986ed790a1 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "acpi-call"; - version = "2020-04-07-${kernel.version}"; + version = "1.2.1"; + name = "${pname}-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "nix-community"; repo = "acpi_call"; - rev = "fe4cd0124099b88b61f83006023bc0d95e742e75"; - sha256 = "1rksbg78i7y2wzam9p6kbhx8rmkaiq0kqg8nj7k0j6d25m79289s"; + rev = "v${version}"; + sha256 = "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg"; }; hardeningDisable = [ "pic" ]; @@ -26,8 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ raskin mic92 ]; - inherit (src.meta) homepage; + homepage = "https://github.com/nix-community/acpi_call"; platforms = platforms.linux; description = "A module allowing arbitrary ACPI calls; use case: hybrid video"; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/os-specific/linux/dlm/default.nix b/pkgs/os-specific/linux/dlm/default.nix new file mode 100644 index 00000000000..9e81ea38348 --- /dev/null +++ b/pkgs/os-specific/linux/dlm/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromSourcehut +}: + +rustPlatform.buildRustPackage rec { + pname = "dlm"; + version = "2020-01-07"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = "6b0e11c4f453b1a4d7a32019227539a980b7ce66"; + sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p"; + }; + + cargoSha256 = "OFMCsUmrRYlobiUAqm1huuzDxdf1BWmU2RqZ9Y6Yjew="; + + meta = with lib; { + description = "A stupid simple graphical login manager"; + homepage = "https://git.sr.ht/~kennylevinsen/dlm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 21458daf966..5a472c73578 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, bash, perl, python }: +{ lib, stdenv, fetchFromGitHub, bash, perl, python2 }: + +# There are fixes for python3 compatibility on master stdenv.mkDerivation rec { pname = "dmtcp"; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { substituteInPlace test/autotest.py \ --replace /bin/bash ${bash}/bin/bash \ --replace /usr/bin/perl ${perl}/bin/perl \ - --replace /usr/bin/python ${python}/bin/python \ + --replace /usr/bin/python ${python2}/bin/python \ --replace "os.environ['USER']" "\"nixbld1\"" \ --replace "os.getenv('USER')" "\"nixbld1\"" ''; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index a5722d59c25..138fea042fc 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -29,11 +29,11 @@ rustPlatform.buildRustPackage rec { done ''; - meta = { + meta = with lib; { description = "Tools for managing firmware updates for system76 devices"; homepage = "https://github.com/pop-os/system76-firmware"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.shlevy ]; - platforms = lib.platforms.linux; + license = licenses.gpl3Only; + maintainers = with maintainers; [ shlevy ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/greetd/default.nix b/pkgs/os-specific/linux/greetd/default.nix new file mode 100644 index 00000000000..fc5dd04b43c --- /dev/null +++ b/pkgs/os-specific/linux/greetd/default.nix @@ -0,0 +1,51 @@ +{ rustPlatform +, lib +, fetchFromSourcehut +, pam +, scdoc +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "greetd"; + version = "0.7.0"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = version; + sha256 = "b+S3fuJ8gjnSQzLHl3Bs9iO/Un2ynggAplz01GjJvFI="; + }; + + cargoSha256 = "w6d8rIc03Qa2/TpztpyVijjd3y0Vo38+JDhsOkSFG5E="; + + nativeBuildInputs = [ + scdoc + installShellFiles + ]; + + buildInputs = [ + pam + ]; + + postInstall = '' + for f in man/*; do + scdoc < "$f" > "$(sed 's/-\([0-9]\)\.scd$/.\1/' <<< "$f")" + rm "$f" + done + installManPage man/* + ''; + + meta = with lib; { + description = "Minimal and flexible login manager daemon"; + longDescription = '' + greetd is a minimal and flexible login manager daemon + that makes no assumptions about what you want to launch. + Comes with agreety, a simple, text-based greeter. + ''; + homepage = "https://kl.wtf/projects/greetd/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/gtkgreet/default.nix b/pkgs/os-specific/linux/gtkgreet/default.nix new file mode 100644 index 00000000000..7ab7c01475b --- /dev/null +++ b/pkgs/os-specific/linux/gtkgreet/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromSourcehut +, pkg-config +, cmake +, meson +, ninja +, gtk3 +, gtk-layer-shell +, json_c +, scdoc +}: + +stdenv.mkDerivation rec { + pname = "gtkgreet"; + version = "0.7"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = version; + sha256 = "ms+2FdtzzNlmlzNxFhu4cpX5H+5H+9ZOtZ0p8uVA3lo="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + cmake + ]; + + buildInputs = [ + gtk3 + gtk-layer-shell + json_c + scdoc + ]; + + mesonFlags = [ + "-Dlayershell=enabled" + ]; + + meta = with lib; { + description = "GTK based greeter for greetd, to be run under cage or similar"; + homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4fef56077c0..7ba05d13293 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -244,8 +244,9 @@ let # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; VGA_SWITCHEROO = yes; # Hybrid graphics support + DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA600 = yes; - DRM_GMA3600 = yes; + DRM_GMA3600 = whenOlder "5.12" yes; DRM_VMWGFX_FBCON = yes; # necessary for amdgpu polaris support DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes; @@ -288,21 +289,31 @@ let SND_SOC_SOF_TOPLEVEL = yes; SND_SOC_SOF_ACPI = module; SND_SOC_SOF_PCI = module; - SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes; - SND_SOC_SOF_CANNONLAKE_SUPPORT = yes; - SND_SOC_SOF_COFFEELAKE_SUPPORT = yes; + SND_SOC_SOF_APOLLOLAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_APOLLOLAKE_SUPPORT = whenOlder "5.12" yes; + SND_SOC_SOF_CANNONLAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_CANNONLAKE_SUPPORT = whenOlder "5.12" yes; + SND_SOC_SOF_COFFEELAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_COFFEELAKE_SUPPORT = whenOlder "5.12" yes; + SND_SOC_SOF_COMETLAKE = whenAtLeast "5.12" module; SND_SOC_SOF_COMETLAKE_H_SUPPORT = whenOlder "5.8" yes; - SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes; - SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes; - SND_SOC_SOF_GEMINILAKE_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_LP_SUPPORT = whenOlder "5.12" yes; + SND_SOC_SOF_ELKHARTLAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_ELKHARTLAKE_SUPPORT = whenOlder "5.12" yes; + SND_SOC_SOF_GEMINILAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_GEMINILAKE_SUPPORT = whenOlder "5.12" yes; SND_SOC_SOF_HDA_AUDIO_CODEC = yes; SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = whenOlder "5.7" yes; SND_SOC_SOF_HDA_LINK = yes; - SND_SOC_SOF_ICELAKE_SUPPORT = yes; + SND_SOC_SOF_ICELAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_ICELAKE_SUPPORT = whenOlder "5.12" yes; SND_SOC_SOF_INTEL_TOPLEVEL = yes; - SND_SOC_SOF_JASPERLAKE_SUPPORT = yes; - SND_SOC_SOF_MERRIFIELD_SUPPORT = yes; - SND_SOC_SOF_TIGERLAKE_SUPPORT = yes; + SND_SOC_SOF_JASPERLAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_JASPERLAKE_SUPPORT = whenOlder "5.12" yes; + SND_SOC_SOF_MERRIFIELD = whenAtLeast "5.12" module; + SND_SOC_SOF_MERRIFIELD_SUPPORT = whenOlder "5.12" yes; + SND_SOC_SOF_TIGERLAKE = whenAtLeast "5.12" module; + SND_SOC_SOF_TIGERLAKE_SUPPORT = whenOlder "5.12" yes; }; usb-serial = { diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index acffa383f07..20f9f5aaa14 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -55,8 +55,8 @@ assert (versionAtLeast version "4.9"); # Wipe higher-level memory allocations on free() with page_poison=1 PAGE_POISONING = yes; - PAGE_POISONING_NO_SANITY = yes; - PAGE_POISONING_ZERO = yes; + PAGE_POISONING_NO_SANITY = whenOlder "5.11" yes; + PAGE_POISONING_ZERO = whenOlder "5.11" yes; # Enable the SafeSetId LSM SECURITY_SAFESETID = whenAtLeast "5.1" yes; @@ -91,4 +91,6 @@ assert (versionAtLeast version "4.9"); CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no; CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes; + # Detect out-of-bound reads/writes and use-after-free + KFENCE = whenAtLeast "5.12" yes; } diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 01158d9c4f0..a8cdaafcdfe 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.226-hardened1.patch", - "sha256": "12h42fsr1sc2zgr1cb2ais0aivg4hpg9x4gc762r7cd4l40fyyg9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.226-hardened1/linux-hardened-4.14.226-hardened1.patch" + "name": "linux-hardened-4.14.227-hardened1.patch", + "sha256": "0g8s91cvcxin95is7hhap5i8vkn4k3570s28vnz8mf0jrcgwdgfd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.227-hardened1/linux-hardened-4.14.227-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.181-hardened1.patch", - "sha256": "13j15nwmnzl1s17403icrpx9cdpfpzb5y1pnl6zaj5wsnjda7k5d", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.181-hardened1/linux-hardened-4.19.181-hardened1.patch" + "name": "linux-hardened-4.19.183-hardened1.patch", + "sha256": "1xi4fkvdvf1rjhrihi7im415x26hwmvhf3zrklm8hw2rmajdfrca", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.183-hardened1/linux-hardened-4.19.183-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.24-hardened1.patch", - "sha256": "0d2kwz01kgh43li6b76b7dhnx37hchzx99rk4h6jdz364272lh1p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.24-hardened1/linux-hardened-5.10.24-hardened1.patch" + "name": "linux-hardened-5.10.25-hardened1.patch", + "sha256": "0d5fid229769frifr7g20ly553gxdqqvajfwyzqwjpr82jjzxlis", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.25-hardened1/linux-hardened-5.10.25-hardened1.patch" }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.7-hardened1.patch", - "sha256": "1d3rg722k796qh2zj97fyk30qak9i71yqy7mk2dpbmdpv0ksacax", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.7-hardened1/linux-hardened-5.11.7-hardened1.patch" + "name": "linux-hardened-5.11.9-hardened1.patch", + "sha256": "169jcalr81ckad08vx489h8j6k42s0rzxbpkr6knyrd7rv06ddk0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.9-hardened1/linux-hardened-5.11.9-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.106-hardened1.patch", - "sha256": "1hg18p1n26am6y2i459jrpnkq06rv0f5hds1znnm7jw4f61k395f", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.106-hardened1/linux-hardened-5.4.106-hardened1.patch" + "name": "linux-hardened-5.4.108-hardened1.patch", + "sha256": "1m208j0svysyn3m0acn10pd4wqjm203ampkhf1wimzpzs8wfasgj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.108-hardened1/linux-hardened-5.4.108-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5052d3754b3..1dd2521dfb2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.226"; + version = "4.14.227"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s"; + sha256 = "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 53fb707ab2b..3530d022369 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.181"; + version = "4.19.183"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j"; + sha256 = "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 941a1dda9b9..b2b5c43722e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.262"; + version = "4.4.263"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j"; + sha256 = "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 6d9bb6111dc..c07e1c98d48 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.262"; + version = "4.9.263"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj"; + sha256 = "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index c415fc601c5..623a3a14f10 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.24"; + version = "5.10.26"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66"; + sha256 = "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 319ef0bfea2..cf9302757f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.7"; + version = "5.11.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cd87v6j8nk89pjqqsaviyzx9lj0d51j46n1in7cjlg18wng3da9"; + sha256 = "0dcqn6s85sd4zl7rv8ay88p5z12xvy2rma0dx6g6b480rg68sxal"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8823e580883..fdb32a2476f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.106"; + version = "5.4.108"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"; + sha256 = "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index ed2b5314384..d8fc7a71b59 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.5"; + version = "5.11.8"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1rf8x08l7zjwhfwaal8kh2wz2qfbrqrjhr4wh0pj7yayaa10877f"; + sha256 = "1zvd74l6vb0rwrkwwh67i8l6ipin0p981vzdmiwpbpfzasbw59xk"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 6f9b1eaa31d..0aa63af52d8 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.102-rt53"; # updated by ./update-rt.sh + version = "5.4.106-rt54"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx"; + sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0d1653cd5dcv4p13mxmva3jz5mp1phvmibfabhha0wsiqkabvx80"; + sha256 = "0xwbpn1k1b4bxq15sw7gicrzkfg32nkja308a5pcwx1ihv9khchf"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1ed116cdfde..06efc5da1ec 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with lib; buildLinux (args // rec { - version = "5.11-rc5"; - extraMeta.branch = "5.11"; + version = "5.12-rc4"; + extraMeta.branch = "5.12"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "029nps41nrym5qz9lq832cys4rai04ig5xp9ddvrpazzh0lfnr4q"; + sha256 = "06i6xnfbyn522pj9zksx6ka01yxwv8dsrb2z517grv682sp8j70k"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 87b26120cbf..0323bf81c76 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.11.5"; + version = "5.11.8"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1w8cksbxnby4xjmycynmiy9y4q5fsnpsbva1804kgan7mhxrppjc"; + sha256 = "1hb05shhqb6747m131sw30h36ak1m9bwzhfldjypn8phlfkflgkq"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 3310692b31d..ae175a36324 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0jz8fzwgvfyjgxjbpw35ixdglp2apqjvp8m386f6yr4zacc6xbv8"; + url = "https://musl.libc.org/releases/${pname}-${version}.tar.gz"; + sha256 = "1p8r6bac64y98ln0wzmnixysckq3crca69ys7p16sy9d04i975lv"; }; enableParallelBuilding = true; @@ -67,12 +67,6 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) - # wcsnrtombs destination buffer overflow, remove >= 1.2.2 - (fetchurl { - name = "CVE-2020-28928.patch"; - url = "https://www.openwall.com/lists/oss-security/2020/11/20/4/1"; - sha256 = "077n2p165504nz9di6n8y5421591r3lsbcxgih8z26l6mvkhcs2h"; - }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; @@ -149,7 +143,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An efficient, small, quality libc implementation"; - homepage = "http://www.musl-libc.org"; + homepage = "https://musl.libc.org/"; + changelog = "https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice dtzWill ]; diff --git a/pkgs/os-specific/linux/powercap/default.nix b/pkgs/os-specific/linux/powercap/default.nix new file mode 100644 index 00000000000..ad9de9f75d5 --- /dev/null +++ b/pkgs/os-specific/linux/powercap/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "powercap"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "powercap"; + repo = "powercap"; + rev = "v${version}"; + sha256 = "0f1sg1zsskcfralg9khwq7lmz25gvnyknza3bb0hmh1a9lw0jhdn"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=On" + ]; + + meta = with lib; { + description = "Tools and library to read/write to the Linux power capping framework (sysfs interface)"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ rowanG077 ]; + }; +} diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index ecbd23e117f..23e78dd848e 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles -, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc +, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl installShellFiles ]; buildInputs = [ - zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc + luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/os-specific/linux/tuigreet/default.nix new file mode 100644 index 00000000000..b6db7cfbb7f --- /dev/null +++ b/pkgs/os-specific/linux/tuigreet/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "tuigreet"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "apognu"; + repo = pname; + rev = version; + sha256 = "1fk8ppxr3a8vdp7g18pp3sgr8b8s11j30mcqpdap4ai14v19idh8"; + }; + + cargoSha256 = "0qpambizjy6z44spnjnh2kd8nay5953mf1ga2iff2mjlv97zpq22"; + + meta = with lib; { + description = "Graphical console greter for greetd"; + homepage = "https://github.com/apognu/tuigreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/wlgreet/default.nix b/pkgs/os-specific/linux/wlgreet/default.nix new file mode 100644 index 00000000000..e48443b1b1e --- /dev/null +++ b/pkgs/os-specific/linux/wlgreet/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromSourcehut +}: + +rustPlatform.buildRustPackage rec { + pname = "wlgreet"; + version = "2020-10-20"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = "4425d296b81550cce01f044fbd7ff083e37550f4"; + sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc"; + }; + + cargoSha256 = "01bfv2kzg2r9z75b8pq61n2ydc8l5zh69jdyjpj931l642f6kd5a"; + + meta = with lib; { + description = "Raw wayland greeter for greetd, to be run under sway or similar"; + homepage = "https://git.sr.ht/~kennylevinsen/wlgreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index baba0ecdf0a..71584aff776 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -1,6 +1,16 @@ { lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }: -let version = "0.6.8"; +let + version = "0.6.8"; + # list of all theoretically available targets + targets = [ + "genode" + "hvt" + "muen" + "spt" + "virtio" + "xen" + ]; in stdenv.mkDerivation { pname = "solo5"; inherit version; @@ -29,21 +39,26 @@ in stdenv.mkDerivation { export DESTDIR=$out export PREFIX=$out make install-tools - ${lib.optionalString stdenv.hostPlatform.isLinux "make ${ - (lib.concatMapStringsSep " " (x: "install-opam-${x}") [ "hvt" "spt" ]) - }"} + + # get CONFIG_* vars from Makeconf which also parse in sh + grep '^CONFIG_' Makeconf > nix_tmp_targetconf + source nix_tmp_targetconf + # install opam / pkg-config files for all enabled targets + ${lib.concatMapStrings (bind: '' + [ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind} + '') targets} + runHook postInstall ''; - doCheck = true; + doCheck = stdenv.hostPlatform.isLinux; checkInputs = [ util-linux qemu ]; - checkPhase = if stdenv.hostPlatform.isLinux then - '' + checkPhase = '' + runHook preCheck patchShebangs tests ./tests/bats-core/bats ./tests/tests.bats - '' - else - null; + runHook postCheck + ''; meta = with lib; { description = "Sandboxed execution environment"; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index d68646c4275..1356f1c7a07 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchurl, makeWrapper, python3, nixosTests }: +{ stdenv, lib, fetchurl, makeWrapper, python3, unrar, ffmpeg, nixosTests }: stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.0.8"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "sha256-Ecbx7FHpcEkcWBAKCtZPtQKX5ibvU4tajSJ5pyEboKc="; + sha256 = "16mh7v8z5ijr75pvavcj6225w6bg12qy1d1w9vm2d5axnfm3wfbk"; }; nativeBuildInputs = [ makeWrapper ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \ $out/bin/bazarr \ --add-flags "$out/src/bazarr.py" \ + --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} \ ''; passthru.tests = { @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Subtitle manager for Sonarr and Radarr"; homepage = "https://www.bazarr.media/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ xwvvvvwx ]; platforms = platforms.all; }; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index e90445e29c8..bc8c8df3551 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -58,7 +58,7 @@ in }; bird2 = generic { - version = "2.0.7"; - sha256 = "0rhhbfmfw2d93rvhglv03rdzxsq2disw6s1wm8d6bgdxmrc2n7b3"; + version = "2.0.8"; + sha256 = "1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr"; }; } diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index cf0417e332e..6a8c6541c2c 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl -, guile, python, pcre, libffi, groff }: +, guile, python2, pcre, libffi, groff }: stdenv.mkDerivation rec { pname = "dico"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = - [ libtool gettext zlib readline gsasl guile python pcre libffi groff ]; + [ libtool gettext zlib readline gsasl guile python2 pcre libffi groff ]; doCheck = true; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 3f76d60233c..8378102dac5 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -1,10 +1,10 @@ -{lib, stdenv, python, wordnet, writeScript}: +{lib, stdenv, python2, wordnet, writeScript}: stdenv.mkDerivation rec { version = "542"; pname = "dict-db-wordnet"; - buildInputs = [python wordnet]; + buildInputs = [python2 wordnet]; convert = ./wordnet_structures.py; builder = writeScript "builder.sh" '' diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index cd0c9c6c24b..3a01120f3a6 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, dict, glibcLocales }: +{ lib, stdenv, fetchurl, python2, dict, glibcLocales }: stdenv.mkDerivation rec { version = "20210201"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; convert = ./wiktionary2dict.py; - buildInputs = [ python dict glibcLocales ]; + buildInputs = [ python2 dict glibcLocales ]; builder = ./builder.sh; passthru.updateScript = ./update.sh; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 2a9e00b266b..2b407074caf 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983"; + sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/fishnet/assets.nix b/pkgs/servers/fishnet/assets.nix index d246159402d..b150e8ed637 100644 --- a/pkgs/servers/fishnet/assets.nix +++ b/pkgs/servers/fishnet/assets.nix @@ -9,13 +9,13 @@ # again so that a selection of them can be embedded into the fishnet binary. stdenv.mkDerivation rec { pname = "fishnet-assets"; - version = "unstable-2020-01-30"; + version = "unstable-2020-03-27"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; - rev = "acd36ab6ccee67a652b6d84aedc4c2828abac5c6"; - sha256 = "0mh4gh6qij70clp64m4jw6q7dafr7gwjqpvpaf9vc6h10g1rhzrx"; + rev = "a1fe3ec6074ad9dc43e6d46e0d42fab5d7cce12c"; + sha256 = "1548wj2bs89b5w42z3c98hpnbln5w8p1909wyl7a63d8vkvnyn5l"; }; relAssetsPath = "share/${pname}"; diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 8060943fa5e..b23a7d1c920 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -12,22 +12,24 @@ let in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; rev = "v${version}"; - sha256 = "0gif9wagm9bzq7j3biasqvzp9lfvmxqr5wagqqybmhbn8ipj20a8"; + sha256 = "0dmc58wzv758b82pjpfzcfi0hr14hqcr61cd9v5xlgk5w78cisjq"; }; - cargoSha256 = "0hqyh0nzfrm7m34kqixrlbc7w8d0k7v6psw8jg6zpwpfcmhqq15j"; + cargoSha256 = "08v969b0kvsg4dq3xsb159pr52a0vqr34g48j8nvq13979yq6d8p"; preBuild = '' rmdir ./assets ln -snf ${assets}/${assets.relAssetsPath} ./assets ''; + passthru.assets = assets; + meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; homepage = "https://github.com/niklasf/fishnet"; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 78addfc4aa2..b3a876546e7 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -2,7 +2,7 @@ , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk -, python, python3, openjdk, mono, libressl, boost +, python2, python3, openjdk, mono, libressl, boost }@args: let diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index aac9ab07c0f..e171d714564 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -4,7 +4,7 @@ { gcc6Stdenv, lib, fetchurl, fetchFromGitHub , which, findutils, m4, gawk -, python, openjdk, mono, libressl +, python2, openjdk, mono, libressl , ... }: @@ -51,7 +51,7 @@ let inherit rev sha256; }; - nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ]; + nativeBuildInputs = [ python2 openjdk gawk which m4 findutils mono ]; buildInputs = [ libressl boost ]; inherit patches; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 80fc6fbc333..f41c5556d71 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -151,7 +151,7 @@ "datadog" = ps: with ps; [ datadog ]; "ddwrt" = ps: with ps; [ ]; "debugpy" = ps: with ps; [ debugpy ]; - "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz + "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi "default_config" = ps: with ps; [ pynacl aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ]; @@ -192,7 +192,7 @@ "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ ]; # missing inputs: dwdwfsapi + "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ]; @@ -424,7 +424,7 @@ "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "kmtronic" = ps: with ps; [ pykmtronic ]; "knx" = ps: with ps; [ xknx ]; - "kodi" = ps: with ps; [ ]; # missing inputs: pykodi + "kodi" = ps: with ps; [ pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky "kwb" = ps: with ps; [ ]; # missing inputs: pykwb @@ -766,7 +766,7 @@ "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient - "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge + "solaredge" = ps: with ps; [ solaredge stringcase ]; "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ solax ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b2c1c1c8aab..6260906e0c2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -36,7 +36,7 @@ let src = fetchFromGitHub { owner = "flz"; repo = "iaqualink-py"; - rev = version; + rev = "v${version}"; sha256 = "16mn6nd9x3hm6j6da99qhwbqs95hh8wx21r1h1m9csl76z77n9lh"; }; checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ]; @@ -193,6 +193,7 @@ in with py.pkgs; buildPythonApplication rec { "conversation" "counter" "cover" + "deconz" "default_config" "demo" "derivative" @@ -293,12 +294,15 @@ in with py.pkgs; buildPythonApplication rec { "shopping_list" "simplisafe" "simulated" + "sma" "sensor" "smarttub" "smtp" + "solaredge" "sql" "ssdp" "stream" + "subaru" "sun" "switch" "system_health" diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix deleted file mode 100644 index daac4839853..00000000000 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, apacheHttpd }: - -if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then - - throw "mod_evasive is not supported on Apache httpd 2.4" - -else - -stdenv.mkDerivation { - name = "mod_evasive-1.10.1"; - - src = fetchurl { - url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz"; - sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07"; - }; - - buildInputs = [ apacheHttpd ]; - - buildPhase = '' - export APACHE_LIBEXECDIR=$out/modules - export makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) - apxs -ca mod_evasive20.c - ''; - - installPhase = '' - mkdir -p $out/modules - cp .libs/mod_evasive20.so $out/modules - ''; - - meta = { - homepage = "http://www.zdziarski.com/blog/?page_id=442"; - description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index 04746d678c5..2762f636f59 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, apacheHttpd, perl }: stdenv.mkDerivation rec { - name = "mod_perl-2.0.10"; + pname = "mod_perl"; + version = "2.0.11"; src = fetchurl { - url = "mirror://apache/perl/${name}.tar.gz"; - sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi"; + url = "mirror://apache/perl/${pname}-${version}.tar.gz"; + sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; buildInputs = [ apacheHttpd perl ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 251f099f7d9..d249d47a215 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt + , nixosTests , substituteAll, gd, geoip, perl , withDebug ? false @@ -55,7 +56,6 @@ stdenv.mkDerivation { "--with-http_realip_module" "--with-http_addition_module" "--with-http_xslt_module" - "--with-http_geoip_module" "--with-http_sub_module" "--with-http_dav_module" "--with-http_flv_module" @@ -81,7 +81,6 @@ stdenv.mkDerivation { "--with-debug" ] ++ optionals withStream [ "--with-stream" - "--with-stream_geoip_module" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" @@ -94,6 +93,8 @@ stdenv.mkDerivation { "--with-perl_modules_path=lib/perl5" ] ++ optional (gd != null) "--with-http_image_filter_module" + ++ optional (geoip != null) "--with-http_geoip_module" + ++ optional (withStream && geoip != null) "--with-stream_geoip_module" ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ configureFlags ++ map (mod: "--add-module=${mod.src}") modules; diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix new file mode 100644 index 00000000000..f907e337ce6 --- /dev/null +++ b/pkgs/servers/irc/inspircd/default.nix @@ -0,0 +1,221 @@ +let + # inspircd ships a few extra modules that users can load + # via configuration. Upstream thus recommends to ship as + # many of them as possible. There is however a problem: + # inspircd is licensed under the GPL version 2 only and + # some modules link libraries that are incompatible with + # the GPL 2. Therefore we can't provide them as binaries + # via our binary-caches, but users should still be able + # to override this package and build the incompatible + # modules themselves. + # + # This means for us we need to a) prevent hydra from + # building a module set with a GPL incompatibility + # and b) dynamically figure out the largest possible + # set of modules to use depending on stdenv, because + # the used libc needs to be compatible as well. + # + # For an overview of all modules and their licensing + # situation, see https://docs.inspircd.org/packaging/ + + # Predicate for checking license compatibility with + # GPLv2. Since this is _only_ used for libc compatibility + # checking, only whitelist licenses used by notable + # libcs in nixpkgs (musl and glibc). + compatible = lib: drv: + lib.any (lic: lic == drv.meta.license) [ + lib.licenses.mit # musl + lib.licenses.lgpl2Plus # glibc + ]; + + # compatible if libc is compatible + libcModules = [ + "regex_posix" + "sslrehashsignal" + ]; + + # compatible if libc++ is compatible + # TODO(sternenseemann): + # we could enable "regex_stdlib" automatically, but only if + # we are using libcxxStdenv which is compatible with GPLv2, + # since the gcc libstdc++ license is GPLv2-incompatible + libcxxModules = [ + "regex_stdlib" + ]; + + compatibleModules = lib: stdenv: [ + # GPLv2 compatible dependencies + "argon2" + "ldap" + "mysql" + "pgsql" + "regex_pcre" + "regex_re2" + "regex_tre" + "sqlite3" + "ssl_gnutls" + ] ++ lib.optionals (compatible lib stdenv.cc.libc) libcModules; + +in + +{ lib +, stdenv +, fetchFromGitHub +, nixosTests +, perl +, pkg-config +, libargon2 +, openldap +, postgresql +, libmysqlclient +, pcre +, tre +, re2 +, sqlite +, gnutls +, libmaxminddb +, openssl +, mbedtls +# For a full list of module names, see https://docs.inspircd.org/packaging/ +, extraModules ? compatibleModules lib stdenv +}: + +let + extras = { + # GPLv2 compatible + argon2 = [ + (libargon2 // { + meta = libargon2.meta // { + # use libargon2 as CC0 since ASL20 is GPLv2-incompatible + # updating this here is important that meta.license is accurate + # libargon2 is licensed under either ASL20 or CC0. + license = lib.licenses.cc0; + }; + }) + ]; + ldap = [ openldap ]; + mysql = [ libmysqlclient ]; + pgsql = [ postgresql ]; + regex_pcre = [ pcre ]; + regex_re2 = [ re2 ]; + regex_tre = [ tre ]; + sqlite3 = [ sqlite ]; + ssl_gnutls = [ gnutls ]; + # depends on stdenv.cc.libc + regex_posix = []; + sslrehashsignal = []; + # depends on used libc++ + regex_stdlib = []; + # GPLv2 incompatible + geo_maxmind = [ libmaxminddb ]; + ssl_mbedtls = [ mbedtls ]; + ssl_openssl = [ openssl ]; + }; + + # buildInputs necessary for the enabled extraModules + extraInputs = lib.concatMap + (m: extras."${m}" or (builtins.throw "Unknown extra module ${m}")) + extraModules; + + # if true, we can't provide a binary version of this + # package without violating the GPL 2 + gpl2Conflict = + let + allowed = compatibleModules lib stdenv; + in + !lib.all (lib.flip lib.elem allowed) extraModules; + + # return list of the license(s) of the given derivation + getLicenses = drv: + let + lics = drv.meta.license or []; + in + if lib.isAttrs lics || lib.isString lics + then [ lics ] + else lics; + + # Whether any member of list1 is also member of list2, i. e. set intersection. + anyMembers = list1: list2: + lib.any (m1: lib.elem m1 list2) list1; + +in + +stdenv.mkDerivation rec { + pname = "inspircd"; + version = "3.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0x3paasf4ynx4ddky2nq613vyirbhfnxzkjq148k7154pz3q426s"; + }; + + outputs = [ "bin" "lib" "man" "doc" "out" ]; + + nativeBuildInputs = [ + perl + pkg-config + ]; + buildInputs = extraInputs; + + configurePhase = '' + patchShebangs configure make/*.pl + + # configure is executed twice, once to set the extras + # to use and once to do the Makefile setup + ./configure \ + --enable-extras \ + ${lib.escapeShellArg (lib.concatStringsSep " " extraModules)} + + # this manually sets the flags instead of using configureFlags, because otherwise stdenv passes flags like --bindir, which make configure fail + ./configure \ + --disable-auto-extras \ + --distribution-label nixpkgs${version} \ + --uid 0 \ + --gid 0 \ + --binary-dir ${placeholder "bin"}/bin \ + --config-dir /etc/inspircd \ + --data-dir ${placeholder "lib"}/lib/inspircd \ + --example-dir ${placeholder "doc"}/share/doc/inspircd \ + --log-dir /var/log/inspircd \ + --manual-dir ${placeholder "man"}/share/man/man1 \ + --module-dir ${placeholder "lib"}/lib/inspircd \ + --runtime-dir /var/run \ + --script-dir ${placeholder "bin"}/share/inspircd \ + ''; + + postInstall = '' + # for some reasons the executables are not executable + chmod +x $bin/bin/* + ''; + + enableParallelBuilding = true; + + passthru.tests = { + nixos-test = nixosTests.inspircd; + }; + + meta = { + description = "A modular C++ IRC server"; + license = [ lib.licenses.gpl2Only ] + ++ lib.concatMap getLicenses extraInputs + ++ lib.optionals (anyMembers extraModules libcModules) (getLicenses stdenv.cc.libc) + # FIXME(sternenseemann): get license of used lib(std)c++ somehow + ++ lib.optional (anyMembers extraModules libcxxModules) "Unknown" + # Hack: Definitely prevent a hydra from building this package on + # a GPL 2 incompatibility even if it is not in a top-level attribute, + # but pulled in indirectly somehow. + ++ lib.optional gpl2Conflict lib.licenses.unfree; + maintainers = [ lib.maintainers.sternenseemann ]; + # windows is theoretically possible, but requires extra work + # which I am not willing to do and can't test. + # https://github.com/inspircd/inspircd/blob/master/win/README.txt + platforms = lib.platforms.unix; + homepage = "https://www.inspircd.org/"; + } // lib.optionalAttrs gpl2Conflict { + # make sure we never distribute a GPLv2-violating module + # in binary form. They can be built locally of course. + hydraPlatforms = []; + }; +} diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 4db8ac1f403..3338f8b2a84 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -3,14 +3,14 @@ with python3Packages; buildPythonApplication rec { pname = "isso"; - version = "0.12.4"; + version = "0.12.5"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; rev = version; - sha256 = "16wjpz8r74fzjvzhl6by3sjc2g1riz8lh59ccgp14bns1yhsh2yi"; + sha256 = "12ccfba2kwbfm9h4zhlxrcigi98akbdm4qi89iglr4z53ygzpay5"; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ with python3Packages; buildPythonApplication rec { flask-caching ]; - buildInputs = [ + nativeBuildInputs = [ cffi ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 6b67ef939dc..92f31126e81 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.7.0"; + version = "10.7.1"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz"; - sha256 = "sha256-63T1EBjtTWxg41W5gBDYCthgnokZ/e/B1s6BmymO32w="; + sha256 = "sha256-pgFksZz0sD73uZDyUIhdFCgHPo67ZZiwklafyemJFGs="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index bfa372ed069..90510d50252 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap -, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python +, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu - net-snmp kerberos pcre libevent openssl python + net-snmp kerberos pcre libevent openssl python3 ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); patches = [ diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 71bcc3fc687..03a135d6c76 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -2,11 +2,11 @@ perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2"; - sha256 = "0ga5mi2nv2v91kakk9xakkg71rnxnddlzv76ca13vfyd4jgcfasf"; + sha256 = "0qsl18p2swdbq4zizvs9ahl2bkilpcyzq817lk16jj5g4rqzivb7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index a9954b4a147..468c46b1269 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.29.0"; + version = "1.30.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BySztUwVqyaL0AvmJMWEbjVqf981ABKMAU9f9C/0wkU="; + sha256 = "1ca69v479537bbj2hjliwk9zzy9fqqsf7fm188k6xxj0a37q9y41"; }; patches = [ diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index ae019515627..47edb29723e 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,12 +1,26 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }: -stdenv.mkDerivation rec { +let + os = if stdenv.isDarwin then "osx" else "linux"; + arch = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + hash = { + x64-linux_hash = "sha256-bTh+Z5w5ZkL2iPteStqVcoFDGZIbpVjuXn20TZsfgtY="; + arm64-linux_hash = "sha256-aIzVSIRuGNiIFJPToXCQwYsbICKuPtwKATnQhkxvJuA="; + x64-osx_hash = "sha256-FxRSAJvRQya2x1kei6yRceGcyQ2mCaFveyeMGw0Jqw4="; + }."${arch}-${os}_hash"; + +in stdenv.mkDerivation rec { pname = "radarr"; - version = "0.2.0.1504"; + version = "3.0.2.4552"; src = fetchurl { - url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1h7pqn39vxd0vr1fwrnvfpxv5vhh4zcr0s8h0zvgplay2z6b6bvb"; + url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; + sha256 = hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,17 +29,22 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/${pname}-${version}} cp -r * $out/share/${pname}-${version}/. - makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ - --add-flags "$out/share/${pname}-${version}/Radarr.exe" \ + makeWrapper "${dotnetCorePackages.netcore_3_1}/bin/dotnet" $out/bin/Radarr \ + --add-flags "$out/share/${pname}-${version}/Radarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - curl sqlite libmediainfo ]} + curl sqlite libmediainfo mono openssl icu ]} ''; + passthru = { + updateScript = ./update.sh; + tests.smoke-test = nixosTests.radarr; + }; + meta = with lib; { description = "A Usenet/BitTorrent movie downloader"; homepage = "https://radarr.video/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ edwtjo purcell ]; - platforms = platforms.all; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/servers/radarr/update.sh b/pkgs/servers/radarr/update.sh new file mode 100755 index 00000000000..ad5364ec721 --- /dev/null +++ b/pkgs/servers/radarr/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl nix-prefetch jq + +set -e + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + arch=$2 + os=$3 + + hashKey="${arch}-${os}_hash" + + url="https://github.com/Radarr/Radarr/releases/download/v$version/Radarr.master.$version.$os-core-$arch.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sriHash="$(nix to-sri --type sha256 $hash)" + + sed -i "s/$hashKey = \"[a-zA-Z0-9\/+-=]*\";/$hashKey = \"$sriHash\";/g" "$dirname/default.nix" +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; radarr.version)') + +latestTag=$(curl https://api.github.com/repos/Radarr/Radarr/releases/latest | jq -r ".tag_name") +latestVersion="$(expr $latestTag : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Radarr is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion $latestVersion + +updateHash $latestVersion x64 linux +updateHash $latestVersion arm64 linux +updateHash $latestVersion x64 osx diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index cd19c77cab3..6bedb891b57 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config -, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }: +, openssl, boost, grpc, abseil-cpp, protobuf3_8, libnsl }: let sqlite3 = fetchurl rec { @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkg-config cmake git ]; - buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 libnsl ]; + buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf3_8 libnsl ]; preConfigure = '' export HOME=$PWD @@ -160,7 +160,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Ripple P2P payment network reference server"; homepage = "https://github.com/ripple/rippled"; - maintainers = with maintainers; [ ehmry offline RaghavSood ]; + maintainers = with maintainers; [ offline RaghavSood ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index cf96edfe963..ada7ea1c220 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U0wZ0NrvCQjMLDDjO6Jf6uu5FlHar7Td2zhoU2+MMkM="; + sha256 = "sha256-uahgIphp2/iE11v33sPNrm0evz6dQvzjEQ9uMVEuTTI="; }; - vendorSha256 = "sha256-dfAuq4iw3NQ4xaabPv7MQ88CYXgivRBeyvbmJ3SSjbI="; + vendorSha256 = "sha256-nAeP9ZmYu5VPKR628aJVNS8t41V/AYkgwOcO/d0nQv4="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a1803abe6a8..cdaa96464e7 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "sonarr"; - version = "2.0.0.5344"; + version = "3.0.5.1144"; src = fetchurl { - url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0bsxf7m2dir7gi0cfn8vdasr11q224b9mp6cixak9ss5zafwn59a"; + url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; + sha256 = "1ajqh3hvjfsbs6rb2f8dnndxsycmlzamp0cwjwkh1j2dinbzdbvp"; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,17 +14,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r * $out/bin/ - makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \ - --add-flags "$out/bin/NzbDrone.exe" \ + --add-flags "$out/bin/Sonarr.exe" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; + passthru = { + updateScript = "./update.sh"; + tests.smoke-test = nixosTests.sonarr; + }; + meta = { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fadenb purcell ]; platforms = lib.platforms.all; }; diff --git a/pkgs/servers/sonarr/update.sh b/pkgs/servers/sonarr/update.sh new file mode 100755 index 00000000000..faa4f65cfc8 --- /dev/null +++ b/pkgs/servers/sonarr/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +latestTag=$(curl https://api.github.com/repos/Sonarr/Sonarr/tags | jq -r '.[] | .name' | sort --version-sort | tail -1) +version="$(expr $latestTag : 'v\(.*\)')" + +update-source-version sonarr "$version" diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 92c31ead6c4..c71d705a00e 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "swego"; - version = "0.93"; + version = "0.94"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-oTeSh7OzjzbgKbSQSNhnCUZw5FdUkN+Y9LkIbWFhn5c="; + sha256 = "sha256-PquedlfBzNSXa3l6IIHlf6Xb4M4uEb1XCKRfN229IEA="; }; vendorSha256 = "sha256-TK1LN9EmVH95jPO6K7gtCwdnW4WOKH3K7Q0FhgNMVUQ="; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 6053b097317..ca8d7d7412d 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.7"; + version = "2.4.8"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-K1uSfsi/uC41ukDGaWaYIKX6A+SU59x3a/DYip9/LPI="; + sha256 = "sha256-hCBhJazI0Y1qQjULF+CBfUfz6PvkgLXafvXKR6iKHmU="; stripRoot = false; }; - vendorSha256 = "sha256-MCQbSy2TOSkZoqC2POIq8mDRld4fe245m0Xe0drxEq8="; + vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ="; doCheck = false; diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix new file mode 100644 index 00000000000..974b7a62e50 --- /dev/null +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, lib, nixosTests }: + +stdenv.mkDerivation rec { + pname = "wiki-js"; + version = "2.5.197"; + + src = fetchurl { + url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; + sha256 = "sha256-0xM9BtQvSt5WkbKBri+KxB+Ghc4wgY8/TUgI6PCFmm0="; + }; + + sourceRoot = "."; + + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir $out + cp -r . $out + + runHook postInstall + ''; + + passthru.tests = { inherit (nixosTests) wiki-js; }; + + meta = with lib; { + homepage = "https://js.wiki/"; + description = "A modern and powerful wiki app built on Node.js"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 0fae5ac2287..330470f0fd5 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.5.3"; + version = "5.6.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ="; + sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI="; }; installPhase = '' diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index 60480b3ac2b..b29151911a6 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,18 +1,18 @@ { lib , fetchFromGitHub , python3Packages -, installShellFiles +, nixosTests }: python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; rev = "v${version}"; - sha256 = "sha256-/pr8ZqgYk24CdJNAETCDF4ZtufXkVEu1Zw25PcPEo7M="; + sha256 = "sha256-Epy6NWtRY2Oj4MHTStdv8ZJ5SvSmUo6IlwL5PJV9pD0="; }; propagatedBuildInputs = with python3Packages; [ @@ -25,11 +25,7 @@ python3Packages.buildPythonApplication rec { prometheus_client ]; - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installManPage xandikos.1 - ''; + passthru.tests.xandikos = nixosTests.xandikos; meta = with lib; { description = "Lightweight CalDAV/CardDAV server"; diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index 5dd060db7ef..d234b18e6c9 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = [ "-p0" "-T" ]; + patchFlags = [ "-p0" ]; patches = upstreamPatches ++ [ ./pgrp-pipe-5.1.patch ]; diff --git a/pkgs/shells/bash/pgrp-pipe-5.1.patch b/pkgs/shells/bash/pgrp-pipe-5.1.patch index 2a9fa6f33c3..478327cafc4 100644 --- a/pkgs/shells/bash/pgrp-pipe-5.1.patch +++ b/pkgs/shells/bash/pgrp-pipe-5.1.patch @@ -14,18 +14,3 @@ diff -u ./configure ../bash-5.0-fixed/configure netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; *qnx[67]*) LOCAL_LIBS="-lncurses" ;; *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; -diff -u ./configure.ac ../bash-5.0-fixed/configure.ac ---- ./configure.ac 2019-01-02 15:39:11.000000000 +0100 -+++ ../bash-5.0-fixed/configure.ac 2019-01-02 15:39:11.000000000 +0100 -@@ -1108,10 +1108,7 @@ - solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; - lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; - linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading -- case "`uname -r`" in -- 1.*|2.[[0123]]*) : ;; -- *) AC_DEFINE(PGRP_PIPE) ;; -- esac ;; -+ AC_DEFINE(PGRP_PIPE) ;; - netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; - *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;; - *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index c10537959d7..360380e19b3 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, installShellFiles +}: stdenv.mkDerivation rec { pname = "mksh"; @@ -6,20 +10,30 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" - "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" + "https://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" + "http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" ]; - sha256 = "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp"; + hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY="; }; + nativeBuildInputs = [ + installShellFiles + ]; + dontConfigure = true; - buildPhase = "sh ./Build.sh -r"; + buildPhase = '' + runHook preBuild + sh ./Build.sh -r + runHook postBuild + ''; installPhase = '' - install -D -m 755 mksh $out/bin/mksh - install -D -m 644 mksh.1 $out/share/man/man1/mksh.1 - install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc + runHook preInstall + install -D mksh $out/bin/mksh + install -D dot.mkshrc $out/share/mksh/mkshrc + installManPage mksh.1 + runHook postInstall ''; meta = with lib; { @@ -32,7 +46,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = licenses.bsd3; + license = with licenses; [ miros isc unicode-dfs-2016 ]; maintainers = with maintainers; [ AndersonTorres joachifm ]; platforms = platforms.unix; }; @@ -41,3 +55,5 @@ stdenv.mkDerivation rec { shellPath = "/bin/mksh"; }; } +# TODO [ AndersonTorres ]: lksh +# TODO [ AndersonTorres ]: a more accurate licensing info diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 0c508d0e29d..78cef0df26f 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.7"; + version = "0.8.8"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-KcXu1u/MvvbCLb5a7D09NvfJPaeo0c8Z/Czuk7XR23M="; + sha256 = "sha256-J9aNuw72qufoVY6VnbdpCtpcI6GAI7ON10XGEJuqieI="; }; postPatch = '' diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 53bd137ddfa..a2cc4206620 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.24"; + version = "0.9.27"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1nk7kbiv7jzmr6narsnr0nyzkhlc7xw3b2bksyq2j6nda67b9b3y"; + sha256 = "09w6bl3qsygfs2ph2r423ndnbd74bzf67vp8587h2dkkfxlzjbad"; }; LC_ALL = "en_US.UTF-8"; @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { doCheck = !stdenv.isDarwin; checkPhase = '' - HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks' + HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks and not test_command_pipeline_capture and not test_git_dirty_working_directory_includes_untracked and not test_dirty_working_directory and not test_vc_get_branch' HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5 HOME=$TMPDIR pytest -k 'test_ptk_highlight' ''; @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A Python-ish, BASHwards-compatible shell"; homepage = "https://xon.sh/"; - changelog = "https://github.com/xonsh/xonsh/releases/tag/${version}"; + changelog = "https://github.com/xonsh/xonsh/raw/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt vrthra ]; platforms = platforms.all; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 19c3d8965a7..2b89b37f786 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -106,7 +106,12 @@ in rec { ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || (stdenv.noCC or false); supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; - defaultHardeningFlags = if stdenv.hostPlatform.isMusl + # Musl-based platforms will keep "pie", other platforms will not. + defaultHardeningFlags = if stdenv.hostPlatform.isMusl && + # Except when: + # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. + # - static armv7l, where compilation fails. + !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic) then supportedHardeningFlags else lib.remove "pie" supportedHardeningFlags; enabledHardeningOptions = diff --git a/pkgs/tools/X11/xkeysnail/default.nix b/pkgs/tools/X11/xkeysnail/default.nix index fa52a714c7a..2d66405904f 100644 --- a/pkgs/tools/X11/xkeysnail/default.nix +++ b/pkgs/tools/X11/xkeysnail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, python3Packages }: +{ lib, fetchFromGitHub, makeWrapper, python3Packages }: python3Packages.buildPythonApplication rec { pname = "xkeysnail"; diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix new file mode 100644 index 00000000000..84372423d61 --- /dev/null +++ b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "aws-lambda-runtime-interface-emulator"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-lambda-runtime-interface-emulator"; + rev = "v${version}"; + sha256 = "sha256-vbVygZzLlJlxaRF/LIqSJP0gZGyu1wSSdeVjILl/OJE="; + }; + + vendorSha256 = "sha256-WcvYPGgkrK7Zs5IplAoUTay5ys9LrDJHpRN3ywEdWRM="; + + # disabled because I lack the skill + doCheck = false; + + meta = with lib; { + description = "To locally test their Lambda function packaged as a container image."; + homepage = "https://github.com/aws/aws-lambda-runtime-interface-emulator"; + license = licenses.asl20; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 13860b4bf7c..56a0d252a8c 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "aws-vault"; - version = "6.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j"; + sha256 = "sha256-bmqmT/gkdgczrDfZdI+FySX5CuesJXWKS0JatzaubIw="; }; - vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z"; + vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 58d87a033f6..445d32be122 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.30"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.34"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-XD0CwBTDUvCTSL7JrcQCAd8zq+Ve0zSDpfz0Vzi8oeM="; + sha256 = "sha256-RJ+ibZmOxH4r+pGI/rrkRES89u0IRUU3sSE5OFSJ2qw="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index bbf8d7eaeb1..d91894f0006 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -1,6 +1,6 @@ -{ python, lib }: +{ python3, lib }: -with python.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "chkcrontab"; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 1ab4795dd62..93b5433fcc0 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ztp3t55EOUQqTAEUZtHvHK8nTTVOAmYR9vN2hXLhpVw="; + sha256 = "sha256-KY9POvwmyUVx9jcn02Ltcz2a1ULqyKW73A9Peb6rpYE="; }; - vendorSha256 = "sha256-+0jp/TvUjpeJJxEs2drVkUb/ua9qqqxome4M9TkpfP4="; + vendorSha256 = "sha256-+p3ucnvgOpSLS/uP9RAkWixCkaDoF64qCww013jPqSs="; doCheck = false; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index db6b1de456f..e24f0022483 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-2kxJcQ0kzIbXUSecDR5CRlgp0y59wftFPUwU1MSHOn0="; + sha256 = "sha256-f4DkmIi4Uf4qJ3zkDWcpuN6nqXAwa91lj9Jd1MIskJ8="; }; - vendorSha256 = "sha256-m+qldNgY3+DKTFjxwKo4Sbi0F7y4xomiIuR+apek61Q="; + vendorSha256 = "sha256-G6rOmI1Q+bMRqOrkByff2q1AtuUN4hBfFzYaFq4TsxY="; doCheck = false; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix new file mode 100644 index 00000000000..2c04eef2160 --- /dev/null +++ b/pkgs/tools/admin/fioctl/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "fioctl"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "foundriesio"; + repo = "fioctl"; + rev = "v${version}"; + sha256 = "1jbj2w2s78wcnrwyr80jyc11ipjysv5aab3486kphx8ysvvgcwfs"; + }; + + vendorSha256 = "1a3x6cv18f0n01f4ac1kprzmby8dphygnwsdl98pmzs3gqqnh284"; + + runVend = true; + + buildFlagsArray = '' + -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev} + ''; + + meta = with lib; { + description = "A simple CLI to manage your Foundries Factory "; + homepage = "https://github.com/foundriesio/fioctl"; + license = licenses.asl20; + maintainers = with maintainers; [ nixinator matthewcroughan ]; + }; +} diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 022496cbd58..1f86affa8c3 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "procs"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { done ''; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; meta = with lib; { description = "A modern replacement for ps written in Rust"; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 9a2d8e52fd9..7df6e94e46b 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3002.5"; + version = "3002.6"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1bqranhanxcxjc1qcc6cm95f4xxag0ic9g61dq352hqh6m1l1ay8"; + sha256 = "/8R4VpNj4dF7ajoMQh6q6cB5u+q8THcloiLQ+/kDoKU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 347a936c3a9..dd754742150 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.10"; + version = "1.5.11"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cedreUdLjUONA8iVlQ/OfOJtM8EgCI8zaKDCbruUIVo="; + sha256 = "sha256-aoflV4C7eH0RNdq8j7kPeAfnOEZECmfZ91/QBQy7oxY="; }; - vendorSha256 = "sha256-hYvW5xAbnxOEapFc70wOF9ybbDv7hLGljKqHI+1Itaw="; + vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc="; subPackages = [ "cmd/stripe" diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/tools/archivers/rpm2targz/default.nix index ac5b132d7ab..1c4730c8de6 100644 --- a/pkgs/tools/archivers/rpm2targz/default.nix +++ b/pkgs/tools/archivers/rpm2targz/default.nix @@ -10,18 +10,7 @@ , zstd }: -let - shdeps = [ - bzip2 - coreutils - cpio - gnutar - gzip - xz - zstd - ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "rpm2targz"; version = "2021.03.16"; @@ -31,9 +20,17 @@ in stdenv.mkDerivation rec { hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ="; }; - buildInputs = shdeps; - - postPatch = '' + postPatch = let + shdeps = [ + bzip2 + coreutils + cpio + gnutar + gzip + xz + zstd + ]; + in '' substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\"" # rpm2targz relies on the executable name # to guess what compressor it should use @@ -41,9 +38,7 @@ in stdenv.mkDerivation rec { sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz ''; - preBuild = '' - makeFlagsArray+=(prefix=$out) - ''; + installFlags = [ "prefix=$(out)" ]; meta = with lib; { description = "Convert a .rpm file to a .tar.gz archive"; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index a3eedf3ea47..ef47578ac57 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -73,7 +73,7 @@ let }; pluginsWithoutDeps = [ - "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" + "bareasc" "bench" "bpd" "bpm" "bucket" "duplicates" "edit" "embedart" "export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play" @@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-03-08"; + version = "unstable-2021-03-24"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "debd382837ef1d30574c2234710d536bb299f979"; - sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI="; + rev = "854b4ab48324afe8884fcd11fa47bd6258d2f4f7"; + sha256 = "sha256-y5EWVNF4bd9fNvU6VkucMpenyFZuqdPkrqQDgG9ZPJY="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix new file mode 100644 index 00000000000..11f228ea691 --- /dev/null +++ b/pkgs/tools/audio/botamusique/default.nix @@ -0,0 +1,150 @@ +{ pkgs +, lib +, stdenv +, fetchFromGitHub +, python3Packages +, ffmpeg +, makeWrapper + +# For the update script +, coreutils +, nix-prefetch-git +, jq +, nodePackages +}: +let + nodejs = pkgs.nodejs-12_x; + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; + botamusiqueNodePackages = import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; + }; + + srcJson = lib.importJSON ./src.json; + src = fetchFromGitHub { + owner = "azlux"; + repo = "botamusique"; + inherit (srcJson) rev sha256; + }; + + nodeDependencies = (botamusiqueNodePackages.shell.override (old: { + src = src + "/web"; + })).nodeDependencies; + + # Python needed to instantiate the html templates + buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]); +in +stdenv.mkDerivation rec { + pname = "botamusique"; + version = "unstable-${lib.substring 0 10 srcJson.date}"; + + inherit src; + + patches = [ + # botamusique by default resolves relative state paths by first checking + # whether it exists in the working directory, then falls back to using the + # installation directory. With Nix however, the installation directory is + # not writable, so that won't work. So we change this so that it uses + # relative paths unconditionally, whether they exist or not. + ./unconditional-relative-state-paths.patch + + # We can't update the package at runtime with NixOS, so this patch makes + # the !update command mention that + ./no-runtime-update.patch + ]; + + postPatch = '' + # However, the function that's patched above is also used for + # configuration.default.ini, which is in the installation directory + # after all. So we need to counter-patch it here so it can find it absolutely + substituteInPlace mumbleBot.py \ + --replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini" + ''; + + nativeBuildInputs = [ + python3Packages.wrapPython + nodejs + makeWrapper + ]; + + pythonPath = with python3Packages; [ + pymumble + packaging + magic + requests + youtube-dl + flask + mutagen + pillow + pyradios + ]; + + buildPhase = '' + runHook preBuild + + # Generates artifacts in ./static + ( + cd web + ln -s ${nodeDependencies}/lib/node_modules ./node_modules + export PATH="${nodeDependencies}/bin:$PATH" + + npm run build + ) + + # Fills out http templates + ${buildPython}/bin/python scripts/translate_templates.py --lang-dir lang/ --template-dir templates/ + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share $out/bin + cp -r . $out/share/botamusique + chmod +x $out/share/botamusique/mumbleBot.py + wrapPythonProgramsIn $out/share/botamusique "$out $pythonPath" + + # Convenience binary and wrap with ffmpeg dependency + makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + + runHook postInstall + ''; + + passthru.updateScript = pkgs.writeShellScript "botamusique-updater" '' + export PATH=${lib.makeBinPath [ coreutils nix-prefetch-git jq nodePackages.node2nix ]} + + nix-prefetch-git https://github.com/azlux/botamusique > ${toString ./src.json} + path=$(jq '.path' -r < ${toString ./src.json}) + + tmp=$(mktemp -d) + trap 'rm -rf "$tmp"' exit + + # botamusique doesn't have a version in its package.json + # But that's needed for node2nix + jq < "$path"/web/package.json > "$tmp/package.json" \ + --arg version "0.0.0" \ + '.version |= $version' + + node2nix \ + --input "$tmp"/package.json \ + --lock "$path"/web/package-lock.json \ + --no-copy-node-env \ + --development \ + --composition /dev/null \ + --output ${toString ./node-packages.nix} + ''; + + meta = with lib; { + description = "Bot to play youtube / soundcloud / radio / local music on Mumble"; + homepage = "https://github.com/azlux/botamusique"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/tools/audio/botamusique/no-runtime-update.patch b/pkgs/tools/audio/botamusique/no-runtime-update.patch new file mode 100644 index 00000000000..8fc8580fce8 --- /dev/null +++ b/pkgs/tools/audio/botamusique/no-runtime-update.patch @@ -0,0 +1,12 @@ +diff --git a/util.py b/util.py +index bfec1ed..5147757 100644 +--- a/util.py ++++ b/util.py +@@ -132,6 +132,7 @@ def check_update(current_version): + + + def update(current_version): ++ return "Can't update Nix installation at runtime" + global log + + target = var.config.get('bot', 'target_version') diff --git a/pkgs/tools/audio/botamusique/node-packages.nix b/pkgs/tools/audio/botamusique/node-packages.nix new file mode 100644 index 00000000000..3f9e2dcdfd0 --- /dev/null +++ b/pkgs/tools/audio/botamusique/node-packages.nix @@ -0,0 +1,5247 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.10.4" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; + }; + }; + "@babel/compat-data-7.12.7" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz"; + sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; + }; + }; + "@babel/core-7.12.9" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.12.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz"; + sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ=="; + }; + }; + "@babel/eslint-parser-7.12.1" = { + name = "_at_babel_slash_eslint-parser"; + packageName = "@babel/eslint-parser"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.12.1.tgz"; + sha512 = "cc7WQHnHQY3++/bghgbDtPx+5bf6xTsokyGzV6Qzh65NLz/unv+mPQuACkQ9GFhIhcTFv6yqwNaEcfX7EkOEsg=="; + }; + }; + "@babel/eslint-plugin-7.12.1" = { + name = "_at_babel_slash_eslint-plugin"; + packageName = "@babel/eslint-plugin"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.12.1.tgz"; + sha512 = "rOjrD5yupTYCO4x0kEbQmi/NsaD+VGOD/9Cvso64WMVPY2y6o5Nvw2sqFWdeSEBdR1Dsa07YjplBs067x5YbXg=="; + }; + }; + "@babel/generator-7.12.5" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; + sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; + }; + }; + "@babel/helper-annotate-as-pure-7.10.4" = { + name = "_at_babel_slash_helper-annotate-as-pure"; + packageName = "@babel/helper-annotate-as-pure"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; + sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA=="; + }; + }; + "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { + name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; + packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; + }; + }; + "@babel/helper-compilation-targets-7.12.5" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; + }; + }; + "@babel/helper-create-class-features-plugin-7.12.1" = { + name = "_at_babel_slash_helper-create-class-features-plugin"; + packageName = "@babel/helper-create-class-features-plugin"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; + sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; + }; + }; + "@babel/helper-create-regexp-features-plugin-7.12.7" = { + name = "_at_babel_slash_helper-create-regexp-features-plugin"; + packageName = "@babel/helper-create-regexp-features-plugin"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz"; + sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ=="; + }; + }; + "@babel/helper-define-map-7.10.5" = { + name = "_at_babel_slash_helper-define-map"; + packageName = "@babel/helper-define-map"; + version = "7.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; + sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; + }; + }; + "@babel/helper-explode-assignable-expression-7.12.1" = { + name = "_at_babel_slash_helper-explode-assignable-expression"; + packageName = "@babel/helper-explode-assignable-expression"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; + sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; + }; + }; + "@babel/helper-function-name-7.10.4" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="; + }; + }; + "@babel/helper-get-function-arity-7.10.4" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; + }; + }; + "@babel/helper-hoist-variables-7.10.4" = { + name = "_at_babel_slash_helper-hoist-variables"; + packageName = "@babel/helper-hoist-variables"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; + }; + }; + "@babel/helper-member-expression-to-functions-7.12.7" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; + sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; + }; + }; + "@babel/helper-module-imports-7.12.5" = { + name = "_at_babel_slash_helper-module-imports"; + packageName = "@babel/helper-module-imports"; + version = "7.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; + }; + }; + "@babel/helper-module-transforms-7.12.1" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; + }; + }; + "@babel/helper-optimise-call-expression-7.12.7" = { + name = "_at_babel_slash_helper-optimise-call-expression"; + packageName = "@babel/helper-optimise-call-expression"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz"; + sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw=="; + }; + }; + "@babel/helper-plugin-utils-7.10.4" = { + name = "_at_babel_slash_helper-plugin-utils"; + packageName = "@babel/helper-plugin-utils"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; + }; + }; + "@babel/helper-remap-async-to-generator-7.12.1" = { + name = "_at_babel_slash_helper-remap-async-to-generator"; + packageName = "@babel/helper-remap-async-to-generator"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; + sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; + }; + }; + "@babel/helper-replace-supers-7.12.5" = { + name = "_at_babel_slash_helper-replace-supers"; + packageName = "@babel/helper-replace-supers"; + version = "7.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; + }; + }; + "@babel/helper-simple-access-7.12.1" = { + name = "_at_babel_slash_helper-simple-access"; + packageName = "@babel/helper-simple-access"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; + }; + }; + "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; + }; + }; + "@babel/helper-split-export-declaration-7.11.0" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; + }; + }; + "@babel/helper-validator-identifier-7.10.4" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; + }; + }; + "@babel/helper-validator-option-7.12.1" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; + sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; + }; + }; + "@babel/helper-wrap-function-7.12.3" = { + name = "_at_babel_slash_helper-wrap-function"; + packageName = "@babel/helper-wrap-function"; + version = "7.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; + sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; + }; + }; + "@babel/helpers-7.12.5" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; + sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; + }; + }; + "@babel/highlight-7.10.4" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; + sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + }; + }; + "@babel/parser-7.12.7" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz"; + sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg=="; + }; + }; + "@babel/plugin-proposal-async-generator-functions-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-async-generator-functions"; + packageName = "@babel/plugin-proposal-async-generator-functions"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; + sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A=="; + }; + }; + "@babel/plugin-proposal-class-properties-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-class-properties"; + packageName = "@babel/plugin-proposal-class-properties"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; + sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; + }; + }; + "@babel/plugin-proposal-dynamic-import-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; + sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; + }; + }; + "@babel/plugin-proposal-export-namespace-from-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; + sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-json-strings"; + packageName = "@babel/plugin-proposal-json-strings"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; + sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; + }; + }; + "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; + sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; + }; + }; + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; + packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; + sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; + }; + }; + "@babel/plugin-proposal-numeric-separator-7.12.7" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; + sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-object-rest-spread"; + packageName = "@babel/plugin-proposal-object-rest-spread"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; + sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; + }; + }; + "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; + packageName = "@babel/plugin-proposal-optional-catch-binding"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; + sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; + }; + }; + "@babel/plugin-proposal-optional-chaining-7.12.7" = { + name = "_at_babel_slash_plugin-proposal-optional-chaining"; + packageName = "@babel/plugin-proposal-optional-chaining"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; + sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA=="; + }; + }; + "@babel/plugin-proposal-private-methods-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-private-methods"; + packageName = "@babel/plugin-proposal-private-methods"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; + sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { + name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; + packageName = "@babel/plugin-proposal-unicode-property-regex"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; + sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; + }; + }; + "@babel/plugin-syntax-async-generators-7.8.4" = { + name = "_at_babel_slash_plugin-syntax-async-generators"; + packageName = "@babel/plugin-syntax-async-generators"; + version = "7.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + }; + "@babel/plugin-syntax-class-properties-7.12.1" = { + name = "_at_babel_slash_plugin-syntax-class-properties"; + packageName = "@babel/plugin-syntax-class-properties"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; + }; + }; + "@babel/plugin-syntax-dynamic-import-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-dynamic-import"; + packageName = "@babel/plugin-syntax-dynamic-import"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; + }; + }; + "@babel/plugin-syntax-export-namespace-from-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-export-namespace-from"; + packageName = "@babel/plugin-syntax-export-namespace-from"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + }; + "@babel/plugin-syntax-json-strings-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-json-strings"; + packageName = "@babel/plugin-syntax-json-strings"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; + }; + }; + "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; + packageName = "@babel/plugin-syntax-logical-assignment-operators"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; + }; + }; + "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; + packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; + }; + }; + "@babel/plugin-syntax-numeric-separator-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; + }; + }; + "@babel/plugin-syntax-object-rest-spread-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-object-rest-spread"; + packageName = "@babel/plugin-syntax-object-rest-spread"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; + }; + }; + "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; + packageName = "@babel/plugin-syntax-optional-catch-binding"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; + }; + }; + "@babel/plugin-syntax-optional-chaining-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-chaining"; + packageName = "@babel/plugin-syntax-optional-chaining"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; + }; + }; + "@babel/plugin-syntax-top-level-await-7.12.1" = { + name = "_at_babel_slash_plugin-syntax-top-level-await"; + packageName = "@babel/plugin-syntax-top-level-await"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.12.1" = { + name = "_at_babel_slash_plugin-transform-arrow-functions"; + packageName = "@babel/plugin-transform-arrow-functions"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; + sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; + }; + }; + "@babel/plugin-transform-async-to-generator-7.12.1" = { + name = "_at_babel_slash_plugin-transform-async-to-generator"; + packageName = "@babel/plugin-transform-async-to-generator"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; + sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; + }; + }; + "@babel/plugin-transform-block-scoped-functions-7.12.1" = { + name = "_at_babel_slash_plugin-transform-block-scoped-functions"; + packageName = "@babel/plugin-transform-block-scoped-functions"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; + sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; + }; + }; + "@babel/plugin-transform-block-scoping-7.12.1" = { + name = "_at_babel_slash_plugin-transform-block-scoping"; + packageName = "@babel/plugin-transform-block-scoping"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; + sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w=="; + }; + }; + "@babel/plugin-transform-classes-7.12.1" = { + name = "_at_babel_slash_plugin-transform-classes"; + packageName = "@babel/plugin-transform-classes"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; + sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; + }; + }; + "@babel/plugin-transform-computed-properties-7.12.1" = { + name = "_at_babel_slash_plugin-transform-computed-properties"; + packageName = "@babel/plugin-transform-computed-properties"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; + sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; + }; + }; + "@babel/plugin-transform-destructuring-7.12.1" = { + name = "_at_babel_slash_plugin-transform-destructuring"; + packageName = "@babel/plugin-transform-destructuring"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; + sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; + }; + }; + "@babel/plugin-transform-dotall-regex-7.12.1" = { + name = "_at_babel_slash_plugin-transform-dotall-regex"; + packageName = "@babel/plugin-transform-dotall-regex"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; + sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; + }; + }; + "@babel/plugin-transform-duplicate-keys-7.12.1" = { + name = "_at_babel_slash_plugin-transform-duplicate-keys"; + packageName = "@babel/plugin-transform-duplicate-keys"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; + sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; + }; + }; + "@babel/plugin-transform-exponentiation-operator-7.12.1" = { + name = "_at_babel_slash_plugin-transform-exponentiation-operator"; + packageName = "@babel/plugin-transform-exponentiation-operator"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; + sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; + }; + }; + "@babel/plugin-transform-for-of-7.12.1" = { + name = "_at_babel_slash_plugin-transform-for-of"; + packageName = "@babel/plugin-transform-for-of"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; + sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; + }; + }; + "@babel/plugin-transform-function-name-7.12.1" = { + name = "_at_babel_slash_plugin-transform-function-name"; + packageName = "@babel/plugin-transform-function-name"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; + sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; + }; + }; + "@babel/plugin-transform-literals-7.12.1" = { + name = "_at_babel_slash_plugin-transform-literals"; + packageName = "@babel/plugin-transform-literals"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; + sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; + }; + }; + "@babel/plugin-transform-member-expression-literals-7.12.1" = { + name = "_at_babel_slash_plugin-transform-member-expression-literals"; + packageName = "@babel/plugin-transform-member-expression-literals"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; + sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.12.1" = { + name = "_at_babel_slash_plugin-transform-modules-amd"; + packageName = "@babel/plugin-transform-modules-amd"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; + sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; + }; + }; + "@babel/plugin-transform-modules-commonjs-7.12.1" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; + sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; + }; + }; + "@babel/plugin-transform-modules-systemjs-7.12.1" = { + name = "_at_babel_slash_plugin-transform-modules-systemjs"; + packageName = "@babel/plugin-transform-modules-systemjs"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; + sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; + }; + }; + "@babel/plugin-transform-modules-umd-7.12.1" = { + name = "_at_babel_slash_plugin-transform-modules-umd"; + packageName = "@babel/plugin-transform-modules-umd"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; + sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; + }; + }; + "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { + name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; + packageName = "@babel/plugin-transform-named-capturing-groups-regex"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; + sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; + }; + }; + "@babel/plugin-transform-new-target-7.12.1" = { + name = "_at_babel_slash_plugin-transform-new-target"; + packageName = "@babel/plugin-transform-new-target"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; + sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; + }; + }; + "@babel/plugin-transform-object-super-7.12.1" = { + name = "_at_babel_slash_plugin-transform-object-super"; + packageName = "@babel/plugin-transform-object-super"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; + sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; + }; + }; + "@babel/plugin-transform-parameters-7.12.1" = { + name = "_at_babel_slash_plugin-transform-parameters"; + packageName = "@babel/plugin-transform-parameters"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; + sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; + }; + }; + "@babel/plugin-transform-property-literals-7.12.1" = { + name = "_at_babel_slash_plugin-transform-property-literals"; + packageName = "@babel/plugin-transform-property-literals"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; + sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; + }; + }; + "@babel/plugin-transform-regenerator-7.12.1" = { + name = "_at_babel_slash_plugin-transform-regenerator"; + packageName = "@babel/plugin-transform-regenerator"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; + sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; + }; + }; + "@babel/plugin-transform-reserved-words-7.12.1" = { + name = "_at_babel_slash_plugin-transform-reserved-words"; + packageName = "@babel/plugin-transform-reserved-words"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; + sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; + }; + }; + "@babel/plugin-transform-shorthand-properties-7.12.1" = { + name = "_at_babel_slash_plugin-transform-shorthand-properties"; + packageName = "@babel/plugin-transform-shorthand-properties"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; + sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; + }; + }; + "@babel/plugin-transform-spread-7.12.1" = { + name = "_at_babel_slash_plugin-transform-spread"; + packageName = "@babel/plugin-transform-spread"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; + sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; + }; + }; + "@babel/plugin-transform-sticky-regex-7.12.7" = { + name = "_at_babel_slash_plugin-transform-sticky-regex"; + packageName = "@babel/plugin-transform-sticky-regex"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; + sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg=="; + }; + }; + "@babel/plugin-transform-template-literals-7.12.1" = { + name = "_at_babel_slash_plugin-transform-template-literals"; + packageName = "@babel/plugin-transform-template-literals"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; + sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; + }; + }; + "@babel/plugin-transform-typeof-symbol-7.12.1" = { + name = "_at_babel_slash_plugin-transform-typeof-symbol"; + packageName = "@babel/plugin-transform-typeof-symbol"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; + sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q=="; + }; + }; + "@babel/plugin-transform-unicode-escapes-7.12.1" = { + name = "_at_babel_slash_plugin-transform-unicode-escapes"; + packageName = "@babel/plugin-transform-unicode-escapes"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; + sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; + }; + }; + "@babel/plugin-transform-unicode-regex-7.12.1" = { + name = "_at_babel_slash_plugin-transform-unicode-regex"; + packageName = "@babel/plugin-transform-unicode-regex"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; + sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; + }; + }; + "@babel/preset-env-7.12.7" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz"; + sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew=="; + }; + }; + "@babel/preset-modules-0.1.4" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; + }; + }; + "@babel/runtime-7.12.5" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz"; + sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; + }; + }; + "@babel/template-7.12.7" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; + sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; + }; + }; + "@babel/traverse-7.12.9" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.12.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz"; + sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw=="; + }; + }; + "@babel/types-7.12.7" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz"; + sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ=="; + }; + }; + "@eslint/eslintrc-0.2.1" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; + sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA=="; + }; + }; + "@fortawesome/fontawesome-common-types-0.2.32" = { + name = "_at_fortawesome_slash_fontawesome-common-types"; + packageName = "@fortawesome/fontawesome-common-types"; + version = "0.2.32"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz"; + sha512 = "ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w=="; + }; + }; + "@fortawesome/fontawesome-svg-core-1.2.32" = { + name = "_at_fortawesome_slash_fontawesome-svg-core"; + packageName = "@fortawesome/fontawesome-svg-core"; + version = "1.2.32"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz"; + sha512 = "XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ=="; + }; + }; + "@fortawesome/free-regular-svg-icons-5.15.1" = { + name = "_at_fortawesome_slash_free-regular-svg-icons"; + packageName = "@fortawesome/free-regular-svg-icons"; + version = "5.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.1.tgz"; + sha512 = "eD9NWFy89e7SVVtrLedJUxIpCBGhd4x7s7dhesokjyo1Tw62daqN5UcuAGu1NrepLLq1IeAYUVfWwnOjZ/j3HA=="; + }; + }; + "@fortawesome/free-solid-svg-icons-5.15.1" = { + name = "_at_fortawesome_slash_free-solid-svg-icons"; + packageName = "@fortawesome/free-solid-svg-icons"; + version = "5.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz"; + sha512 = "EFMuKtzRMNbvjab/SvJBaOOpaqJfdSap/Nl6hst7CgrJxwfORR1drdTV6q1Ib/JVzq4xObdTDcT6sqTaXMqfdg=="; + }; + }; + "@types/anymatch-1.3.1" = { + name = "_at_types_slash_anymatch"; + packageName = "@types/anymatch"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; + }; + }; + "@types/eslint-7.2.5" = { + name = "_at_types_slash_eslint"; + packageName = "@types/eslint"; + version = "7.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.5.tgz"; + sha512 = "Dc6ar9x16BdaR3NSxSF7T4IjL9gxxViJq8RmFd+2UAyA+K6ck2W+gUwfgpG/y9TPyUuBL35109bbULpEynvltA=="; + }; + }; + "@types/eslint-scope-3.7.0" = { + name = "_at_types_slash_eslint-scope"; + packageName = "@types/eslint-scope"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz"; + sha512 = "O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw=="; + }; + }; + "@types/estree-0.0.45" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.45"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz"; + sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="; + }; + }; + "@types/html-minifier-terser-5.1.1" = { + name = "_at_types_slash_html-minifier-terser"; + packageName = "@types/html-minifier-terser"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha512 = "giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="; + }; + }; + "@types/json-schema-7.0.6" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; + }; + }; + "@types/json5-0.0.29" = { + name = "_at_types_slash_json5"; + packageName = "@types/json5"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + }; + "@types/node-14.14.9" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.14.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz"; + sha512 = "JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw=="; + }; + }; + "@types/parse-json-4.0.0" = { + name = "_at_types_slash_parse-json"; + packageName = "@types/parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + }; + }; + "@types/source-list-map-0.1.2" = { + name = "_at_types_slash_source-list-map"; + packageName = "@types/source-list-map"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; + }; + }; + "@types/tapable-1.0.6" = { + name = "_at_types_slash_tapable"; + packageName = "@types/tapable"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz"; + sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; + }; + }; + "@types/uglify-js-3.11.1" = { + name = "_at_types_slash_uglify-js"; + packageName = "@types/uglify-js"; + version = "3.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz"; + sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q=="; + }; + }; + "@types/webpack-4.41.25" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.41.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz"; + sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ=="; + }; + }; + "@types/webpack-sources-2.0.0" = { + name = "_at_types_slash_webpack-sources"; + packageName = "@types/webpack-sources"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz"; + sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg=="; + }; + }; + "@webassemblyjs/ast-1.9.0" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"; + sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; + }; + }; + "@webassemblyjs/floating-point-hex-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; + sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; + }; + }; + "@webassemblyjs/helper-api-error-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; + sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; + }; + }; + "@webassemblyjs/helper-buffer-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; + }; + }; + "@webassemblyjs/helper-code-frame-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; + sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; + }; + }; + "@webassemblyjs/helper-fsm-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; + sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; + }; + }; + "@webassemblyjs/helper-module-context-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; + sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; + sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; + }; + }; + "@webassemblyjs/helper-wasm-section-1.9.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; + }; + }; + "@webassemblyjs/ieee754-1.9.0" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; + sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; + }; + }; + "@webassemblyjs/leb128-1.9.0" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; + sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; + }; + }; + "@webassemblyjs/utf8-1.9.0" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; + sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; + }; + }; + "@webassemblyjs/wasm-edit-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; + }; + }; + "@webassemblyjs/wasm-gen-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; + }; + }; + "@webassemblyjs/wasm-opt-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; + }; + }; + "@webassemblyjs/wasm-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; + sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; + }; + }; + "@webassemblyjs/wast-parser-1.9.0" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; + sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; + }; + }; + "@webassemblyjs/wast-printer-1.9.0" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; + sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; + }; + }; + "@webpack-cli/info-1.1.0" = { + name = "_at_webpack-cli_slash_info"; + packageName = "@webpack-cli/info"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.1.0.tgz"; + sha512 = "uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ=="; + }; + }; + "@webpack-cli/serve-1.1.0" = { + name = "_at_webpack-cli_slash_serve"; + packageName = "@webpack-cli/serve"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.1.0.tgz"; + sha512 = "7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg=="; + }; + }; + "@xtuc/ieee754-1.2.0" = { + name = "_at_xtuc_slash_ieee754"; + packageName = "@xtuc/ieee754"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + }; + "@xtuc/long-4.2.2" = { + name = "_at_xtuc_slash_long"; + packageName = "@xtuc/long"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + }; + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "acorn-8.0.4" = { + name = "acorn"; + packageName = "acorn"; + version = "8.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz"; + sha512 = "XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ=="; + }; + }; + "acorn-jsx-5.3.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + }; + }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ajv-keywords-3.5.2" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; + }; + }; + "ansi-colors-4.1.1" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; + "anymatch-3.1.1" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "array-back-4.0.1" = { + name = "array-back"; + packageName = "array-back"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz"; + sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg=="; + }; + }; + "array-includes-3.1.2" = { + name = "array-includes"; + packageName = "array-includes"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz"; + sha512 = "w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw=="; + }; + }; + "array.prototype.flat-1.2.4" = { + name = "array.prototype.flat"; + packageName = "array.prototype.flat"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha512 = "4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg=="; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "autoprefixer-10.0.2" = { + name = "autoprefixer"; + packageName = "autoprefixer"; + version = "10.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.2.tgz"; + sha512 = "okBmu9OMdt6DNEcZmnl0IYVv8Xl/xYWRSnc2OJ9UJEOt1u30opG1B8aLsViqKryBaYv1SKB4f85fOGZs5zYxHQ=="; + }; + }; + "babel-loader-8.2.1" = { + name = "babel-loader"; + packageName = "babel-loader"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz"; + sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw=="; + }; + }; + "babel-plugin-dynamic-import-node-2.3.3" = { + name = "babel-plugin-dynamic-import-node"; + packageName = "babel-plugin-dynamic-import-node"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "big.js-5.2.2" = { + name = "big.js"; + packageName = "big.js"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; + }; + }; + "binary-extensions-2.1.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + }; + }; + "boolbase-1.0.0" = { + name = "boolbase"; + packageName = "boolbase"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + }; + "bootstrap-4.5.3" = { + name = "bootstrap"; + packageName = "bootstrap"; + version = "4.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz"; + sha512 = "o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ=="; + }; + }; + "bootswatch-4.5.3" = { + name = "bootswatch"; + packageName = "bootswatch"; + version = "4.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bootswatch/-/bootswatch-4.5.3.tgz"; + sha512 = "gaB3gBSAegmYbk97aVELKcSKVdPjWsSY4yCITkUt/SqbqjtMU/HtIUszb4O9vzdbrfuVXThc/qCXzjoJaAPgiQ=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "browserslist-4.14.7" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.14.7"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz"; + sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ=="; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "call-bind-1.0.0" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; + sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camel-case-4.1.1" = { + name = "camel-case"; + packageName = "camel-case"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz"; + sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q=="; + }; + }; + "camelcase-6.2.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + }; + }; + "caniuse-lite-1.0.30001161" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001161"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz"; + sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g=="; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; + "chokidar-3.4.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; + sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; + }; + }; + "chrome-trace-event-1.0.2" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; + }; + }; + "clean-css-4.2.3" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; + sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "colorette-1.2.1" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz"; + sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="; + }; + }; + "command-line-usage-6.1.1" = { + name = "command-line-usage"; + packageName = "command-line-usage"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz"; + sha512 = "F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA=="; + }; + }; + "commander-2.20.3" = { + name = "commander"; + packageName = "commander"; + version = "2.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; + "commander-4.1.1" = { + name = "commander"; + packageName = "commander"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; + sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; + }; + }; + "commander-6.2.0" = { + name = "commander"; + packageName = "commander"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; + sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; + }; + }; + "comment-parser-0.7.6" = { + name = "comment-parser"; + packageName = "comment-parser"; + version = "0.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz"; + sha512 = "GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg=="; + }; + }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "contains-path-0.1.0" = { + name = "contains-path"; + packageName = "contains-path"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz"; + sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; + }; + }; + "convert-source-map-1.7.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + }; + }; + "core-js-3.7.0" = { + name = "core-js"; + packageName = "core-js"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz"; + sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA=="; + }; + }; + "core-js-compat-3.7.0" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg=="; + }; + }; + "cosmiconfig-7.0.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA=="; + }; + }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; + "css-loader-5.0.1" = { + name = "css-loader"; + packageName = "css-loader"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz"; + sha512 = "cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw=="; + }; + }; + "css-select-1.2.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + }; + "css-what-2.1.3" = { + name = "css-what"; + packageName = "css-what"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; + sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; + }; + }; + "cssesc-3.0.0" = { + name = "cssesc"; + packageName = "cssesc"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-4.3.1" = { + name = "debug"; + packageName = "debug"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "doctrine-1.5.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"; + sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "dom-converter-0.2.0" = { + name = "dom-converter"; + packageName = "dom-converter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; + sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; + }; + }; + "dom-serializer-0.2.2" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + }; + }; + "domelementtype-1.3.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + }; + }; + "domelementtype-2.0.2" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"; + sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="; + }; + }; + "domhandler-2.4.2" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; + sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "dot-case-3.0.3" = { + name = "dot-case"; + packageName = "dot-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz"; + sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; + }; + }; + "electron-to-chromium-1.3.607" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.607"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz"; + sha512 = "h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g=="; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emojis-list-3.0.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "enhanced-resolve-5.3.2" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.2.tgz"; + sha512 = "G28GCrglCAH6+EqMN2D+Q2wCUS1O1vVQJBn8ME2I/Api41YBe4vLWWRBOUbwDH7vwzSZdljxwTRVqnf+sm6XqQ=="; + }; + }; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + }; + "entities-1.1.2" = { + name = "entities"; + packageName = "entities"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; + }; + }; + "entities-2.1.0" = { + name = "entities"; + packageName = "entities"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + }; + }; + "envinfo-7.7.3" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz"; + sha512 = "46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "es-abstract-1.17.7" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.17.7"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz"; + sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g=="; + }; + }; + "es-abstract-1.18.0-next.1" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.18.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; + sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA=="; + }; + }; + "es-to-primitive-1.2.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + }; + "escalade-3.1.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "eslint-7.14.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz"; + sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; + }; + }; + "eslint-import-resolver-node-0.3.4" = { + name = "eslint-import-resolver-node"; + packageName = "eslint-import-resolver-node"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha512 = "ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="; + }; + }; + "eslint-module-utils-2.6.0" = { + name = "eslint-module-utils"; + packageName = "eslint-module-utils"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="; + }; + }; + "eslint-plugin-import-2.22.1" = { + name = "eslint-plugin-import"; + packageName = "eslint-plugin-import"; + version = "2.22.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; + sha512 = "8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="; + }; + }; + "eslint-plugin-jquery-1.5.1" = { + name = "eslint-plugin-jquery"; + packageName = "eslint-plugin-jquery"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-jquery/-/eslint-plugin-jquery-1.5.1.tgz"; + sha512 = "L7v1eaK5t80C0lvUXPFP9MKnBOqPSKhCOYyzy4LZ0+iK+TJwN8S9gAkzzP1AOhypRIwA88HF6phQ9C7jnOpW8w=="; + }; + }; + "eslint-plugin-jsdoc-30.7.8" = { + name = "eslint-plugin-jsdoc"; + packageName = "eslint-plugin-jsdoc"; + version = "30.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.8.tgz"; + sha512 = "OWm2AYvXjCl7nRbpcw5xisfSVkpVAyp4lGqL9T+DeK4kaPm6ecnmTc/G5s1PtcRrwbaI8bIWGzwScqv5CdGyxA=="; + }; + }; + "eslint-rule-composer-0.3.0" = { + name = "eslint-rule-composer"; + packageName = "eslint-rule-composer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; + sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="; + }; + }; + "eslint-scope-5.1.0" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz"; + sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; + }; + }; + "eslint-scope-5.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + }; + "eslint-utils-2.1.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; + }; + }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; + "espree-7.3.0" = { + name = "espree"; + packageName = "espree"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz"; + sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.3.1" = { + name = "esquery"; + packageName = "esquery"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; + sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + }; + }; + "esrecurse-4.3.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "estraverse-5.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "events-3.2.0" = { + name = "events"; + packageName = "events"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz"; + sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="; + }; + }; + "execa-4.1.0" = { + name = "execa"; + packageName = "execa"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "file-entry-cache-5.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "find-cache-dir-2.1.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "flat-cache-2.0.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + }; + }; + "flatted-2.0.2" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "gensync-1.0.0-beta.2" = { + name = "gensync"; + packageName = "gensync"; + version = "1.0.0-beta.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; + }; + }; + "get-intrinsic-1.0.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; + sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; + }; + }; + "get-stream-5.2.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; + "glob-to-regexp-0.4.1" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; + "graceful-fs-4.2.4" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-symbols-1.0.1" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; + }; + }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; + "hosted-git-info-2.8.8" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + }; + }; + "html-minifier-terser-5.1.1" = { + name = "html-minifier-terser"; + packageName = "html-minifier-terser"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; + }; + }; + "html-webpack-plugin-4.5.0" = { + name = "html-webpack-plugin"; + packageName = "html-webpack-plugin"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz"; + sha512 = "MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw=="; + }; + }; + "htmlparser2-3.10.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; + }; + }; + "human-signals-1.1.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; + }; + }; + "icss-utils-5.1.0" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "import-fresh-3.2.2" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; + sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; + }; + }; + "import-local-3.0.2" = { + name = "import-local"; + packageName = "import-local"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz"; + sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indexes-of-1.0.1" = { + name = "indexes-of"; + packageName = "indexes-of"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "interpret-2.2.0" = { + name = "interpret"; + packageName = "interpret"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"; + sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; + "is-callable-1.2.2" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"; + sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; + }; + }; + "is-core-module-2.1.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz"; + sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA=="; + }; + }; + "is-date-object-1.0.2" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-negative-zero-2.0.0" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-regex-1.1.1" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; + sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; + }; + }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; + "is-string-1.0.5" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; + sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; + }; + }; + "is-symbol-1.0.3" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "jest-worker-26.6.2" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; + sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; + }; + }; + "jquery-3.5.1" = { + name = "jquery"; + packageName = "jquery"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz"; + sha512 = "XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="; + }; + }; + "jquery-migrate-3.3.2" = { + name = "jquery-migrate"; + packageName = "jquery-migrate"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.2.tgz"; + sha512 = "L3gYhr7yEtLUSAeqXSicVa0vRD4aGwjw/bWY8YzrO2o/qDY1BaMyP3oB3bZf5Auy3Hu9ynliio0CTyDWCBPVDw=="; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.14.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + }; + }; + "jsdoctypeparser-9.0.0" = { + name = "jsdoctypeparser"; + packageName = "jsdoctypeparser"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; + sha512 = "jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw=="; + }; + }; + "jsesc-0.5.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + }; + "jsesc-2.5.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + }; + "json-parse-even-better-errors-2.3.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json5-1.0.1" = { + name = "json5"; + packageName = "json5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + }; + "json5-2.1.3" = { + name = "json5"; + packageName = "json5"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; + sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; + }; + }; + "klona-2.0.4" = { + name = "klona"; + packageName = "klona"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + }; + "leven-3.1.0" = { + name = "leven"; + packageName = "leven"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; + }; + }; + "levn-0.4.1" = { + name = "levn"; + packageName = "levn"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; + }; + }; + "lines-and-columns-1.1.6" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "loader-runner-4.1.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz"; + sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA=="; + }; + }; + "loader-utils-1.4.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + }; + }; + "loader-utils-2.0.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"; + sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; + "lodash-4.17.20" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.20"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + }; + }; + "lower-case-2.0.1" = { + name = "lower-case"; + packageName = "lower-case"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz"; + sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ=="; + }; + }; + "make-dir-2.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; + }; + }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; + "mime-db-1.44.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + }; + }; + "mime-types-2.1.27" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "mini-css-extract-plugin-1.3.1" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.1.tgz"; + sha512 = "jIOheqh9EU98rqj6ZaFTYNNDSFqdakNqaUZfkYwaXPjI9batmXVXX+K71NrqRAgtoGefELBMld1EQ7dqSAD5SQ=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "nanoid-3.1.18" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.18"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz"; + sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "neo-async-2.6.2" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; + }; + }; + "no-case-3.0.3" = { + name = "no-case"; + packageName = "no-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz"; + sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw=="; + }; + }; + "node-releases-1.1.67" = { + name = "node-releases"; + packageName = "node-releases"; + version = "1.1.67"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz"; + sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg=="; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "normalize-range-0.1.2" = { + name = "normalize-range"; + packageName = "normalize-range"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + }; + "npm-run-path-4.0.1" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; + }; + }; + "nth-check-1.0.2" = { + name = "nth-check"; + packageName = "nth-check"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + }; + }; + "num2fraction-1.2.2" = { + name = "num2fraction"; + packageName = "num2fraction"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + }; + "object-inspect-1.8.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "object.assign-4.1.2" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + }; + }; + "object.getownpropertydescriptors-2.1.0" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; + }; + }; + "object.values-1.1.1" = { + name = "object.values"; + packageName = "object.values"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; + sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-5.1.2" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + }; + "optionator-0.9.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; + }; + }; + "p-limit-1.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-limit-3.0.2" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz"; + sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg=="; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "param-case-3.0.3" = { + name = "param-case"; + packageName = "param-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz"; + sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "parse-json-5.1.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; + sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + }; + }; + "pascal-case-3.1.1" = { + name = "pascal-case"; + packageName = "pascal-case"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz"; + sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA=="; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pkg-dir-2.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; + "pkg-dir-4.2.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; + }; + }; + "popper.js-1.16.1" = { + name = "popper.js"; + packageName = "popper.js"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"; + sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="; + }; + }; + "postcss-8.1.10" = { + name = "postcss"; + packageName = "postcss"; + version = "8.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz"; + sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg=="; + }; + }; + "postcss-loader-4.1.0" = { + name = "postcss-loader"; + packageName = "postcss-loader"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.1.0.tgz"; + sha512 = "vbCkP70F3Q9PIk6d47aBwjqAMI4LfkXCoyxj+7NPNuVIwfTGdzv2KVQes59/RuxMniIgsYQCFSY42P3+ykJfaw=="; + }; + }; + "postcss-modules-extract-imports-3.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; + }; + }; + "postcss-modules-local-by-default-4.0.0" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; + }; + }; + "postcss-modules-scope-3.0.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; + }; + }; + "postcss-modules-values-4.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; + }; + }; + "postcss-selector-parser-6.0.4" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw=="; + }; + }; + "postcss-value-parser-4.1.0" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; + }; + }; + "prelude-ls-1.2.1" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + }; + "pretty-error-2.1.2" = { + name = "pretty-error"; + packageName = "pretty-error"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz"; + sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "readdirp-3.5.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + }; + }; + "rechoir-0.7.0" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; + sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + }; + }; + "reduce-flatten-2.0.0" = { + name = "reduce-flatten"; + packageName = "reduce-flatten"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz"; + sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; + }; + }; + "regenerate-1.4.2" = { + name = "regenerate"; + packageName = "regenerate"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; + }; + }; + "regenerate-unicode-properties-8.2.0" = { + name = "regenerate-unicode-properties"; + packageName = "regenerate-unicode-properties"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + }; + }; + "regenerator-runtime-0.13.7" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.7"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; + }; + }; + "regenerator-transform-0.14.5" = { + name = "regenerator-transform"; + packageName = "regenerator-transform"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; + }; + }; + "regexpp-3.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + }; + "regexpu-core-4.7.1" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; + }; + }; + "regextras-0.7.1" = { + name = "regextras"; + packageName = "regextras"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz"; + sha512 = "9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w=="; + }; + }; + "regjsgen-0.5.2" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; + }; + }; + "regjsparser-0.6.4" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; + sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; + }; + }; + "relateurl-0.2.7" = { + name = "relateurl"; + packageName = "relateurl"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + }; + "renderkid-2.0.4" = { + name = "renderkid"; + packageName = "renderkid"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz"; + sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g=="; + }; + }; + "resolve-1.19.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; + }; + }; + "resolve-cwd-3.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "resolve-from-5.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; + "sass-1.29.0" = { + name = "sass"; + packageName = "sass"; + version = "1.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz"; + sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA=="; + }; + }; + "sass-loader-10.1.0" = { + name = "sass-loader"; + packageName = "sass-loader"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.0.tgz"; + sha512 = "ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg=="; + }; + }; + "schema-utils-2.7.1" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + }; + }; + "schema-utils-3.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz"; + sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.0.0" = { + name = "semver"; + packageName = "semver"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + }; + "semver-7.3.2" = { + name = "semver"; + packageName = "semver"; + version = "7.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; + }; + }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; + "signal-exit-3.0.3" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; + "source-list-map-2.0.1" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; + "source-map-support-0.5.19" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.19"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; + }; + }; + "spdx-correct-3.1.1" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + }; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + }; + "spdx-license-ids-3.0.6" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string.prototype.trimend-1.0.3" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; + sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw=="; + }; + }; + "string.prototype.trimstart-1.0.3" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; + sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg=="; + }; + }; + "string_decoder-1.3.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "strip-final-newline-2.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; + }; + }; + "strip-json-comments-3.1.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; + "table-layout-1.0.1" = { + name = "table-layout"; + packageName = "table-layout"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz"; + sha512 = "dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q=="; + }; + }; + "tapable-1.1.3" = { + name = "tapable"; + packageName = "tapable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; + }; + }; + "tapable-2.1.1" = { + name = "tapable"; + packageName = "tapable"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-2.1.1.tgz"; + sha512 = "Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ=="; + }; + }; + "terser-4.8.0" = { + name = "terser"; + packageName = "terser"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; + sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; + }; + }; + "terser-5.5.0" = { + name = "terser"; + packageName = "terser"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.5.0.tgz"; + sha512 = "eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g=="; + }; + }; + "terser-webpack-plugin-5.0.3" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz"; + sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "tsconfig-paths-3.9.0" = { + name = "tsconfig-paths"; + packageName = "tsconfig-paths"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; + }; + }; + "tslib-1.14.1" = { + name = "tslib"; + packageName = "tslib"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + }; + "type-check-0.4.0" = { + name = "type-check"; + packageName = "type-check"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; + "typical-5.2.0" = { + name = "typical"; + packageName = "typical"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz"; + sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; + }; + }; + "unicode-canonical-property-names-ecmascript-1.0.4" = { + name = "unicode-canonical-property-names-ecmascript"; + packageName = "unicode-canonical-property-names-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + }; + }; + "unicode-match-property-ecmascript-1.0.4" = { + name = "unicode-match-property-ecmascript"; + packageName = "unicode-match-property-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + }; + }; + "unicode-match-property-value-ecmascript-1.2.0" = { + name = "unicode-match-property-value-ecmascript"; + packageName = "unicode-match-property-value-ecmascript"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + }; + }; + "unicode-property-aliases-ecmascript-1.1.0" = { + name = "unicode-property-aliases-ecmascript"; + packageName = "unicode-property-aliases-ecmascript"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + }; + }; + "uniq-1.0.1" = { + name = "uniq"; + packageName = "uniq"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + }; + "uri-js-4.4.0" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; + }; + }; + "utila-0.4.0" = { + name = "utila"; + packageName = "utila"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; + sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c"; + }; + }; + "v8-compile-cache-2.2.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "vfile-location-3.2.0" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"; + sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; + }; + }; + "watchpack-2.0.1" = { + name = "watchpack"; + packageName = "watchpack"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.1.tgz"; + sha512 = "vO8AKGX22ZRo6PiOFM9dC0re8IcKh8Kd/aH2zeqUc6w4/jBGlTy2P7fTC6ekT0NjVeGjgU2dGC5rNstKkeLEQg=="; + }; + }; + "webpack-5.6.0" = { + name = "webpack"; + packageName = "webpack"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.6.0.tgz"; + sha512 = "SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA=="; + }; + }; + "webpack-cli-4.2.0" = { + name = "webpack-cli"; + packageName = "webpack-cli"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.2.0.tgz"; + sha512 = "EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA=="; + }; + }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; + "webpack-sources-1.4.3" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; + }; + }; + "webpack-sources-2.2.0" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz"; + sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w=="; + }; + }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "wordwrapjs-4.0.0" = { + name = "wordwrapjs"; + packageName = "wordwrapjs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz"; + sha512 = "Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-1.0.3" = { + name = "write"; + packageName = "write"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; + }; + }; + "yaml-1.10.0" = { + name = "yaml"; + packageName = "yaml"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz"; + sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg=="; + }; + }; + }; + args = { + name = "botamusique"; + packageName = "botamusique"; + version = "0.0.0"; + src = ../../../../../../../../run/user/1000/tmp.ioJA7NbZmp; + dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.12.7" + sources."@babel/core-7.12.9" + (sources."@babel/eslint-parser-7.12.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/eslint-plugin-7.12.1" + sources."@babel/generator-7.12.5" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" + sources."@babel/helper-compilation-targets-7.12.5" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" + sources."@babel/helper-define-map-7.10.5" + sources."@babel/helper-explode-assignable-expression-7.12.1" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-hoist-variables-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.12.7" + sources."@babel/helper-module-imports-7.12.5" + sources."@babel/helper-module-transforms-7.12.1" + sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" + sources."@babel/helper-split-export-declaration-7.11.0" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-wrap-function-7.12.3" + sources."@babel/helpers-7.12.5" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.12.7" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.7" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.7" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.7" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + sources."@babel/preset-env-7.12.7" + sources."@babel/preset-modules-0.1.4" + sources."@babel/runtime-7.12.5" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" + (sources."@eslint/eslintrc-0.2.1" // { + dependencies = [ + sources."globals-12.4.0" + ]; + }) + sources."@fortawesome/fontawesome-common-types-0.2.32" + sources."@fortawesome/fontawesome-svg-core-1.2.32" + sources."@fortawesome/free-regular-svg-icons-5.15.1" + sources."@fortawesome/free-solid-svg-icons-5.15.1" + sources."@types/anymatch-1.3.1" + sources."@types/eslint-7.2.5" + sources."@types/eslint-scope-3.7.0" + sources."@types/estree-0.0.45" + sources."@types/html-minifier-terser-5.1.1" + sources."@types/json-schema-7.0.6" + sources."@types/json5-0.0.29" + sources."@types/node-14.14.9" + sources."@types/parse-json-4.0.0" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.6" + (sources."@types/uglify-js-3.11.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.41.25" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-sources-2.0.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@webpack-cli/info-1.1.0" + sources."@webpack-cli/serve-1.1.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.1" + sources."ajv-6.12.6" + sources."ajv-keywords-3.5.2" + sources."ansi-colors-4.1.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."argparse-1.0.10" + sources."array-back-4.0.1" + sources."array-includes-3.1.2" + sources."array.prototype.flat-1.2.4" + sources."astral-regex-1.0.0" + sources."autoprefixer-10.0.2" + sources."babel-loader-8.2.1" + sources."babel-plugin-dynamic-import-node-2.3.3" + sources."balanced-match-1.0.0" + sources."big.js-5.2.2" + sources."binary-extensions-2.1.0" + sources."boolbase-1.0.0" + sources."bootstrap-4.5.3" + sources."bootswatch-4.5.3" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserslist-4.14.7" + sources."buffer-from-1.1.1" + sources."call-bind-1.0.0" + sources."callsites-3.1.0" + sources."camel-case-4.1.1" + sources."camelcase-6.2.0" + sources."caniuse-lite-1.0.30001161" + sources."chalk-2.4.2" + sources."chokidar-3.4.3" + sources."chrome-trace-event-1.0.2" + (sources."clean-css-4.2.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colorette-1.2.1" + sources."command-line-usage-6.1.1" + sources."commander-4.1.1" + sources."comment-parser-0.7.6" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + sources."contains-path-0.1.0" + sources."convert-source-map-1.7.0" + sources."core-js-3.7.0" + (sources."core-js-compat-3.7.0" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) + sources."cosmiconfig-7.0.0" + sources."cross-spawn-7.0.3" + (sources."css-loader-5.0.1" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + sources."semver-7.3.2" + ]; + }) + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."cssesc-3.0.0" + sources."debug-4.3.1" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."define-properties-1.1.3" + sources."doctrine-3.0.0" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.0.2" + ]; + }) + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + sources."dot-case-3.0.3" + sources."electron-to-chromium-1.3.607" + sources."emoji-regex-7.0.3" + sources."emojis-list-3.0.0" + sources."end-of-stream-1.4.4" + (sources."enhanced-resolve-5.3.2" // { + dependencies = [ + sources."tapable-2.1.1" + ]; + }) + sources."enquirer-2.3.6" + sources."entities-2.1.0" + sources."envinfo-7.7.3" + sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.1" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + (sources."eslint-7.14.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."eslint-scope-5.1.1" + sources."eslint-visitor-keys-2.0.0" + sources."globals-12.4.0" + sources."has-flag-4.0.0" + sources."semver-7.3.2" + sources."supports-color-7.2.0" + ]; + }) + (sources."eslint-import-resolver-node-0.3.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."eslint-module-utils-2.6.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."eslint-plugin-import-2.22.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."doctrine-1.5.0" + sources."ms-2.0.0" + ]; + }) + sources."eslint-plugin-jquery-1.5.1" + (sources."eslint-plugin-jsdoc-30.7.8" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."eslint-rule-composer-0.3.0" + sources."eslint-scope-5.1.0" + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.0" + sources."esprima-4.0.1" + (sources."esquery-1.3.1" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."events-3.2.0" + sources."execa-4.1.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."file-entry-cache-5.0.1" + sources."fill-range-7.0.1" + (sources."find-cache-dir-2.1.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pkg-dir-3.0.0" + ]; + }) + sources."find-up-2.1.0" + sources."flat-cache-2.0.1" + sources."flatted-2.0.2" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.0.1" + sources."get-stream-5.2.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."glob-to-regexp-0.4.1" + sources."globals-11.12.0" + sources."graceful-fs-4.2.4" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."he-1.2.0" + sources."hosted-git-info-2.8.8" + sources."html-minifier-terser-5.1.1" + sources."html-webpack-plugin-4.5.0" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."entities-1.1.2" + ]; + }) + sources."human-signals-1.1.1" + sources."icss-utils-5.1.0" + sources."ignore-4.0.6" + sources."import-fresh-3.2.2" + (sources."import-local-3.0.2" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."interpret-2.2.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-callable-1.2.2" + sources."is-core-module-2.1.0" + sources."is-date-object-1.0.2" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" + sources."is-number-7.0.0" + sources."is-regex-1.1.1" + sources."is-stream-2.0.0" + sources."is-string-1.0.5" + sources."is-symbol-1.0.3" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + (sources."jest-worker-26.6.2" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."jquery-3.5.1" + sources."jquery-migrate-3.3.2" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.0" + sources."jsdoctypeparser-9.0.0" + sources."jsesc-2.5.2" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json5-2.1.3" + sources."klona-2.0.4" + sources."leven-3.1.0" + sources."levn-0.4.1" + sources."lines-and-columns-1.1.6" + (sources."load-json-file-2.0.0" // { + dependencies = [ + sources."parse-json-2.2.0" + sources."pify-2.3.0" + ]; + }) + sources."loader-runner-4.1.0" + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."locate-path-2.0.0" + sources."lodash-4.17.20" + sources."lower-case-2.0.1" + sources."make-dir-2.1.0" + sources."merge-stream-2.0.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-2.1.0" + (sources."mini-css-extract-plugin-1.3.1" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + ]; + }) + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."nanoid-3.1.18" + sources."natural-compare-1.4.0" + sources."neo-async-2.6.2" + sources."no-case-3.0.3" + sources."node-releases-1.1.67" + sources."normalize-package-data-2.5.0" + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."npm-run-path-4.0.1" + sources."nth-check-1.0.2" + sources."num2fraction-1.2.2" + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" + (sources."object.getownpropertydescriptors-2.1.0" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + (sources."object.values-1.1.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."optionator-0.9.1" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."param-case-3.0.3" + sources."parent-module-1.0.1" + sources."parse-json-5.1.0" + sources."pascal-case-3.1.1" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.6" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" + sources."pkg-dir-2.0.0" + sources."popper.js-1.16.1" + (sources."postcss-8.1.10" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-loader-4.1.0" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + sources."semver-7.3.2" + ]; + }) + sources."postcss-modules-extract-imports-3.0.0" + sources."postcss-modules-local-by-default-4.0.0" + sources."postcss-modules-scope-3.0.0" + sources."postcss-modules-values-4.0.0" + sources."postcss-selector-parser-6.0.4" + sources."postcss-value-parser-4.1.0" + sources."prelude-ls-1.2.1" + sources."pretty-error-2.1.2" + sources."progress-2.0.3" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."randombytes-2.1.0" + (sources."read-pkg-2.0.0" // { + dependencies = [ + sources."path-type-2.0.0" + sources."pify-2.3.0" + ]; + }) + sources."read-pkg-up-2.0.0" + sources."readable-stream-3.6.0" + sources."readdirp-3.5.0" + sources."rechoir-0.7.0" + sources."reduce-flatten-2.0.0" + sources."regenerate-1.4.2" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.7" + sources."regenerator-transform-0.14.5" + sources."regexpp-3.1.0" + sources."regexpu-core-4.7.1" + sources."regextras-0.7.1" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."relateurl-0.2.7" + (sources."renderkid-2.0.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."resolve-1.19.0" + (sources."resolve-cwd-3.0.0" // { + dependencies = [ + sources."resolve-from-5.0.0" + ]; + }) + sources."resolve-from-4.0.0" + sources."rimraf-2.6.3" + sources."safe-buffer-5.1.2" + sources."sass-1.29.0" + (sources."sass-loader-10.1.0" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + sources."semver-7.3.2" + ]; + }) + sources."schema-utils-2.7.1" + sources."semver-5.7.1" + sources."serialize-javascript-5.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + sources."slice-ansi-2.1.0" + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.6" + sources."sprintf-js-1.0.3" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-bom-3.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-5.5.0" + sources."table-5.4.6" + sources."table-layout-1.0.1" + sources."tapable-1.1.3" + (sources."terser-4.8.0" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-5.0.3" // { + dependencies = [ + sources."commander-2.20.3" + sources."p-limit-3.0.2" + sources."p-try-2.2.0" + sources."schema-utils-3.0.0" + sources."source-map-0.6.1" + (sources."terser-5.5.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + ]; + }) + sources."text-table-0.2.0" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + (sources."tsconfig-paths-3.9.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."tslib-1.14.1" + sources."type-check-0.4.0" + sources."type-fest-0.8.1" + sources."typical-5.2.0" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" + sources."uniq-1.0.1" + sources."uri-js-4.4.0" + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" + sources."utila-0.4.0" + sources."v8-compile-cache-2.2.0" + sources."validate-npm-package-license-3.0.4" + sources."vfile-location-3.2.0" + sources."watchpack-2.0.1" + (sources."webpack-5.6.0" // { + dependencies = [ + sources."acorn-8.0.4" + sources."eslint-scope-5.1.1" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + sources."schema-utils-3.0.0" + sources."source-map-0.6.1" + sources."tapable-2.1.1" + sources."webpack-sources-2.2.0" + ]; + }) + (sources."webpack-cli-4.2.0" // { + dependencies = [ + sources."commander-6.2.0" + ]; + }) + sources."webpack-merge-4.2.2" + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."which-2.0.2" + sources."word-wrap-1.2.3" + sources."wordwrapjs-4.0.0" + sources."wrappy-1.0.2" + sources."write-1.0.3" + sources."yaml-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + homepage = "https://github.com/azlux/botamusique#readme"; + license = "MIT"; + }; + production = false; + bypassCache = true; + reconstructLock = false; + }; +in +{ + args = args; + sources = sources; + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { + src = stdenv.mkDerivation { + name = args.name + "-package-json"; + src = nix-gitignore.gitignoreSourcePure [ + "*" + "!package.json" + "!package-lock.json" + ] args.src; + dontBuild = true; + installPhase = "mkdir -p $out; cp -r ./* $out;"; + }; + }); +} diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/tools/audio/botamusique/src.json new file mode 100644 index 00000000000..7f63d480a8e --- /dev/null +++ b/pkgs/tools/audio/botamusique/src.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/azlux/botamusique", + "rev": "df38c7dbd6d59c6790cf2364d1f344b7f6f72107", + "date": "2021-03-13T15:44:40+08:00", + "path": "/nix/store/30ds4gp7aldj9rqix1xf7j2ps5blrx8w-botamusique", + "sha256": "06xw1pif145zcm9z8l9kzl8ayl7vy5ywr0m3a5yswybcp2fzj087", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch b/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch new file mode 100644 index 00000000000..3642a034fc8 --- /dev/null +++ b/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch @@ -0,0 +1,22 @@ +diff --git a/util.py b/util.py +index bfec1ed..0546772 100644 +--- a/util.py ++++ b/util.py +@@ -22,16 +22,7 @@ log = logging.getLogger("bot") + + + def solve_filepath(path): +- if not path: +- return '' +- +- if path[0] == '/': +- return path +- elif os.path.exists(path): +- return path +- else: +- mydir = os.path.dirname(os.path.realpath(__file__)) +- return mydir + '/' + path ++ return path + + + def get_recursive_file_list_sorted(path): diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4b8908448f6..f07b19830de 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }: +{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.15"; + version = "1.1.16"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9"; + sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"; }; nativeBuildInputs = with python3.pkgs; [ + setuptools-scm # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python3.pkgs.setuptools_scm + libb2 lz4 zstd openssl ] ++ lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3.pkgs; [ cython llfuse @@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4.dev}" export BORG_LIBB2_PREFIX="${libb2}" - export BORG_LIBZSTD_PREFIX="${zstd}" + export BORG_LIBZSTD_PREFIX="${zstd.dev}" ''; makeWrapperArgs = [ @@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec { # 64 failures, needs pytest-benchmark doCheck = false; + passthru.tests = { + inherit (nixosTests) borgbackup; + }; + meta = with lib; { description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 9eba33235bc..54644ac3a0e 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,22 +1,22 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4+Ra7rNvIL4SpdCkRbPBNrZeTb1dMbuwZx+D++1qsGs="; + sha256 = "sha256-zZHJlC0OICIc3G825t7GrZwdmkaaLQKzX2IwkKigkV4="; }; - cargoSha256 = "sha256-cZSscmH3XPfH141hZhew79/UZHsqDZRN3EoNnYkW0wA="; + cargoSha256 = "sha256-KVeIF6x+gpb8vkqCtZptF5EX9G1Zv6q8L6tskN6HziM="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; postBuild = '' - RUBYOPT="-KU -E utf-8:utf-8" ronn doc/man/*.md + RUBYOPT="-KU -E utf-8:utf-8" ronn -r doc/man/*.md ''; postInstall = '' diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 91d59a4de0f..6c4f2f6e854 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages +{ lib, fetchurl, python2Packages , gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield , bzip2, xz, lzip # unzip is handled by p7zip @@ -11,7 +11,7 @@ let ++ lib.optional (unrarSupport) unrar ++ [ bzip2 xz lzip ]); -in pythonPackages.buildPythonApplication rec { +in python2Packages.buildPythonApplication rec { pname = "dtrx"; version = "7.1"; @@ -24,6 +24,17 @@ in pythonPackages.buildPythonApplication rec { wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}" ''; + checkPhase = '' + python2 tests/compare.py + ''; + + checkInputs = with python2Packages; [ + pyyaml + ]; + + # custom test suite fails + doCheck = false; + meta = with lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "https://brettcsmith.org/2007/dtrx/"; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a6d2382a1a6..12052100db3 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }: +{ lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { version = "1.15.1"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin - then [ macfuse-stubs ] - else [ fuse ]; + buildInputs = [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs ''; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 3777c4e7cb1..eec257c44b7 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkg-config, python, gtest +, cmake, pkg-config, python3, gtest , boost, cryptopp, curl, fuse, openssl }: @@ -44,9 +44,11 @@ stdenv.mkDerivation rec { --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" ''; - nativeBuildInputs = [ cmake gtest pkg-config python ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ boost cryptopp curl fuse openssl ]; + strictDeps = true; + + buildInputs = [ boost cryptopp curl fuse openssl gtest ]; cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 5522b63922a..3631e52d87d 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lus+1hkc4GxrTxtdfDJ0XqJp37dcjKp4/sI3CEh8cYA="; + sha256 = "sha256-/gdmrQhYsE4a/1sxtJ5IfVUWjh08wTVrOr4V7Fkn1i0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 63a6153e8ca..95b5b6ab34a 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse }: stdenv.mkDerivation rec { pname = "s3fs-fuse"; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k="; }; - buildInputs = [ curl openssl libxml2 ] - ++ lib.optionals stdenv.isLinux [ fuse ] - ++ lib.optionals stdenv.isDarwin [ macfuse-stubs ]; + buildInputs = [ curl openssl libxml2 fuse ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index acfd3b1e9a0..6a34657d3d1 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, macfuse-stubs }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse }: stdenv.mkDerivation rec { pname = "unionfs-fuse"; @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ - --replace '/usr/local/include/osxfuse/fuse' '${macfuse-stubs}/include/fuse' + --replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse' ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ]; + buildInputs = [ fuse ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index b2cbe58ce96..3bc87680c52 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "0.7.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "052qckag9vzcx6472pyk1324jq4qib0isx33z3m1m4923ydanbcz"; + sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y="; }; - cargoSha256 = "1nsvx445jrycggidnynn9glpjjm5sh8nwsvqwyyd54k9xb4rqgj1"; + cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index a0ecdde3826..b3426722f79 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, pkg-config, imagemagick, wafHook }: +{ lib, stdenv, fetchFromGitHub, python2, pkg-config, imagemagick, wafHook }: stdenv.mkDerivation rec { pname = "blockhash"; @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p"; }; - nativeBuildInputs = [ python pkg-config wafHook ]; + nativeBuildInputs = [ python2 pkg-config wafHook ]; buildInputs = [ imagemagick ]; + strictDeps = true; + meta = with lib; { homepage = "http://blockhash.io/"; description = '' diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 4a887688c4f..decb92615f9 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -1,9 +1,7 @@ -{ lib, fetchFromGitHub, buildPythonApplication -, pygtk -, numpy ? null +{ lib, python2Packages, fetchFromGitHub }: -buildPythonApplication { +with python2Packages; buildPythonApplication { name = "escrotum-2019-06-10"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 1a782661466..1297b61e7f8 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.201"; + version = "1.202"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-XVaROIxyNBBFoXf+K1mv4mW8wWozqMcs1cgaWj8L8Q0="; + sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index dc1a49a40bf..626e7de1a44 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.11"; + version = "2.0.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA="; + sha256 = "sha256-jvit6Z0SwxjDmpEqojmPUJ3TVmVmW3RC+3tfvG1ev4Q="; }; - vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY="; + vendorSha256 = "sha256-V05cCKQeqw6BEjLIYDeHeDePkA7rs7kjqPCys5eLefA="; doCheck = false; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index a23675fe911..fac8fbcfee9 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation { description = "Multi-algo CPUMiner"; homepage = "https://github.com/wolf9466/cpuminer-multi"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/misc/digitemp/default.nix b/pkgs/tools/misc/digitemp/default.nix new file mode 100644 index 00000000000..adf23e4bdf5 --- /dev/null +++ b/pkgs/tools/misc/digitemp/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "digitemp"; + version = "3.7.2"; + + src = fetchFromGitHub { + owner = "bcl"; + repo = "digitemp"; + rev = "v${version}"; + sha256 = "19zka5fcdxhhginaspak76l984iqq9v2j6qrwvi5mvca7bcj8f72"; + }; + + enableParallelBuilding = true; + + makeFlags = [ + "LOCK=no" + "ds9097" + "ds9097u" + ]; + + installPhase = '' + runHook preInstall + install -D -m555 -t $out/bin digitemp_* + install -D -m444 -t $out/share/doc/${pname} FAQ README + runHook postInstall + ''; + + meta = with lib; { + description = "Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"; + longDescription = '' + DigiTemp is a command line application used for reading 1-wire sensors like + the DS18S20 temperature sensor, or DS2438 battery monitor. DigiTemp supports + the following devices: + + DS18S20 (and older DS1820) Temperature Sensor + DS18B20 Temperature Sensor + DS1822 Temperature Sensor + DS2438 Battery monitor + DS2409 1-wire coupler (used in 1-wire hubs) + DS2422 Counter + DS2423 Counter + + The output format can be customized and all settings are stored in a + configuration file (.digitemprc) in the current directory. DigiTemp can + repeatedly read the sensors and output to stdout and/or to a logfile. + ''; + homepage = "https://www.digitemp.com"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 80afcb5cd9f..58f7da84fc0 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "sha256-P5Sq8ld6pPACHn7iOJ9Uk+zR8ZLxHVvnRyFfkfGGv6I="; + sha256 = "sha256-AAfpv1paEnHu1S2B8yC0hyYOj5deKTkCyLGvp6Roz64="; }; dontBuild = true; diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index ecbf298132f..3e78bc97732 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python2, xorg, makeWrapper }: stdenv.mkDerivation rec { pname = "disper"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python ]; + strictDeps = true; + + buildInputs = [ python2 ]; preConfigure = '' export makeFlags="PREFIX=$out" diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix index 2a2f44d8182..e9efd66b2f1 100644 --- a/pkgs/tools/misc/fdtools/default.nix +++ b/pkgs/tools/misc/fdtools/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation { homepage = "https://code.dogmap.org./fdtools/"; description = "A set of utilities for working with file descriptors"; license = lib.licenses.gpl2; - platforms = lib.platforms.all; + platforms = lib.platforms.linux; maintainers = [ lib.maintainers.Profpatsch ]; }; } diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix index e53c51c33e9..e9286e6a11e 100644 --- a/pkgs/tools/misc/fet-sh/default.nix +++ b/pkgs/tools/misc/fet-sh/default.nix @@ -2,26 +2,28 @@ stdenvNoCC.mkDerivation rec { pname = "fet-sh"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "6gk"; repo = "fet.sh"; rev = "v${version}"; - sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky"; + sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E="; }; - dontBuild = true; + postPatch = '' + patchShebangs fet.sh + ''; installPhase = '' - install -m755 -D ./fet.sh $out/bin/fet.sh + install -m755 -D fet.sh $out/bin/fet.sh ''; meta = with lib; { - description = "A fetch written in posix shell without any external commands (linux only)"; + description = "A fetch written in posix shell without any external commands"; homepage = "https://github.com/6gk/fet.sh"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ elkowar ]; }; diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix new file mode 100644 index 00000000000..1fcaf3a4711 --- /dev/null +++ b/pkgs/tools/misc/github-backup/default.nix @@ -0,0 +1,30 @@ +{ lib +, python3 +, git +, git-lfs +}: + +python3.pkgs.buildPythonApplication rec { + pname = "github-backup"; + version = "0.39.0"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47"; + }; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ git git-lfs ]) + ]; + + # has no unit tests + doCheck = false; + + meta = with lib; { + description = "Backup a github user or organization"; + homepage = "https://github.com/josegonzalez/python-github-backup"; + changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index b164c8c0ae0..d4c0c6e2143 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.159.0"; + version = "0.160.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-02uM37tulJ78IwOAqXm5Ym30kHVepnMBVg+eTMj34qQ="; + sha256 = "sha256-XrZlDYHGexBGxEhpFVjovUYE9Cpu/QaYp11JmBnqT8o="; }; - vendorSha256 = "sha256-whcHI/qkNBPYcR5WLWQCPdHiwYdLEOgorbAKTTYIWDk="; + vendorSha256 = "sha256-mzT9PLthx08Hil0DBxtw6/ouZrZZSfyElWro1iyJsTY="; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 19d2e862ec4..ad7a74e8137 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -35,7 +35,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04"; + version = "2.06-rc1"; in ( @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w"; + sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa"; }; patches = [ diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 8c24848f4b5..34b93403487 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kubespray/kargo-cli"; description = "A tool helps to deploy a kubernetes cluster with Ansible"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.gpl3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index ed186772ab7..2a63074c8d7 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "lazydocker"; - version = "0.10"; + version = "0.12"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8"; + sha256 = "sha256-bpc83DFAyrAQ3VI9saYe+10ZQqOHgscerRKRyjfYD4g="; }; goPackagePath = "github.com/jesseduffield/lazydocker"; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index cb02d87e22a..8c4cb5c1a75 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "13v5x8gyka2v4kx52khwalb6ai328z7kk9jlipbbbys63p6nyddr"; + sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU="; }; patches = [ diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index ad1210e9540..6c1f1759084 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-3kDaaPDRbhJyp/CblTKhB0dUeOjroCs3WkjEXL87Od4="; + sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g="; }; vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8="; diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index e6945f05129..66717912599 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -1,27 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "microplane"; - version = "0.0.26"; + version = "0.0.28"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm"; + sha256 = "00ayci0a4lv67sg2bb4fw5wpdlps4pjqiiam595dar82lsjwj63j"; }; - goPackagePath = "github.com/Clever/microplane"; - - subPackages = ["."]; - - # Regenerate deps.nix with the following steps: - # git clone git@github.com:Clever/microplane.git - # cd microplane - # git checkout v<version> - # dep2nix - - goDeps = ./deps.nix; + vendorSha256 = "0hn2gsm9bgmrm620fn2cx28l2gj1yfgvjix9ds50m7kwkx6q0dga"; buildFlagsArray = '' -ldflags="-s -w -X main.version=v${version}" diff --git a/pkgs/tools/misc/microplane/deps.nix b/pkgs/tools/misc/microplane/deps.nix deleted file mode 100644 index 2c8266c2dc6..00000000000 --- a/pkgs/tools/misc/microplane/deps.nix +++ /dev/null @@ -1,228 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1"; - sha256 = "1p1ncq4vv244w9v144vplsb2vbl3369wdxn4gc7xbfafkjwn8bxc"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/facebookgo/errgroup"; - fetch = { - type = "git"; - url = "https://github.com/facebookgo/errgroup"; - rev = "779c8d7ef069c522bc72ee5f31a98d89a37f3fb6"; - sha256 = "1kyqrnvr158f5lgb1pbianjd8xnmxxvpgz7qilmp7zvr69gykbas"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "130e6b02ab059e7b717a096f397c5b60111cae74"; - sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "e881974953e6ab6d1a6a1610e98ed6401a3aa1ba"; - sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; - sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; - sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/nathanleiby/diffparser"; - fetch = { - type = "git"; - url = "https://github.com/nathanleiby/diffparser"; - rev = "936553ce5db1b73e63cbcd7546416d13538e8d85"; - sha256 = "0qlxkbda4l1glwxdy52fhk3bqkyyc55si4xplf54jpi2x9khi2v4"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; - sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"; - sha256 = "0k4xswdfd2ridj7m48ijb4klq9mxpw03g8h2rvq99yddi8vmlbvn"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; - }; - } - { - goPackagePath = "github.com/xanzy/go-gitlab"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/go-gitlab"; - rev = "ee3313ca5478c4786248d63dd75e4cd8e1fad2db"; - sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a"; - sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "aabf50738bcdd9b207582cbe796b59ed65d56680"; - sha256 = "0gq60lfzbyc6ggp5v3vbl6li818nmv0n32l9qf80ckpqpqkknkh5"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bb50c06baba3d0c76f9d125c0719093e315b5b44"; - sha256 = "19fkbykwjhwa0833cqcphv7sfwc1538ad5wlsdkgdwr59qb9d32i"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be"; - sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "28a7276518d399b9634904daad79e18b44d481bc"; - sha256 = "0qsj394qyy27iaf8srl7bkbsx7sp4aifrv3z2xllkydya8y18rv8"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } -] diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 7b40e213135..6843506cb8e 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-hTNwEspM1qlQkC6lD7N947tvS7O7RCIUYACvj4KYsAY="; + sha256 = "sha256-1LyDwQWC8cb3Sq8lZ9eDpZMcu5/yh0BJFuOWQ3iTtpY="; }; - cargoSha256 = "sha256-7G+h+g00T/aJ1cQ1SChxy8dq3CWWdHlx5DAH77xM9Oc="; + cargoSha256 = "sha256-11aP0/p9wC9o1KuM+CLAuHhZxuYff6nvJPj0/yjb1+E="; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/misc/paperlike-go/default.nix b/pkgs/tools/misc/paperlike-go/default.nix new file mode 100644 index 00000000000..0278fb1f791 --- /dev/null +++ b/pkgs/tools/misc/paperlike-go/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "paperlike-go"; + version = "unstable-2021-03-26"; + + src = fetchFromGitHub { + owner = "leoluk"; + repo = "paperlike-go"; + rev = "bd658d88ea9a3b21e1b301b96253abab7cf56d79"; + sha256 = "1h0n2n5w5pn3r08qf6hbmiib5m71br27y66ki9ajnaa890377qaj"; + }; + + subPackages = [ "cmd/paperlike-cli" ]; + + vendorSha256 = "00mn0zfivxp2h77s7gmyyjp8p5a1vysn73wwaalgajymvljxxx1r"; + + meta = { + description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC."; + homepage = "https://github.com/leoluk/paperlike-go"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.adisbladis ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix index f4572d0e5bc..90c128f8ac3 100644 --- a/pkgs/tools/misc/pdf-parser/default.nix +++ b/pkgs/tools/misc/pdf-parser/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication { homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; license = licenses.publicDomain; maintainers = [ maintainers.lightdiscord ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 0b5005b9c82..2cfbf5ae91a 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_78 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,mod,probe,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}" + wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_78 ]}" done ''; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 77f865a6a16..59bbe2c2ab1 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/graysky2/profile-cleaner"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index a3b613611fc..354075df549 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-1udmtstmTmoW45tvDSVQPoMymw5YRKMls1CmWnqIaNE="; + sha256 = "sha256-kRKU6ynZffV17GqEArkXxz6M9xoa3kn2yNqjyLRY0rc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index ef684aebe3c..bbe96bf6c29 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let ''; in stdenv.mkDerivation rec { pname = "remind"; - version = "03.03.01"; + version = "03.03.05"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "0y4l960529sl3sn4r4g36qpy3jk5h1x4algjy7an7sfiqb8n98fi"; + sha256 = "sha256-Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE="; }; nativeBuildInputs = optional tkremind makeWrapper; diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/tools/misc/rmtrash/default.nix index d50079f82c2..61b8ead738c 100644 --- a/pkgs/tools/misc/rmtrash/default.nix +++ b/pkgs/tools/misc/rmtrash/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper , trash-cli, coreutils, which, getopt }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "rmtrash"; version = "1.14"; @@ -12,9 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694"; }; - dontConfigure = true; - dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -35,5 +32,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ peelz ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index a3543c433ae..c589590abcf 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1bnnqrxsmp3z2qksd8h4lfbq4kxxy1cg4yynadz66lxyzabv2v21"; + sha256 = "1bmnwvjhw2ba7yqn9if83d57b8qbrbqgy2br8q2drz4ylk0gjirg"; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "0plk47i2xrn3x5yr3gw3pq74maqf4krb8d6i4sf8gil4mnpcgxir"; + cargoSha256 = "1d4ca8yzx437x53i7z2kddv9db89zy6ywbgl6y1cwwd6wscbrxcq"; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index b1e75f36b54..23ab5c16fba 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; - rev = version; - sha256 = "sha256-JzTWbkICOIfsHgMvpXz4bIWaXKKDAD8INSorMvnXiBw="; + rev = "v${version}"; + sha256 = "sha256-gszvWetreafIP9I8hi9zz24TOTSsGzDsm/vXJS6n4Q4="; }; - vendorSha256 = "sha256-r0c3y+nRc/hCTAT31DasQjxZN86BT8jnJmsLM7Ugrq4="; + vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE="; runVend = true; buildFlagsArray = [ diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/tools/misc/tz/default.nix new file mode 100644 index 00000000000..c0c6fe9ec33 --- /dev/null +++ b/pkgs/tools/misc/tz/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tz"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "oz"; + repo = "tz"; + rev = "v${version}"; + sha256 = "sha256-36nTau7xjABdeUOioHar28cuawFWW3DBaDH0YAvdufI="; + }; + + vendorSha256 = "sha256-Soa87I7oMa34LjYKxNAz9Limi0kQ6JUtb/zI4G7yZnw="; + + meta = with lib; { + description = "A time zone helper"; + homepage = "https://github.com/oz/tz"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/tools/misc/uwuify/default.nix b/pkgs/tools/misc/uwuify/default.nix new file mode 100644 index 00000000000..b90bd8bb46d --- /dev/null +++ b/pkgs/tools/misc/uwuify/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "uwuify"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "Daniel-Liu-c0deb0t"; + repo = "uwu"; + rev = "v${version}"; + sha256 = "sha256-tPmLqgrWi7wDoMjMrxodKp4S0ICwV9Kp7Pa151rHho0="; + }; + + cargoSha256 = "sha256-HUP6OEvoGJ/BtAl+yuGzqEp1bsxfGAh0UJtXz9/ZiK8="; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + meta = with lib; { + description = "Fast text uwuifier"; + homepage = "https://github.com/Daniel-Liu-c0deb0t/uwu"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index fc3b52878b5..85868977899 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.03.14"; + version = "2021.03.25"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3"; + sha256 = "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 56e139941b2..df369147d34 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-ATQRXYaIp1MKCO/EAPsopzFEZeNJzdk73/OcgjsMdkg="; + sha256 = "sha256-286rN3g6leSnbZZ0VjWl43nhBAMPJDUMv7DhgVTsjKw="; }; patches = [ diff --git a/pkgs/tools/misc/ytfzf/no-update.patch b/pkgs/tools/misc/ytfzf/no-update.patch index 07ca62cd943..13e57abb496 100644 --- a/pkgs/tools/misc/ytfzf/no-update.patch +++ b/pkgs/tools/misc/ytfzf/no-update.patch @@ -1,13 +1,13 @@ diff --git a/ytfzf b/ytfzf -index 5238682..c5c3a1a 100755 +index f7871c7..179c836 100755 --- a/ytfzf +++ b/ytfzf -@@ -757,23 +757,8 @@ clear_history () { +@@ -829,23 +829,8 @@ send_notify () { } update_ytfzf () { -- branch="$1" -- updatefile="/tmp/ytfzf-update" +- local branch="$1" +- local updatefile="/tmp/ytfzf-update" - curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile" - - if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then @@ -27,4 +27,4 @@ index 5238682..c5c3a1a 100755 + exit 1 } - + scrape_subscriptions () { diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index 724d25d49f9..7a4bd5adcba 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, python, gyp, util-linux }: +{ stdenv, lib, fetchgit, python2, util-linux }: stdenv.mkDerivation { pname = "bud"; @@ -11,10 +11,12 @@ stdenv.mkDerivation { sha256 = "08yr6l4lc2m6rng06253fcaznf6sq0v053wfr8bbym42c32z0xdh"; }; - buildInputs = [ - python gyp + nativeBuildInputs = [ + python2 python2.pkgs.gyp ] ++ lib.optional stdenv.isLinux util-linux; + strictDeps = true; + buildPhase = '' python ./gyp_bud -f make make -C out diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 112a95eccc6..300e03761a6 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python, pythonPackages, makeWrapper }: +{ lib, stdenv, fetchgit, python3Packages, makeWrapper }: stdenv.mkDerivation { @@ -12,7 +12,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ]; + propagatedBuildInputs = with python3Packages; [ requests vobject lxml ]; + + strictDeps = true; doCheck = false; # no test @@ -20,7 +22,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cp $src/carddav-util.py $out/bin - pythondir="$out/lib/${python.libPrefix}/site-packages" + pythondir="$out/lib/${python3Packages.python.sitePackages}" mkdir -p "$pythondir" cp $src/carddav.py "$pythondir" ''; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix deleted file mode 100644 index b8fd0679892..00000000000 --- a/pkgs/tools/networking/ccnet/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl, which, autoreconfHook, pkg-config, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: - -stdenv.mkDerivation rec { - version = "6.1.8"; - seafileVersion = "6.1.8"; - pname = "ccnet"; - - src = fetchurl { - url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; - sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm"; - }; - - nativeBuildInputs = [ pkg-config which autoreconfHook vala python ]; - propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; - - configureFlags = [ "--enable-server" ]; - - meta = with lib; { - homepage = "https://github.com/haiwen/ccnet"; - description = "A framework for writing networked applications in C"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 8c57d946950..8e9097f2f99 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.11"; + version = "8.6.12"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+ej6Q2XczWVcu7lMRjt+Sj2FZxlfFSepE6crCFgPuoc="; + sha256 = "sha256-Oad0JpeeCpIHfH9e1pTKtrnvZ+eFx3dR5GP6g6piFS0="; }; - vendorSha256 = "sha256-50ESG3GL9BcTaGp1Q5rc1XklF3H7WKcyM1yq7SZa2QE="; + vendorSha256 = "sha256-LYMZFaCNlJg+9Hoh2VbY6tMHv6oT7r+JHBcQYpOceRQ="; doCheck = false; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index af4ae7ed769..f40ef295d13 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, python +{ lib, stdenv, fetchFromGitHub, python2 , unzip, makeWrapper }: let - python' = python.override { + python' = python2.override { packageOverrides = self: super: { docker = self.buildPythonPackage rec { name = "docker-${version}"; @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { cat > $out/bin/dd-jmxfetch <<EOF #!/usr/bin/env bash - exec ${python}/bin/python $out/agent/jmxfetch.py $@ + exec ${python'.interpreter} $out/agent/jmxfetch.py $@ EOF chmod a+x $out/bin/dd-jmxfetch diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 375d0dc1625..871dd5ee5bd 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5BwSRHqsCLAD/p8U0zblAhtkpzkPVzHvS4VaTAYNF9o="; + sha256 = "sha256-oOq5Y/6n7VHU9WPjnt+moVWZgo8mQl6Jd8daLJ2/pSQ="; }; vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM="; diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 90f969f2d76..e6f3a2f1088 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "getmail6"; - version = "6.14"; + version = "6.15"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1a3bw4wwdapd9n051dgwqldd8gwiipb5shaz08qwp1jndpvylm7d"; + sha256 = "0cvwvlhilrqlcvza06lsrm5l1yazzvym3s5kcjxcm9cminfaf4qb"; }; doCheck = false; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 8c0e093f9dd..318a56df6f5 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "0r7w1c3rh0wnsrhdpzr2fp1aqdqafrb42f2hra6xwwspr092ixq0"; + sha256 = "sha256-1IG1AKMz6WzDDbdZnSaAS4HHlPApCG1qND7xJcQ97Hk="; }; - vendorSha256 = "0dmd4r6x76jn8pyvp47x4llzc2wij5m9lchgyaagcb5sfdgbns9x"; + vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 1b2b0f2deb3..70b663edded 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-03-12T03-36-59Z"; + version = "2021-03-23T05-46-11Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-aIJjr7KaT4E4Q1Ho4D0emduJWFxdCXCodq7J43r0DMQ="; + sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4="; }; - vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo="; + vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ="; doCheck = false; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 8f46e657edb..4553063929f 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe -, xapian, glib, gmime3, texinfo , emacs, guile +, xapian, glib, gmime3, texinfo, emacs, guile , gtk3, webkitgtk, libsoup, icu +, makeWrapper , withMug ? false , batchSize ? null }: @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) guile ++ lib.optionals withMug [ gtk3 webkitgtk ]; - nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ]; + nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ]; enableParallelBuilding = true; @@ -37,8 +38,12 @@ stdenv.mkDerivation rec { --replace "@abs_top_builddir@" "$out" ''; - # Install mug - postInstall = lib.optionalString withMug '' + # Make sure included scripts can find their dependencies & optionally install mug + postInstall = '' + wrapProgram "$out/bin/mu" \ + --prefix LD_LIBRARY_PATH : "$out/lib" \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2" + '' + lib.optionalString withMug '' for f in mug ; do install -m755 toys/$f/$f $out/bin/$f done diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix new file mode 100644 index 00000000000..583189f57db --- /dev/null +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "oapi-codegen"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "deepmap"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-edIm1O+LQdmKhH8/5WuSsxVtOcf3VlkObGjIY+30mms="; + }; + + vendorSha256 = "sha256-lhWnPZavtBEa4A76rvr0xw3L5W6HYK1Uw+PW8z8gWuU="; + + # Tests use network + doCheck = false; + + meta = with lib; { + description = "Go client and server OpenAPI 3 generator"; + homepage = "https://github.com/deepmap/oapi-codegen"; + license = licenses.asl20; + maintainers = [ maintainers.j4m3s ]; + }; +} diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 6159201bac8..be19656f1c2 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,9 +1,8 @@ -{ lib, stdenv, skawarePackages +{ lib, skawarePackages # Whether to build the TLS/SSL tools and what library to use -# acceptable values: "libressl", false -# TODO: add bearssl -, sslSupport ? "libressl" , libressl +# acceptable values: "bearssl", "libressl", false +, sslSupport ? "bearssl" , libressl, bearssl }: with skawarePackages; @@ -11,6 +10,7 @@ let sslSupportEnabled = sslSupport != false; sslLibs = { libressl = libressl; + bearssl = bearssl; }; in @@ -58,7 +58,7 @@ buildPackage { # remove all s6 executables from build directory rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) rm minidentd - rm libs6net.* libstls.* libs6tls.* + rm libs6net.* libstls.* libs6tls.* libsbearssl.* mv doc $doc/share/doc/s6-networking/html ''; diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index 452718ebc9c..68b4859a5fb 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "0lkz25z0qy1giss4rnhkx9fvsdd8ckf4z1gqw46zl664x96bb705"; + sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk="; }; - cargoSha256 = "01ya9535whi2kviw57f25n8h05ckpb4bq1h7qav6srai97rm937s"; + cargoSha256 = "sha256-BUo3Y2tLvhOrk2w2GzYeWKpXH7TAOEdBI6vVtW2/cCs="; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Secure multithreaded packet sniffer"; homepage = "https://github.com/kpcyrd/sniffglue"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ xrelkd ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 1d1736cd816..7acdc2d7e9c 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -1,22 +1,31 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security +, libiconv }: rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.7.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "0b7q0xbfbrhvpnxbm9bd1ncdza9k2kcmcir3qhqzb2pgsb5b5njx"; + sha256 = "cOlya3ngIoaoqzh0fIbNAjwO7S7wZCQk7WVqgZona8A="; }; - cargoSha256 = "02fgqys9qf0jzs2n230pyj151v6xbm6wm2rd9qm5gsib6zaq7gfa"; + cargoSha256 = "5B2fY+S9z6o+CHCIK93+Yj8dpaiQi4PSMQw1mfXg1NA="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]; + + # Get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = 1; checkFlagsArray = [ "--skip=basic_options" ]; + # Nix build happens in sandbox without internet connectivity + # disable tests as some of them require internet due to nature of application + doCheck = false; doInstallCheck = true; postInstallCheck = '' $out/bin/xh --help > /dev/null diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix index 275cc88e597..1a3d3ed7a35 100644 --- a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix +++ b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fping libowlevelzs net-snmp ]; + buildInputs = [ libowlevelzs net-snmp ]; postPatch = '' substituteInPlace src/confent.cxx \ - --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping" + --replace /usr/sbin/fping "${fping}/bin/fping" ''; meta = with lib; { diff --git a/pkgs/tools/networking/zs-wait4host/default.nix b/pkgs/tools/networking/zs-wait4host/default.nix index 4c8342256c7..b6b4c985dfe 100644 --- a/pkgs/tools/networking/zs-wait4host/default.nix +++ b/pkgs/tools/networking/zs-wait4host/default.nix @@ -1,4 +1,4 @@ -{ bash, coreutils, fetchurl, fping, lib, stdenvNoCC }: +{ coreutils, fetchurl, fping, lib, stdenvNoCC }: stdenvNoCC.mkDerivation rec { pname = "zs-wait4host"; @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { sha256 = "9F1264BDoGlRR7bWlRXhfyvxWio4ydShKmabUQEIz9I="; }; - buildInputs = [ bash coreutils fping ]; - postPatch = '' for i in zs-wait4host zs-wait4host-inf; do substituteInPlace "$i" \ diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 12bf27165f7..d5be54b71b0 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; + # enables `cargo audit fix` + cargoBuildFlags = [ "--features fix" ]; + # The tests require network access which is not available in sandboxed Nix builds. doCheck = false; diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 1b8aa8fc3f9..735c940f18b 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE="; + sha256 = "sha256-lBCGSeEVxlXrn1RHqMEYSXLOehJw/DiL+33nx4+rV2Y="; }; - cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8="; + cargoSha256 = "sha256-QL71pJ5RBWRRse5DXwctMvu+z818jEEQjaNBXHLy20Y="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 8897a313e8d..db60d5e8429 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2021-01-16"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "8127799f79ee96129b295d78294f40a54078131f"; - sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns"; + rev = "ddcd476603dfd3388b1dc8234fa9d550156a51f5"; + sha256 = "sha256-E6ABXtzw6bHmrIirB1sJL6S2MEa3sfcvRLzRa92frCo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 352a6a54665..e2cb9ec20b4 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -10,7 +10,7 @@ let common = { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz - , bash, coreutils, gzip, gnutar + , bash, coreutils, util-linuxMinimal, gzip, gnutar , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive, libcpuid @@ -41,6 +41,7 @@ common = nativeBuildInputs = [ pkg-config ] + ++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive @@ -139,8 +140,13 @@ common = doInstallCheck = true; # not cross # socket path becomes too long otherwise - preInstallCheck = lib.optional stdenv.isDarwin '' + preInstallCheck = lib.optionalString stdenv.isDarwin '' export TMPDIR=$NIX_BUILD_TOP + '' + + # tests/ca/substitute.sh is flakey for some reason, so we skip it + # for now. https://github.com/NixOS/nix/issues/4667 + lib.optionalString is24 '' + echo "exit 99" > tests/ca/substitute.sh ''; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 45d6349af40..7e00c0b07cf 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf +{ stdenv, lib, fetchFromGitHub, python2Packages, nasm, libelf , kernel ? null, withDriver ? false }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "chipsec"; version = "1.5.1"; diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index eae5a5256df..23022f92b6a 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }: +{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python3, coreutils }: stdenv.mkDerivation rec { pname = "cipherscan"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python ]; + buildInputs = [ python3 ]; + + strictDeps = true; buildPhase = '' substituteInPlace cipherscan --replace '$0' 'cipherscan' diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix new file mode 100644 index 00000000000..a49123aded2 --- /dev/null +++ b/pkgs/tools/security/cosign/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cosign"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = "v${version}"; + sha256 = "0rgq29vi0h378j0bqs53gjgp246rqxfpk6rwskzrmawgry0zr8pk"; + }; + + vendorSha256 = "0pcp3wdvwq06ajdfbgadyq0ipfj65n276hj88p5v6wqfn821ahd6"; + + subPackages = [ "cmd/cosign" ]; + + meta = with lib; { + homepage = "https://github.com/sigstore/cosign"; + changelog = "https://github.com/sigstore/cosign/releases/tag/v${version}"; + description = "Container Signing CLI with support for ephemeral keys and Sigstore signing"; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse ]; + }; +} diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 6d67f038e4a..13bbdbb99d4 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,25 +1,29 @@ -{ buildGoModule +{ lib +, buildGoModule , docker , fetchFromGitHub -, lib }: buildGoModule rec { pname = "grype"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/OgAh33DF0UkBcc5GriGgeoZ7kae9GhGnUnIX6lGlys="; + sha256 = "sha256-X67TEHKmKKuTFGo55ZVkYVNw4f/d8aU2b/FQsq1OIJg="; }; vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo="; propagatedBuildInputs = [ docker ]; - # tests require a running Docker instance + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/anchore/grype/internal/version.version=${version}") + ''; + + # Tests require a running Docker instance doCheck = false; meta = with lib; { diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index c177726bbb1..d556566a7d5 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1637"; + version = "1661"; src = fetchurl { url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - sha256 = "09z3wbv38dc8wnw1q961s6bcd0kvz2xkjp6dxg4kn914fwzlqfnx"; + sha256 = "sha256-VRRZKK0rJPNL5qDqz5+0kuEODqkZuEKMch+pcOhdYUc="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 855ffc6fdba..db4d14ba3ed 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "ldeep"; - version = "1.0.9"; + version = "1.0.10"; src = fetchPypi { inherit pname version; - sha256 = "0n38idkn9hy31m5xkrc36dmw364d137c7phssvj76gr2gqsrqjy3"; + sha256 = "sha256-/7mcmAj69NmuiK+xlQijAk39sMLDX8kHatmSI6XYbwE="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index cb6ee5aefe0..7c2f230266e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.34" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.37" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 17d21d96423..85d41fba9f9 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 010e4d5a643a857e09bafbcf79b541e607de3c4c - ref: refs/tags/6.0.34 + revision: eae71004c4a1720d9af1513ca750cfe116d99a7b + ref: refs/tags/6.0.37 specs: - metasploit-framework (6.0.34) + metasploit-framework (6.0.37) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -30,9 +30,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.37) + metasploit-payloads (= 2.0.39) metasploit_data_models - metasploit_payloads-mettle (= 1.0.6) + metasploit_payloads-mettle (= 1.0.7) mqtt msgpack nessus_rest @@ -123,22 +123,22 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.432.0) + aws-partitions (1.435.0) aws-sdk-core (3.113.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.227.0) + aws-sdk-ec2 (1.230.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.49.0) + aws-sdk-iam (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.91.0) + aws-sdk-s3 (1.93.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -183,7 +183,7 @@ GEM http_parser.rb (0.6.0) i18n (1.8.9) concurrent-ruby (~> 1.0) - io-console (0.5.8) + io-console (0.5.9) irb (1.3.4) reline (>= 0.1.5) jmespath (1.4.0) @@ -212,7 +212,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.37) + metasploit-payloads (2.0.39) metasploit_data_models (4.1.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -223,7 +223,7 @@ GEM railties (~> 5.2.2) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.6) + metasploit_payloads-mettle (1.0.7) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.4) @@ -323,7 +323,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.26) + rex-socket (0.1.29) rex-core rex-sslscan (0.1.6) rex-core diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index b5fb78fd1f3..4a3da7d7f3f 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.34"; + version = "6.0.37"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-sKt1hN7thNhA+bjeFF3gxJs/82EPXPiM81zcMpDRDyg="; + sha256 = "sha256-q6/1GW02C1z5nQwAKXU7xbVVviwXwS+XS7ZfNjJryiA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index edd4d305fd8..0be20b68769 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg"; + sha256 = "13hy3xhff1cqlzv5hi3lz7vb11wh10m6221hq471d8m94chmmkjs"; type = "gem"; }; - version = "1.432.0"; + version = "1.435.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,20 +134,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhpwxad3yc5c3a8jmp116qx5jmym0ykpv39iwdq5km4h3as6h2d"; + sha256 = "1c7qqly2f94db3643xwjj9mcb34vilx11awbv40v2f8z7xisvvz3"; type = "gem"; }; - version = "1.227.0"; + version = "1.230.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7vnkwh6z7nxgpmdw8hy70wxiimszyp644vmj8p1pr7ybz6sv9l"; + sha256 = "0x2768blsy8lpib9pi2f2d67flabar3bq6chmbj07iqzpwvpz569"; type = "gem"; }; - version = "1.49.0"; + version = "1.51.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs3zg9d3lzi7rwys4qv62mcmga39s4rg4rmb0dalqknz6lqzhrq"; + sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94"; type = "gem"; }; - version = "1.91.0"; + version = "1.93.0"; }; aws-sigv4 = { groups = ["default"]; @@ -424,10 +424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0prpvq05wzp8n7vk44zcwmn53p1akn4r105n5py6bmbxsmmkvyhr"; + sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja"; type = "gem"; }; - version = "0.5.8"; + version = "0.5.9"; }; irb = { groups = ["default"]; @@ -514,12 +514,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "010e4d5a643a857e09bafbcf79b541e607de3c4c"; - sha256 = "0a0gs6835p2wyf6ghp0gc7rkz6y4w1fi9pmqz50di17dvs27baxh"; + rev = "eae71004c4a1720d9af1513ca750cfe116d99a7b"; + sha256 = "086adcr3cpxn9fbjzh8p5jz5bdf57dsjj00ckpwmq2rndlczbbxb"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.34"; + version = "6.0.37"; }; metasploit-model = { groups = ["default"]; @@ -536,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mf1c50j2gszxspnn9f2d356z8aaiv9s9x8lpdi05cf6syvhsa2k"; + sha256 = "1ibvh45sbmzdn6gsd3dgj1a67mhgy6p3hvjbh9b2qb7ijc14gv49"; type = "gem"; }; - version = "2.0.37"; + version = "2.0.39"; }; metasploit_data_models = { groups = ["default"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mxhybic6myh993fs4jmp0hz998ryf362y0b33wqanff1n8aj75k"; + sha256 = "1ivxz2wl9k0j7ba7xas0bfm44c1iczfvlgyxhsgqbpqkqwc374vg"; type = "gem"; }; - version = "1.0.6"; + version = "1.0.7"; }; method_source = { groups = ["default"]; @@ -1066,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mgk44f55w2g536nkxbg62qq5cfr05qxldglfr3yf94qkkanl2gg"; + sha256 = "0ar9vm8pwjz7c11kr3pjnxbgk68f2i5k1r9j3r34pfq9n26s79gr"; type = "gem"; }; - version = "0.1.26"; + version = "0.1.29"; }; rex-sslscan = { groups = ["default"]; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index dd915a36e47..1c1b0e41068 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NM/Ggd5MKctQKE0MNawyE+Xciuj9++6DXXkMrrpfkhA="; + sha256 = "sha256-QF9w3ZrW+Mbl6EOC1n2848+q71AhxXTf0j//Us9L1r8="; }; - vendorSha256 = "sha256-h+MuMfIKXgXzLU6hNMxfPXawic9UZrwzVlzjjRF7X3o="; + vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU="; preBuild = '' mv v2/* . diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 936bd7eda91..ca3e1feef3e 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-8rISyZdxxGqpZlOc4ziY33tMRK/w4fiTVCiK5RVBDvw="; + sha256 = "sha256-XJcNhIMu60H5LmoRzMqhPq33cCU9PBPfIIUtaSnmrH8="; }; - cargoSha256 = "sha256-sxYm6uNTvBZsjzHywduq0fhnqZMbECLqxq8yg3ZxtVU="; + cargoSha256 = "sha256-4l/KQMtGfZX5Rg35AJxvwzg3aAzuPK2iKrHDRgIw+bg="; postPatch = '' # The GPGME backend is recommended diff --git a/pkgs/tools/security/pwncat/default.nix b/pkgs/tools/security/pwncat/default.nix new file mode 100644 index 00000000000..559dc8d8e3c --- /dev/null +++ b/pkgs/tools/security/pwncat/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonApplication +, fetchPypi +}: + +buildPythonApplication rec { + pname = "pwncat"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sfdqphs0v3lj3vffda4w05r6sqir7qafa8lmlh0wr921wyiqwag"; + }; + + # Tests requires to start containers + doCheck = false; + + meta = with lib; { + description = " TCP/UDP communication suite"; + homepage = "https://pwncat.org/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sipvicious/default.nix b/pkgs/tools/security/sipvicious/default.nix new file mode 100644 index 00000000000..8403019a341 --- /dev/null +++ b/pkgs/tools/security/sipvicious/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +}: + +buildPythonApplication rec { + pname = "sipvicious"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "EnableSecurity"; + repo = pname; + rev = "v${version}"; + sha256 = "17f6w7qh33zvlhqwf22y9y7skha0xjs46yk66q8xm4brsv4lfxxa"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "sipvicious" ]; + + meta = with lib; { + description = " Set of tools to audit SIP based VoIP systems"; + homepage = "https://github.com/EnableSecurity/sipvicious"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/tools/security/slowhttptest/default.nix new file mode 100644 index 00000000000..5dce5d5439a --- /dev/null +++ b/pkgs/tools/security/slowhttptest/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, fetchFromGitHub +, openssl +}: + +stdenv.mkDerivation rec { + pname = "slowhttptest"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "shekyan"; + repo = pname; + rev = "v${version}"; + sha256 = "1xv2j3hl4zj0s2cxcsvlwgridh9ap4g84g7c4918d03id15wydcx"; + }; + + buildInputs = [ openssl ]; + + meta = with lib; { + description = "Application Layer DoS attack simulator"; + homepage = "https://github.com/shekyan/slowhttptest"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index ae6f000fe3f..ec1ade20a19 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,22 +2,23 @@ buildGoModule rec { pname = "sops"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "mozilla"; repo = pname; - sha256 = "0xl53rs8jzq5yz4wi0vzsr6ajsaf2x2n1h3x7krk02a9839y6f18"; + sha256 = "1a0v1jgbz8n3dymzr2shg2ms9sxjwaci209ldzq8v4g737v10zgm"; }; - vendorSha256 = "1cpm06dyc6lb3a9apfggyi16alb2yijvyan1gbrl8r9fwlqvdpjk"; + vendorSha256 = "1qaml2h3c8fhmi8ahp2fmd0hagqp5xqaf8jxjh4mfmbv2is3yz1l"; doCheck = false; meta = with lib; { homepage = "https://github.com/mozilla/sops"; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; + changelog = "https://github.com/mozilla/sops/raw/v${version}/CHANGELOG.rst"; maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix deleted file mode 100644 index cb2a0473cf1..00000000000 --- a/pkgs/tools/security/steghide/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}: - -stdenv.mkDerivation rec { - buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; - version = "0.5.1"; - pname = "steghide"; - - src = fetchurl { - url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; - sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b"; - }; - - patches = [ - ./patches/steghide-0.5.1-gcc34.patch - ./patches/steghide-0.5.1-gcc4.patch - ./patches/steghide-0.5.1-gcc43.patch - ]; - - # AM_CXXFLAGS needed for automake - preConfigure = '' - export AM_CXXFLAGS="$CXXFLAGS -std=c++0x" - ''; - - meta = with lib; { - homepage = "http://steghide.sourceforge.net/"; - description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch deleted file mode 100644 index 373316c7840..00000000000 --- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- steghide-0.5.1.old/src/Makefile.am -+++ steghide-0.5.1.new/src/Makefile.am 2004-07-16 19:01:39.673947633 +0200 -@@ -33,5 +33,5 @@ - WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc - LIBS = @LIBINTL@ @LIBS@ - localedir = $(datadir)/locale --LIBTOOL = $(SHELL) libtool -+LIBTOOL = $(SHELL) libtool --tag=CXX - MAINTAINERCLEANFILES = Makefile.in ---- steghide-0.5.1.old/src/AuSampleValues.cc -+++ steghide-0.5.1.new/src/AuSampleValues.cc 2004-07-16 18:59:18.934578427 +0200 -@@ -17,21 +17,21 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ -- -+#include "common.h" - #include "AuSampleValues.h" - - // AuMuLawSampleValue --const BYTE AuMuLawSampleValue::MinValue = 0 ; --const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ; -+template<> const BYTE AuMuLawSampleValue::MinValue = 0 ; -+template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ; - - // AuPCM8SampleValue --const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ; --const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ; -+template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ; -+template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ; - - // AuPCM16SampleValue --const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ; --const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ; -+template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ; -+template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ; - - // AuPCM32SampleValue --const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ; --const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ; -+template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ; -+template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ; diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch deleted file mode 100644 index a8df1735e9d..00000000000 --- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h ---- steghide-0.5.1-orig/src/AuData.h 2003-09-28 09:30:29.000000000 -0600 -+++ steghide-0.5.1/src/AuData.h 2007-05-11 22:04:56.000000000 -0600 -@@ -26,22 +26,30 @@ - - // AuMuLawAudioData - typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ; -+template<> - inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; } -+template<> - inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; } - - // AuPCM8AudioData - typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ; -+template<> - inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; } -+template<> - inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; } - - // AuPCM16AudioData - typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ; -+template<> - inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; } -+template<> - inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; } - - // AuPCM32AudioData - typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ; -+template<> - inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; } -+template<> - inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; } - - #endif // ndef SH_AUDATA_H -diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc ---- steghide-0.5.1-orig/src/MHashPP.cc 2003-10-05 04:17:50.000000000 -0600 -+++ steghide-0.5.1/src/MHashPP.cc 2007-05-11 22:07:01.000000000 -0600 -@@ -120,7 +120,7 @@ - - std::string MHashPP::getAlgorithmName (hashid id) - { -- char *name = mhash_get_hash_name (id) ; -+ char *name = (char *) mhash_get_hash_name (id) ; - std::string retval ; - if (name == NULL) { - retval = std::string ("<algorithm not found>") ; diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch deleted file mode 100644 index ca66b9c544f..00000000000 --- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch +++ /dev/null @@ -1,349 +0,0 @@ ---- steghide-0.5.1.old/configure.in 2003-10-15 09:48:52.000000000 +0200 -+++ steghide-0.5.1.new/configure.in 2008-05-09 19:04:46.000000000 +0200 -@@ -7,27 +7,26 @@ - dnl checks for programs. - AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_AWK - AC_PROG_LN_S -+AC_CXX_COMPILE_STDCXX_0X - - dnl GNU gettext - AC_CHECK_FUNCS(strchr) - AM_GNU_GETTEXT - AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes) - - dnl check if debugging support is requested --AC_MSG_CHECKING([wether to enable debugging]) -+AC_MSG_CHECKING([whether to enable debugging]) - AC_ARG_ENABLE(debug,[ --enable-debug enable debugging], - if test "$enableval" = yes ; - then - AC_MSG_RESULT([yes]) - AC_DEFINE(DEBUG,1,[enable code used only for debugging]) -- CXXFLAGS="-O2 -Wall -g" - else - AC_MSG_RESULT([no]) -- CXXFLAGS="-O2 -Wall" - fi - , - AC_MSG_RESULT([no]) - CXXFLAGS="-O2 -Wall" - ) -@@ -213,7 +212,18 @@ - echo "libmhash can be downloaded from http://mhash.sourceforge.net/."; - echo "**********"; - AC_MSG_ERROR([[libmhash not found]]) - fi - -+dnl Should we add std=c++0x? -+ -+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes; -+then -+ CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra" -+else -+ CXXFLAGS="${CXXFLAGS} -Wall -Wextra" -+fi -+ -+AC_SUBST(CXXFLAGS) -+ - dnl create Makefiles - AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile]) ---- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4 1970-01-01 01:00:00.000000000 +0100 -+++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4 2008-05-09 19:04:46.000000000 +0200 -@@ -0,0 +1,107 @@ -+# =========================================================================== -+# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AC_CXX_COMPILE_STDCXX_0X -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the C++0x -+# standard. -+# -+# LAST MODIFICATION -+# -+# 2008-04-17 -+# -+# COPYLEFT -+# -+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. -+ -+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [ -+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags, -+ ac_cv_cxx_compile_cxx0x_native, -+ [AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ AC_TRY_COMPILE([ -+ template <typename T> -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check<check<bool>> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check<int> check_type; -+ check_type c; -+ check_type&& cr = c;],, -+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no) -+ AC_LANG_RESTORE -+ ]) -+ -+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x, -+ ac_cv_cxx_compile_cxx0x_cxx, -+ [AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS -std=c++0x" -+ AC_TRY_COMPILE([ -+ template <typename T> -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check<check<bool>> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check<int> check_type; -+ check_type c; -+ check_type&& cr = c;],, -+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no) -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ AC_LANG_RESTORE -+ ]) -+ -+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x, -+ ac_cv_cxx_compile_cxx0x_gxx, -+ [AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS -std=gnu++0x" -+ AC_TRY_COMPILE([ -+ template <typename T> -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check<check<bool>> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check<int> check_type; -+ check_type c; -+ check_type&& cr = c;],, -+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no) -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ AC_LANG_RESTORE -+ ]) -+ -+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes || -+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes || -+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then -+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ]) -+ fi -+]) ---- steghide-0.5.1.old/src/Arguments.cc 2003-10-11 23:25:04.000000000 +0200 -+++ steghide-0.5.1.new/src/Arguments.cc 2008-05-09 19:04:44.000000000 +0200 -@@ -26,10 +26,12 @@ - #include "Terminal.h" - #include "common.h" - #include "error.h" - #include "msg.h" - -+float Arguments::Default_Goal = 100.0 ; -+ - // the global Arguments object - Arguments Args ; - - Arguments::Arguments (int argc, char* argv[]) - { ---- steghide-0.5.1.old/src/Arguments.h 2003-10-11 23:23:57.000000000 +0200 -+++ steghide-0.5.1.new/src/Arguments.h 2008-05-09 19:04:44.000000000 +0200 -@@ -98,11 +98,11 @@ - static const bool Default_EmbedEmbFn = true ; - static const bool Default_Force = false ; - static const VERBOSITY Default_Verbosity = NORMAL ; - static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats - static const unsigned int Max_Algorithm = 3 ; -- static const float Default_Goal = 100.0 ; -+ static float Default_Goal ; - static const DEBUGCOMMAND Default_DebugCommand = NONE ; - static const bool Default_Check = false ; - static const unsigned int Default_DebugLevel = 0 ; - static const unsigned int Default_GmlGraphRecDepth = 0 ; - static const unsigned int Default_GmlStartVertex = 0 ; ---- steghide-0.5.1.old/src/EncryptionMode.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/EncryptionMode.h 2008-05-09 19:04:46.000000000 +0200 -@@ -69,11 +69,11 @@ - static const unsigned int NumValues = 8 ; - IRep Value ; - - typedef struct struct_Translation { - IRep irep ; -- char* srep ; -+ const char* srep ; - } Translation ; - static const Translation Translations[] ; - } ; - - #endif // ndef SH_ENCMODE_H ---- steghide-0.5.1.old/src/Graph.cc 2003-10-11 23:54:26.000000000 +0200 -+++ steghide-0.5.1.new/src/Graph.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -20,10 +20,12 @@ - - #include <ctime> - #include <list> - #include <map> - #include <vector> -+#include <algorithm> -+#include <climits> - - #include "BitString.h" - #include "CvrStgFile.h" - #include "Edge.h" - #include "Graph.h" ---- steghide-0.5.1.old/src/Matching.cc 2003-10-11 23:54:30.000000000 +0200 -+++ steghide-0.5.1.new/src/Matching.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -16,10 +16,11 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -+#include <algorithm> - #include "Edge.h" - #include "Graph.h" - #include "Matching.h" - #include "ProgressOutput.h" - #include "common.h" ---- steghide-0.5.1.old/src/ProgressOutput.cc 2003-10-11 11:20:51.000000000 +0200 -+++ steghide-0.5.1.new/src/ProgressOutput.cc 2008-05-09 19:04:44.000000000 +0200 -@@ -21,10 +21,12 @@ - #include <cmath> - - #include "ProgressOutput.h" - #include "common.h" - -+float ProgressOutput::NoAvgWeight = 1.0 ; -+ - ProgressOutput::ProgressOutput () - : Message("__nomessage__") - { - LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time - } ---- steghide-0.5.1.old/src/ProgressOutput.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/ProgressOutput.h 2008-05-09 19:04:44.000000000 +0200 -@@ -60,13 +60,13 @@ - /** - * update the output appending rate, [average edge weight], "done" and a newline - * \param rate the rate of matched vertices - * \param avgweight the average edge weight (is not printed if not given) - **/ -- void done (float rate, float avgweight = NoAvgWeight) const ; -+ void done (float rate, float avgweight = 1.0) const ; - -- static const float NoAvgWeight = -1.0 ; -+ static float NoAvgWeight ; - - protected: - std::string vcompose (const char *msgfmt, va_list ap) const ; - - private: ---- steghide-0.5.1.old/src/SMDConstructionHeuristic.cc 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/SMDConstructionHeuristic.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -16,10 +16,12 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -+#include <algorithm> -+ - #include "Edge.h" - #include "Graph.h" - #include "Matching.h" - #include "SMDConstructionHeuristic.h" - #include "Vertex.h" ---- steghide-0.5.1.old/src/WavFile.cc 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/WavFile.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -19,10 +19,11 @@ - */ - - #include <cstdio> - #include <cstdlib> - #include <cstring> -+#include <algorithm> - - #include "CvrStgFile.h" - #include "DFSAPHeuristic.h" - #include "SampleValueAdjacencyList.h" - #include "SMDConstructionHeuristic.h" ---- steghide-0.5.1.old/src/wrapper_hash_map.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/wrapper_hash_map.h 2008-05-09 19:04:46.000000000 +0200 -@@ -25,17 +25,21 @@ - - #ifdef __GNUC__ - # if __GNUC__ < 3 - # include <hash_map.h> - namespace sgi { using ::hash ; using ::hash_map ; } ; --# else -+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 ) - # include <ext/hash_map> --# if __GNUC_MINOR__ == 0 -+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0 - namespace sgi = std ; // GCC 3.0 - # else - namespace sgi = __gnu_cxx ; // GCC 3.1 and later - # endif -+# else -+# include <unordered_map> -+# define hash_map unordered_map -+ namespace sgi = std ; - # endif - #else - namespace sgi = std ; - #endif - ---- steghide-0.5.1.old/src/wrapper_hash_set.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/wrapper_hash_set.h 2008-05-09 19:04:46.000000000 +0200 -@@ -26,17 +26,21 @@ - - #ifdef __GNUC__ - # if __GNUC__ < 3 - # include <hash_set.h> - namespace sgi { using ::hash ; using ::hash_set ; } ; --# else -+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 ) - # include <ext/hash_set> --# if __GNUC_MINOR__ == 0 -+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0 - namespace sgi = std ; // GCC 3.0 - # else - namespace sgi = ::__gnu_cxx ; // GCC 3.1 and later - # endif -+# else -+# include <unordered_set> -+# define hash_set unordered_set -+ namespace sgi = std ; - # endif - #else - namespace sgi = std ; - #endif - diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 0ef2f7509b6..4c94e2544c7 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "teler"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - sha256 = "sha256-FZG23j7LUwfJ0dSbU4xW0YyCKJxOjVf1uqkuGlrwnqs="; + sha256 = "sha256-lExZWFj0PQFUBJgfhahF8PfYaOndRxKyVHoMlubmEpc="; }; - vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys="; + vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE="; preBuild = '' buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}") diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 0b6c95cafd2..f8e831ef2c3 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9"; + sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 59082c89f7d..fc8b2865f25 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.6.3"; + version = "1.7.0"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4"; + sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my"; + sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j"; + sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i"; + sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg"; }; }; @@ -35,9 +35,13 @@ in stdenv.mkDerivation { sourceRoot = "."; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/bash-completion/completions mv vault $out/bin echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/security/zgrab2/default.nix b/pkgs/tools/security/zgrab2/default.nix new file mode 100644 index 00000000000..b8863a6a94e --- /dev/null +++ b/pkgs/tools/security/zgrab2/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zgrab2"; + version = "20210327-${lib.strings.substring 0 7 rev}"; + rev = "17a5257565c758e2b817511d15476d330be0a17a"; + + src = fetchFromGitHub { + owner = "zmap"; + repo = pname; + inherit rev; + sha256 = "1hxk2jggj8lww97lwmks46i001p5ycnxnck8yya6d0fd3ayxvw2w"; + }; + + vendorSha256 = "1s0azy5b5hi5h24vs6a9f1n70l980vkid28ihqh10zq6ajmds2z3"; + + subPackages = [ "cmd/zgrab2" ]; + + meta = with lib; { + description = "Web application scanner"; + homepage = "https://github.com/zmap/zgrab2"; + license = with licenses; [ asl20 isc ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 5b3a584bd24..c01a909668e 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, pythonPackages +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, python3Packages , libevdev }: @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah"; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook python3Packages.python ]; - buildInputs = [ pythonPackages.python pythonPackages.evdev libevdev ]; + buildInputs = [ python3Packages.evdev libevdev ]; + + strictDeps = true; meta = with lib; { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index d34f0d4b737..fc4ea8d6b33 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper -, libaio, python, zlib +, libaio, python3, zlib , withGnuplot ? false, gnuplot ? null }: stdenv.mkDerivation rec { @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ="; }; - buildInputs = [ python zlib ] + buildInputs = [ python3 zlib ] ++ lib.optional (!stdenv.isDarwin) libaio; nativeBuildInputs = [ makeWrapper ]; + strictDeps = true; + enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 303e78d82ed..c57c2766984 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3qx9nL1lzVbtvVW3O9kQw4FoVuCqo8fxl8u1WXZNRFs="; + sha256 = "sha256-fQzKWgePF7SszYMwRSB3s59AmVjvzMvXPM49PXFTBGM="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index b3b084fbe71..bf6589eb66b 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, lib, stdenv, libuuid, popt, icu, ncurses }: +{ fetchurl, lib, stdenv, libuuid, popt, icu, ncurses, nixosTests }: stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "sha256-3cVR1kOlPwvURANF064yxJsEp5fpwBA26kYLa7QWjKg="; + sha256 = "sha256-dUAEt/hbJ5KHx6w8BGmx1+Dq4EOpei5YewVgyl84KMA="; }; postPatch = '' @@ -37,10 +37,15 @@ stdenv.mkDerivation rec { done ''; + passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isx86 { + installer-simpleLabels = nixosTests.installer.simpleLabels; + }; + meta = with lib; { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; homepage = "https://www.rodsbooks.com/gdisk/"; platforms = platforms.all; + maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 2f0e2c600d0..e7d6130ffa6 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation { url = "https://github.com/ipmitool/ipmitool/commit/5db314f694f75c575cd7c9ffe9ee57aaf3a88866.patch"; sha256 = "01niwrgajhrdhl441gzmw6v1r1yc3i8kn98db4b6smfn5fwdp1pa"; }) + (fetchpatch { + name = "CVE-2020-5208.patch"; + url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch"; + sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY="; + }) ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index cd4eef89520..ac980e6c36c 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -1,23 +1,45 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: -buildPythonApplication rec { +stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; - repo = "ROC-smi"; + repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-0QqaBMkqRVEl89x3hvWQGAgt7LbtMZPhuf7KenQYHaQ="; + hash = "sha256-LEaC1XhmyoVWrpL05MhgN02LVT2rLKdnw9g2QdfM/uE="; }; - format = "other"; + nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; - dontConfigure = true; - dontBuild = true; + postPatch = '' + # Upstream ROCm is installed in an /opt directory. For this reason, + # it does not completely follow FHS layout, creating top-level + # rocm_smi, oam, and bindings top-level directories. Since rocm-smi + # is a package that is typically installed, we change the paths to + # follow FHS more closely. - installPhase = '' - install -Dm0755 rocm_smi.py $out/bin/rocm-smi + # rocm_smi libraries and headers go into lib and include. Bindings + # go into lib/rocm_smi/bindings. + substituteInPlace rocm_smi/CMakeLists.txt \ + --replace "DESTINATION rocm_smi/" "DESTINATION " \ + --replace "DESTINATION bindings" "DESTINATION lib/rocm_smi/bindings" \ + --replace "../rocm_smi/bindings/rsmiBindings.py" "../lib/rocm_smi/bindings/rsmiBindings.py" \ + --replace 'DESTINATION ''${ROCM_SMI}/' "DESTINATION " + + # oam libraries and headers go into lib and include. + substituteInPlace oam/CMakeLists.txt \ + --replace "DESTINATION oam/" "DESTINATION " \ + --replace 'DESTINATION ''${OAM_NAME}/' "DESTINATION " + + # Update relative path to librocm_smi64 in the Python binding. + substituteInPlace python_smi_tools/rsmiBindings.py \ + --replace "/../lib/librocm_smi64.so" "/../../librocm_smi64.so" + ''; + + postInstall = '' + wrapPythonProgramsIn $out/bin ''; meta = with lib; { @@ -25,6 +47,6 @@ buildPythonApplication rec { homepage = "https://github.com/RadeonOpenCompute/ROC-smi"; license = with licenses; [ mit ]; maintainers = with maintainers; [ danieldk ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index cf88dc846fb..be4eaf5f079 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.10.1"; + version = "4.10.2"; pname = "sleuthkit"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = "${pname}-${version}"; - sha256 = "142kkpkpawpqyc88pr6xdvlagw6djaah1schyjxq9qdq9cnqx0dw"; + sha256 = "sha256-N0/spV/Bxk/UNULPot82Vw1uTIxy/Arf84wqUp6W2Tc="; }; postPatch = '' diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix index 951f236d04a..4efaf56ccf6 100644 --- a/pkgs/tools/text/jsawk/default.nix +++ b/pkgs/tools/text/jsawk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_78 }: stdenv.mkDerivation { pname = "jsawk"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cp $src/jsawk $out/bin/ wrapProgram $out/bin/jsawk \ - --prefix PATH : "${spidermonkey_38}/bin" + --prefix PATH : "${spidermonkey_78}/bin" ''; meta = { diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 9cc31be7ed4..383c3603bc8 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.10.0"; + version = "5.10.1"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "02jqbxnchljyqnmlbxjaf5zpdi03gxapfy38dfikl5j4f7yyxvjs"; + sha256 = "sha256-S3OGc7rirNkP5aSnaASP6n7b7zYHSaDDWRVRWWTM2hc="; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/tools/text/zstxtns-utils/default.nix b/pkgs/tools/text/zstxtns-utils/default.nix index eebf0785394..362f2fca84d 100644 --- a/pkgs/tools/text/zstxtns-utils/default.nix +++ b/pkgs/tools/text/zstxtns-utils/default.nix @@ -1,5 +1,4 @@ -{ bash -, coreutils +{ coreutils , fetchurl , gnugrep , lib @@ -18,7 +17,6 @@ stdenvNoCC.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ bash coreutils gnugrep moreutils ]; installPhase = '' runHook preInstall @@ -27,8 +25,8 @@ stdenvNoCC.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/zstxtns-merge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep moreutils]}" - wrapProgram $out/bin/zstxtns-unmerge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep]}" + wrapProgram $out/bin/zstxtns-merge --set PATH "${lib.makeBinPath [coreutils gnugrep moreutils]}" + wrapProgram $out/bin/zstxtns-unmerge --set PATH "${lib.makeBinPath [coreutils gnugrep]}" ''; meta = with lib; { diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/tools/typesetting/biblatex-check/default.nix index 606e07730e4..63bf7cf1d71 100644 --- a/pkgs/tools/typesetting/biblatex-check/default.nix +++ b/pkgs/tools/typesetting/biblatex-check/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation { pname = "biblatex-check"; @@ -11,7 +11,9 @@ stdenv.mkDerivation { sha256 = "1bq0yqckhssazwkivipdjmn1jpsf301i4ppyl88qhc5igx39wg25"; }; - buildInputs = [ python ]; + buildInputs = [ python3 ]; + + strictDeps = true; installPhase = '' install -Dm755 biblatex_check.py $out/bin/biblatex-check diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 9993263c1f6..f553908d9cc 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -52,6 +52,9 @@ in (buildEnv { buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; + # This is set primarily to help find-tarballs.nix to do its job + passthru.packages = pkgList.all; + postBuild = '' cd "$out" mkdir -p ./bin diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index d096f834ba1..6ee7c844994 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu ]; broken = stdenv.isAarch64; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix index ff2889b9b91..71b85b845eb 100644 --- a/pkgs/tools/video/gopro/default.nix +++ b/pkgs/tools/video/gopro/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras"; homepage = "https://github.com/KonradIT/gopro-linux"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 14fda991f5a..10a270b484c 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.2.15"; + version = "0.3.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-QJn1A2l9bK4jUObnKfzO9/2LxY9i+ueGlZiefqCYZKA="; + sha256 = "sha256-zN9anlm+KbSbFKphC8mLaK+w8cOuOSKrVw5YGNCjEeA="; }; - vendorSha256 = "sha256-bpPFtyDPelLfpxU5OGkEPrp6EvERThg1TzAQ6otg8B0="; + vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix new file mode 100644 index 00000000000..36e223f8d4c --- /dev/null +++ b/pkgs/tools/wayland/swaycwd/default.nix @@ -0,0 +1,45 @@ +{ lib, nim, stdenv, fetchFromGitLab +, enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ] +}: + +stdenv.mkDerivation { + name = "swaycwd"; + version = "0.0.1"; + + src = fetchFromGitLab { + owner = "cab404"; + repo = "swaycwd"; + rev = "aca81695ec2102b9bca6f5bae364f69a8b9d399f"; + hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4="; + }; + + configurePhase = '' + runHook preConfigure + { + echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}' + echo 'export enabledShells' + } > shells.nim + runHook postConfigure + ''; + + nativeBuildInputs = [ nim ]; + + buildPhase = '' + export HOME=$TMPDIR + nim c --opt:speed -d:release swaycwd.nim + ''; + + installPhase = '' + runHook preInstall + install -D -m555 -t $out/bin swaycwd + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://gitlab.com/cab404/swaycwd"; + description = "Returns cwd for shell in currently focused sway window, or home directory if cannot find shell"; + maintainers = with maintainers; [ cab404 ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6795cedf949..27a933c0f93 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -92,6 +92,7 @@ mapAliases ({ cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; catfish = xfce.catfish; # added 2019-12-22 + ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # added 2021-03-25 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 @@ -99,6 +100,16 @@ mapAliases ({ cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cifs_utils = cifs-utils; # added 2016-08 ckb = ckb-next; # added 2018-10-21 + + # these are for convenience, not for backward compat and shouldn't expire + clang5Stdenv = lowPrio llvmPackages_5.stdenv; + clang6Stdenv = lowPrio llvmPackages_6.stdenv; + clang7Stdenv = lowPrio llvmPackages_7.stdenv; + clang8Stdenv = lowPrio llvmPackages_8.stdenv; + clang9Stdenv = lowPrio llvmPackages_9.stdenv; + clang10Stdenv = lowPrio llvmPackages_10.stdenv; + clang11Stdenv = lowPrio llvmPackages_11.stdenv; + clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 @@ -302,6 +313,7 @@ mapAliases ({ inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; + inte-ui = inter; # added 2021-03-27 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 @@ -564,6 +576,7 @@ mapAliases ({ procps-ng = procps; # added 2018-06-08 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16 pygmentex = texlive.bin.pygmentex; # added 2019-12-15 + pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # added 2021-03-21 pyo3-pack = maturin; pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 pulseaudioLight = pulseaudio; # added 2018-04-25 @@ -694,6 +707,7 @@ mapAliases ({ speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 + spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16 spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 spring-boot = spring-boot-cli; # added 2020-04-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a4dc1a1fa2..d6dc3774206 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -168,6 +168,8 @@ in breakpad = callPackage ../development/misc/breakpad { }; + buf = callPackage ../development/tools/buf { }; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; @@ -197,6 +199,8 @@ in inherit (python3Packages) sphinx; }; + catatonit = callPackage ../applications/virtualization/catatonit { }; + cen64 = callPackage ../misc/emulators/cen64 { }; cereal = callPackage ../development/libraries/cereal { }; @@ -1044,6 +1048,8 @@ in awslogs = callPackage ../tools/admin/awslogs { }; + aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; + aws-env = callPackage ../tools/admin/aws-env { }; aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; @@ -1128,6 +1134,8 @@ in barman = python3Packages.callPackage ../tools/misc/barman { }; + bashate = python3Packages.callPackage ../development/tools/bashate { }; + bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; bashcards = callPackage ../tools/misc/bashcards { }; @@ -1136,6 +1144,8 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; + bitwarden = callPackage ../tools/security/bitwarden { }; inherit (nodePackages) bitwarden-cli; @@ -1159,6 +1169,8 @@ in bonfire = callPackage ../tools/misc/bonfire { }; + botamusique = callPackage ../tools/audio/botamusique { }; + boulder = callPackage ../tools/admin/boulder { }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; @@ -1225,6 +1237,8 @@ in corsmisc = callPackage ../tools/security/corsmisc { }; + cosign = callPackage ../tools/security/cosign { }; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; cpuid = callPackage ../os-specific/linux/cpuid { }; @@ -1603,7 +1617,7 @@ in b3sum = callPackage ../tools/security/b3sum {}; - backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; + backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; bandwhich = callPackage ../tools/networking/bandwhich { inherit (darwin.apple_sdk.frameworks) Security; @@ -1930,8 +1944,6 @@ in cbor-diag = callPackage ../development/tools/cbor-diag { }; - ccnet = callPackage ../tools/networking/ccnet { }; - cassowary = callPackage ../tools/networking/cassowary { }; croc = callPackage ../tools/networking/croc { }; @@ -2038,6 +2050,8 @@ in swaykbdd = callPackage ../tools/wayland/swaykbdd { }; + swaycwd = callPackage ../tools/wayland/swaycwd { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wev = callPackage ../tools/wayland/wev { }; @@ -2187,6 +2201,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + digitemp = callPackage ../tools/misc/digitemp { }; + dijo = callPackage ../tools/misc/dijo { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -2240,7 +2256,7 @@ in dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; - dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + inherit (ocamlPackages) dot-merlin-reader; dozenal = callPackage ../applications/misc/dozenal { }; @@ -2375,6 +2391,8 @@ in fileshelter = callPackage ../servers/web-apps/fileshelter { }; + fioctl = callPackage ../tools/admin/fioctl { }; + firecracker = callPackage ../applications/virtualization/firecracker { }; firectl = callPackage ../applications/virtualization/firectl { }; @@ -2828,6 +2846,7 @@ in procs = callPackage ../tools/admin/procs { inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin) libiconv; }; psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; @@ -3129,9 +3148,7 @@ in librsync = librsync_0_9; }; - bud = callPackage ../tools/networking/bud { - inherit (pythonPackages) gyp; - }; + bud = callPackage ../tools/networking/bud { }; bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; @@ -3257,6 +3274,7 @@ in clementine = libsForQt514.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; + protobuf = protobuf3_14; }; clementineUnfree = clementine.unfree; @@ -3352,6 +3370,8 @@ in usbview = callPackage ../tools/misc/usbview { }; + uwuify = callPackage ../tools/misc/uwuify { }; + anthy = callPackage ../tools/inputmethods/anthy { }; evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; @@ -3381,9 +3401,7 @@ in skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; - libkkc-data = callPackage ../data/misc/libkkc-data { - inherit (pythonPackages) marisa; - }; + libkkc-data = callPackage ../data/misc/libkkc-data { }; libkkc = callPackage ../tools/inputmethods/libkkc { }; @@ -3853,6 +3871,8 @@ in drone-runner-exec = callPackage ../development/tools/continuous-integration/drone-runner-exec { }; + drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { }; + dropbear = callPackage ../tools/networking/dropbear { }; dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; @@ -4025,6 +4045,7 @@ in wrangler = callPackage ../development/tools/wrangler { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; + inherit (darwin) libiconv; }; wsl-open = callPackage ../tools/misc/wsl-open { }; @@ -4146,9 +4167,7 @@ in epsxe = callPackage ../misc/emulators/epsxe { }; - escrotum = callPackage ../tools/graphics/escrotum { - inherit (pythonPackages) buildPythonApplication pygtk numpy; - }; + escrotum = callPackage ../tools/graphics/escrotum { }; etcher = callPackage ../tools/misc/etcher { }; @@ -4401,6 +4420,8 @@ in flamegraph = callPackage ../development/tools/flamegraph { }; + flawfinder = callPackage ../development/tools/flawfinder { }; + flips = callPackage ../tools/compression/flips { }; fmbt = callPackage ../development/tools/fmbt { @@ -4785,6 +4806,8 @@ in gitfs = callPackage ../tools/filesystems/gitfs { }; + github-backup = callPackage ../tools/misc/github-backup { }; + gitin = callPackage ../applications/version-management/git-and-tools/gitin { }; gitinspector = callPackage ../applications/version-management/gitinspector { }; @@ -6852,6 +6875,8 @@ in nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { }; oatpp = callPackage ../development/libraries/oatpp { }; @@ -7919,6 +7944,8 @@ in pulseSupport = config.pulseaudio or false; }; + scimark = callPackage ../misc/scimark { }; + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -8078,6 +8105,8 @@ in sipsak = callPackage ../tools/networking/sipsak { }; + sipvicious = python3Packages.callPackage ../tools/security/sipvicious { }; + siril = callPackage ../applications/science/astronomy/siril { }; sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; @@ -8765,6 +8794,8 @@ in tydra = callPackage ../tools/misc/tydra { }; + tz = callPackage ../tools/misc/tz { }; + u9fs = callPackage ../servers/u9fs { }; ua = callPackage ../tools/networking/ua { }; @@ -9663,6 +9694,24 @@ in jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix; + adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + + adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; @@ -10384,10 +10433,13 @@ in graphviz = graphviz-nox; }); - inherit (callPackage ../development/compilers/haxe { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }) haxe_3_2 haxe_3_4; - haxe = haxe_3_4; + inherit (callPackage ../development/compilers/haxe { }) + haxe_4_2 + haxe_3_4 + haxe_3_2 + ; + + haxe = haxe_4_2; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; @@ -10735,7 +10787,7 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; - llvmPackages = recurseIntoAttrs (with targetPlatform; + llvmPackages = with targetPlatform; if isDarwin then llvmPackages_7 else if isFreeBSD then @@ -10745,55 +10797,55 @@ in else if isWasm then llvmPackages_8 else - llvmPackages_latest); + llvmPackages_latest; - llvmPackages_5 = callPackage ../development/compilers/llvm/5 { + llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - }; + }); - llvmPackages_6 = callPackage ../development/compilers/llvm/6 { + llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - }; + }); - llvmPackages_7 = callPackage ../development/compilers/llvm/7 { + llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - }; + }); - llvmPackages_8 = callPackage ../development/compilers/llvm/8 { + llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; - }; + }); - llvmPackages_9 = callPackage ../development/compilers/llvm/9 { + llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; - }; + }); - llvmPackages_10 = callPackage ../development/compilers/llvm/10 { + llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_10.tools; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; - }; + }); - llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({ + llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; - }); + })); llvmPackages_latest = llvmPackages_11; - llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; + llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -10867,9 +10919,8 @@ in muon = callPackage ../development/compilers/muon { }; - nim = callPackage ../development/compilers/nim { }; - nim-unwrapped = nim.unwrapped; - nimble-unwrapped = nim.nimble-unwrapped; + inherit (callPackages ../development/compilers/nim { }) + nim-unwrapped nimble-unwrapped nim; nrpl = callPackage ../development/tools/nrpl { }; @@ -11198,7 +11249,9 @@ in jdk = oraclejdk; }; - sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { }; + sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; + }; squeak = callPackage ../development/compilers/squeak { }; @@ -11794,11 +11847,6 @@ in sparkleshare = callPackage ../applications/version-management/sparkleshare { }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; - spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ - inherit (darwin) libobjc; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; @@ -12537,7 +12585,7 @@ in jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; + fedpkg = callPackage ../development/tools/fedpkg { }; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; @@ -13505,6 +13553,8 @@ in bctoolbox = callPackage ../development/libraries/bctoolbox { }; + bearssl = callPackage ../development/libraries/bearssl { }; + beecrypt = callPackage ../development/libraries/beecrypt { }; belcard = callPackage ../development/libraries/belcard { }; @@ -16761,7 +16811,7 @@ in qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; inherit bison; inherit cups; inherit dconf; @@ -17228,8 +17278,6 @@ in stlink = callPackage ../development/tools/misc/stlink { }; - steghide = callPackage ../tools/security/steghide {}; - stegseek = callPackage ../tools/security/stegseek {}; stlport = callPackage ../development/libraries/stlport { }; @@ -17990,7 +18038,7 @@ in mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; @@ -18009,7 +18057,7 @@ in subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); + apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -18247,6 +18295,10 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; + inspircd = callPackage ../servers/irc/inspircd { }; + + inspircdMinimal = inspircd.override { extraModules = []; }; + imgproxy = callPackage ../servers/imgproxy { }; ircdog = callPackage ../applications/networking/irc/ircdog { }; @@ -19269,7 +19321,7 @@ in fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse { util-linux = util-linuxMinimal; }); - fuse = lowPrio fusePackages.fuse_2; + fuse = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2); fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; @@ -19408,12 +19460,15 @@ in macfuse-stubs = callPackage ../os-specific/darwin/macfuse { inherit (darwin) libtapi; + inherit (darwin.apple_sdk.frameworks) DiskArbitration; }; osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; power-calibrate = callPackage ../os-specific/linux/power-calibrate { }; + powercap = callPackage ../os-specific/linux/powercap { }; + powerstat = callPackage ../os-specific/linux/powerstat { }; smemstat = callPackage ../os-specific/linux/smemstat { }; @@ -19867,7 +19922,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_10; + linux_latest_for_hardened = pkgs.linux_5_11; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -21128,6 +21183,8 @@ in papis = with python3Packages; toPythonApplication papis; + paperlike-go = callPackage ../tools/misc/paperlike-go { }; + paps = callPackage ../tools/misc/paps { }; pecita = callPackage ../data/fonts/pecita {}; @@ -21284,7 +21341,6 @@ in maligned = callPackage ../development/tools/maligned { }; - inter-ui = callPackage ../data/fonts/inter-ui { }; inter = callPackage ../data/fonts/inter { }; scientifica = callPackage ../data/fonts/scientifica { }; @@ -21418,6 +21474,8 @@ in vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; + vollkorn = callPackage ../data/fonts/vollkorn { }; + weather-icons = callPackage ../data/fonts/weather-icons { }; wireless-regdb = callPackage ../data/misc/wireless-regdb { }; @@ -21679,6 +21737,8 @@ in bandwidth = callPackage ../tools/misc/bandwidth { }; + banking = callPackage ../applications/office/banking { }; + baresip = callPackage ../applications/networking/instant-messengers/baresip { }; barrier = libsForQt5.callPackage ../applications/misc/barrier {}; @@ -21837,6 +21897,8 @@ in catfs = callPackage ../os-specific/linux/catfs { }; + catgirl = callPackage ../applications/networking/irc/catgirl { }; + catimg = callPackage ../tools/misc/catimg { }; catt = callPackage ../applications/video/catt { }; @@ -22545,6 +22607,14 @@ in grandorgue = callPackage ../applications/audio/grandorgue { }; + greetd = recurseIntoAttrs { + greetd = callPackage ../os-specific/linux/greetd { }; + gtkgreet = callPackage ../os-specific/linux/gtkgreet { }; + dlm = callPackage ../os-specific/linux/dlm { }; + wlgreet = callPackage ../os-specific/linux/wlgreet { }; + tuigreet = callPackage ../os-specific/linux/tuigreet { }; + }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -23623,6 +23693,8 @@ in kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; + kube-score = callPackage ../applications/networking/cluster/kube-score { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; @@ -23633,6 +23705,8 @@ in kubernix = callPackage ../applications/networking/cluster/kubernix { }; + kubeconform = callPackage ../applications/networking/cluster/kubeconform { }; + kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; @@ -24078,6 +24152,8 @@ in moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; + moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { }; + mooSpace = callPackage ../applications/audio/mooSpace { }; mop = callPackage ../applications/misc/mop { }; @@ -25279,6 +25355,8 @@ in slop = callPackage ../tools/misc/slop {}; + slowhttptest = callPackage ../tools/security/slowhttptest { }; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; sniproxy = callPackage ../applications/networking/sniproxy { }; @@ -25957,6 +26035,7 @@ in neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovim = wrapNeovim neovim-unwrapped { }; + neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -26669,7 +26748,9 @@ in autoconf = buildPackages.autoconf269; }; - zgrviewer = callPackage ../applications/graphics/zgrviewer {}; + zgrab2 = callPackage ../tools/security/zgrab2 { }; + + zgrviewer = callPackage ../applications/graphics/zgrviewer { }; zgv = callPackage ../applications/graphics/zgv { # Enable the below line for terminal display. Note @@ -26790,6 +26871,8 @@ in lndconnect = callPackage ../applications/blockchains/lndconnect { }; + lndmanage = callPackage ../applications/blockchains/lndmanage.nix { }; + monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost17x; @@ -28421,10 +28504,14 @@ in dcmtk = callPackage ../applications/science/medicine/dcmtk { }; + xmedcon = callPackage ../applications/science/medicine/xmedcon { }; + ### SCIENCE/PHYSICS elmerfem = callPackage ../applications/science/physics/elmerfem {}; + professor = callPackage ../applications/science/physics/professor { }; + sacrifice = callPackage ../applications/science/physics/sacrifice {}; sherpa = callPackage ../applications/science/physics/sherpa {}; @@ -28885,6 +28972,8 @@ in simgrid = callPackage ../applications/science/misc/simgrid { }; + sumo = callPackage ../applications/science/networking/sumo { }; + spyder = with python3.pkgs; toPythonApplication spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; @@ -29636,10 +29725,10 @@ in pykms = callPackage ../tools/networking/pykms { }; - pyload = callPackage ../applications/networking/pyload {}; - pyupgrade = with python3Packages; toPythonApplication pyupgrade; + pwncat = python3Packages.callPackage ../tools/security/pwncat { }; + pwntools = with python3Packages; toPythonApplication pwntools; uae = callPackage ../misc/emulators/uae { }; @@ -29994,6 +30083,8 @@ in pythonPackages = python3Packages; }; + wiki-js = callPackage ../servers/web-apps/wiki-js { }; + winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; @@ -30457,7 +30548,6 @@ in zettlr = callPackage ../applications/misc/zettlr { texlive = texlive.combined.scheme-medium; - inherit (haskellPackages) pandoc-citeproc; }; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1ded50ce763..0da4fea8f42 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -33,6 +33,7 @@ let equations = callPackage ../development/coq-modules/equations { }; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; flocq = callPackage ../development/coq-modules/flocq {}; + fourcolor = callPackage ../development/coq-modules/fourcolor {}; gappalib = callPackage ../development/coq-modules/gappalib {}; heq = callPackage ../development/coq-modules/heq {}; hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {}; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 03d70a32f6a..38d1ed6b86c 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -46,6 +46,8 @@ let self = rec { # addon packages + a4ksubtitles = callPackage ../applications/video/kodi-packages/a4ksubtitles { }; + controllers = { default = callPackage ../applications/video/kodi-packages/controllers { controller = "default"; }; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 2bfcb9d5d80..590a24fb2b0 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -4,7 +4,8 @@ with pkgs; runCommand "nixpkgs-metrics" { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ]; - requiredSystemFeatures = [ "benchmark" ]; + #FIXME: the job doesn't work, see issue #76776 + #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time } '' export NIX_STATE_DIR=$TMPDIR diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0e3b21e59ad..61728d14095 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -317,7 +317,15 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; - elpi = callPackage ../development/ocaml-modules/elpi { }; + elpi = callPackage ../development/ocaml-modules/elpi ( + let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15" + then ppxlib.override { version = "0.15.0"; } + else ppxlib; in + { + ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; }; + ppxlib = ppxlib_0_15; + } + ); encore = callPackage ../development/ocaml-modules/encore { }; @@ -345,6 +353,12 @@ let faraday = callPackage ../development/ocaml-modules/faraday { }; + faraday-async = callPackage ../development/ocaml-modules/faraday/async.nix { }; + + faraday-lwt = callPackage ../development/ocaml-modules/faraday/lwt.nix { }; + + faraday-lwt-unix = callPackage ../development/ocaml-modules/faraday/lwt-unix.nix { }; + farfadet = callPackage ../development/ocaml-modules/farfadet { }; fdkaac = callPackage ../development/ocaml-modules/fdkaac { }; @@ -620,10 +634,15 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; - merlin = callPackage ../development/tools/ocaml/merlin { }; + merlin = + if lib.versionAtLeast ocaml.version "4.11" + then callPackage ../development/tools/ocaml/merlin/4.x.nix { } + else callPackage ../development/tools/ocaml/merlin { }; merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + metrics = callPackage ../development/ocaml-modules/metrics { }; metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; @@ -769,6 +788,8 @@ let ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; + ocaml-freestanding = callPackage ../development/ocaml-modules/ocaml-freestanding { }; + ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { }; @@ -1023,13 +1044,23 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { + ppxlib = ppxlib.override { version = "0.15.0"; }; + }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; - ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; + ppx_import = callPackage ../development/ocaml-modules/ppx_import ( + let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15" + then ppxlib.override { version = "0.15.0"; } + else ppxlib; in + { + ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; }; + ppxlib = ppxlib_0_15; + } + ); ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; @@ -1400,7 +1431,10 @@ let omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; + google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { + # needs Base64 module + ocaml_extlib = ocaml_extlib.override { minimal = false; }; + }; hol_light = callPackage ../applications/science/logic/hol_light { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 557484e96ff..a2aa171979c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10955,11 +10955,11 @@ let url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; - propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PerlMagick PodParser TextUnidecode XMLLibXSLT ]; preCheck = '' rm t/931_epub.t # epub test fails ''; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ @@ -10968,6 +10968,12 @@ let shortenPerlShebang "$file" done ''; + postInstall = '' + for file in latexmlc latexmlmath latexmlpost ; do + # add runtime dependencies that cause silent failures when missing + wrapProgram $out/bin/$file --prefix PATH : ${lib.makeBinPath [ pkgs.ghostscript pkgs.potrace ]} + done + ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; license = lib.licenses.free; @@ -10976,19 +10982,11 @@ let libapreq2 = buildPerlPackage { pname = "libapreq2"; - version = "2.13"; + version = "2.16"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz"; - sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; + url = "mirror://cpan/authors/id/S/SH/SHAY/libapreq2-2.16.tar.gz"; + sha256 = "e04c855a3ea070b8863569fbae02fe828f534ac88755b23e24d3863cc9598349"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-12412.patch"; - url = "https://svn.apache.org/viewvc/httpd/apreq/trunk/library/parser_multipart.c?r1=1866760&r2=1866759&pathrev=1866760&view=patch"; - sha256 = "08zaw5pb2i4w1y8crhxmlf0d8gzpvi9z49x4nwlkg4j87x7gjvaa"; - stripLen = 2; - }) - ]; outputs = [ "out" ]; buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; propagatedBuildInputs = [ (pkgs.apacheHttpdPackages.mod_perl.override { inherit perl; }) ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1383da9574..2875eca59b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -322,6 +322,8 @@ in { aioshelly = callPackage ../development/python-modules/aioshelly { }; + aiosmb = callPackage ../development/python-modules/aiosmb { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; aiosqlite = callPackage ../development/python-modules/aiosqlite { }; @@ -370,6 +372,8 @@ in { amqplib = callPackage ../development/python-modules/amqplib { }; + android-backup = callPackage ../development/python-modules/android-backup { }; + androidtv = callPackage ../development/python-modules/androidtv { }; androguard = callPackage ../development/python-modules/androguard { }; @@ -1608,10 +1612,10 @@ in { cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { - cudatoolkit = pkgs.cudatoolkit_10_0; - cudnn = pkgs.cudnn_cudatoolkit_10_0; - nccl = pkgs.nccl_cudatoolkit_10; - cutensor = pkgs.cutensor_cudatoolkit_10; + cudatoolkit = pkgs.cudatoolkit_11; + cudnn = pkgs.cudnn_cudatoolkit_11; + nccl = pkgs.nccl_cudatoolkit_11; + cutensor = pkgs.cutensor_cudatoolkit_11; }; curio = callPackage ../development/python-modules/curio { }; @@ -2080,6 +2084,8 @@ in { else callPackage ../development/python-modules/dulwich/0_19.nix { }; + dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; + dyn = callPackage ../development/python-modules/dyn { }; dynd = callPackage ../development/python-modules/dynd { }; @@ -3271,6 +3277,8 @@ in { imgsize = callPackage ../development/python-modules/imgsize { }; + iminuit = callPackage ../development/python-modules/iminuit { }; + immutables = callPackage ../development/python-modules/immutables { }; impacket = callPackage ../development/python-modules/impacket { }; @@ -3968,7 +3976,6 @@ in { llfuse = callPackage ../development/python-modules/llfuse { inherit (pkgs) fuse; - inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration; }; llvmlite = callPackage ../development/python-modules/llvmlite { @@ -4708,8 +4715,6 @@ in { numpy-stl = callPackage ../development/python-modules/numpy-stl { }; - numtraits = callPackage ../development/python-modules/numtraits { }; - nunavut = callPackage ../development/python-modules/nunavut { }; nvchecker = callPackage ../development/python-modules/nvchecker { }; @@ -5608,6 +5613,8 @@ in { pydbus = callPackage ../development/python-modules/pydbus { }; + pydeconz = callPackage ../development/python-modules/pydeconz { }; + pydenticon = callPackage ../development/python-modules/pydenticon { }; pydexcom = callPackage ../development/python-modules/pydexcom { }; @@ -5847,6 +5854,8 @@ in { pykmtronic = callPackage ../development/python-modules/pykmtronic { }; + pykodi = callPackage ../development/python-modules/pykodi { }; + pykwalify = callPackage ../development/python-modules/pykwalify { }; pylacrosse = callPackage ../development/python-modules/pylacrosse { }; @@ -6146,6 +6155,8 @@ in { pyrad = callPackage ../development/python-modules/pyrad { }; + pyradios = callPackage ../development/python-modules/pyradios { }; + py-radix = callPackage ../development/python-modules/py-radix { }; pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; @@ -7760,6 +7771,8 @@ in { softlayer = callPackage ../development/python-modules/softlayer { }; + solaredge = callPackage ../development/python-modules/solaredge { }; + solax = callPackage ../development/python-modules/solax { }; solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); @@ -7859,7 +7872,7 @@ in { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; - sphinx-autobuild = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; |